From 78e3a03d09a11f9b0268bffa02c3cc5c6d65771f Mon Sep 17 00:00:00 2001 From: Thomas Sachau Date: Tue, 4 Jan 2011 17:02:05 +0000 Subject: Version bump, drop old (Portage version: 2.2.0_alpha11-r1/cvs/Linux x86_64) --- net-p2p/freenet/ChangeLog | 11 ++- net-p2p/freenet/freenet-0.7.5_p1311.ebuild | 108 ----------------------------- net-p2p/freenet/freenet-0.7.5_p1320.ebuild | 108 +++++++++++++++++++++++++++++ net-p2p/freenet/freenet-9999.ebuild | 6 +- 4 files changed, 120 insertions(+), 113 deletions(-) delete mode 100644 net-p2p/freenet/freenet-0.7.5_p1311.ebuild create mode 100644 net-p2p/freenet/freenet-0.7.5_p1320.ebuild (limited to 'net-p2p') diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog index 89df8db341f3..1c1a7bfab61c 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.108 2010/12/26 12:48:21 tommy Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.109 2011/01/04 17:02:05 tommy Exp $ + +*freenet-0.7.5_p1320 (04 Jan 2011) + + 04 Jan 2011; Thomas Sachau (Tommy[D]) + -freenet-0.7.5_p1311.ebuild, +freenet-0.7.5_p1320.ebuild, + freenet-9999.ebuild: + Version bump, drop old *freenet-0.7.5_p1312 (26 Dec 2010) diff --git a/net-p2p/freenet/freenet-0.7.5_p1311.ebuild b/net-p2p/freenet/freenet-0.7.5_p1311.ebuild deleted file mode 100644 index 2f86afdc67d5..000000000000 --- a/net-p2p/freenet/freenet-0.7.5_p1311.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_p1311.ebuild,v 1.1 2010/12/17 14:48:08 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-* "${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_p1320.ebuild b/net-p2p/freenet/freenet-0.7.5_p1320.ebuild new file mode 100644 index 000000000000..3faea53780eb --- /dev/null +++ b/net-p2p/freenet/freenet-0.7.5_p1320.ebuild @@ -0,0 +1,108 @@ +# 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_p1320.ebuild,v 1.1 2011/01/04 17:02:05 tommy Exp $ + +EAPI="2" +DATE=20110103 +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-* "${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-9999.ebuild b/net-p2p/freenet/freenet-9999.ebuild index bc5d9449ca40..05fa51478b92 100644 --- a/net-p2p/freenet/freenet-9999.ebuild +++ b/net-p2p/freenet/freenet-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2010 Gentoo Foundation +# 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-9999.ebuild,v 1.12 2010/11/22 15:54:20 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.13 2011/01/04 17:02:05 tommy Exp $ EAPI="2" -DATE=20101030 +DATE=20110102 JAVA_PKG_IUSE="doc source" EGIT_REPO_URI="git://github.com/freenet/fred-official.git" -- cgit v1.2.3-65-gdbad