Restrict ant-core dependency to 1.7*, fixes bug 330735

Package-Manager: portage-2.2_rc67-r8/cvs/Linux x86_64

4 files changed, 17 insertions, 113 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 203935fed213..f855aaaf010b 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.86 2010/07/31 14:11:41 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.87 2010/08/01 19:52:46 tommy Exp $
+
+*freenet-0.7.5_p1263-r1 (01 Aug 2010)
+
+  01 Aug 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7.5_p1262.ebuild, -freenet-0.7.5_p1263.ebuild,
+  +freenet-0.7.5_p1263-r1.ebuild:
+  Restrict ant-core dependency to 1.7*, fixes bug 330735
 
 *freenet-0.7.5_p1263 (31 Jul 2010)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 0c96a4f631e6..90586fefd64f 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -8,21 +8,19 @@ AUX run.sh-20090501 16217 RMD160 f8b03990d011e1f149ec43aa536fd7540a19f01a SHA1 1
 AUX strip-openjdk-check.patch 2332 RMD160 92d35cc304c4dbf6747d12e97d318014e9ad4b49 SHA1 f3d70414f13dbc5d3fcd832d2796e1ec56a60b33 SHA256 450f21664ad64f92051c04bd5a9bf4095ed04cc0e24cd436c23c578cf2022821
 AUX strip-version-check.patch 349 RMD160 579ddfdf6549263e7ec2b9190eff6d08d6a2d5c4 SHA1 58e7422d180e4f443d415ec424646933eceeceb8 SHA256 35a33e5c52288505eefca96a6fbb98ae725d6fbefb727e73e513a1356b5cbfef
 AUX wrapper1.conf 2396 RMD160 e029cb5feaf98a03234a061362c0989207fdfd23 SHA1 9b882dc0d366b946596bdecb1b1d45c1e221e4e0 SHA256 52e5e283ac4c43d78feecf1edf5ccb38e5505c89624769976fcbf4ac2c8a1572
-DIST freenet-0.7.5_p1262.zip 3457765 RMD160 d1783343dcafccc001280f6e55121670ccdb66f7 SHA1 0dce26a4f8ac70142616648108d2f6bc6830aafa SHA256 3f9cdfb05e47cd098717687300b825b7a8991f623257bc7a67a535f69a4d84d7
 DIST freenet-0.7.5_p1263.zip 3461014 RMD160 17ae3065a84252c3836c4f671f3e8daaf5e05013 SHA1 e0d47302d34636a8b93473be93ca3b5301fdfd91 SHA256 31b4e0d08b95b76ca38a5a064051a5443b503728bffe171c66c830cfe29f8935
 DIST seednodes-20091027.fref 22241 RMD160 5a21874cb0c8dd27cc46329253a10182ac1280bd SHA1 55a060aee01afa8e9bc94be04e2356b7e2f6c4b0 SHA256 42a00a8166deb01ad660600315a9624961c4403ebcf1509971f483ddb4b63e94
 DIST seednodes-20100701.fref 22311 RMD160 e80cd82b443b45c00998c0e87bfe6e485686419a SHA1 024bc22dacfe336fafef1b9fafadeaec7c976491 SHA256 1264cad055f597583cf7f5f14cdaafd392c5543d45cfff2c450c1fd551da3105
-EBUILD freenet-0.7.5_p1262.ebuild 3143 RMD160 504f4f9e14a91e71f3d259678ba3f3e9ac01d13d SHA1 647022637c1c62d50c56afea51a79354985478c1 SHA256 93684f78fe8f231232207668e2be463803f2528c9db4864005456d034032ac50
-EBUILD freenet-0.7.5_p1263.ebuild 3143 RMD160 a74624285ef85e89d1b4ed4a4069476b946b7558 SHA1 e84266eb2bc0364dcdc6c003e07c621592ec4a1d SHA256 e290add165cd1240a506b809d081f1c8d04820347f5522c9b782f338f08e07f6
+EBUILD freenet-0.7.5_p1263-r1.ebuild 3152 RMD160 6b8bf07a2c1cf72a79b2dd567ea9fa37b1f08999 SHA1 93c91bf310f9aace73420a3d84bc7d4d83755d71 SHA256 efec65b75aa7b4852f5c43d08295eda219e1637e4249ed303cb2d5dc160a20ad
 EBUILD freenet-9999.ebuild 2726 RMD160 1acb97ba5b19473364e20377c97c138ff4978e47 SHA1 f605fbd33a1be05fe1cfc4443cf7cb2298b4dbd9 SHA256 2824165081536a8a0f8866df81f0fd89fbb404df1188bd6ae36b3daf1d002e35
-MISC ChangeLog 7788 RMD160 cabdbf8aced942261000cba42511d7d064030dd3 SHA1 6703be74c31d8113895c6d8b54e5c92eb056d7ae SHA256 b2a5dfd2db3532bdccc072ad5328bbc24d1d5e21079019f3d6c22b53fcdb5315
+MISC ChangeLog 8038 RMD160 c486349a26801009aabb0ea1485e8a2f7c3d77e9 SHA1 90d69395872dabd5be78a56f9625930ee327acca SHA256 f40a33986ec7373f9ff379551943c7c131a3e3bf9daf0ad8f45f65788feebe08
 MISC metadata.xml 332 RMD160 692365bdee16dc9218a18a306e5b15a4b2684206 SHA1 6f1d02202549206e3c5856c9a5a99b334015f7c9 SHA256 869705ebd157480153ca5ddbf7c48426b4374a8cba10164a1f1582fde5afa3a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iJwEAQECAAYFAkxULzkACgkQG7kqcTWJkGfragP/bc80rbHwy5LYgmxVihqKQ4Ks
