Version bump, remove old, move to tarballs as requested by QA team (fixes bug 282248)

Package-Manager: portage-2.2_rc40-r1/cvs/Linux x86_64

7 files changed, 39 insertions, 134 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 5e56e5a3c0d1..be687a416ed5 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.68 2009/08/22 14:50:29 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.69 2009/09/05 22:57:48 tommy Exp $
+
+*freenet-0.7.5_p1233 (05 Sep 2009)
+
+  05 Sep 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7.5_p1229.ebuild, -freenet-0.7.5_p1232.ebuild,
+  +freenet-0.7.5_p1233.ebuild, freenet-9999.ebuild, files/run.sh-20090501,
+  files/ext.patch:
+  Version bump, remove old, move to tarballs as requested by QA team (fixes
+  bug 282248)
 
 *freenet-0.7.5_p1232 (22 Aug 2009)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 909effd4c440..a411c33e2523 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,28 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ext.patch 2644 RMD160 037d1f8d15e6f2da50c96ec172266b7ea4e14972 SHA1 7615f981a804ca8e553a98eeb3563cfd7720495b SHA256 d8131189125b31bdf37db90812ed7e53f7480f70e4c00bd35bd56c0427d6e709
+AUX ext.patch 2511 RMD160 ce76693385f75f16be75e9ce5b62248c8605b5a3 SHA1 85337d5578bc2caab0c7ea2602ef85e26d4c263a SHA256 a8d41b4c15308bc4404b7b165d682a4b7f3953ae605d7789f93cc50db36bde39
 AUX freenet 476 RMD160 fdce44749587d73cb3f5b916e893e3bb95ef3200 SHA1 48eb8bfbd27a17b0bb3b29248ce4c43b59a76bda SHA256 4a8482117a434e9885438b7ca5384851bff49fefa28b13e33494a746c781342f
 AUX freenet-0.7.5_p1232-strip-error.patch 747 RMD160 ea1c7127d3b759ddab102322b865e92a12665c6b SHA1 2182f15e34c444d5924d26b2078da2f0bec6b0fe SHA256 bb3ca54049ee537f30c353c681ba6399f6bc47850fa2c7969e02c9622c1e1793
 AUX freenet-0.7.5_p1232-strip-openjdk-warning.patch 448 RMD160 fe46149bc653ebf8181f82940028e44817bf2b93 SHA1 ac4cdf3a18ac07f9f4fd1f9e2fb9fe19dd047f86 SHA256 6f129e24455e0c12d6b83f9940bb7e88b7896eb459cac248a76344171b2a3426
 AUX freenet.old 452 RMD160 e9e834fedf4270c14f3e8d754c58eb05f3f570c5 SHA1 edb5d0ab062d46f494db88560885d7ee7b026e29 SHA256 b3047b40128bbd7843dc370ab0aa150a9836ed789f48181bd6d8fc72f1714fa6
