summaryrefslogtreecommitdiff
path: root/net-p2p/freenet
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2011-07-15 23:16:57 +0100
committerdakkar <dakkar@thenautilus.net>2011-07-15 23:17:17 +0100
commit1e95cba4d293ee115632807b721a1ad344712b93 (patch)
tree1b3a9cdde1b155f8437523d51d7a2653a488827a /net-p2p/freenet
parentnodoka depends on sexy (diff)
downloadgentoo-overlay-1e95cba4d293ee115632807b721a1ad344712b93.tar.gz
gentoo-overlay-1e95cba4d293ee115632807b721a1ad344712b93.tar.bz2
gentoo-overlay-1e95cba4d293ee115632807b721a1ad344712b93.zip
freenet 1384
Diffstat (limited to 'net-p2p/freenet')
-rw-r--r--net-p2p/freenet/Manifest10
-rw-r--r--net-p2p/freenet/freenet-0.7.5_p1283.ebuild101
-rw-r--r--net-p2p/freenet/freenet-0.7.5_p1384.ebuild (renamed from net-p2p/freenet/freenet-0.7.5_p1312.ebuild)57
3 files changed, 44 insertions, 124 deletions
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 86812d0..cf10623 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -7,10 +7,8 @@ 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_p1283.zip 3577337 RMD160 6862c247fb85be397bceba638b0da241705989af SHA1 fa8c430c52499fc46aa0d1654094ed68c88ddea9 SHA256 3bcc301238f7b286468d0d9ccc14e03e006bbbf6d4d0840d407cdd0cc86250e4
-DIST freenet-0.7.5_p1312.zip 3670478 RMD160 7114674664089e7d8c1fddac84590818e2db3c30 SHA1 4a16b39b2ae8e01ae464e197d5251f06aca74031 SHA256 98358ca6ef769fcc5b9f756a5975105bbddd5d2bbd5da8ad09ec0bc5eda77b38
-DIST seednodes-20100701.fref 22311 RMD160 e80cd82b443b45c00998c0e87bfe6e485686419a SHA1 024bc22dacfe336fafef1b9fafadeaec7c976491 SHA256 1264cad055f597583cf7f5f14cdaafd392c5543d45cfff2c450c1fd551da3105
-DIST seednodes-20101030.fref 15810 RMD160 7e8091941da4d324d76466400aea627edc75ddf3 SHA1 68489e1fe439726d630211bc7ea062dec7c04c86 SHA256 218d22d391c82278625b4d0057092c5731a7e97821d31ac84d77dcf18b6cdc10
-EBUILD freenet-0.7.5_p1283.ebuild 3149 RMD160 e439a2ecc92100962bf993ad9e32f376d0e2367d SHA1 f429748a941b58f9dd44bc9a81b349437e6ee244 SHA256 19a4e87c8ce9139ee0a5f9cd07f8548b0dc3cc2e5802e4a23b466eda18bbf78c
-EBUILD freenet-0.7.5_p1312.ebuild 3479 RMD160 7c26015d940d410ee3e7541e3f0b93f461ac1ad3 SHA1 6f81bfe21f62b56a6e70db14f20c0f6e784907a2 SHA256 4c9fc8b6056c161b7432e495959814423ee74909d385d934db358468f041fa70
+DIST freenet-0.7.5_p1384.zip 4156816 RMD160 c5693dd4deb4dbad0ed6c1746e9f7112bbd65ded SHA1 b924b72191be90a92fb48c5587a420e8ae940246 SHA256 3072a397f945ffe5ea24dca47fdbd47e28722e50469d0957902f9f4e67fe59f4
+DIST freenet-ant-1.7.1.jar 1327167 RMD160 2ff5fa9c7041aa475bc1374763897fd8f19ca1f4 SHA1 ab21c797797d9e216ff1e05dfaac969a74191cd1 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1
+DIST seednodes-20110618.fref.bz2 10704 RMD160 43842b56643cd2596769eebc4c360d2c18081f69 SHA1 394b089c5b3a49eb066a5b93d83a35e4c5afe409 SHA256 81a707dcc68be8b453fd2c2cfb1ea8e7fd6d637c0f4321bc93947d2dcc9ab93c
+EBUILD freenet-0.7.5_p1384.ebuild 4189 RMD160 8645242a20a4303c2631ca85073744e54edcbf06 SHA1 de061afdbebc1281552e268aaf98e77dc7740f9c SHA256 c060898621f2c7ba71350444e65d7c6e96ae966693cbdd41a6752704bcdd923d
MISC metadata.xml 332 RMD160 692365bdee16dc9218a18a306e5b15a4b2684206 SHA1 6f1d02202549206e3c5856c9a5a99b334015f7c9 SHA256 869705ebd157480153ca5ddbf7c48426b4374a8cba10164a1f1582fde5afa3a3
diff --git a/net-p2p/freenet/freenet-0.7.5_p1283.ebuild b/net-p2p/freenet/freenet-0.7.5_p1283.ebuild
deleted file mode 100644
index 5736b5b..0000000
--- a/net-p2p/freenet/freenet-0.7.5_p1283.ebuild
+++ /dev/null
@@ -1,101 +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_p1277.ebuild,v 1.1 2010/09/13 17:48:04 tommy Exp $
-
-EAPI="2"
-DATE=20100701
-
-inherit eutils java-pkg-2 java-ant-2 multilib
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="http://www.freenetproject.org/"
-SRC_URI="http://github.com/${PN}/fred-official/zipball/build0${PV#*p} -> ${P}.zip
- 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-1.7*
- dev-java/lzma
- dev-java/lzmajio
- dev-java/mersennetwister"
-#force secure versions for now
-DEPEND="app-arch/unzip
- >=virtual/jdk-1.5
- ${CDEPEND}"
-RDEPEND=">=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() {
- 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}"/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
- java-pkg-2_src_prepare
-}
-
-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_p1312.ebuild b/net-p2p/freenet/freenet-0.7.5_p1384.ebuild
index 6628c03..2aaed99 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1312.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1384.ebuild
@@ -1,17 +1,18 @@
-# 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-0.7.5_p1311.ebuild,v 1.1 2010/12/17 14:48:08 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1380.ebuild,v 1.1 2011/07/10 17:20:28 tommy Exp $
EAPI="2"
-DATE=20101030
+DATE=20110618
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="http://www.github.com/${PN}/fred-official/zipball/build0${PV#*p} -> ${P}.zip
- mirror://gentoo/seednodes-${DATE}.fref"
+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"
@@ -24,26 +25,27 @@ CDEPEND="dev-db/db-je:3.3
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
+ >=virtual/jdk-1.6
${CDEPEND}
- test? ( dev-java/junit )"
-RDEPEND=">=virtual/jre-1.5
+ test? ( dev-java/junit
+ dev-java/ant-junit )
+ dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.6
net-libs/nativebiginteger
${CDEPEND}"
PDEPEND="net-libs/NativeThread
freemail? ( dev-java/bcprov )"
EANT_BUILD_TARGET="package"
+EANT_TEST_TARGET="unit"
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_GENTOO_CLASSPATH="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"
+export EANT_EXTRA_ARGS+=" -Dtest.skip=true"
pkg_setup() {
has_version dev-java/icedtea[cacao] && {
@@ -57,21 +59,42 @@ pkg_setup() {
enewuser freenet -1 -1 /var/freenet freenet
}
-src_prepare() {
+src_unpack() {
+ unpack ${P}.zip seednodes-${DATE}.fref.bz2
mv "${WORKDIR}"/freenet-fred-* "${S}"
- cd "${S}"
+}
+
+src_prepare() {
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"
+ sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
+ -e "s:/usr/share/ant-core/lib/ant.jar:/usr/share/freenet/lib/ant.jar: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}"
+ cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
java-pkg-2_src_prepare
}
+src_test() {
+# java-pkg_jar-from --into lib junit
+# java-pkg_jar-from --into lib ant-junit
+ java-pkg_jar-from --into lib fec
+ java-pkg_jar-from --into lib java-service-wrapper
+ java-pkg_jar-from --into lib mersennetwister
+ java-pkg_jar-from --into lib lzma
+ java-pkg_jar-from --into lib db4o-jdk5
+ java-pkg_jar-from --into lib db4o-jdk12
+ java-pkg_jar-from --into lib db4o-jdk11
+ export EANT_EXTRA_ARGS+=" -Dtest.skip=false"
+ 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
@@ -82,14 +105,14 @@ src_install() {
doins freenet-wrapper.conf || die
insinto /var/freenet
doins run.sh || die
- newins "${DISTDIR}"/seednodes-${DATE}.fref seednodes.fref || 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 () {
+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."