Version bump, use --user instead of --chuid for init script, fixes bug 488958, drop old

Package-Manager: portage-2.2.6-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x35899067

4 files changed, 26 insertions, 158 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 7f306fe78d98..efec5023261d 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.181 2014/03/30 19:14:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.182 2014/06/01 10:29:19 tommy Exp $
+
+*freenet-0.7.5_p1462 (01 Jun 2014)
+
+  01 Jun 2014; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7.5_p1455.ebuild, -freenet-0.7.5_p1456.ebuild,
+  +freenet-0.7.5_p1462.ebuild:
+  Version bump, use --user instead of --chuid for init script, fixes bug
+  488958, drop old
 
 *freenet-0.7.5_p1459-r1 (30 Mar 2014)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index ade80a5d7f2e..c4beb30fe74b 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -12,22 +12,21 @@ AUX freenet.old 452 SHA256 b3047b40128bbd7843dc370ab0aa150a9836ed789f48181bd6d8f
 AUX freenet.service 271 SHA256 eb9e38c169055ba62ccc5e97065a1e7d96b2e639d1ae921a658acd3c98f74c65 SHA512 2f3d4ec0ba05eff328e8176cbe130176a82a1bb432599de44ab78ca27e9c96e0eafe0871f12b0165247f941a2e929635a6abe6cd61351b1305c0d0e8cff83d2b WHIRLPOOL 42be0b1bab59e2b0aecd4dc5e8fd4a29432df4497e88073c235d2ba0761a66850d54da7b01dc36f34712e62fb2f0efd141d0c0116f5267c16a4f69103dde9783
 AUX libraryloader-revert-using-of-absolute-path.patch 854 SHA256 b8bc840cc0c35a32bf000c23bdb5a7c7cb30508f6f39e3a3d29bb149996e6209 SHA512 24627e9f30a1b4456bf386ebc0a789e6c1d8670d4c1371b2d658cf04f9a04c09dc91ac803af0b8f883578cf9b3b351da69c7f882f7bdf3277f183134219b4889 WHIRLPOOL 6a328c040c81548bc77452639e2a0752304ef639480258b34d6d4ae15b0009d766a18df90f5685d4f2891a71188c19788675a65d8912560afb9a9fdfa0e9261e
 AUX run.sh-20090501 16217 SHA256 470aa99d083a16d2f620282502a59546611f1903e21aef50b93b10d9fada7d7a SHA512 ba97f1e370ffb7c9ea109b7d529430581a588d8d7e121ec09865e9e8932f2901477f7f43e7d0b95c7c95c2c42db05870e5d811528f91f78b48b68a539c804e67 WHIRLPOOL 201c2541da742ae0c211d6b736914340dd06d4907326de5a0073b39e8aa0a60933ed7d4eef3aa86465f9d0c2e0bf5bd78ed85d3c83c08ba9b50aabc25853864e
-DIST freenet-0.7.5_p1455.zip 4691756 SHA256 04d63ede7a49350eff8a6e4573aa000acd0c5034a5175f6b8634eb9308cf0120 SHA512 df25ce08bb2dc6c9c9d83c75ac288d5074b25d0322d8d12febbe8d915e70b48750d5c3b8bd8f76fb707d3308d9772308c09369c3c4a2f3037eef5c41b33a4367 WHIRLPOOL f52ec6cb95caefc00aed06f93f099290b10f8d3953c5b66565a8cbb91c32a2e8f3a528c9ac7940472717ff960fff05aeb521faac377d2c0ccf8037ec0400511e
-DIST freenet-0.7.5_p1456.zip 4707904 SHA256 f37bdfaaa155c3ef30971c3ef3736cd2cdb52febc774fe53dfaedbed7a8bcf20 SHA512 58c70e7800094388ff2cd35c791d91d31c246703743e13cba51ea3d1f27557177ef824186c4b1c56c04f173ad5ce319eda86305ae46527939f52f7aedded6fb5 WHIRLPOOL 3b58ff9bc3bbd5f212c33b1de0f8bdcad3399dd886312514be04ed3ac776274bb8c373d5a35254a446a247b41547d1b5dc9bf2e32f4f01d35cbcfac559702ba0
 DIST freenet-0.7.5_p1459.zip 4738681 SHA256 36baaab901c1c7e9be3b018868b7a58d202590488839176332fc382c5362fef2 SHA512 84c01f015be4f74e0f89e4a265ae7cda1604dfc56c4153ed510995f3e01b76d2a2c7af700fb419a6496eebf7eefeebe875c40c885641a92fa55d0da659bfa9a6 WHIRLPOOL 3372bbfdd1f02af04f6c1c2256171e10be223fc9ef253e347a414497ffb551d9e5dbe23704602d199bc08dc815fa9c000ac773eba0376db254bb734ec115399a
