Fix dependency on dev-java/bcprov, drop old version

Package-Manager: portage-2.2.0_alpha85-r1/cvs/Linux x86_64

5 files changed, 20 insertions, 168 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 9d298a44ef4b..02478388be5f 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/freenet
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.143 2011/11/19 18:34:57 tommy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.144 2012/02/08 18:42:24 tommy Exp $
+
+  08 Feb 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7.5_p1404.ebuild, freenet-0.7.5_p1405.ebuild, freenet-9999.ebuild:
+  Fix dependency on dev-java/bcprov, drop old version
 
 *freenet-0.7.5_p1405 (19 Nov 2011)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index f7139269c67e..85c8d1c3220e 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -11,22 +11,20 @@ AUX freenet.old 452 RMD160 e9e834fedf4270c14f3e8d754c58eb05f3f570c5 SHA1 edb5d0a
 AUX run.sh-20090501 16217 RMD160 f8b03990d011e1f149ec43aa536fd7540a19f01a SHA1 123fb5cf1c9b50357156fa300c5015a7e0ca65ad SHA256 470aa99d083a16d2f620282502a59546611f1903e21aef50b93b10d9fada7d7a
 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_p1404.zip 4179533 RMD160 142f98b58f80090670bcce3b2dcb77e2e20f4d18 SHA1 e9e7a5f4528155994d9e5097e6e3a68fc5ec6f39 SHA256 7452313c06aba0c386f96aff0ec40c03b8c3b0fc60c0818543f66a8c8b5ffc52
 DIST freenet-0.7.5_p1405.zip 4189365 RMD160 a84e7ef4fc02beb5d5898752f9872d40c268edcf SHA1 8fd7a18a8c880bc67afb4fbad620f05797324df3 SHA256 c972e020ca74ebeecab8c0e86bb012917fbd073095b4fb054adbec69d69f1cd4
 DIST freenet-ant-1.7.1.jar 1327167 RMD160 2ff5fa9c7041aa475bc1374763897fd8f19ca1f4 SHA1 ab21c797797d9e216ff1e05dfaac969a74191cd1 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1
 DIST seednodes-20110917.fref.bz2 11229 RMD160 bf4e1b1d8d2a06ce623c06284f2ae86451334dc8 SHA1 780c0290b6c76d3d2f5fe88f8f1e8c5685eefca1 SHA256 5e31ce1aea96e773cc597ed112e48cd398b352e4235512cc70709f667e118af1
 DIST seednodes-20111119.fref.bz2 12102 RMD160 b9c16399e5686b92e485ecd275a5528184b85f07 SHA1 524a36faa3f7f6930c4ffd743f05e708c0a6efc2 SHA256 12b5403cf0b8de809ae7b88f855caff79f0613f7cdd70b90eaa85fe8bd5c9d54
