Fix autotools-utils usage (bug #392137). Fix python module CFLAGS handling.

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

diff --git a/app-forensics/afflib/ChangeLog b/app-forensics/afflib/ChangeLog
index c281faf9de7b1a15638d29a5ce90966f021fa67b..b4916c6913fd56be6e76a2107ff7d13bef92f1d9 100644 (file)
--- a/app-forensics/afflib/ChangeLog
+++ b/app-forensics/afflib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-forensics/afflib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/afflib/ChangeLog,v 1.20 2011/11/26 10:50:21 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/afflib/ChangeLog,v 1.21 2011/11/28 05:41:56 radhermit Exp $
+
+  28 Nov 2011; Tim Harder <radhermit@gentoo.org> afflib-3.6.12.ebuild,
+  +files/afflib-3.6.12-pyaff-header.patch,
+  files/afflib-3.6.12-python-module.patch:
+  Fix autotools-utils usage (bug #392137). Fix python module CFLAGS handling.
 
   26 Nov 2011; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Improve s3 use flag description.

diff --git a/app-forensics/afflib/Manifest b/app-forensics/afflib/Manifest
index 236f13e20e36a6c07e87ad6363ac12034b304c29..1e2ae22b4b382c93eb6d5b7642874a2c06f5c718 100644 (file)
--- a/app-forensics/afflib/Manifest
+++ b/app-forensics/afflib/Manifest
@@ -2,7 +2,8 @@
 Hash: SHA512
 
 AUX afflib-3.3.4-glibc-2.10.patch 867 RMD160 46fa71f88a38ffb5e3a28421b067aeb534790281 SHA1 962d58d1bed558b2191b8436d50d51e4e1227e07 SHA256 a7623e40b9ccb01e8f3363b4adc5bcef15b53160c7693bb86ab65929b1ede323
-AUX afflib-3.6.12-python-module.patch 461 RMD160 8ae476dd4d8392696c0b7c54456e1e8fe54b556f SHA1 1496e8f806c1bb2d8efc3d40d7941311844a3300 SHA256 c87f4d6e5687ff6c595684338abf4b89f6bbd3223a247d5d030ecb046f987d8d
+AUX afflib-3.6.12-pyaff-header.patch 330 RMD160 4d20f3b2ed234325ff24b0b6c81ec47d2b6c5c1a SHA1 95ad65cf22a60264e47654d677aaf7bdf218f79d SHA256 6a45c593a5c8875e78ee8411bec34eb473f70aab46ba6f8f6bb20db7e884d0c9
+AUX afflib-3.6.12-python-module.patch 507 RMD160 2896028274b5c2a44a4093f83b4abf5f8cd6e2d3 SHA1 d80d15ace18c5b0cbdf5862d1f9712b33ca60250 SHA256 40c3eeb3f68bf96172d6cc12d9db385060b85e5333adfc8003a8ffde91ad1124
 DIST afflib-3.3.4.tar.gz 1894802 RMD160 ee64a8e312269348a90ece7edf517b0209a2d0c9 SHA1 e2dd28eb54ed325cead0e6f134f7b1811c87b5a0 SHA256 e87ff2b2dbcd74fa7d0bac370be8b18fab346f3b456d34be9baa325de646ea41
 DIST afflib-3.5.2.tar.gz 10773038 RMD160 5b903ab74975bb0c2128cbd252a4bf0a46728c87 SHA1 c188af3d0b80c2810435127858e14724d8de588d SHA256 918c34493b63ca208b4855e883c0e0b2ae589cbd7ec6e29fb7d5d775b4b67c9c
 DIST afflib-3.5.8.tar.gz 10789347 RMD160 7b5df1c1bfd9374299746345b18fb2d1982ad1e6 SHA1 18584d2360d47eb3d4a1e2ea54fab54362df67e9 SHA256 4337cbe567e6479dccb4e326006c72ac86027ae5c01829c26f79c7e11b858d88
@@ -11,18 +12,18 @@ DIST afflib-3.6.8.tar.gz 778037 RMD160 e424f1f9cb781e7e0b7cb194c23b3c31652677c2
 EBUILD afflib-3.3.4.ebuild 1165 RMD160 6c0ff7ff4e131a17bf1045ab65378b1a2426c7c2 SHA1 060d8896ace3f65ffef851f6208a2f541f76f1d3 SHA256 4302eaeeede04841cb25bbe46a5c509e58057694abb67676c3f69875d8955396
 EBUILD afflib-3.5.2.ebuild 1079 RMD160 6f6e32d6e22f63a98196b4f51e4e09ca826f4af9 SHA1 81ef6860cde17fa48b7892bff001720ccd2bc9bc SHA256 7634c7b16c6176f847fa3b8e70b700731ae7a25520780a184a27ab2db32ab1fa
 EBUILD afflib-3.5.8.ebuild 1079 RMD160 2777281e4d0184c44be3ebaddec66590c8c2970e SHA1 ad5f57283bcb1c51acdf353117ea7b9171a42f3c SHA256 2a1679e5f92ea282e01a84a07729aff5eaef501789b17e2dd68d7ab36ae14268
-EBUILD afflib-3.6.12.ebuild 1452 RMD160 d4f487c69aedc1cc11005616ee11c8efb6f42137 SHA1 cffade82f686e31c850c88c743298a7c626ad683 SHA256 11eb0047814b6bd8e8906c6fe50b3834a895659387a2d72bfcffbeeca781f2cc
+EBUILD afflib-3.6.12.ebuild 1444 RMD160 cdb240243bf9dfef43ab051d1975b03038483420 SHA1 7d8354f02689de6ad27bb2f81fe8a262d2a8c76a SHA256 fcc476c61b672efd8ced8abc6ad39f9f785d594e2a0b0b31fc69218db692dea1
 EBUILD afflib-3.6.8.ebuild 1072 RMD160 958ceda4302fafef6266471eea1630ae01820742 SHA1 a03f7299271637d327e034b9a925cb0406885622 SHA256 a1f149d68a32a51456b1043678d819da8395f78d055bc2afd4900c4e30f984d4
-MISC ChangeLog 2765 RMD160 7dd96182d8dc6e8a1af01be35668ab208c062bf5 SHA1 4645a0a1714587c9fdee25104c5e1e0b69412b3a SHA256 43e01e4bca8d4da3159f730be0c8e6aaa53dd21e2f2eb698df3dc7070f498e9a
+MISC ChangeLog 3001 RMD160 e6607560c7b7b05762dce0600d3b030e0f1995e7 SHA1 1784d8c5be79b1552a615745a32d7919ba82f90d SHA256 6cf987282542de4f50939a332e33a7e7f2674c7fc39d8da8a23fc276900c4e94
 MISC metadata.xml 445 RMD160 c5595344446491a917b5b379dfb41f3f6f2591cb SHA1 2bcf35664beca128210611194ebb276a1e8b4228 SHA256 ea0cbc15bc43a440761e95137148f57702b83f6655a29ebb25ff30bc66d5941f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO0MRzAAoJEEqz6FtPBkyjgLoH/3QhBWm5kCceN2gmypJ6izyf
-/c1yN75RQEa+n3lfAKBYahcpGpA1rxkjuqr1Hs18m7EIfJMxK//l1QlLBSjgYjjR
-kJZvE6sQa3DMt+53Oas5aIQU5GJtFG85xnm+r6xGfoLnJayO23ttygn32GJAUTdX
-KiS57CXTJ6ah6z+VEhY3mdk7/j6DWZ1EH3ziB1t8whGNiOCLY5CjtnetEuce7Vl1
-hMHBvfZqScQ7XYEbx8rKLRHNCqOxyUVn/4cX5t5Try1XUk9h7Nmn0+1SV3QdHk+N
-JHshpoIgouRr8sBPSatWvkl34J4GSQEoTJNCTfl/DtbF3hVIzrdxEB28XO+kTAA=
-=vq5l
+iQEcBAEBCgAGBQJO0x8qAAoJEEqz6FtPBkyjcwsH/RFfQLrweC+QznY6vs0VADzd
+fkNzxSg1eavvIMeLV9tSFT4095OCHuYYWZWHJwtkNVm+cK2IUbLY+xbUpxiVUxEC
+dkgZ1G9A7TUwkfc644LFs+6SFUhkjMDKlsjEPmlfShk6jGN+dQm6IBdGse/APhoe
+qqlkb9WIdMaciivJ1LCbCknvEbfFOdy2SOvuxkc8DnWO8OkhAfzLjY3UR+0iia+k
+4bV6PBPgnYiJjbpqrBMklGJQMYRDLG5aWdjpDIsE7TCwS8i+wSxihXcHgaPXQLQ8
+Sm/P+xsd0ctIHJgn70MSqE6O5iRanp6Iq4aH0d8In7GO0GzQzokuwPHjzpSYWhA=
+=79p/
 -----END PGP SIGNATURE-----

diff --git a/app-forensics/afflib/afflib-3.6.12.ebuild b/app-forensics/afflib/afflib-3.6.12.ebuild
index d962d3e912c45b2877dc26ef043a5822a6bcb417..22b39aa564e8489c39ec5bb5666ae51ed4dcfde7 100644 (file)
--- a/app-forensics/afflib/afflib-3.6.12.ebuild
+++ b/app-forensics/afflib/afflib-3.6.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/afflib/afflib-3.6.12.ebuild,v 1.6 2011/11/26 10:43:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/afflib/afflib-3.6.12.ebuild,v 1.7 2011/11/28 05:41:56 radhermit Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -25,7 +25,10 @@ RDEPEND="dev-libs/expat
        s3? ( net-misc/curl )"
 DEPEND="${RDEPEND}"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
+PATCHES=(
+       "${FILESDIR}"/${P}-python-module.patch
+       "${FILESDIR}"/${P}-pyaff-header.patch
+)
 
 pkg_setup() {
        if use python ; then
@@ -35,11 +38,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-       epatch "${FILESDIR}"/${P}-python-module.patch
-
        sed -i -e "/FLAGS/s: -g::" configure.ac || die
        sed -i -e "/-static/d" tools/Makefile.am || die
 
+       autotools-utils_src_prepare
        eautoreconf
 }
 
@@ -48,16 +50,12 @@ src_configure() {
        use ncurses || export ac_cv_lib_ncurses_initscr=no
        use readline || export ac_cv_lib_readline_readline=no
 
-       econf \
-               $(use_enable fuse) \
-               $(use_enable python) \
-               $(use_enable qemu) \
-               $(use_enable s3) \
-               $(use_enable static-libs static) \
+       local myeconfargs=(
+               $(use_enable fuse)
+               $(use_enable python)
+               $(use_enable qemu)
+               $(use_enable s3)
                $(use_enable threads threading)
-}
-
-src_install() {
-       default
-       remove_libtool_files all
+       )
+       autotools-utils_src_configure
 }

diff --git a/app-forensics/afflib/files/afflib-3.6.12-pyaff-header.patch b/app-forensics/afflib/files/afflib-3.6.12-pyaff-header.patch
new file mode 100644 (file)
index 0000000..496b02d
--- /dev/null
+++ b/app-forensics/afflib/files/afflib-3.6.12-pyaff-header.patch
@@ -0,0 +1,13 @@
+Fix include location based on the include directories passed via CFLAGS.
+
+--- afflib-3.6.12/pyaff/pyaff.c.orig
++++ afflib-3.6.12/pyaff/pyaff.c
+@@ -21,7 +21,7 @@
+  ****************************************************/
+ 
+ #include "Python.h"
+-#include "lib/afflib.h"
++#include "afflib.h"
+ 
+ #include <string.h>
+ #include <stdlib.h>

diff --git a/app-forensics/afflib/files/afflib-3.6.12-python-module.patch b/app-forensics/afflib/files/afflib-3.6.12-python-module.patch
index c5422010f615668b9d8fd2070303c3377ad5a109..281d8f38c0e17d4285b73a5c6a9e07e403b60faa 100644 (file)
--- a/app-forensics/afflib/files/afflib-3.6.12-python-module.patch
+++ b/app-forensics/afflib/files/afflib-3.6.12-python-module.patch
@@ -1,3 +1,5 @@
+Only build the shared python library.
+
 --- afflib-3.6.12/pyaff/Makefile.am.orig
 +++ afflib-3.6.12/pyaff/Makefile.am
 @@ -7,7 +7,8 @@
@@ -8,6 +10,6 @@
 +pyaff_la_LIBADD               = @top_builddir@/lib/libafflib.la
  pyaff_la_CPPFLAGS     = $(PYTHON_CPPFLAGS)
 -pyaff_la_LDFLAGS      = -module -avoid-version $(PYTHON_LDFLAGS)
-+pyaff_la_CFLAGS        = -shared
++pyaff_la_CFLAGS       = $(AM_CFLAGS) -shared
 +pyaff_la_LDFLAGS      = -module -avoid-version -shared $(PYTHON_LDFLAGS)
  endif