+DIST freenet-0.7.5_p1462.zip 4718690 SHA256 9db76a289082582493b31dd0f3ada2a4dc9a0413a4327696120a0dba5eb4963b SHA512 7340519482d0152357251a7149fdac04ef6667b2bef68d6257ebaa938ff8b1f849c718e1ce6027c92816b72d5e78b9bd19e58025366eaf41752e73450b5b89f2 WHIRLPOOL 33e5a7cd4f85d855c6bdb6883aac2b0ba15e8a610a263d2ff634b884cd44f2a8e964efca90252be18efcf7c2a18dcad9667c7d1e26523ec5799810ffe5dfc81a
 DIST freenet-ant-1.7.1.jar 1327167 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408 WHIRLPOOL 667be2b1581c5fd847907b63522a0f83c595a6b8f1805d714e978a5cb0f05de4804153c89605618adf5c3b097a7019e7d7e9de0bf0987c7b1adb0dbc54e0f055
-DIST seednodes-20130218.fref.bz2 9194 SHA256 9ac006dc994456ef34f81b070a3dba6574f209fc2ea3413f57f66f0b5dde77a2 SHA512 42539e0471b44be83bcb2cc473217482099f7800d97fd642401607d6d99da4f0ea25c8dc974025d34665607a7f787a37137e4d839b047bca2f1f4d42b8363fe2 WHIRLPOOL 9a4ebbf703f9da7e427fd95ac6b4afbe6f4dd632b09362fbe7504d8606e8b9be768e39cfae82e211bd656e0748b5006e96ab4f4ceb3b9fcf60782a0f062fb8c2
 DIST seednodes-20130915.fref.bz2 10046 SHA256 2008510e1c8730aa02674b1dd22f64bd0de86507b27052adcfa66d176f1351ef SHA512 e829ceab4851eaf912e840ec87bcd4458ba9cf7eb0e25d4f4ed059734054136b6c2889671e624999697a97d7b833c2e1a65b47f6e0116f8cb2f11b2e43df921d WHIRLPOOL fab300deed68030030bb99c5716a691b33ed6b89929c3eb506fd02928ad8914044370552c94c5178639ca2adb92cf6f58e3b4b62f6e1f565f65481ddcbb3802d
