Version bump, bug #185634. Build from source, most bundled deps removed, few that we don't have package for are left - bug #176739. Added java herd to metadata.xml.

Package-Manager: portage-2.1.4

5 files changed, 94 insertions, 20 deletions

diff --git a/net-p2p/phex/ChangeLog b/net-p2p/phex/ChangeLog
index 7e267a01703f..038288d94e2a 100644
--- a/net-p2p/phex/ChangeLog
+++ b/net-p2p/phex/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/phex
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/phex/ChangeLog,v 1.11 2007/07/21 09:47:27 betelgeuse Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/phex/ChangeLog,v 1.12 2008/01/15 20:17:10 caster Exp $
+
+*phex-3.2.0.102 (15 Jan 2008)
+
+  15 Jan 2008; Vlastimil Babka <caster@gentoo.org> metadata.xml,
+  +phex-3.2.0.102.ebuild:
+  Version bump, bug #185634. Build from source, most bundled deps removed, few
+  that we don't have package for are left - bug #176739. Added java herd to
+  metadata.xml.
 
   21 Jul 2007; Petteri Räty <betelgeuse@gentoo.org> phex-3.0.0.99.ebuild:
   Change RDEPEND from >=dev-java/jgoodies-looks-1.3.2 to >=2.0 because this
diff --git a/net-p2p/phex/Manifest b/net-p2p/phex/Manifest
index 89ca592e3c36..ec369d66255a 100644
--- a/net-p2p/phex/Manifest
+++ b/net-p2p/phex/Manifest
@@ -1,30 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX phex-3.0.0.99.sh 350 RMD160 5a765fd7949407bf56bc2475921c0d163f7e8989 SHA1 bf7be4177fc77e18a1fb3d04ed9f2da63c572efc SHA256 169579d431b2eecfd2de9a711d4c9c6fc6838b9066e4ab73f7060d7a6aca5ddc
 MD5 e98d6e7bf9cae89952c15ff0d5547c13 files/phex-3.0.0.99.sh 350
 RMD160 5a765fd7949407bf56bc2475921c0d163f7e8989 files/phex-3.0.0.99.sh 350
 SHA256 169579d431b2eecfd2de9a711d4c9c6fc6838b9066e4ab73f7060d7a6aca5ddc files/phex-3.0.0.99.sh 350
 DIST phex_3.0.0.99.zip 3566529 RMD160 85f1139ea419887b9c1ff77d5917c31f4bbe6ace SHA1 485b9d87d925b06c7c60292fa4d6580f24cab05d SHA256 f2b945f275c4ee1b31a7834f36e71a24b6592e1cfc1314a4593411279ed429bf
+DIST phex_3.2.0.102_src.zip 5416827 RMD160 6c9e359aac0b1786333b25f20699a4e6bd61a782 SHA1 0ab7974309375f1e69e6cdc242eaf63eec7b0d58 SHA256 e5b6316a3e60c68949ca33321804ae9473858f7d65d5fb59275a4f0e7a64eda9
 EBUILD phex-3.0.0.99.ebuild 768 RMD160 226563a7b3921b15d5b1e9dfa95c17426ea9f2b6 SHA1 6b7885e57ba8b82e6de87c06c0161140df84ca6b SHA256 05fda3e12de291c77327b3d3c9274b9750882396af0c523f4bdb0793c0a49686
 MD5 e05209eadf192911b5f2e2bef8618f6d phex-3.0.0.99.ebuild 768
 RMD160 226563a7b3921b15d5b1e9dfa95c17426ea9f2b6 phex-3.0.0.99.ebuild 768
 SHA256 05fda3e12de291c77327b3d3c9274b9750882396af0c523f4bdb0793c0a49686 phex-3.0.0.99.ebuild 768
-MISC ChangeLog 1928 RMD160 693f7a72d19da2eeef965c4cb84f63808aa20cdd SHA1 da5f863c987b60b30630c350fed4e1f343b6b6f4 SHA256 860ddefb803db0e8e7b2d865d13d4f51bf7b8d815c2bb7e2e5d61c9b0ccaae4b
-MD5 80d92acde596b1e4a070856216b28da5 ChangeLog 1928
-RMD160 693f7a72d19da2eeef965c4cb84f63808aa20cdd ChangeLog 1928
-SHA256 860ddefb803db0e8e7b2d865d13d4f51bf7b8d815c2bb7e2e5d61c9b0ccaae4b ChangeLog 1928
-MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
-MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
-SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160
+EBUILD phex-3.2.0.102.ebuild 1901 RMD160 8c7788b8092cf8c43801444e86c899f5f7ebc8c1 SHA1 ac78f7d9709729a4f6801fdd53a56de23324120a SHA256 d4c33dd58040f62468de9869686e19a293013740a918aa9b16a36e7071a97896
+MD5 a8a2de578801f170a272f36d2f865867 phex-3.2.0.102.ebuild 1901
+RMD160 8c7788b8092cf8c43801444e86c899f5f7ebc8c1 phex-3.2.0.102.ebuild 1901
+SHA256 d4c33dd58040f62468de9869686e19a293013740a918aa9b16a36e7071a97896 phex-3.2.0.102.ebuild 1901
+MISC ChangeLog 2218 RMD160 5107756b0e9c9ab771fed3632dd2cca1f8e79a78 SHA1 716d84535204479ee1176766d307d8d17bebfb6e SHA256 9005713fce08ab3d05085a8f6a2c8eafe8daddcda4d24141840e14f4ccd7d713
+MD5 88505bf0376effac9fa205d75942db9c ChangeLog 2218
+RMD160 5107756b0e9c9ab771fed3632dd2cca1f8e79a78 ChangeLog 2218
+SHA256 9005713fce08ab3d05085a8f6a2c8eafe8daddcda4d24141840e14f4ccd7d713 ChangeLog 2218
+MISC metadata.xml 178 RMD160 762e91a039aed240aa7272e8be70f778d701e15f SHA1 2b364810ae0765d67cdde794f001cceede7e3b93 SHA256 7f865bd96e898370f7e6181794cd523e888a60371a1536ce422ff1f2b4b7db23
+MD5 ff2e4b55e921b18d5fdd0d395914d4ee metadata.xml 178
+RMD160 762e91a039aed240aa7272e8be70f778d701e15f metadata.xml 178
+SHA256 7f865bd96e898370f7e6181794cd523e888a60371a1536ce422ff1f2b4b7db23 metadata.xml 178
 MD5 e36490d6d8f2a12542ddb90a98f9e5a7 files/digest-phex-3.0.0.99 235
 RMD160 1df1f0c4fc49f7d1356d03a651ecd13092e9e8bf files/digest-phex-3.0.0.99 235
 SHA256 d2678743132dc854f20929cc105f14b531a993e83c881fe949a9d1a7eef854ed files/digest-phex-3.0.0.99 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGodYucxLzpIGCsLQRAqqbAJwJpxfTA8cbv5/pNBsfEHqK+fN7ewCfTgS5