-EBUILD freenet-0.7.5_p1404.ebuild 4722 RMD160 1c5c5e27d65f35b49850f7bb1d0c1774783ab4f7 SHA1 4aff5a65fbb5d0bfdb31424612080cc1fcc85556 SHA256 ad183cd0626f5d1e34213803f6e738a9bd420f7a566ba0676d7e4fef189398dc
-EBUILD freenet-0.7.5_p1405.ebuild 4722 RMD160 7e0d8ba58e82d9325b3ac729160ddc8a6824ce61 SHA1 969f422f8a3e711929e06f056c0fc500b221786f SHA256 b7857d944453c909c0d6c03f0f3f57e81bed4251f9a10f89454b919fa5cd3fb9
-EBUILD freenet-9999.ebuild 4286 RMD160 7ba4055addcb69bd98d36e0cde2d4e12ca66ddb0 SHA1 05c56a72015f92ba972edca7babc67ddffa9a037 SHA256 7c98f8edb8631d62ab617a0e9d1f87f591813aefe6898c6e6a7e4c5392036084
-MISC ChangeLog 18647 RMD160 938537d98c8d631b760a2a171b328275edb4562b SHA1 cf229114b0dbe03cbb04918ba5fdae77a573001c SHA256 a92c3af328df4314e08c8ecdc838d9a55ce519db8e0c5edc70bb1768816eca3c
+EBUILD freenet-0.7.5_p1405.ebuild 4729 RMD160 678b0c7a4f6774bf6b4415da9355fad2ef3177b9 SHA1 987a17efddea220574fb195bfafb20019c0454df SHA256 83a9cc815d9e368dd228f8fa3c4c0cc693169b5fb55937ab5901060656a0bfcf
+EBUILD freenet-9999.ebuild 4293 RMD160 1dd09422d35c230f1b53517e8cca84ceaec555c6 SHA1 0f3273d77424e66c2f46b9c34e21d2dcd9fda4fe SHA256 49af484120343dd332ed3c1e9afab3d05e049ae6d36a51f1d157a3927101286b
+MISC ChangeLog 18841 RMD160 ac2083203ba5702048d3f113706fe94043469b1d SHA1 282f7b02771b7edc9a02d4a129b51b1d928a0907 SHA256 07d098c9e48b8702a5f6e0836891e9ce43a6398688365cc07676872b30858235
 MISC metadata.xml 310 RMD160 94e7e4cefcf1deb4bbff792a0cbf30ef63e7b264 SHA1 8f8368b809a3e803ab488945087827a41f1b40f5 SHA256 e614c0ca7fa5d32c3e94ccd6d822fd0aa482ce31439e0206f26b0f7a76113950
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk7H9t4ACgkQG7kqcTWJkGc4ZAP8DcO312YE/F9Ju0wocDD7pELy
-XeS6VS1vnuV9oOQmnh5UTGDcmtEmsC8tUCEvFwTx3OAxjlgJwS0HcipHmYjeteAW
-uLkJeyC4JlJ35zCgiMNb406crk5EObel6DuUsPbDTXvTspj/O6UGkRNNdLLVW0bv
-OZybZPTAj+asz/PkAdE=
-=LzV4
+iJwEAQECAAYFAk8ywhsACgkQG7kqcTWJkGcpdQP+OPFVw8emv6mJXqokwzqEjPYC
+J8snqAMZoIQg4yW4x9yklnvJZ/y0N16icoOWlvZK4OwLJggciFMMAMHxjSJ+e1Kg
+pSPf5EBGTCl+hrC/G2i+veT8SxfFSRc7O4ctKXlAozXfBurAuTOZUJeFgU/4beo5
+mmq8hrmuGLetEOY4DtE=
+=ZSQk
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1404.ebuild b/net-p2p/freenet/freenet-0.7.5_p1404.ebuild
deleted file mode 100644
index 36013d2c3ecb..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1404.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2011 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_p1404.ebuild,v 1.1 2011/09/17 18:37:32 tommy Exp $
-
-EAPI="2"
-DATE=20110917
-JAVA_PKG_IUSE="doc source"
-
-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.bz2
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="as-is GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="freemail test"
-
-CDEPEND="freemail? ( dev-java/bcprov )
-	dev-java/commons-compress
-	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/jbitcollider-core
-	dev-java/lzma
-	dev-java/lzmajio
-	dev-java/mersennetwister"
-DEPEND="app-arch/unzip
-	>=virtual/jdk-1.6
-	${CDEPEND}
-	test? ( dev-java/junit
-		dev-java/ant-junit )
-	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.6
-	net-libs/nativebiginteger
-	${CDEPEND}"
-PDEPEND="net-libs/NativeThread"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="commons-compress db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper jbitcollider-core lzma lzmajio mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.junit.present=true"
-export EANT_EXTRA_ARGS+=" -Dtest.skip=true"
-
-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_unpack() {
-	unpack ${P}.zip seednodes-${DATE}.fref.bz2
-	mv "${WORKDIR}"/freenet-fred-* "${S}"
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/freenet-0.7.5_p1389-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/0.7.5_p1302-ext.patch \
-		"${FILESDIR}"/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch \
-		"${FILESDIR}"/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch
-
-	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
-		freenet-wrapper.conf || die "sed failed"
-
-	echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf
-
-	local i=2 pkg jars jar
-	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
-		jars="$(java-pkg_getjars ${pkg})"
-		for jar in ${jars} ; do
-			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf
-		done
-	done
-	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf
-
-	if use freemail ; then
-		jars="$(java-pkg_getjars bcprov)"
-		for jar in ${jars} ; do
-			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf
-		done
-	fi
-
-	java-ant_rewrite-classpath "${EANT_BUILD_XML}"
-	java-pkg-2_src_prepare
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-}
-
-src_test() {
-	java-pkg_jar-from --into lib fec
-	java-pkg_jar-from --into lib java-service-wrapper
-	java-pkg_jar-from --into lib mersennetwister
-	java-pkg_jar-from --into lib lzma
-	java-pkg_jar-from --into lib db4o-jdk5
-	java-pkg_jar-from --into lib db4o-jdk12
-	java-pkg_jar-from --into lib db4o-jdk11
-	export EANT_EXTRA_ARGS+=" -Dtest.skip=false"
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.jar
-	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.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 "${WORKDIR}"/seednodes-${DATE}.fref seednodes.fref || die
-	fperms +x /var/freenet/run.sh
-	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src
-}
-
-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
-}
diff --git a/net-p2p/freenet/freenet-0.7.5_p1405.ebuild b/net-p2p/freenet/freenet-0.7.5_p1405.ebuild
index 092782c980fa..fdae69f58158 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1405.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1405.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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_p1405.ebuild,v 1.1 2011/11/19 18:34:57 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1405.ebuild,v 1.2 2012/02/08 18:42:24 tommy Exp $
 
 EAPI="2"
 DATE=20111119
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="freemail test"
 
-CDEPEND="freemail? ( dev-java/bcprov )
+CDEPEND="freemail? ( >=dev-java/bcprov-1.45 )
 	dev-java/commons-compress
 	dev-db/db-je:3.3
 	dev-java/fec
diff --git a/net-p2p/freenet/freenet-9999.ebuild b/net-p2p/freenet/freenet-9999.ebuild
index 91ab4e273fdc..0a12adc650c9 100644
--- a/net-p2p/freenet/freenet-9999.ebuild
+++ b/net-p2p/freenet/freenet-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.23 2011/09/17 18:42:44 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.24 2012/02/08 18:42:24 tommy Exp $
 
 EAPI="2"
 DATE=20110917
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="freemail test"
 
-CDEPEND="freemail? ( dev-java/bcprov )
+CDEPEND="freemail? ( >=dev-java/bcprov-1.45 )
 	dev-java/commons-compress
 	dev-db/db-je:3.3
 	dev-java/fec