-EBUILD freenet-0.7.5_p1455.ebuild 4284 SHA256 bf58e79d53dd5df1ced02ce4550208bb3fcfe3582c7a5ed59b4c0b58f710e94c SHA512 c905d3789e0b98e54928791e08071d818db87833988ea6ab97247b44bc1ab70833b741c16e5206a5ad5106d58e1d4fbda23aebd54a571990d3027e2618ecc993 WHIRLPOOL 3c9886fde57daed8ce668a879380d1153fe5ace5a4a8bc5bd923442ced50e9acc0720bc00f076df83ab7635aaf95259336a63a7dd5b2207118787b6d6a48d666
-EBUILD freenet-0.7.5_p1456.ebuild 4323 SHA256 749a98537aec87d2bfb762d8676c0ffff64d92dfdd68cce4974e59c180404c83 SHA512 c553eb4644a3e1a3a189d9f8eb1050d8ec43eec7670ef0034f9c2cffcc8062c59062c9c1010b2b6d4d697e7e2951e228369ddc1b8258ba467f3b62c4bc78c9f6 WHIRLPOOL 5fdc588ec12d70775271e69c04990ccb9c7809d2fff32e477af38c7a8a0a9d73cde9769d9a6c125fde6991567c331dd173bbf7d59aa049ffa794eee1b7431cc9
 EBUILD freenet-0.7.5_p1459-r1.ebuild 4406 SHA256 26f5021fa891c284fceea27d2e140e64b580af989c6c76af024eec27e962852b SHA512 3e7b5ce9a2f83b7e0f238f11835b001f0a2c576ed6db401c0b9a01282f76b2c1e5501656f92b5ca2eb7d39540a275b6ac0291c8d9565128e62f2de4bed39ec08 WHIRLPOOL aa353bab256175a8a0da8c9ef6c2f301e92d40b5338b34b310d6e8111290326b5f994d6f09f6a38fa5db6babb7aed42c845528c578ca080bd740f8b84dd27a23
 EBUILD freenet-0.7.5_p1459.ebuild 4350 SHA256 0b85e55e70ef86d240274987c7dcf1522b6009ff154c96d76718848cf9a368fc SHA512 8d96dc4dfd089cebe0044279f38f7660fa8fe8fd73c2b76685de4a932f605ceaede8da615e6f72383c8ca2710624da53af392653857f327ee6e38fd79d5e7f85 WHIRLPOOL cf7046b1fbbf9f79d4b00e6a3d0dba284e0d1cc89ce40ce843d233f82532d16b8dd1fec99fd4ae167da85c53b20a43d3c6a96a791d16f8f54166968e50b46b2c
-MISC ChangeLog 25371 SHA256 790b64a152383ee436a23ce8f34883b58cde4c4b170b426574ce6dc1d233c509 SHA512 994b64fe80d68cc8ad00bfd15ed3472c815cd5175c282f24232637338e4f725ea1de1117c01b080e487b13186242b550b61d1c35ba39f4c049458e2517df59ca WHIRLPOOL 5bc90e39fd196e01813d8624060f1f59e31fd9aa91c3e9e20c2dd7cd3276b791e4e23ffd2947f1d4c77443dadb8dadd77e4c80a56c20666295ccd4eee92774c0
+EBUILD freenet-0.7.5_p1462.ebuild 4403 SHA256 60af36909908555d540756ca7b09ae9eca3831ee06c54a8d73da7cfbdb6d48cd SHA512 82c56f1a4ff0f0a51acd76d36396f33cf0155fdefc4be9c26ae1f2061936b51c1365e62a5148642d3b7c101f6786d0d19ad6f36f48b6ab8cf2ebe845e8964220 WHIRLPOOL 102630970c0adb5a7ca2763b1329afba9203b8f69be48dfc92ff6140ab858356d9742e5c1f2c9c81f8eba2f7dd1bae3a2715625a42b2e7a53672a544eb7ef22c
+MISC ChangeLog 25650 SHA256 39e918f20c20715eaf4172ca65339e08ae51ae95478d955f30c93add37025a14 SHA512 c9e8063c70c455bbbfee9a791bf70943c6344026afc002a67b0244161f665c55ccef95a630abd6a86d5b30cab0a8d57fb2c38e249f749a7fb9826814439e4de7 WHIRLPOOL 37e2058121d7f356b9876ba4edfc1bb4c8ef2198a94ddb30567f9da49c066cfa7ae35004eb2ee093479b87c0af9af7ac11b9b94d8f63090162c1f6decd8a6af1
 MISC metadata.xml 243 SHA256 76e8c4cafe92af4eb083e9682c375a2f887458dac6ce8f2982976a96abcf8219 SHA512 92bf36a1bad3877a5a981271afa7381a38f3cc87267233205af5aa0ad53c455d851bb1d9ff60fe02eda49a3347c497c5bfeaa4c160542abd62d81a0450c4b77f WHIRLPOOL 18fde625e32450606e852e52f034c73d6514284aa19842867313432d1ab1cc1d40ceae766c0c61b927a7b5c3917a6624c8e875583f49c0d5951797cf66e8ff95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlM4bP4ACgkQCaWpQKGI+9R7XwCfejPW1vCiZD/mgsPIkdUE6pxo