-AUX run.sh-20090501 16218 RMD160 4805178fcff6e4414515c11709d8339c333f2fd0 SHA1 93a787a3d75a43dcd229ad422a05bb9f29eefda7 SHA256 a6c296bb39983349b43afbb3e758c3940e7ba86940d3a2615c47e97ad733dc19
+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 seednodes-20090413.fref 22342 RMD160 e9342614255f0e15c37eb830631ef4e62cf672e1 SHA1 2c966b82b42a72ecfbef717f9f5c30b6e5f2e52b SHA256 adfcda384f3b239a763d7a0bc4bd0cb7623febb534798d5f384ebd11efad7a92
-DIST seednodes-20090708.fref 25500 RMD160 43fc960ea4f54ce82f996f7174d7673b05ba52fb SHA1 941ff6852512cadfc095f69dcf35407545aaead5 SHA256 84f4692c2ac8ea5624d48e09a1a93f3832114c5e9a4598dbadc4a3a90f83c328
-DIST seednodes-20090821.fref 19121 RMD160 137cca51b4e74795eab722bec600655bf6bffca8 SHA1 d17a5d7b0603fed8352b5453eadd56fcfabcfb05 SHA256 ba0a1b6e8852125802653290ca895642075a4e940f3dd5a6215266eb427d40e2
-EBUILD freenet-0.7.5_p1229.ebuild 3138 RMD160 0176a21a5470453db4efec2a86523861bdc15429 SHA1 6dc46f74ba620c37549aa270fa7565cdd0221f01 SHA256 c1906b39d398a8ae632e322999e59a924908674c2d0dc9a43f3fd07ef170e191
-EBUILD freenet-0.7.5_p1232.ebuild 3185 RMD160 eaccfb0d6ce45fc3993f2773b629b52f0e0136fa SHA1 7aacab7cafd215f28196ae182bcac68d2e8a7ac3 SHA256 4eaa8053cc0c0e08359c5fb1c5e829c17ac27616e81cf55e6239dbeb84ea456c
-EBUILD freenet-9999.ebuild 2579 RMD160 255a5788443eab70fa464697582ecaebec34bd2c SHA1 41fc872b44bd96132b1084a75ae603ac0cd1214d SHA256 4153fcfcb720e3ac72c791d6d8b009afc62a3830278e8091f92fc4d73994fbdc
-MISC ChangeLog 4267 RMD160 1b3aa52260dbf9f26f41ebd4b7eaaea1db40e2e3 SHA1 887f4e4a6656a33c716206a924a812bb6187193c SHA256 1eccc7de9fbef45dbeef07fff440f59e84b12e475f4b307da522ea30f7186074
+DIST freenet-0.7.5_p1233.tgz 2038363 RMD160 bcde13fbb53238a3a14b39c35caf2fc188afd77d SHA1 d658bbae54a2b92c53b3dc59e413a3dd2167df95 SHA256 c816838db27428355a284bcdfad1562228973b4cbff265000c47775625804221
+DIST seednodes-20090904.fref 27001 RMD160 33b2263d6af4712617cd0ed22fdef6f891459ff5 SHA1 0409a3e0f41e06e179ab5633241c65ce0fcd45c5 SHA256 79a85d6d2769536b7d8f50857d34d6ce88a2813380d9881c79977143a4e87c52
+EBUILD freenet-0.7.5_p1233.ebuild 3145 RMD160 fd4f5d1129d0a61d75a9b33b24b7e325533e3778 SHA1 8d110897ff77f8bc6c046cee8f7042526c9ca95a SHA256 29a79d594410b48e6ff344feb3dd99d0c4975af2ad60ce5b7e41c4142c30700a
+EBUILD freenet-9999.ebuild 2579 RMD160 32dee441d905073d94940174d5111b1d46f0a3a7 SHA1 0f39892dbb13521af7187883e2f6ea7186b15baa SHA256 f1e9a99fee01bea58af66821cb90eaf577e03a9dc605f159197bf04c1673d426
+MISC ChangeLog 4607 RMD160 8e48d3b0f7c6cb08cf500799c58503f90606fa35 SHA1 7c3acb7e46c1f0f40bdc84ee3e245db5b191e166 SHA256 f581a5990e4aad78103075df37b38f91d8160e1a8d54bc90814da3f728cc1554
 MISC metadata.xml 332 RMD160 5e5c8b88681af85d63236c47f3a9a92881515679 SHA1 38a87952bb9389758e8700b4468b122ccf5199ea SHA256 3ca39205a9351767ed2901a4c8c8dd563ed1d83f6684f3bb6c2ab9e92ba4c10f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iJwEAQECAAYFAkqQBcAACgkQG7kqcTWJkGcvJwP+Jm8V3EkioWdHHCbmVZEKezY9