-jPlyFq/1Ub+OhLBZKOE6Hf/i1bGCggXhtMW/nZ2PdqFW5VgEFUfZMY4R1RbZveY9
-FU6PEQob9cMyu8Uua3xeGdLXX92fwbj5d9KLEVtcmpa45HHPOEDS25qBkSqXkFO7
-PrYSXQ3JdqrCm9MAJ/U=
-=NmTD
+iJwEAQECAAYFAkxV0JwACgkQG7kqcTWJkGcVeQQAs3MmIHdAxhcCcXyToEvbHvel
+JIMqg8DezShyohhprRk6X5DcHvse0CA0hIX1VmxZG47mudslcQLi3lDDSxtCCOis
+2vnxCtfjeLqxsgh6ErXlLgsWaMzqMo/wkfvH5+9KH+qeKNbgHf4GPnAWBqJ1S59j
+r0RcBlaRxCOCxL3FJgc=
+=ugw6
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1262.ebuild b/net-p2p/freenet/freenet-0.7.5_p1263-r1.ebuild
index d999fc44594c..11e25adbd5a1 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1262.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1263-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1262.ebuild,v 1.1 2010/07/21 16:38:26 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1263-r1.ebuild,v 1.1 2010/08/01 19:52:46 tommy Exp $
 
 EAPI="2"
 DATE=20100701
@@ -23,7 +23,7 @@ CDEPEND="dev-db/db-je:3.3
 	dev-java/db4o-jdk11
 	dev-java/db4o-jdk12
 	dev-java/db4o-jdk5
-	dev-java/ant-core
+	=dev-java/ant-core-1.7*
 	dev-java/lzma
 	dev-java/lzmajio
 	dev-java/mersennetwister"
diff --git a/net-p2p/freenet/freenet-0.7.5_p1263.ebuild b/net-p2p/freenet/freenet-0.7.5_p1263.ebuild
deleted file mode 100644
index 62edecbccf44..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1263.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1263.ebuild,v 1.1 2010/07/31 14:11:41 tommy Exp $
-
-EAPI="2"
-DATE=20100701
-
-inherit eutils java-pkg-2 java-ant-2 multilib
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="http://www.freenetproject.org/"
-SRC_URI="http://github.com/${PN}/fred-official/zipball/build0${PV#*p} -> ${P}.zip
-	mirror://gentoo/seednodes-${DATE}.fref"
-
-LICENSE="as-is GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="freemail"
-
-CDEPEND="dev-db/db-je:3.3
-	dev-java/fec
-	dev-java/java-service-wrapper
-	dev-java/db4o-jdk11
-	dev-java/db4o-jdk12
-	dev-java/db4o-jdk5
-	dev-java/ant-core
-	dev-java/lzma
-	dev-java/lzmajio
-	dev-java/mersennetwister"
-#force secure versions for now
-DEPEND="app-arch/unzip
-	>=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	net-libs/nativebiginteger
-	${CDEPEND}"
-PDEPEND="net-libs/NativeThread
-	freemail? ( dev-java/bcprov )"
-
-EANT_BUILD_TARGET="dist"
-EANT_GENTOO_CLASSPATH="ant-core db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper lzma lzmajio mersennetwister"
-
-pkg_setup() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-	enewgroup freenet
-	enewuser freenet -1 -1 /var/freenet freenet
-}
-
-src_prepare() {
-	mv "${WORKDIR}"/freenet-fred-official-* "${S}"
-	cd "${S}"
-	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/ext.patch
-	epatch "${FILESDIR}"/strip-openjdk-check.patch
-	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" freenet-wrapper.conf || die "sed failed"
-	use freemail && echo "wrapper.java.classpath.12=/usr/share/bcprov/lib/bcprov.jar" >> freenet-wrapper.conf
-	java-ant_rewrite-classpath
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_newjar lib/freenet-cvs-snapshot.jar ${PN}.jar
-	if has_version =sys-apps/baselayout-2*; then
-		doinitd "${FILESDIR}"/freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-	dodoc AUTHORS README || die
-	insinto /etc
-	doins freenet-wrapper.conf || die
-	insinto /var/freenet
-	doins run.sh || die
-	newins "${DISTDIR}"/seednodes-${DATE}.fref seednodes.fref || die
-	fperms +x /var/freenet/run.sh
-	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
-}
-
-pkg_postinst () {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/freenet start."
-	elog "2. Open localhost:8888 in your browser for the web interface."
-	#workaround for previously existing freenet user
-	[[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
-		freenet:freenet /var/freenet
-}
-
-pkg_postrm() {
-	if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then
-		elog " "
-		elog "If you dont want to use freenet any more"
-		elog "and dont want to keep your identity/other stuff"
-		elog "remember to do 'rm -rf /var/freenet' to remove everything"
-	fi
-}