Fix build failure with USE=python (bug #435900, thanks to Jouni Rinne, Rafał Mużyło, Sander Sweers et al.)

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

5 files changed, 100 insertions, 8 deletions

diff --git a/dev-libs/libxslt/ChangeLog b/dev-libs/libxslt/ChangeLog
index 303f02c5baed..de748a40a606 100644
--- a/dev-libs/libxslt/ChangeLog
+++ b/dev-libs/libxslt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libxslt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.236 2012/09/22 14:01:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.237 2012/09/22 21:56:30 tetromino Exp $
+
+  22 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libxslt-1.1.27.ebuild, +files/libxslt-1.1.27-python-config.patch,
+  +files/libxslt-1.1.27-python-includes.patch:
+  Fix build failure with USE=python (bug #435900, thanks to Jouni Rinne, Rafał
+  Mużyło, Sander Sweers et al.)
 
 *libxslt-1.1.27 (22 Sep 2012)
 
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 3d8233093565..c259cfd4e236 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -12,18 +12,24 @@ AUX libxslt-1.1.26-pattern-compile-crash.patch 5849 SHA256 7275ca9a9d1c436e37159
 AUX libxslt-1.1.26-pattern-out-of-bounds-read.patch 797 SHA256 cf5bb2f4a1e95981ebaee4000e736dfe450a9a95639c49333b4f2bc93287c8df SHA512 0962e23eb916d1e68c98a90abcf5705abcc4cdcf36a3cd7d9df4a109c96e175b02e98809944189f48326cc70f2cc3a3904d30a949a1f7cc103b44129ca77cdf9 WHIRLPOOL 3aa693af43f2bd46f956bbfcdb9e8e8fccb9ca591090cfc713b6cd473a86b967680046efeefb441bdb32ab1b3df67cacee92e4cf5f2bb47259a7641add25dd86
 AUX libxslt-1.1.26-posix-comparison.patch 531 SHA256 48647e961a179f498746fc5124e14dbb4eb6bdef9d9f126c4805f68d50a7473d SHA512 30938faf55f3a98d7a9d2ce7930c789803db7ab7cde1ddc1db643a7f75aa6e63a642b41b8987515a287d3ec2e2e755b633989bfab5fc0d83beb4a2f3deb2d6e8 WHIRLPOOL b84e66dbd7414311074cab7b309a5268209ee6d9714b4dbc5b5fcf2040b1d69f1a44cfe7ecf1defa236e7ffb322cca35d9ab94321379b7f42a9260a5c1b8604e
 AUX libxslt-1.1.26-undefined.patch 516 SHA256 ba0e7dd87ece3431a8704783759c10bf3d872b3eb6a8cf3db0106caaae039645 SHA512 ea02b8f17ec2c30b2c00ae4481480ab07c760f0ec8a34ab14f057596a3b792a6348a401f7d23e310178df2da01cf70efe616096d37b4980877b8bc23b92e14ad WHIRLPOOL 058305755468e6023640072b9c7516e9dde78e92823f353f515f70a1b97d65093384658b8a575673c323e7865456135ea350305c9279c934581353e201862801
+AUX libxslt-1.1.27-python-config.patch 756 SHA256 d8a457bb106b195dd20e738656aed10eb10f93bf5edd4162dcebefffcad4e477 SHA512 905e7db5e90b0c2a4d574ed800b4bdd355734332fb1e76ad19b6446884f9fef315a8d0d25737b5ba556972e2da28f8e0425c298911d360dff2b5e23bd4a204de WHIRLPOOL 89c5d38ab440419e145283f258e25e97350a3a988d7891f88a73607f8e7e886d27b9fc5219532ea5f295d29a87b9113f96fe99e2e76ed4187c22a2a14a2558f3
+AUX libxslt-1.1.27-python-includes.patch 1426 SHA256 c76b78384937ebc15d501f1e64fb0b05e60eb7a25311fc9caada212484bcc4af SHA512 23115bf08e19e4981b48f0f83b63978dc8c8501f8907fc42a4539e96c6e509509fd3eb032cce8b5d04e97838c3b9362eb829223cba81c59d3a897dba837adb79 WHIRLPOOL 3b8df133e1e8fcfc3e396cf59ca6ce8c811ca922088a9d750fe6e4d014472f6c151bd2d3131e97192ebbb7f47f8523922ce15e0860a846caddf8fb4ea192b750
 AUX libxslt.m4-libxslt-1.1.26.patch 1421 SHA256 c02cd8437064db0921c08e63245c403dad12410d2997715aa7aa36600bfaa895 SHA512 78cfb6bd823805f660c9d07c4f6f83a87cf2385c48fcb11bff82792101f06b36d08f851089497f0c019f5743f31248cbabe341f78f4ca7e7617c86c4e5a8404a WHIRLPOOL 0b4da6d1ce77e653a6c175fc203f5fecd0c831a018a5063e66e5ff0cc19d9a19d8938b06e4318938a35f665f91442290f267bb3fc86b9268c2455ac9616caeff
 DIST libxslt-1.1.26.tar.gz 3401513 SHA256 55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1 SHA512 f09aa039d2addd3cf45dfeb3b22fe5e756757e2e801275384342fdfc297acf78b557d310e30262986a1af7825da8f1d66bc0ce9f132e474d4c32e322aa72f11e WHIRLPOOL a71ffc6ec16114277e393de9fe6a6c3476febef2551b537abd013862caa247804f53e82f2de716cdfdce101ebc081e877379c5e3c890ba6e7df4ba3ad67f1d6c
 DIST libxslt-1.1.27.tar.gz 3427310 SHA256 b6a8d9a421f2630999ca91d9f8c091ee8ea2d580e6be84c1d21b2a45e11e7e26 SHA512 4bfab92b151892c04cc5291f0bdf845681ef07a7f4c406cb0a23c20561c059354422a94392b6a91dab3a79cfaf958be6f623c55d80399829a97f52f79a575ebb WHIRLPOOL bf180d09a9b4717dfd434b9867cf2d66a92772a800db3f36ab70df1cdef9b4c0a76bbc63d8364e70ceff1a6abbb5b4b4c47b107cd63d372b887b859ea01465f1
 EBUILD libxslt-1.1.26-r3.ebuild 3029 SHA256 3c9e0635a8fbd38bce60d6aa32a389480952c95b0fa2401fe8a5e52d0e632617 SHA512 c8692b5c796dce6c449f8e9acec0e73adf78c29b01b855003d842ae4376189a800a42df3990e0316de083dc72483723664d660c29eab5e2c4f5263c3e809c6cd WHIRLPOOL 7ab8574e98e5f09447a978df4d3c791969e0b652ea071ca1d37fe43339280fbea2b16c41bb57865bbc8f7e406f1f078189be215b42bae2a2e1f483230188b565
 EBUILD libxslt-1.1.26-r4.ebuild 3383 SHA256 66d80bc5dbb1737d1ee8b66731a6ff61e9eec6bceaa10aa90b4794dc3aa9bb15 SHA512 f20996fcd15e1f7f3ee52c1c46ba4b6791a0fbe1620dd672868bbdd8499dc4db81015e5e269c0640dd0dd2a3a13958188c8fd9c4578d5acdadb69c004d53fc5a WHIRLPOOL 04eabc750149ae7bef75ea8c2d48cd9c7543b503ba4e469fa0b7c037b6ec1a349616c7aa70b757cb4102768e23191d80afeeeadf179c7de7c4798f42923bbcc3
-EBUILD libxslt-1.1.27.ebuild 2781 SHA256 60ebfab8fcdcb22e815e70a9036e7ece512d944901f18bb003c97ffa5b67d21b SHA512 5a88e0d87237ae5c51b7b67b7590d1978d0e76cebf51621a0a8e6f37741aa9de78b7b18822b2ae6011b35d76056a70e5ef2a8255250acfd9059f1a1850a5c440 WHIRLPOOL a9ffd8f35ff1370b30e4416610aa314cbc175558d4fd6631c7d7a46794932426e07f702d62eb98443417f96b64c5be1753eed4d9dbb5e967587322f63e0b5886
-MISC ChangeLog 29165 SHA256 25e78c9b2f0367f0e27f6936e2c7a9666fcead5ecc526c989e5c562701774395 SHA512 006c71ea41c1afdc1860b1777140838bfff2aa0f083e0d9e1cd44a7d93638bae68ee5c285f4ec82bad2c65cb7d4bebb3a7ce4310574a83cbe229328aa767b88f WHIRLPOOL 534a389d50ab26be36fbc961c063c18e8f638c5efc2b5d49a3a156b9f298be33cf86e3df734cc926a03ce7d668fd17d4e343e74fc3cf885d61dcb59c2e27601d
+EBUILD libxslt-1.1.27.ebuild 3001 SHA256 be74940e846f43313771833b7ad31bcd42b3bb5899afb3a2fdad388631f78f61 SHA512 ea655d88158c6a8146fe96ec0063dab9798763a1f1545f9ec5b586ab51e33706c97a433d145e82aa82e1b0dde9824730ee68fbaa081483cfbf385a7573cb9e06 WHIRLPOOL 03bbbf8d751e4d557d74c3053128d4fe860831214238e0ab27995edf2f76c1b5c3a955c287df14a5e5a2e7fe89843275adc2a28b851e5bc1f3f4584748b5528e
+MISC ChangeLog 29458 SHA256 b10a1f623fef992ffbb2d7e4100d4486dc0c22be0ae6f33b53b9b15b1e3fc54b SHA512 ee567c583561a0170a3c1bdfc8decff7e78f782d6413a948dd59bf5277b58bea78699213fb88c9cb6fdd2657c01a778d91bf6da30c15dfe918f20599bcf466e6 WHIRLPOOL 5dfa0cd850f5e3ccff02c53e4aaddeb19d0ab2b6550cc5ea72d37850e442a71902fbd9d766eefe145ff098b03f2108a69bb49f02952a4d0723c38143518991a0
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBdxNgACgkQCaWpQKGI+9Q7GgCeM3mcS9XwGTN1Re69DZqu9T3M
-XeEAnR7zMklW0K7sxPHB0JFOTnVu2AAq
-=hObU
+iQEcBAEBCAAGBQJQXjQTAAoJEJ0WA1zPCt1hfWwIALtJ0Nk6otx53cPYv8k4z1/W
+u+a4XXdCj0jSvKEVrz5owLjrjgeosacpc1ukmBPsTmiLOyEqe1oXV+zPPJ4eYt0j
+w8y15szIDCQPk/OR3itoyhu3X2F/yFuQVmIJftwROuB1kVFITrwsh5Ndcu0AkgYD
+F9wg0hp1PA1ZA+gp29BOxlyHRzdPlocc2xoQzXKyhHvFOBRzEA1Z/Wkbv6Y9zrHR
+5hkU6K0Yu30HP7UnFA64ZRS9xLdBVcTrgLHGKqIg4xYpBTsiiRg3od4qjiFFjqRd
+cnNJH2L7wf1YpWmhBWO8EQNV/8vZPYo5IQtng6WiWG1REVNZnq0ILJdhY0jZIzE=
+=VnBG
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libxslt/files/libxslt-1.1.27-python-config.patch b/dev-libs/libxslt/files/libxslt-1.1.27-python-config.patch
new file mode 100644
index 000000000000..352a75352092
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.27-python-config.patch
@@ -0,0 +1,26 @@
+From 4514fed897ab0911097e54715e7936048bf43dd9 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 22 Sep 2012 16:37:36 -0400
+Subject: [PATCH] Gentoo uses /usr/bin/python-config with automatic version
+ detection
+
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 0d7ba86..3c8a5ad 100644
+--- a/configure.in
++++ b/configure.in
+@@ -353,7 +353,7 @@ except: print 0"`
+ 		    PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
+ 	    fi
+ 	fi
+-        PYTHON_LIBS=`python$PYTHON_VERSION-config --libs`
++        PYTHON_LIBS=`python-config --libs`
+     fi
+     if test "$with_python" != ""
+     then
+-- 
+1.7.12
+
diff --git a/dev-libs/libxslt/files/libxslt-1.1.27-python-includes.patch b/dev-libs/libxslt/files/libxslt-1.1.27-python-includes.patch
new file mode 100644
index 000000000000..ed2b147d644d
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.27-python-includes.patch
@@ -0,0 +1,48 @@
+From d690cf1ee8f61eb86a9bd6f21aa5aea8a7b4d2a3 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 22 Sep 2012 17:44:32 -0400
+Subject: [PATCH] Fix python build by using libxsltmod_la_CPPFLAGS instead of
+ AM_CPPFLAGS
+
+Commit a2cd8a03 broke the --with-python build by moving includes from
+INCLUDES to AM_CPPFLAGS. AM_CPPFLAGS gets ignored when a target-specific
+*_CPPFLAGS variable exists, but at least some automake versions
+automatically add "libxsltmod_la_CPPFLAGS = -shared" to python/Makefile.in
+
+https://bugzilla.gnome.org/show_bug.cgi?id=684637
+---
+ python/Makefile.am | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/python/Makefile.am b/python/Makefile.am
+index 48a6c6e..6869c2b 100644
+--- a/python/Makefile.am
++++ b/python/Makefile.am
+@@ -3,12 +3,6 @@ AUTOMAKE_OPTIONS = 1.4 foreign
+ 
+ SUBDIRS= . tests
+ 
+-AM_CPPFLAGS = \
+-	-I$(PYTHON_INCLUDES) \
+-	-I$(top_srcdir)/libxslt \
+-	-I$(top_srcdir) \
+-	-I../libexslt
+-
+ AM_CFLAGS = $(LIBXML_CFLAGS)
+ 
+ DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
+@@ -36,6 +30,11 @@ all-local: libxslt.py
+ 
+ python_LTLIBRARIES = libxsltmod.la
+ 
++libxsltmod_la_CPPFLAGS += \
++	-I$(PYTHON_INCLUDES) \
++	-I$(top_srcdir)/libxslt \
++	-I$(top_srcdir) \
++	-I../libexslt
+ libxsltmod_la_SOURCES = libxslt.c types.c
+ nodist_libxsltmod_la_SOURCES = libxslt-py.c
+ libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS)
+-- 
+1.7.12
+
diff --git a/dev-libs/libxslt/libxslt-1.1.27.ebuild b/dev-libs/libxslt/libxslt-1.1.27.ebuild
index 476c49291bab..37a71905038b 100644
--- a/dev-libs/libxslt/libxslt-1.1.27.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.27.ebuild,v 1.1 2012/09/22 14:01:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.27.ebuild,v 1.2 2012/09/22 21:56:30 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -35,8 +35,14 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-1.1.26-disable_static_modules.patch
 
+	# Use python-config, not python2.7-config
+	epatch "${FILESDIR}/${PN}-1.1.27-python-config.patch"
+
+	# bug #435900, https://bugzilla.gnome.org/show_bug.cgi?id=684637
+	epatch "${FILESDIR}/${P}-python-includes.patch"
+
 	# Python bindings are built/tested/installed manually.
-	sed -e "s/@PYTHON_SUBDIR@//" -i Makefile.am || die "sed failed"
+	sed -e 's/$(PYTHON_SUBDIR)//' -i Makefile.am || die "sed failed"
 
 	eautoreconf
 	epunt_cxx