-3jmDkS879/AwWrRvLHmVPUWQRPT8uZoxwhKKZSsEwp0Nv7PsCG0XF/jcY54oROaP
-S9U/banKjymyLtGRDWtW3tsENpEJWJi4Bqg4lIBu2F/bimn7hGODzoy0GqR3n9PP
-qmxx4yRkX+U3cRcBtbE=
-=13os
+iJwEAQECAAYFAkqi7P8ACgkQG7kqcTWJkGfBqAP/VvBvXitwQB+Rpf3skzLf3Smz
+Hw0MilYmx1/UOb0S0Zxd9B2JmltgDCQO78wIV2pUgVRbvG98e3PpECogDCCILzZq
+ZHCiy7iZ4vKyxaQRMs3OZJGFjzIsHnEwZLVem0xAZWHFhY056P5X5FmaRh/0lF/R
+EJIJxNgLJSj1DkVB7Js=
+=LIWG
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/files/ext.patch b/net-p2p/freenet/files/ext.patch
index 73c4417ac0ef..6e5a5c5a7f42 100644
--- a/net-p2p/freenet/files/ext.patch
+++ b/net-p2p/freenet/files/ext.patch
@@ -1,5 +1,5 @@
---- freenet/build.xml	2009-08-04 20:54:09.267989544 +0200
-+++ freenet/build.xml.new	2009-08-04 20:57:01.295527065 +0200
+--- build.xml	2009-08-04 20:54:09.267989544 +0200
++++ build.xml.new	2009-08-04 20:57:01.295527065 +0200
 @@ -68,19 +68,9 @@
  		</exec>
  	</target>
@@ -21,9 +21,8 @@
  		<!-- Create the time stamp -->
  		<tstamp/>
 
-diff -ur freenet-old/src/freenet/node/NodeStarter.java freenet/src/freenet/node/NodeStarter.java
---- freenet-old/src/freenet/node/NodeStarter.java	2008-10-28 21:40:50.000000000 +0100
-+++ freenet/src/freenet/node/NodeStarter.java	2008-10-28 21:39:14.000000000 +0100
+--- src/freenet/node/NodeStarter.java	2008-10-28 21:40:50.000000000 +0100
++++ src/freenet/node/NodeStarter.java	2008-10-28 21:39:14.000000000 +0100
 @@ -162,37 +162,8 @@
  	}
  
diff --git a/net-p2p/freenet/files/run.sh-20090501 b/net-p2p/freenet/files/run.sh-20090501
index 435d5346b379..3f9723ff3e76 100644
--- a/net-p2p/freenet/files/run.sh-20090501
+++ b/net-p2p/freenet/files/run.sh-20090501
@@ -131,7 +131,6 @@ done
 # Change the current directory to the location of the script
 cd "`dirname \"$REALPATH\"`"
 REALDIR="`pwd`"
-
 # If the PIDDIR is relative, set its value relative to the full REALPATH to avoid problems if
 #  the working directory is later changed.
 FIRST_CHAR="`echo $PIDDIR | cut -c1,1`"