-hUkqX31F6oVWCsLd10XNIhU=
-=Yzpt
------END PGP SIGNATURE-----
+MD5 006476d2e6a915b72a6b06139d5ff024 files/digest-phex-3.2.0.102 250
+RMD160 af5a17749e4c704d2f1d6a87a79de95142b7c25b files/digest-phex-3.2.0.102 250
+SHA256 1f0faf54d82d80a108387a7857f6de3e3982fecf43ab5d6c9ae8c502f5d5d49d files/digest-phex-3.2.0.102 250
diff --git a/net-p2p/phex/files/digest-phex-3.2.0.102 b/net-p2p/phex/files/digest-phex-3.2.0.102
new file mode 100644
index 000000000000..2e643c33eb3a
--- /dev/null
+++ b/net-p2p/phex/files/digest-phex-3.2.0.102
@@ -0,0 +1,3 @@
+MD5 bcb61203ef343a5a302b10ad04b05268 phex_3.2.0.102_src.zip 5416827
+RMD160 6c9e359aac0b1786333b25f20699a4e6bd61a782 phex_3.2.0.102_src.zip 5416827
+SHA256 e5b6316a3e60c68949ca33321804ae9473858f7d65d5fb59275a4f0e7a64eda9 phex_3.2.0.102_src.zip 5416827
diff --git a/net-p2p/phex/metadata.xml b/net-p2p/phex/metadata.xml
index aa0f3664825f..5466afb2ddd8 100644
--- a/net-p2p/phex/metadata.xml
+++ b/net-p2p/phex/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-p2p</herd>
+<herd>java</herd>
 </pkgmetadata>
diff --git a/net-p2p/phex/phex-3.2.0.102.ebuild b/net-p2p/phex/phex-3.2.0.102.ebuild
new file mode 100644
index 000000000000..36dbc0616339
--- /dev/null
+++ b/net-p2p/phex/phex-3.2.0.102.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/phex/phex-3.2.0.102.ebuild,v 1.1 2008/01/15 20:17:10 caster Exp $
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="java gnutella file-sharing application"
+HOMEPAGE="http://phex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.zip"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+COMMON_DEPEND="=dev-java/commons-httpclient-3.0*
+	>=dev-java/commons-logging-1.1
+	>=dev-java/jgoodies-forms-1.0.5
+	>=dev-java/jgoodies-looks-2.0
+	dev-java/log4j
+	dev-java/l2fprod-common
+	=dev-java/commons-beanutils-1.7*
+	dev-java/commons-codec
+	dev-java/commons-collections
+	>=dev-java/commons-lang-2.1"
+
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.5
+	${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_P}_src"
+
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# build macosx gui against the bundled library, but don't install the library
+	# easier than to patch the gui out, it won't be executed anyway ...
+	mv lib/MRJAdapter.jar . || die
+	rm -vf lib/*.jar || die
+	# avoid patches like plague
+	sed -i "s/createJar, copyThirdpartyJars/createJar/" build/buildJava.xml || die
+	JAVA_ANT_REWRITE_CLASSPATH="true" java-ant_bsfix_files build/*.xml
+	# remove bundled packages that we have - bug #176739
+	rm -rf src/com/l2fprod src/org/apache || die
+}
+
+src_compile() {
+	local gcp="$(java-pkg_getjars commons-httpclient-3,commons-logging,jgoodies-forms,jgoodies-looks-2.0,log4j,l2fprod-common,commons-beanutils-1.7,commons-codec,commons-collections,commons-lang-2.1)"
+	cd build
+	eant -Dgentoo.classpath="${gcp}:MRJAdapter.jar" -Dproject.buildtarget=build buildJava
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	java-pkg_dolauncher ${PN} --main phex.Main
+
+	dohtml docs/readme/* || die
+}