Version bump, drop old, fix license, fixes bug 446618 with thanks to ulm

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

6 files changed, 19 insertions, 311 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 093165e75282..c32ffcffdbe9 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.159 2012/10/30 18:31:09 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.160 2012/12/20 14:59:50 tommy Exp $
+
+*freenet-0.7.5_p1423 (20 Dec 2012)
+
+  20 Dec 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7.5_p1419.ebuild, -freenet-0.7.5_p1421.ebuild,
+  -freenet-0.7.5_p1422.ebuild, +freenet-0.7.5_p1423.ebuild:
+  Version bump, drop old, fix license, fixes bug 446618 with thanks to ulm
 
 *freenet-0.7.5_p1422 (30 Oct 2012)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 7d706bf19702..f9dd95b316f5 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -11,23 +11,18 @@ AUX freenet-0.7.5_p1422-wrapper.conf 947 SHA256 213508785a1bb2bd1263f434fc52b45b
 AUX freenet.old 452 SHA256 b3047b40128bbd7843dc370ab0aa150a9836ed789f48181bd6d8fc72f1714fa6 SHA512 7f12188a1e81f40f361d6df4cf0ae0f8af1363da19318ce04625411b0ff30badb53b440c984589d9f1386ad05e6b8e4201eb79c99f381468f7f6356dccebb3a9 WHIRLPOOL 182ff0f515c6832a17880ea1db705e5ba690b6d08f1e4d3f12aa4f6e291dab68491507b14541b89a13b4ba797296ac432eaaa24cd8b35ad2d63d14bc6a6c0fae
 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_p1419.zip 4318751 SHA256 8a7566fae1a0826732431bfba0222863077f0b44f049aa4ee0d4e422076fd8c0 SHA512 a9753e0bf3ef60719d1754dbc29d056fd9e691aef28d9cb2c2320e3523d3e028ce9f0b258561c6270368473df24a7fd50652b3fa628435b4b07bf229148b49dd WHIRLPOOL ac71166876283f6fd8f2951e2bd80794193da2578ae23677cc183ff1ead91f86c8b7449b2ceb899ee94137e7515ea3e23e6c28eccf85932a639b75e865056f02
-DIST freenet-0.7.5_p1421.zip 4341594 SHA256 caca06574e6bdd32b14aa397a38649087de15a47f7a180f0ebc9ced241ecc55a SHA512 1fb450ebe0b438379f43509db0fde879eec632a01ca9ee6585e626b4110004a193cfb057bbedc3c76ce81886ea02e6df4f1cab6a4c3dfa4b7bb9d9cc4b6d137f WHIRLPOOL 7744a859aaeb6356e7c82204f47d1f796b8013a137eba2fc83f9fecb3019913873908c3be5ea51bee3f6e3a45b609c057db6626a403e48208d8414d9a5e97fc4
-DIST freenet-0.7.5_p1422.zip 4348259 SHA256 bc099b310073ab9f996cd436cbef3c87d227684ef38050450f6f4662f406f120 SHA512 ee5ad899f99a68be5eb501877920cc7ed881c343e0c4d5b6a5e937b3521f319817e0f02aa3206c33211e8b9ab215ba9facfd8acc9ad81753bddb5c2825c5b6ac WHIRLPOOL c6734b091ec0b660b517437b6a13d68e54931efd1883606ad238da094a01db9ac659505e4b9d2d3ae72358d366186d7c1b65853f74af6089303a86c3d2954287
+DIST freenet-0.7.5_p1423.zip 4348396 SHA256 ba8a0aca1679ee836f3df07090042ae56097037e8b86346d1b2244bf0db68f00 SHA512 f5eba97dbc517e67af038703da7e16ad1983a6200251d0b3c8578a487ee7d55d23184b29f946a0e2cf8b0b830114e206efd4b91b19a5224f2ebfb00e7708be5f WHIRLPOOL f0248113051e6609970f2253b3c99bf8b2840339383fb3eaaffef9109b7c55d3b3aee59c4ff87f97dd4042d5a05f8ef01be69dcc29e7e3aa885f4e0ee3b54c0f
 DIST freenet-ant-1.7.1.jar 1327167 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408 WHIRLPOOL 667be2b1581c5fd847907b63522a0f83c595a6b8f1805d714e978a5cb0f05de4804153c89605618adf5c3b097a7019e7d7e9de0bf0987c7b1adb0dbc54e0f055
