Version bump

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

3 files changed, 146 insertions, 7 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index d481f787618f..4b7f03e36cfb 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,12 @@
 # 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.131 2011/06/22 19:05:06 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.132 2011/07/10 17:20:28 tommy Exp $
+
+*freenet-0.7.5_p1380 (10 Jul 2011)
+
+  10 Jul 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +freenet-0.7.5_p1380.ebuild:
+  Version bump
 
 *freenet-0.7.5_p1378 (22 Jun 2011)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 9d77636bf387..a5c6d20a6a30 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -10,18 +10,20 @@ AUX strip-openjdk-check.patch 4015 RMD160 c512338ac1dc9ca88082f403d8a4bc4dfcb98c
 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_p1378.zip 4145248 RMD160 9de4c0d75c44c1ec996c023a23e09056a674769d SHA1 f098e7ea8cbf5f1cb761b14b39a22a189e3cb0a7 SHA256 5dda20ceaa29fd24adadb7f80a636a2d3509f1fed04abaa6b9bbab14db5570fe
+DIST freenet-0.7.5_p1380.zip 4145922 RMD160 269c30d46209e5e578fb7a50c6331dae1f089753 SHA1 6c4b82ba8231c09940600913d5774a4ea5c872f8 SHA256 7e5d7ae1b887d91c632c31cd2c80177e796718899e1060d0070b5d597c149d59
 DIST freenet-ant-1.7.1.jar 1327167 RMD160 2ff5fa9c7041aa475bc1374763897fd8f19ca1f4 SHA1 ab21c797797d9e216ff1e05dfaac969a74191cd1 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1
 DIST seednodes-20110618.fref.bz2 10704 RMD160 43842b56643cd2596769eebc4c360d2c18081f69 SHA1 394b089c5b3a49eb066a5b93d83a35e4c5afe409 SHA256 81a707dcc68be8b453fd2c2cfb1ea8e7fd6d637c0f4321bc93947d2dcc9ab93c
 EBUILD freenet-0.7.5_p1378.ebuild 4189 RMD160 99ddb63ffb5d8305cd03081f6eb01e53a7d8457e SHA1 96fbabc9abfa9f493ed17b2419e6d984d61d755d SHA256 6f178058d308a1f8a498ca98d3b590bac89bd0b93c4da2333d9e3c04c6b124c7
+EBUILD freenet-0.7.5_p1380.ebuild 4189 RMD160 8645242a20a4303c2631ca85073744e54edcbf06 SHA1 de061afdbebc1281552e268aaf98e77dc7740f9c SHA256 c060898621f2c7ba71350444e65d7c6e96ae966693cbdd41a6752704bcdd923d
 EBUILD freenet-9999.ebuild 3683 RMD160 b398a9f69a7c941391eb9f34bc78b1544a7b2bfd SHA1 d0765209565e1063597285d0e060cadf97676238 SHA256 440b3d6001384afb14d090abdb51afa7093f2aca6b18bd7ba1550ee79acf6dbd
-MISC ChangeLog 16180 RMD160 7f6a493cea48416b5a39ec8ed15a95619f5b9217 SHA1 270519b0e5f947321400dc285726d13654565362 SHA256 3a85061bbffccd8dc95f1aa1f95bb02b089d67d484d30c7a538d86e8d98c2824
+MISC ChangeLog 16322 RMD160 31901a13c0f00bad60c4d36b56a189a114b09dd5 SHA1 33617f7a677b3a4a729580743dca1f20b7537fde SHA256 057e12132339d0313829e9fe06b1a5e2c8b5088a6b1f1581a2fa621f12cac3df
 MISC metadata.xml 332 RMD160 692365bdee16dc9218a18a306e5b15a4b2684206 SHA1 6f1d02202549206e3c5856c9a5a99b334015f7c9 SHA256 869705ebd157480153ca5ddbf7c48426b4374a8cba10164a1f1582fde5afa3a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4CPO8ACgkQG7kqcTWJkGdPfwP/XVemn4r4b4JKMOFFMjw7PVMe
-+2m0JERrcr26dZ7HI7FTTmTzkRxryd8dynzYX0GSrNGkej4FUUPKTUQtlskoAjFL
-k9SOpQLO+kq8pjcHCnc/B9ERHY4OU4po7L6i9wHZiYlHqfeuFaIp8mAk8SSSINrx
-5zUWocUiM1xI0X7aCF4=
-=pf1c
+iJwEAQECAAYFAk4Z32oACgkQG7kqcTWJkGdokAQAtE7y3Nj91KJyy1oLLFL8ISTg
+R2LKgpN/JClnzK++VJ4qMwHSoulEQYi7S7WA6HYo9h99283VVuA5+qWVDwCaO9hN
+AlfpO+eIQTthf48dx0pj2YP5e9q96WJdJCikXRtFkXkfGQVJFo2l+ohUnjFTwl/t
+BGH6sI4/nS3boFGBGVQ=
+=jLkO
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1380.ebuild b/net-p2p/freenet/freenet-0.7.5_p1380.ebuild
new file mode 100644
index 000000000000..2aaed9995cfd
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1380.ebuild
@@ -0,0 +1,131 @@
+# 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_p1380.ebuild,v 1.1 2011/07/10 17:20:28 tommy Exp $
+
+EAPI="2"
+DATE=20110618
+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="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/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
+	freemail? ( dev-java/bcprov )"
+
+EANT_BUILD_TARGET="package"
+EANT_TEST_TARGET="unit"
+EANT_BUILD_XML="build-clean.xml"
+EANT_GENTOO_CLASSPATH="db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper 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}"/wrapper1.conf freenet-wrapper.conf || die
+	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
+	epatch "${FILESDIR}"/0.7.5_p1302-ext.patch
+	epatch "${FILESDIR}"/strip-openjdk-check.patch
+	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
+		-e "s:/usr/share/ant-core/lib/ant.jar:/usr/share/freenet/lib/ant.jar: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 "${EANT_BUILD_XML}"
+	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
+	java-pkg-2_src_prepare
+}
+
+src_test() {
+#	java-pkg_jar-from --into lib junit
+#	java-pkg_jar-from --into lib ant-junit
+	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
+}