net-p2p/freenet: Remove hardcoded path, thanks to gentoofan23 and drac

svn path=/sunrise/; revision=6582

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index ebbb741a2b42bbaf4f1d5a0fcb0b817b63dcff90..3db659e738f9b7fd8fec53ec8e9d348dd02c5073 100644 (file)
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Jul 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  freenet-0.7_p1154.ebuild, freenet-9999.ebuild:
+  Remove hardcoded path, thanks to gentoofan23 and drac
+
   22 Jul 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   freenet-9999.ebuild:
   Simplify

diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 09d85784a30c48887b80771bf990da11deebce97..30d40303290bad1d6bd688e1af51bc06f09928f9 100644 (file)
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -5,7 +5,7 @@ AUX wrapper.conf.patch 691 RMD160 a4f534fb81d20972d80d16a579a5f493918149d1 SHA1
 DIST freenet-0.7_p1154.tar.bz2 2058160 RMD160 4c529cc366c463ccfbf3d902c939bbcaaca2965a SHA1 6578724f69bb24ce0121cb51bc01adddb82d4f56 SHA256 2d7791156acf3fa398c95a57d23a6f9820a4084a1ab5e1e70204b2292c282076
 DIST seednodes-20080721.fref 37077 RMD160 4b7aca1d3864a42f4bbece5cf7d9b410888feebe SHA1 93fa0bbae17e15cbf073ad9da9070de023c265f5 SHA256 37f075bc40611f0db15e3e5012aebbd6a14775f2a70e90ab7838b5f91fa42ac1
 DIST wrapper-20080330.conf 1667 RMD160 77c0e4d379521ce10da408dd35ec0ebb5c82f4a9 SHA1 7f8679579c47e2c0644d26c67c26d779bf6f8d75 SHA256 70a98acb43b43b00b45bda40de5745ba188d366dd69c5d97968aa4494b7441f0
-EBUILD freenet-0.7_p1154.ebuild 2795 RMD160 ec696596bd45560a55e755c8b5c139d89fae0262 SHA1 1296a1398c649a68a8cd5924f9d2f29c4ad1b348 SHA256 182ced762454eccf63ef8dae68d28b2f366aff26b678454b0067e325763da9ef
-EBUILD freenet-9999.ebuild 3273 RMD160 0491852bd1c3542f03c6604a49dfa0fe40650e18 SHA1 07cc56189062d53011e1b7917eda9331100f820b SHA256 d142f9b61407df8cfb2e52f563bd953bca07c103646b6b240a5c049013bbd44d
-MISC ChangeLog 10963 RMD160 c9a6925269d2bc383fd7a58b27d8d58a8d5874e1 SHA1 6a8de5991c46d876a15120314ad8802334e31e01 SHA256 34c471c44605b9793ec8475ba94c298649601ab11461101b92b60957d1d1a0b0
+EBUILD freenet-0.7_p1154.ebuild 2819 RMD160 5c4d35f08f27654c62f5f0bbd91c0f4145dbe613 SHA1 2bcef40f0700c1c5ad7c21c421e93867f189c315 SHA256 4900d38de7a7ffad848fd3a56fa13038fef0e95dbc9cc7da370bb6e09a69c0c4
+EBUILD freenet-9999.ebuild 3297 RMD160 ada38bb9debd5c2fb2e0daa938bcae2f06146c2f SHA1 e61e36214da2351f83dac22c329bbf8bc7bb9f84 SHA256 c65378f401a40f64376cf586c245cc1dbf2e2223f7824b31505086189dcecc92
+MISC ChangeLog 11128 RMD160 4df75407ccd7a1bb0673de07f3e46e6cabedc96c SHA1 6502526f8140a11e6124517f8f4958d3001cea05 SHA256 c45b65be4f52b7f1665eeefbed9cf7f7dd034615ac2ffb83efa1ea63f8a0b5c2
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/net-p2p/freenet/freenet-0.7_p1154.ebuild b/net-p2p/freenet/freenet-0.7_p1154.ebuild
index 3af85e9b55c4882e0e61e83dd96e7c5407a2cd05..81aa12db80277926f4ac439a74be538b0c8b35d1 100644 (file)
--- a/net-p2p/freenet/freenet-0.7_p1154.ebuild
+++ b/net-p2p/freenet/freenet-0.7_p1154.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=1
 WRAPPER_DATE=20080330
-inherit eutils java-pkg-2 java-ant-2
+inherit eutils java-pkg-2 java-ant-2 multilib
 
 DESCRIPTION="An encrypted network without censorship"
 HOMEPAGE="http://www.freenetproject.org/"
@@ -45,7 +45,7 @@ src_unpack() {
        cp "${DISTDIR}"/wrapper-${WRAPPER_DATE}.conf wrapper.conf
        epatch "${FILESDIR}"/wrapper.conf.patch
        epatch "${FILESDIR}"/ext.patch
-       use amd64 && sed -i -e 's/=lib/=lib64/g' wrapper.conf
+       sed -i -e "s/=lib/=$(get_libdir)/g" wrapper.conf || die "sed failed"
        mkdir -p lib
        cd lib
        java-pkg_jar-from db-je-3.2

diff --git a/net-p2p/freenet/freenet-9999.ebuild b/net-p2p/freenet/freenet-9999.ebuild
index 921f3af1c638ad7dc3004370643591597e7bbb8e..3d79c00f7a707749a1e42ffeebc9d5dfa8099600 100644 (file)
--- a/net-p2p/freenet/freenet-9999.ebuild
+++ b/net-p2p/freenet/freenet-9999.ebuild
@@ -7,7 +7,7 @@ DATE=20080721
 DATE2=20080330
 ESVN_REPO_URI="http://freenet.googlecode.com/svn/trunk/freenet"
 ESVN_OPTIONS="--ignore-externals"
-inherit eutils java-pkg-2 java-ant-2 subversion
+inherit eutils java-pkg-2 java-ant-2 multilib subversion
 
 DESCRIPTION="An encrypted network without censorship"
 HOMEPAGE="http://www.freenetproject.org/"
@@ -57,7 +57,7 @@ src_unpack() {
        sed -ie "s:@custom@:${MY_FREENET_LATEST}:g" src/freenet/node/Version.java
        epatch "${FILESDIR}"/wrapper.conf.patch
        epatch "${FILESDIR}"/ext.patch
-       use amd64 && sed -i -e 's/=lib/=lib64/g' wrapper.conf
+       sed -i -e "s/=lib/=$(get_libdir)/g" wrapper.conf || die "sed failed"
        mkdir -p lib
        cd lib
        java-pkg_jar-from db-je-3.2