New snapshot, and fix as-needed failure, bug #209475

Package-Manager: portage-2.1.4.4

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 6d91321eaabfa7638f47a12952b1829ef923c850..f5b54c26f2782b008f10d725b7f14daa65509401 100644 (file)
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.99 2008/02/04 16:51:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.100 2008/02/18 19:57:26 armin76 Exp $
+
+*amule-2.2.0_pre20080218 (18 Feb 2008)
+
+  18 Feb 2008; Raúl Porcel <armin76@gentoo.org>
+  +files/2.2.0-geoip-asneeded.patch, -amule-2.2.0_pre20080204.ebuild,
+  +amule-2.2.0_pre20080218.ebuild:
+  New snapshot, and fix as-needed failure, bug #209475
 
 *amule-2.2.0_pre20080204 (04 Feb 2008)
 *amule-2.1.3-r1 (04 Feb 2008)

diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index d7b269eb1f5ee3a6610f3fa057a0f10fbb07f411..261bd66e2a325383b688b485b7e0a92281ee4a63 100644 (file)
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,12 +1,13 @@
 AUX 2.1.3-wx-2.8.patch 4943 RMD160 38b154b4755db86cc00c5f46d36ee30f26014cac SHA1 bd048f7b88ff4c19841f606d03c5a9750e6e6945 SHA256 c0c0a55fb437fdf618137f2cb0c5ff59a1595aeddf5455a1bad2b2ab11b0a244
+AUX 2.2.0-geoip-asneeded.patch 540 RMD160 7b4d15d61b7abe0711bb3285646d54f22a7e8e25 SHA1 b4bd04482fbacf8dbfe983fc9c3a0de57393d01e SHA256 de27b68621c3484ecafe0ed4f0c4e2b8968833f6a9cb21785fab38d53e000086
 AUX amuled.confd 409 RMD160 0e31c5aaa42c4ee2b6dfcd00afcde3b48b2d4299 SHA1 b5872943f5ec0ac41a7c054239a754f1f9669e09 SHA256 7af480fd6dd325ad66b37464417d4d89015a52722961d44da2e3f7990ac4959a
 AUX amuled.initd 1204 RMD160 d17d6b709f8b7eb91132804fa8a420b5f9499d14 SHA1 936566e113bb91cbc7cfe6803bf7b1d76b8cbadb SHA256 af51a7d148368b2ed3b9cc289e0831c95348dbda9b331360a5635af31b81ed7a
 AUX amuleweb.confd 830 RMD160 1921152543c6f327caf55087269cf0f277545764 SHA1 7800ad36f88a116ca4dcc7b68944b7acaf5877e1 SHA256 e0c4ad636011797618c31ce3d4d5d20ea689ecf6f3ad350fff5b1716c6009c4f
 AUX amuleweb.initd 1236 RMD160 d9f417c3145a26d0e2e0879ab8fe4cc6b569dd35 SHA1 c4f7830950db758c1d961e1edb51e8b067cfb50c SHA256 64a2d1c7770b6d975a68a900b6b15f7bc8ff686b249da3ca96c7bc62cfee57d1
 DIST aMule-2.1.3.tar.bz2 3248530 RMD160 fcc345000e5ad0a221d1e96d0d514f3be36428c3 SHA1 dd47deb38e7a5b823550b85150f5a814c597b273 SHA256 6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244
-DIST aMule-CVS-20080204.tar.bz2 4055924 RMD160 9b96507265dfc3d4116e0eafac37222516861597 SHA1 77285daeb7d50dc7abebda903559f9ebc2b3b9fb SHA256 3a0681904c4c00923ee8a61ece5b1cb414a0aab6f9573e2a9341f7e1d1d28274
+DIST aMule-CVS-20080218.tar.bz2 3992460 RMD160 7e7e405c1f8d649b43ded418fe7851aedabb5d41 SHA1 16f8dfd9ac02fc55eec01aff106965a5c05542a7 SHA256 56cfa14dd7fdd61abc1cb5876a56bec37a94b5ec8a888dcd132f788f90491576
 EBUILD amule-2.1.3-r1.ebuild 3061 RMD160 776e4a14c59a3566590a81e7d6427deecbab95d0 SHA1 d56c453494fb1c705a1658b042a16cb1e42aa4b2 SHA256 ec91cda54fc5edf0397d3ac5edf90480cf0dc1da0542b424bbfd24089ed3c681
 EBUILD amule-2.1.3.ebuild 3013 RMD160 0435e512f6b69ae8e47cf697fa26e0101553ad9f SHA1 421e60db1e7e7041df32437b00ae8b1c4a84cc16 SHA256 e680653b5c7925ae07d8f3282927f9f97831db5a081b8eb1445a4efccd7158ef