-DIST seednodes-20120730.fref.bz2 7995 SHA256 3d162430e3e4ae9827c0580988c2520e8ff9077ca4beaae72d07845923607e44 SHA512 9761765eb1f8c8efc7759d12de8928ae28a7d0cd287666c1e3391cddb65b1e41cb66735f416e48d3294a36d2dec0bbbd7195e3b54651a564ac410403eea58bec WHIRLPOOL 2b8b2f1c9250caac84b11b6775862452d03831c1848fe2ba23bfb4d17b3b453227aed421a2de8b7c62265afdb80b35687325b1939e34d9326920214dd8e41164
 DIST seednodes-20121030.fref.bz2 9181 SHA256 c71fc9addf7f81208822e59baf2d9ae7f3399c8881360511a7b8926012050b57 SHA512 e079ba7a7752774332862b6332ccff4cd221e53a42b14a795e4c12caca9f7448df67250e8bc456251dafff60048af10a06a83fdc1a04f71b3bb722500d064f2d WHIRLPOOL 4b7b6112680134f6c26ee4bfad0cfe1b2cc2063ef91215c93c562247c7089934df5c78b7fc5e570c4f9a89b3b5574e643917c6961a6b8476a5c98e2689cd2712
-EBUILD freenet-0.7.5_p1419.ebuild 4583 SHA256 36e124c06e782474d8f7ced58562bc1f6c91fa7520dfa6526e72a66298211f46 SHA512 b07d058d83dbeabf2ba819508ed1d7993fd610505eecaad3fc4763f5c15ecc268f2a5febb78416aab47986d678245b09b4538bdf60f8cce34a266353aae5425e WHIRLPOOL 92541486b33e68a32934a326bd5ef26aa9e6f8cbdba2530600ccc583ce32b61a91cee35fd238673e87410ce6a8dfc0c0521c67a13fa0d05b27e454b13fe864ac
-EBUILD freenet-0.7.5_p1421.ebuild 4253 SHA256 8aadea7421975b53ae65a5a216de326cec4ffd7f864c4b8e9643cfef45f83c94 SHA512 677776a2fabcce5a7c17204729b72e568cc60c3fb9159a77ab095a8119b368b52f8ce505abf35f603b49c32c246ea3c97b3f3f0de047f89d843523a0d31b756d WHIRLPOOL 4053169b8511e191b5ac3cfce71279553c15a7a36c72bd0f56f4830298f0f82686b70eaf37b8d3428a61db4de8376aef114d2a53cb3a4c03d6a3722e59cd1c88
-EBUILD freenet-0.7.5_p1422.ebuild 4253 SHA256 fe8672cb3d5f804f3ca9f138683753fc60593c777df383037174dd3a85be918e SHA512 bb588f42975ab6c3db19f12b098ed96a30614f37f771f34ce9aad83454bc010f8214caac3769c4e402797f367cfff07106a97c8804d71d000eb2766c691174a9 WHIRLPOOL 520fca73101133173d3818d2f0fcb3237c35462e936d1fd5c06be53d8f04bd11ac9d04b5f724f041520f55c3a6d83bf10cac5ba4ca3bef6b0e6c1e1380eedcad
-MISC ChangeLog 21532 SHA256 2e3152904ae60ac9fb5be22b78fcbb59e4519c8b59008834e4dbb2152242f7e4 SHA512 69a3c39f92ec8b3ac51dfd0774c23c6c210ceacea69c59e18d91327ff90a4d941f069603b451c477660a4e968c1c1f7aebff6005936e99ae524f9f9de9d446ae WHIRLPOOL 33349fe67aee18223e8ff8965a4f9337db4718f05cb01101a337437d7f0a8dec48d6f6adf50bf74cd805de274bf6f11b43a62de3a2c293125aed0df17697480a
-MISC metadata.xml 310 SHA256 e614c0ca7fa5d32c3e94ccd6d822fd0aa482ce31439e0206f26b0f7a76113950 SHA512 51675c6c4240c3ca73e9526462da9617e4fa9a86ec43e21a2c85ef824015b3843948504ecb6643f4fdb65c3911712f2e0ab87ad37b56063445db42a315be6de4 WHIRLPOOL c0b49fedbcb65ed5b30254fc90688436070b66de3cc3699d0621d495dfad139bc6a6388b3f25be3be1824ce1eaf2cf688100abbf621116629e61ecfb52e338e0
+EBUILD freenet-0.7.5_p1423.ebuild 4275 SHA256 a0dc36d9dfec878a4f1618aa79f0600508411fe1bf574423af04489b2c6dc36c SHA512 9af359d623be0575c7e620ac265a03189617241c41f63e7d11f449bf5c7263d4427735928245b490ec4979385c37a30ab34c5f78f3deb989aa638b8c790ecd5c WHIRLPOOL e701ceec35b62173ca0a188cc672c607aeddf009fb569be02a78a693559c13c3340d7fcfa2df4f1e7c8583a6304929a9640f2e9a0c648ff0a4b295a8f6cc2ed0
+MISC ChangeLog 21823 SHA256 6511d92f5f1eae6bfa33c9de221732bd1c10a0cd79a95e9da2337e317bf95378 SHA512 9cff381ab8420a546cab18932f85b9e40089b167200dcaad286eddf9076f875ed809ef7785b87e319c49bdd6ed0c922a4a8086b3ebfc56b2ec01c06a590e0b9c WHIRLPOOL 64b0a8ae41216d06968aff4684690dc9b0f8b488fb5a56c92fecd66cfe50d7864abe374ebbf727b20e98af8275f0a155e81357996b1030f5a2171da31bc637ed
+MISC metadata.xml 243 SHA256 76e8c4cafe92af4eb083e9682c375a2f887458dac6ce8f2982976a96abcf8219 SHA512 92bf36a1bad3877a5a981271afa7381a38f3cc87267233205af5aa0ad53c455d851bb1d9ff60fe02eda49a3347c497c5bfeaa4c160542abd62d81a0450c4b77f WHIRLPOOL 18fde625e32450606e852e52f034c73d6514284aa19842867313432d1ab1cc1d40ceae766c0c61b927a7b5c3917a6624c8e875583f49c0d5951797cf66e8ff95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlCQHPYACgkQG7kqcTWJkGcTFwQAxorZZlMb7/AfPxhiCMrfPpYz
-YDPTriomomhHED+yWj5ONXsvbs9bqKgM+8XQklxiLmzI8MeqSHdatzXDOUvbkOn6
-4hgy2Qjknf5gGD9z0PLq/hnqGYBYPRchtZI3DRlZKQ2dOC3DsMPwPJv1paDEgGBV
-E9HkH6IPqQ8QsQP65DM=
-=8Uj4
+iJwEAQEIAAYFAlDTJ+0ACgkQG7kqcTWJkGcw1QP/StrezVZ86y6RVB2BQjSlTCWe
+LgB8l5kd+2SZsmf5qzg92hoKLZMRLGFz/3vzX3GWi6pMrqwwafXdgz4gtta1VyCz
+o6GOc+T7pknxhPwFE/GLjd8hPPO8eOF+Dn4arbEu/BMPjuUdXPfhAhfnZHi0YwjD
+WyhT5iNK/b8koQWY3pc=
+=OND7
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1419.ebuild b/net-p2p/freenet/freenet-0.7.5_p1419.ebuild
deleted file mode 100644
index a8ab27f6182f..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1419.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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_p1419.ebuild,v 1.1 2012/10/14 10:27:36 tommy Exp $
-
-EAPI="2"
-DATE=20120730
-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="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-1.45: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="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 -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}"
-}
-
-java_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-nativebiginteger-no-nativedoublevalue.patch
-
-	EPATCH_OPTS+=" -R"
-	epatch "${FILESDIR}"/libraryloader-revert-using-of-absolute-path.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
-
-	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
-
-	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_p1421.ebuild b/net-p2p/freenet/freenet-0.7.5_p1421.ebuild
deleted file mode 100644
index 7adf2702931c..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1421.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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_p1421.ebuild,v 1.1 2012/10/25 20:46:25 tommy Exp $
-
-EAPI="2"
-DATE=20120730
-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="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="test"
-
-CDEPEND=">=dev-java/bcprov-1.45: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"
-
-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}"
-}
-
-java_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_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_p1422.ebuild b/net-p2p/freenet/freenet-0.7.5_p1423.ebuild
index 6d9fdc52d436..8d893fec7ba1 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1422.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1423.ebuild
@@ -1,6 +1,6 @@
 # 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_p1422.ebuild,v 1.1 2012/10/30 18:31:09 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1423.ebuild,v 1.1 2012/12/20 14:59:50 tommy Exp $
 
 EAPI="2"
 DATE=20121030
@@ -14,7 +14,7 @@ SRC_URI="http://github.com/${PN}/fred-official/zipball/build0${PV#*p} -> ${P}.zi
 	mirror://gentoo/seednodes-${DATE}.fref.bz2
 	mirror://gentoo/freenet-ant-1.7.1.jar"
 
-LICENSE="as-is GPL-2"
+LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
diff --git a/net-p2p/freenet/metadata.xml b/net-p2p/freenet/metadata.xml
index f204e556140f..fed3658eec53 100644
--- a/net-p2p/freenet/metadata.xml
+++ b/net-p2p/freenet/metadata.xml
@@ -5,8 +5,5 @@
 		<email>tommy@gentoo.org</email>
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
-	<use>
-		<flag name='freemail'>Add Freemail support</flag>
-	</use>
 </pkgmetadata>