net-p2p/freenet: Simplify code for revision

svn path=/sunrise/; revision=7340

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 0f376fd06e1f7f693d04c14c3611f348126f20f5..eeaf433969c2c53c8d1ca1f372a5667d55c847e0 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: $
 
+  12 Nov 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  freenet-9999-r1.ebuild:
+  Simplify code for revision
+
   12 Nov 2008; Dennis Nezic <dennisn@dennisn.dyndns.org>
   freenet-9999-r1.ebuild:
   Fixed the incorrect-revision problem.

diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index e3284ff1c80d0ca4a9f1187cd2b354b514f44f56..242373b11439a58ebec0d84905d85b286bff97b8 100644 (file)
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -5,6 +5,6 @@ AUX wrapper1.conf 2234 RMD160 e314aac24d60a60292bee3bfa3447307105280d5 SHA1 8f6c
 DIST freenet-0.7_p1174.tar.bz2 1324572 RMD160 60b970a2ab501bca1eb3caf495533cefe841974a SHA1 f7150ab152a6c649f5813e98275d3f5758ecfb50 SHA256 03f763219ae414d3beb8abb078ede52d5a9f2dd4f066aca592fede9b4a7a9863
 DIST seednodes-20081112.fref 25475 RMD160 25ff9e544164c4f5f73f654988a898b59261da0c SHA1 fa9d24f602fecd5e06cb47bc078f3f5385f78f61 SHA256 562aac5f011bad0991ef4546f810bc5f1d1c013ce908fad227b6ef335026ca5f
 EBUILD freenet-0.7_p1174.ebuild 2757 RMD160 d410e1f5b8e92561b76ad986ac65104aa36e6536 SHA1 a83b537190e233b1a846a09039b81eb5eb8376d8 SHA256 bec6873008945783c61d00b23770418060f418000d6779db8ca87a52dddef8b1
-EBUILD freenet-9999-r1.ebuild 3548 RMD160 528fc7c96f1280381ff8edfe1eff8b2074b5f028 SHA1 26f8c2b2c670297d006eeb46cd8f29472a1607f6 SHA256 fa6b885c0522bed52e0712e0419a9c1256cbf095dcabfba849b808b9248176b3
-MISC ChangeLog 15476 RMD160 c1efd250c773d8169f4749e2849aa77bc3fec622 SHA1 abecf1eb8a7a2805543f3c54244be5dac236edc9 SHA256 d8eefa965f45fd6e8421875192a506cdaba2dd40fff724db8c4fcb32a55a391a
+EBUILD freenet-9999-r1.ebuild 3510 RMD160 3f2328fc2b507dabd932544407f3c5e3f729a2e6 SHA1 7cc435e47cb40f67b6c45d3004a16f4d751484d3 SHA256 86f7ad046a0a25314a28b92ffd3e68d936cd87015c20d8d7dc658e4d94f1e53c
+MISC ChangeLog 15591 RMD160 1fec2c7a81abffb243e116518682d3a734d54782 SHA1 84c0a8836467566cb1e7a5fffc7ebaca83972292 SHA256 c44fea9a2b066e5eb74f785b8a0a87d74516319051bf8de2c2466e0430a5c15b
 MISC metadata.xml 238 RMD160 61d35251af6d2d13fa32d5c455dbf179174ca375 SHA1 b2ff81a006f10b2a9d37722a77eb70be65abb9e8 SHA256 9425b3716c550570a17382ba0b1a9fbf3243483ea6117ae94453ee7047362f8a

diff --git a/net-p2p/freenet/freenet-9999-r1.ebuild b/net-p2p/freenet/freenet-9999-r1.ebuild
index 966064c537c84b486e78f3ba19c443f6b6c3e51c..38831f24761669862e861aad8d7f477ba7100aac 100644 (file)
--- a/net-p2p/freenet/freenet-9999-r1.ebuild
+++ b/net-p2p/freenet/freenet-9999-r1.ebuild
@@ -49,7 +49,7 @@ pkg_setup() {
 src_unpack() {
        subversion_src_unpack
        subversion_wc_info
-       FREENET_REVISION=${ESVN_WC_REVISION}
+       sed -i -e "s:@custom@:${ESVN_WC_REVISION}:g" src/freenet/node/Version.java || die "sed failed"
        ESVN_REPO_URI="http://freenet.googlecode.com/svn/trunk/apps/new_installer/res/unix/"
        ESVN_OPTIONS="-N"
        subversion_src_unpack
@@ -63,7 +63,6 @@ src_unpack() {
        head -n 133 run.sh >run1.sh
        tail -n 444 run.sh >>run1.sh
        mv run1.sh run.sh
-       sed -i -e "s:@custom@:${FREENET_REVISION}:g" src/freenet/node/Version.java || die "sed failed"
        epatch "${FILESDIR}"/ext.patch
        sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" wrapper.conf || die "sed failed"
        use freemail && echo "wrapper.java.classpath.10=/usr/share/bcprov/lib/bcprov.jar" >> wrapper.conf