-EBUILD amule-2.2.0_pre20080204.ebuild 2963 RMD160 5e477ca0fac11c6a3be20109ac4ac20feb2bbff5 SHA1 60bdac5ba9ef011a1247162ce8b1c18e59a6e266 SHA256 937b72a209b824f17021ade9f66ead10c32c731d44702bcf496caf8ab29a363b
-MISC ChangeLog 14619 RMD160 e3e20cbbd549fcdb5071c271e356e80aec383ffb SHA1 e98f2cead59f176c48a3ff8e93c769011bcb0900 SHA256 1deccdf1d3959b01b9452dfcdc62a46529b1b185b13885260a8aa9a37b1febdb
+EBUILD amule-2.2.0_pre20080218.ebuild 3092 RMD160 39d443bc922ea7952afbe9919d8dfc8e66b583c5 SHA1 02de050c7cd76dd1eb7a7ef45ca8ab88928c9f6d SHA256 da5ce66f37a3c69274cb437fe44535a2f1aad58500b0c0370d8b0d916adec286
+MISC ChangeLog 14870 RMD160 567205c6d0afd6be355b3ad8adb8329628e5d30e SHA1 60cfeb38769a72954c43b99acf8bb9fd2c2de573 SHA256 9e8b5eeeff4dda257c3e2db92a6b99460c6c6e81b4a7066b800fa4a087eec6c7
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f

diff --git a/net-p2p/amule/amule-2.2.0_pre20080204.ebuild b/net-p2p/amule/amule-2.2.0_pre20080218.ebuild
similarity index 92%
rename from net-p2p/amule/amule-2.2.0_pre20080204.ebuild
rename to net-p2p/amule/amule-2.2.0_pre20080218.ebuild
index 0c3e58ceb1e349b158714dfdae8c2ce90adb6a30..d928d78ed47e48c8c62082f812df68fec4dfcc30 100644 (file)
--- a/net-p2p/amule/amule-2.2.0_pre20080204.ebuild
+++ b/net-p2p/amule/amule-2.2.0_pre20080218.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20080204.ebuild,v 1.1 2008/02/04 16:51:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20080218.ebuild,v 1.1 2008/02/18 19:57:26 armin76 Exp $
 
-inherit eutils flag-o-matic wxwidgets
+inherit eutils flag-o-matic wxwidgets autotools
 
 MY_P=${PN/m/M}-CVS-${PV/2.2.0_pre/}
 S="${WORKDIR}/${PN}-cvs"
@@ -51,6 +51,14 @@ pkg_preinst() {
        fi
 }
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${FILESDIR}"/2.2.0-geoip-asneeded.patch
+       AT_M4DIR="m4" eautoreconf
+}
+
 src_compile() {
                local myconf
 

diff --git a/net-p2p/amule/files/2.2.0-geoip-asneeded.patch b/net-p2p/amule/files/2.2.0-geoip-asneeded.patch
new file mode 100644 (file)
index 0000000..1116762
--- /dev/null
+++ b/net-p2p/amule/files/2.2.0-geoip-asneeded.patch
@@ -0,0 +1,12 @@
+diff -Naur amule-cvs.orig/configure.in amule-cvs/configure.in
+--- amule-cvs.orig/configure.in        2008-02-17 01:22:03.000000000 +0100
++++ amule-cvs/configure.in     2008-02-17 01:22:56.000000000 +0100
+@@ -364,7 +364,7 @@
+ if test x"$ENABLE_IP2COUNTRY" = x"yes" ; then
+       GEOIP_LIB="-lGeoIP"
+       CXXFLAGS="$CXXFLAGS $GEOIP_INCLUDE"
+-      LDFLAGS="$LDFLAGS $GEOIP_LIB"
++      LIBS="$LIBS $GEOIP_LIB"
+       AC_CHECK_HEADER(GeoIP.h,,
+               [AC_MSG_ERROR([--enable-geoip passed to configure, but the GeoIP header files were not found])])
+       AC_CHECK_LIB(GeoIP, GeoIP_open,