Version bump, add net-p2p to metadata.xml, clean old ebuild, mark -r2 stable on x86.

7 files changed, 23 insertions, 14 deletions

diff --git a/net-p2p/xnap/ChangeLog b/net-p2p/xnap/ChangeLog
index a38850ba0c98..6561a8ec839a 100644
--- a/net-p2p/xnap/ChangeLog
+++ b/net-p2p/xnap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/xnap
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/xnap/ChangeLog,v 1.4 2004/06/25 00:37:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xnap/ChangeLog,v 1.5 2004/08/11 17:55:44 squinky86 Exp $
+
+*xnap-2.5-r3 (11 Aug 2004)
+
+  11 Aug 2004; Jon Hood <squinky86@gentoo.org> metadata.xml,
+  -xnap-2.5-r1.ebuild, xnap-2.5-r2.ebuild, +xnap-2.5-r3.ebuild:
+  Version bump, add net-p2p to metadata.xml, clean old ebuild, mark 2.5-r2
+  stable on x86.
 
 *xnap-2.5-r2 (18 Apr 2004)
 
diff --git a/net-p2p/xnap/Manifest b/net-p2p/xnap/Manifest
index fb89f4cdb06c..4626ced7c2fa 100644
--- a/net-p2p/xnap/Manifest
+++ b/net-p2p/xnap/Manifest
@@ -1,6 +1,6 @@
-MD5 b412b2f4aecaa29728e2c5bf0eed0245 xnap-2.5-r1.ebuild 697
-MD5 be29cac7de66f323bf3501224a4bf3fe xnap-2.5-r2.ebuild 730
-MD5 b4a24757f03657ed4d1445fb6344f6dd ChangeLog 485
-MD5 45b68792beb0dd5bae5f7442b37decf8 metadata.xml 591
-MD5 e42bfee8ad9d2da376f965e1043d29a0 files/digest-xnap-2.5-r1 58
+MD5 bc6ca783db90e7ed742018d4a34f3707 xnap-2.5-r3.ebuild 731
+MD5 769d6917ed327426a19a722ba350d94e xnap-2.5-r2.ebuild 730
+MD5 9ac93ecef56844831fcc4201771fb908 ChangeLog 732
+MD5 e9d687372b2fe95682284e376adac0d0 metadata.xml 610
 MD5 84c0761e0ff5f7a4c8b02516e7dc5304 files/digest-xnap-2.5-r2 60
+MD5 84c0761e0ff5f7a4c8b02516e7dc5304 files/digest-xnap-2.5-r3 60
diff --git a/net-p2p/xnap/files/digest-xnap-2.5-r1 b/net-p2p/xnap/files/digest-xnap-2.5-r1
deleted file mode 100644
index 6288b2053911..000000000000
--- a/net-p2p/xnap/files/digest-xnap-2.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d7b9b2f74a3b3a1630c79a946e0b285 xnap-2.5.jar 1328406
diff --git a/net-p2p/xnap/files/digest-xnap-2.5-r3 b/net-p2p/xnap/files/digest-xnap-2.5-r3
new file mode 100644
index 000000000000..fc6b2a5ebdad
--- /dev/null
+++ b/net-p2p/xnap/files/digest-xnap-2.5-r3
@@ -0,0 +1 @@
+MD5 155c0651a70235aebfe194d8477d09b8 xnap-2.5r2.jar 1318377
diff --git a/net-p2p/xnap/metadata.xml b/net-p2p/xnap/metadata.xml
index 7d85eab6b198..1374597e4315 100644
--- a/net-p2p/xnap/metadata.xml
+++ b/net-p2p/xnap/metadata.xml
@@ -2,8 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>java</herd>
+<herd>net-p2p</herd>
 <longdescription>
- XNap provides a plugin enabled framework for peer-to-peer (P2P) applications and a client which is based on that framework. It is free software and licensed under the  GNU Public License  .
+ XNap provides a plugin enabled framework for peer-to-peer (P2P) applications and a client which is based on that framework. It is free software and licensed under the GNU Public License .
 
  XNap is purely written in Java. The client features a modern Swing based user interface and console support that will run nicely on every platform with a recent Java Runtime Environment (1.3 or higher). 
 </longdescription>
diff --git a/net-p2p/xnap/xnap-2.5-r2.ebuild b/net-p2p/xnap/xnap-2.5-r2.ebuild
index eab8303bb66c..23c6f50d6c59 100644
--- a/net-p2p/xnap/xnap-2.5-r2.ebuild
+++ b/net-p2p/xnap/xnap-2.5-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/xnap/xnap-2.5-r2.ebuild,v 1.2 2004/06/25 00:37:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xnap/xnap-2.5-r2.ebuild,v 1.3 2004/08/11 17:55:44 squinky86 Exp $
 
 DESCRIPTION="A P2P framework and client"
 HOMEPAGE="http://xnap.sf.net"
 SRC_URI="mirror://sourceforge/xnap/${P}r2.jar"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ~ppc ~sparc ~alpha"
 IUSE=""
 RDEPEND=">=virtual/jre-1.3"
 
diff --git a/net-p2p/xnap/xnap-2.5-r1.ebuild b/net-p2p/xnap/xnap-2.5-r3.ebuild
index 223820db14ab..b82da6a0ef5f 100644
--- a/net-p2p/xnap/xnap-2.5-r1.ebuild
+++ b/net-p2p/xnap/xnap-2.5-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/xnap/xnap-2.5-r1.ebuild,v 1.2 2004/06/25 00:37:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xnap/xnap-2.5-r3.ebuild,v 1.1 2004/08/11 17:55:44 squinky86 Exp $
 
 DESCRIPTION="A P2P framework and client"
 HOMEPAGE="http://xnap.sf.net"
-SRC_URI="mirror://sourceforge/xnap/${P}.jar"
+SRC_URI="mirror://sourceforge/xnap/${P}r2.jar"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
@@ -18,12 +18,13 @@ src_unpack() {
 }
 
 src_install() {
+	mv ${S}/${A} ${S}/${PN}.jar
 	insinto /opt/${PN}/lib
-	doins ${P}.jar
+	doins ${PN}.jar
 
 	echo "#!/bin/sh" > ${PN}
 	echo "cd /opt/${PN}" >> ${PN}
-	echo '${JAVA_HOME}'/bin/java -jar lib/${P}.jar '$*' >> ${PN}
+	echo '${JAVA_HOME}'/bin/java -jar lib/${PN}.jar '$*' >> ${PN}
 
 	into /opt
 	dobin ${PN}