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

(Portage version: 2.2_rc40-r1/cvs/Linux x86_64)

6 files changed, 27 insertions, 120 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/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"