-2V4An1/XvQFFF07rQJGaqRmKWfR4HiRJ
-=ljsr
+iJwEAQEIAAYFAlOLAIUACgkQG7kqcTWJkGeAaQP+P9uvYN3Ug3DfJ0u13OLJKn45
+KFIeOdr5zqwLqXSvK4fg7lRyDYfJXX1zBcMko1GhuxckSHC3p20TB5GV6PhFGnnX
+tGbsVNKS6st2rrVaOYISaO+TgiDhCAeoeR2SSAMSV/QTHIfR8tlA/Ep19b4GxI3G
+K5UQK5v1Z3c07Tbj3FE=
+=pJXe
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1455.ebuild b/net-p2p/freenet/freenet-0.7.5_p1455.ebuild
deleted file mode 100644
index e0ee9ff1a236..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1455.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2013 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_p1455.ebuild,v 1.3 2013/09/07 19:15:44 tommy Exp $
-
-EAPI="2"
-DATE=20130218
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2 multilib user
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-SRC_URI="https://github.com/${PN}/fred-official/archive/build0${PV#*p}.zip -> ${P}.zip
-	mirror://gentoo/seednodes-${DATE}.fref.bz2
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND=">=dev-java/bcprov-1.49:0
-	dev-java/commons-compress:0
-	dev-db/db-je:3.3
-	dev-java/fec:0
-	dev-java/java-service-wrapper:0
-	dev-java/db4o-jdk11:0
-	dev-java/db4o-jdk12:0
-	dev-java/db4o-jdk5:0
-	dev-java/jbitcollider-core:0
-	dev-java/lzma:0
-	dev-java/lzmajio:0
-	dev-java/mersennetwister:0"
-DEPEND="app-arch/unzip
-	>=virtual/jdk-1.6
-	${CDEPEND}
-	test? ( dev-java/junit:0
-		dev-java/ant-junit:0 )
-	dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.6
-	net-libs/nativebiginteger:0
-	${CDEPEND}"
-PDEPEND="net-libs/NativeThread:0"
-
-JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_ENCODING="utf8"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov,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.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
-
-S=${WORKDIR}/fred-official-build0${PV#*p}
-
-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
-}
-
-java_prepare() {
-	cp "${FILESDIR}"/freenet-0.7.5_p1422-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/0.7.5_p1321-ext.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
-	local ifs_original=${IFS}
-	IFS=","
-	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
-	IFS=${ifs_original}
-	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf
-
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-}
-
-EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
-
-src_test() {
-	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_p1456.ebuild b/net-p2p/freenet/freenet-0.7.5_p1462.ebuild
index 4186da27417f..f7e77f3cb19f 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1456.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1462.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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_p1456.ebuild,v 1.1 2013/09/18 12:49:27 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1462.ebuild,v 1.1 2014/06/01 10:29:19 tommy Exp $
 
-EAPI="2"
+EAPI="5"
 DATE=20130915
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2 multilib user
+inherit eutils java-pkg-2 java-ant-2 multilib systemd user
 
 DESCRIPTION="An encrypted network without censorship"
 HOMEPAGE="https://freenetproject.org/"
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-CDEPEND=">=dev-java/bcprov-1.45:0
+CDEPEND="dev-java/bcprov:1.49
 	dev-java/commons-compress:0
 	dev-db/db-je:3.3
 	dev-java/fec:0
@@ -50,7 +50,7 @@ JAVA_ANT_ENCODING="utf8"
 EANT_BUILD_TARGET="package"
 EANT_TEST_TARGET="unit"
 EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov,commons-compress,db4o-jdk5,db4o-jdk12,db4o-jdk11,db-je-3.3,fec,java-service-wrapper,jbitcollider-core,lzma,lzmajio,mersennetwister"
+EANT_GENTOO_CLASSPATH="bcprov-1.49,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.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
 
 S=${WORKDIR}/fred-official-build0${PV#*p}
@@ -111,7 +111,9 @@ src_install() {
 	else
 		newinitd "${FILESDIR}"/freenet.old freenet
 	fi
-	dodoc AUTHORS README || die
+	systemd_dounit "${FILESDIR}"/freenet.service
+	dodoc AUTHORS || die
+	newdoc README.md README || die
 	insinto /etc
 	doins freenet-wrapper.conf || die
 	insinto /var/freenet