Version bump, drop old ones

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

4 files changed, 17 insertions, 120 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 7bd74dd8d197..a7bc0d769a46 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.104 2010/12/02 21:37:02 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.105 2010/12/12 16:24:46 tommy Exp $
+
+*freenet-0.7.5_p1310 (12 Dec 2010)
+
+  12 Dec 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7.5_p1306.ebuild, -freenet-0.7.5_p1308.ebuild,
+  +freenet-0.7.5_p1310.ebuild:
+  Version bump, drop old ones
 
 *freenet-0.7.5_p1308 (02 Dec 2010)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 8fc11c96b70c..5181e845c8fd 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -9,20 +9,18 @@ AUX run.sh-20090501 16217 RMD160 f8b03990d011e1f149ec43aa536fd7540a19f01a SHA1 1
 AUX strip-openjdk-check.patch 4015 RMD160 c512338ac1dc9ca88082f403d8a4bc4dfcb98c07 SHA1 8e2e7c6eb7bb0f738d9afd73b2b32f7f5b2d515b SHA256 74f4d18e590b181d60ee41c1d3aa9ede8525fd643cdfa4e4688d1c8310ec893c
 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_p1306.zip 3636747 RMD160 dd51aff2aa2ef2dfac3e4817a7fc7668fa27dba7 SHA1 dc9515cb244014d036de893054cadd5eed456d2b SHA256 e4a2b2fda054c2b3c55e299a94278f47d1bcbecca623c37e2a53fe82cf014ba2
-DIST freenet-0.7.5_p1308.zip 3658332 RMD160 e7ca45fb9d2e220a4cb3f93fb63711ee9ce7f299 SHA1 16a1601b80230a0a62fbdc32cb9e07b36cfef553 SHA256 55c8e9bee4ae41dc721862594a61de6e584bf0065e1b251a6b286e4b7712a72f
+DIST freenet-0.7.5_p1310.zip 3662472 RMD160 60fe722e50df06f3a72e1cbdd5e489d916773915 SHA1 cef935b4ac413bd92844ee9218711048e9727a27 SHA256 de9dec9818765b0a57fc774b2657fcef662b5ac0847ba76e1b04fc719aae6637
 DIST seednodes-20101030.fref 15810 RMD160 7e8091941da4d324d76466400aea627edc75ddf3 SHA1 68489e1fe439726d630211bc7ea062dec7c04c86 SHA256 218d22d391c82278625b4d0057092c5731a7e97821d31ac84d77dcf18b6cdc10
-EBUILD freenet-0.7.5_p1306.ebuild 3436 RMD160 4b79b27028bb93a494bd76a20343dcc4c55885b3 SHA1 7d4f2b9eb6f6acae5dee575cb03c284d023c56c3 SHA256 fb84f3140ee1bcb706911d3273e712e84dd1801fa15ccf7fd222b7b8f701a741
-EBUILD freenet-0.7.5_p1308.ebuild 3436 RMD160 8a23e1ad9a4549e5b9d47eb64ff52a53c401224e SHA1 79ab91ab90fc9cc71eb49742fa6e3d2d9eec67fe SHA256 72fdb42383d5f41b0b9b98f5f2b551cae524894fec482206802c733a8b21e535
+EBUILD freenet-0.7.5_p1310.ebuild 3436 RMD160 8d90fc858287c869385534ae1c257450bd9c1470 SHA1 7dce6afbca47341d7c5961d62ae7ecb15d096038 SHA256 f4de68862f13e7f4944dd222a86e3d22a95abf4287b0f684596a8af766afa8ef
 EBUILD freenet-9999.ebuild 3095 RMD160 0b53c7d491c98d5f6abd5921b5cb93f9d612da9b SHA1 3c30afc05ee702db0374d4f5bcf87899cc5d39d4 SHA256 e8558c801830f516f4951696628e681285a3417648f8556fd09ee91ac9fc16d5
-MISC ChangeLog 11272 RMD160 f8e1e6e55e0d9379d992366f170cc28984bcc6c0 SHA1 4a58fda587c5441089c79f0a309dfea08e87eea6 SHA256 15f82943c20bfa9bd60f022757198cbb88246bba9ce0c0fd5e936253223de1ec
+MISC ChangeLog 11489 RMD160 a0040e99f9584220a80e3681c64ff09a732bb05a SHA1 1cd412d7c910623e0f13f184e37b790dc0dd6864 SHA256 1abb6ceaa80ca5a5c8dc34e2ac20b935f0aec427bf76ca1f5a626110327e3545
 MISC metadata.xml 332 RMD160 692365bdee16dc9218a18a306e5b15a4b2684206 SHA1 6f1d02202549206e3c5856c9a5a99b334015f7c9 SHA256 869705ebd157480153ca5ddbf7c48426b4374a8cba10164a1f1582fde5afa3a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iJwEAQECAAYFAkz4ElkACgkQG7kqcTWJkGeLXwQApV54MOEO2HpqtavmuR6JAkfB
-SBNeiIl+C5zdR7iamLy1l8ICnqGXOCd+wmvr6iRrvVuumJymgBU4oBundcCD2Ghc
-189vmjr3znns1Ih9opls/G0AlAPMnL3jJPcXpHXP0fvy1/fdQxoWUBGnu1arjF2k
-vYMFVEeQv2lg1mLQoZA=
-=Mor1
+iJwEAQECAAYFAk0E+IEACgkQG7kqcTWJkGcNowQAyZfIKItDE04ry1Kjwt4WlSlL
+zUnWykw+Oj9y9x37IHI76rwSozuLo4bXjoIX55zgN+fGlJ4tnBmOZddwM640qJpz
+c9RrE2AURqlRv/fiKdoYWLMHm8ucpDws+sXZhRh7ZHqrjMNXWOMjTNGbvUjzYONy
+ma8/aVOm2uNA7MWQ8SI=
+=orMU
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1308.ebuild b/net-p2p/freenet/freenet-0.7.5_p1308.ebuild
deleted file mode 100644
index 789b2d1ac437..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1308.ebuild
+++ /dev/null
@@ -1,108 +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_p1308.ebuild,v 1.1 2010/12/02 21:37:02 tommy Exp $
-
-EAPI="2"
-DATE=20101030
-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="mirror://gentoo/${P}.zip
-	mirror://gentoo/seednodes-${DATE}.fref"
-
-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/ant-core-1.7*
-	dev-java/lzma
-	dev-java/lzmajio
-	dev-java/mersennetwister"
-DEPEND="app-arch/unzip
-	>=virtual/jdk-1.5
-	${CDEPEND}
-	test? ( dev-java/junit )"
-RDEPEND=">=virtual/jre-1.5
-	net-libs/nativebiginteger
-	${CDEPEND}"
-PDEPEND="net-libs/NativeThread
-	freemail? ( dev-java/bcprov )"
-
-EANT_BUILD_TARGET="package"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="ant-core 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"
-use test || export EANT_EXTRA_ARGS+=" -Dtest.skip=true"
-use test && EANT_GENTOO_CLASSPATH+=" junit"
-
-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}"/0.7.5_p1302-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 "${EANT_BUILD_XML}"
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.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
-	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_p1306.ebuild b/net-p2p/freenet/freenet-0.7.5_p1310.ebuild
index 5838d7c28e5f..194d2fd98380 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1306.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1310.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_p1306.ebuild,v 1.1 2010/11/30 18:19:11 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1310.ebuild,v 1.1 2010/12/12 16:24:46 tommy Exp $
 
 EAPI="2"
 DATE=20101030