diff --git a/net-p2p/freenet/freenet-0.7.5_p1232.ebuild b/net-p2p/freenet/freenet-0.7.5_p1232.ebuild
deleted file mode 100644
index c83aca04ded5..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1232.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2009 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_p1232.ebuild,v 1.1 2009/08/22 14:50:29 tommy Exp $
-
-EAPI="1"
-DATE=20090821
-
-EGIT_REPO_URI="git://github.com/freenet/fred-staging.git"
-EGIT_PROJECT="freenet/fred-staging"
-EGIT_TREE="c9c29bce98478c2e30c178e26cffc8a98469e096"
-
-inherit eutils git java-pkg-2 java-ant-2 multilib
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="http://www.freenetproject.org/"
-SRC_URI="mirror://gentoo/seednodes-${DATE}.fref"
-
-LICENSE="as-is GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="freemail"
-
-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
-	dev-java/lzma
-	dev-java/lzmajio
-	dev-java/mersennetwister"
-#force secure versions for now
-DEPEND="|| ( >=dev-java/icedtea6-1.5.1 >=dev-java/icedtea6-bin-1.5.1 >=dev-java/sun-jdk-1.5.0.20 >=dev-java/sun-jdk-1.6.0.15 )
-	>=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND="|| ( >=dev-java/icedtea6-1.5.1 >=dev-java/icedtea6-bin-1.5.1 >=dev-java/sun-jdk-1.5.0.20 >=dev-java/sun-jdk-1.6.0.15 >=dev-java/sun-jre-bin-1.5.0.20 >=dev-java/sun-jre-bin-1.6.0.15 )
-	>=virtual/jre-1.5
-	net-libs/nativebiginteger
-	${CDEPEND}"
-PDEPEND="net-libs/NativeThread
-	freemail? ( dev-java/bcprov )"
-
-EANT_BUILD_TARGET="dist"
-EANT_GENTOO_CLASSPATH="ant-core db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper lzma lzmajio mersennetwister"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup freenet
-	enewuser freenet -1 -1 /var/freenet freenet
-}
-
-src_unpack() {
-	git_src_unpack
-	cd "${S}"
-	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/ext.patch
-	epatch "${FILESDIR}"/${P}-{strip-error,strip-openjdk-warning}.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
-}
-
-src_install() {
-	java-pkg_newjar lib/freenet-cvs-snapshot.jar ${PN}.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
-}
-
-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_p1229.ebuild b/net-p2p/freenet/freenet-0.7.5_p1233.ebuild
index 4335c0604eae..259e32dd589e 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1229.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1233.ebuild
@@ -1,19 +1,16 @@
 # Copyright 1999-2009 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_p1229.ebuild,v 1.2 2009/08/17 17:23:58 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1233.ebuild,v 1.1 2009/09/05 22:57:48 tommy Exp $
 
-EAPI="1"
-DATE=20090708
+EAPI="2"
+DATE=20090904
 
-EGIT_REPO_URI="git://github.com/freenet/fred-staging.git"
-EGIT_PROJECT="freenet/fred-staging"
-EGIT_TREE="127b7772c442079abdc0acb1f45a5aae91266cb9"
-
-inherit eutils git java-pkg-2 java-ant-2 multilib
+inherit eutils java-pkg-2 java-ant-2 multilib
 
 DESCRIPTION="An encrypted network without censorship"
 HOMEPAGE="http://www.freenetproject.org/"
-SRC_URI="mirror://gentoo/seednodes-${DATE}.fref"
+SRC_URI="http://github.com/${PN}/fred-official/tarball/build0${PV#*p} -> ${P}.tgz
+	mirror://gentoo/seednodes-${DATE}.fref"
 
 LICENSE="as-is GPL-2"
 SLOT="0"
@@ -50,12 +47,13 @@ pkg_setup() {
 	enewuser freenet -1 -1 /var/freenet freenet
 }
 
-src_unpack() {
-	git_src_unpack
-	cd "${S}"
+src_prepare() {
+	cd "${WORKDIR}"/freenet-fred-official-*
+	S=$(pwd)
 	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
 	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/{ext,strip-version-check}.patch
+	epatch "${FILESDIR}"/ext.patch
+	epatch "${FILESDIR}"/${PN}-0.7.5_p1232-{strip-error,strip-openjdk-warning}.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
diff --git a/net-p2p/freenet/freenet-9999.ebuild b/net-p2p/freenet/freenet-9999.ebuild
index f04da8079829..67e779496981 100644
--- a/net-p2p/freenet/freenet-9999.ebuild
+++ b/net-p2p/freenet/freenet-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 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.4 2009/08/17 17:23:58 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.5 2009/09/05 22:57:48 tommy Exp $
 
 EAPI="1"
-DATE=20090413
+DATE=20090904
 
 EGIT_REPO_URI="git://github.com/freenet/fred-official.git"
 EGIT_PROJECT="freenet/fred-official"