Update to python-r1.eclass. Add a patch for cleaner multiple python ABI support.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 151 insertions, 12 deletions

diff --git a/dev-libs/libxslt/ChangeLog b/dev-libs/libxslt/ChangeLog
index aa4808d6bdc9..8b9f627d2326 100644
--- a/dev-libs/libxslt/ChangeLog
+++ b/dev-libs/libxslt/ChangeLog
@@ -1,6 +1,14 @@
 # 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.246 2012/11/29 13:23:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.247 2012/12/18 07:48:47 tetromino Exp $
+
+*libxslt-1.1.28-r1 (18 Dec 2012)
+
+  18 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libxslt-1.1.28.ebuild, +libxslt-1.1.28-r1.ebuild,
+  +files/libxslt-1.1.28-manual-python.patch:
+  Update to python-r1.eclass. Add a patch for cleaner multiple python ABI
+  support.
 
   29 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   -files/libxslt-1.1.23-parallel-install.patch, -libxslt-1.1.26-r3.ebuild,
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index c66bb11f9bd2..e7ac37a8495a 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -4,21 +4,23 @@ Hash: SHA256
 AUX libxslt-1.1.26-disable_static_modules.patch 318 SHA256 6c08da472bd1d48af1aab88619e460ad17f56c49bfaa00ccbfd8acf9212c5e80 SHA512 c54fa2b0edcdadde68f3d63bc8f39404eea7d5b866c1b2b0989c0cb343e25bd78da047434314447d3e5773b2c9e1455bcc82153c83541f12ecf4169919f3187a WHIRLPOOL 12984a243827e5bb25293d760f4d74f493254e5e90b48c6be20928aeae68cbfe71c345868165324af83c685781d0fd1b4e3594347e89964dfa3db5bf1ab58a55
 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-1.1.28-manual-python.patch 1180 SHA256 905ac247a14998c0dcc44aacc926e7eb49758482769ae66e14194ae0f5aca354 SHA512 cd84143397223d2e1e70c796346dd8ed4359bc9bc6b1f808d6a47f75c54d0589456382dd13723f42983f41267861e742fde60e9e401ded53f0c3a3f4596dfb36 WHIRLPOOL 159e662add550048f7fee53ef98179afe5aa9858a10d517f2dad1dc3903cca2c34cec7d5f1e9cb370f9ca60104cbb528866294db7da0463b86d74b732342f6e6
 AUX libxslt.m4-libxslt-1.1.26.patch 1421 SHA256 c02cd8437064db0921c08e63245c403dad12410d2997715aa7aa36600bfaa895 SHA512 78cfb6bd823805f660c9d07c4f6f83a87cf2385c48fcb11bff82792101f06b36d08f851089497f0c019f5743f31248cbabe341f78f4ca7e7617c86c4e5a8404a WHIRLPOOL 0b4da6d1ce77e653a6c175fc203f5fecd0c831a018a5063e66e5ff0cc19d9a19d8938b06e4318938a35f665f91442290f267bb3fc86b9268c2455ac9616caeff
 DIST libxslt-1.1.27.tar.gz 3427310 SHA256 b6a8d9a421f2630999ca91d9f8c091ee8ea2d580e6be84c1d21b2a45e11e7e26 SHA512 4bfab92b151892c04cc5291f0bdf845681ef07a7f4c406cb0a23c20561c059354422a94392b6a91dab3a79cfaf958be6f623c55d80399829a97f52f79a575ebb WHIRLPOOL bf180d09a9b4717dfd434b9867cf2d66a92772a800db3f36ab70df1cdef9b4c0a76bbc63d8364e70ceff1a6abbb5b4b4c47b107cd63d372b887b859ea01465f1
 DIST libxslt-1.1.28.tar.gz 3435907 SHA256 5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c SHA512 20b65bdaceaac5bd11d509bf683ce8e344030bc95164639266ae705d41659bcba47b5be1b059d0d67681e6428b0710db675d1749c06aa531bc2212ed3d0511b1 WHIRLPOOL 7f059d7d6b02fc5982c31d3239188ff0a6d211f722635ac3d3cd77bedf54ef9b1a9433ef1c55a9335f353ce618f3dd93a9e1e19c117988358ab31857edff1843
 EBUILD libxslt-1.1.27.ebuild 2949 SHA256 143cda0a714841032727c4f7f95d76df1cf5e2c53d5fbfc21d28881202fed87b SHA512 452c56bd6bc1289958f6b5366f4dcd0c5ccf5d639462eff7b6e188b422ae33e8d66355e3f84fc560129acf06aa7e06846ea9f52e995313badf1695bbdce70e5a WHIRLPOOL aea9bbcfa8b663e3b9979d1d444e1a9e6a0c946747ed880d640ab65add60872c28404c567b79ce3c756a3c3a1badafd17cdac3bafcea5bac60e6fe9df36c51ca
-EBUILD libxslt-1.1.28.ebuild 2666 SHA256 64451c4bbad545a8cc43971671ea4d8464b6416dd0f46899f22b69f883a6a8df SHA512 5193544c327e75dfbb8ab884e37e35e807b085c15f97ee33d8ae0c77db40e0dd12b2e5b8e965fac50976ed4a4a5e0fc290bc0764b9e9b13d908db6fe0b3ef65f WHIRLPOOL a2b8fa27933784b380407d6b26c173e1c040bf55c3489f3ae66485d6744b46ba442a2d4c2da4863ef3932ac3ff89ae87ea3524ee045dfe0bb1b19ad320c77492
-MISC ChangeLog 31063 SHA256 966a6367ce5e87a99a991f2455c8c403c3861c86b94c35de544083ef03963b8e SHA512 6be6ba2064a9392b46dc25aebf2dca4880c94f00a809230ebc7d4389594f47025ade86806b4b1dbfd39b120c8cff7b816272a8cf62526ebe87c83e829922a435 WHIRLPOOL a5a65f2455cae92b5e28bbda7510f74cb6b27771f248ebe53db34d8c6f182bc41778e15b38b10cdc19ce0eae11072008715fc25b7d1745d466756896eb7180da
+EBUILD libxslt-1.1.28-r1.ebuild 2403 SHA256 3652ca32c7d27dd018d039488146e56b5b1707f2cb537cd4819678624ffb63a6 SHA512 70067fc7d87ec9cb0a4b58dc4afdfc66ed73d3f2d01dbe261039d8312ab6bd606e8f6c9454cc97a814eb22aa11f50d75c8a0c5d87754fc1895b8f150fdfcb06f WHIRLPOOL c96232002de78c875f01560a85fb68abd2851bb79d6a0b4df5b7515b830b3f1d5096ee41a444e9c7d3ee1dd93d2fdb6d08b0f3a842426a0674143cc0108c36ba
+EBUILD libxslt-1.1.28.ebuild 2668 SHA256 3598be3d81b96806cc5b846c6cd171c1b156bbe6b30a0b743140b7f391d3fc5f SHA512 9b45a64a805b08a47f17167329dff3ea09c4afa6da6138a00495131a0c1f0d35ff923ed802b759845aa8ec56f48cce126fc31204c0947b34de7fabaec51fce10 WHIRLPOOL aeb0d424d8b565cd5089b5b48a8e98ee2cff2ab5a28e6bf05a8b5406d75662bc82a6376b6888992893761f425e80827f860444e9b52d5a2af4eebe7c6ef9b380
+MISC ChangeLog 31339 SHA256 d6a91cc0bfe822bbdadd02bc5cd29604d5d5acfda85e27d2eec07f4e9a1cb9ca SHA512 98a47cbc997a211643a379fdd6e6ce699322780888bab9ffd3cc68631c9bae003e6e3d08682c56e1c2cb1c14382f7bd80c288faa63c9bfd455f8e675892fe3da WHIRLPOOL 56ed200fa8f434188206ce25d9a25bbee5ceb58fe00c68fa375dcae9c0e4bed305f7493ba4647b83912773e9d981780e8d4fd11363ab70b31f3f5a57f1d61702
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQt2GCAAoJEEdUh39IaPFNByUH/2GhrebtQtRp6JRmN/TyAz9l
-qt8MDIHK0IWnMLu5pfqOO60Zno2E2iRFjFfcIVc5dF1+zLOoWjnV88mTTVH5Qioh
-tyNNLuXwJ9MWONx22l9n+fZ8U0wXt+hQLOBtktG5Bu0VzAJTMfjFHNPBGjsOcupe
-/pL/eZDKbmWqY1vf7iDgR+JgB14JQrf35Ku1IuUyd4bUfHr304XpETboHgOKme98
-BZ7N/5z4LmLG62B2avaOosIqbmjg5OMfO+XIxe2ItvSNvc094/A2E+3+7u6VdBa7
-Yz/3sSyNmwSV9ibK6Id1dzubMiQ8Qi8a3I0vQhgwdFIAcLxMWF0JIg58j92BF9g=
-=VAQC
+iQEcBAEBCAAGBQJQ0B/gAAoJEJ0WA1zPCt1hMe8IAKiToawzHeDFRQEBsqxCTY4g
+xk63McIBlKlKSSrRHOffxu8QErId0B7SWeB3lmWfmTcxFdTJ3CPpXjxl7dfMrjfm
+34pIZW1/a8DlPMAwuwFOjsOWEanZM0jkcFjYM3S9WAlQQCN02CsMS9bxqdujbUIb
+7tnQ7vMe4IR0mu2OtP3ad/jqzkOVKIidEBESZ8ptT+Klvgzm3LVbQqXkW5ldXPOA
+EmibYl6Eut7QM8osH3EInAxXGcLx8kYbDZD3ewC7sygYqXE0OjjRPlDpg0DZMQGM
+JrBSNHC7vgTPsPjTBCMAyUirEQCVFInb3kMsXJdM8BZwcATxtPzDQSk2kXiqky0=
+=Cl7n
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-manual-python.patch b/dev-libs/libxslt/files/libxslt-1.1.28-manual-python.patch
new file mode 100644
index 000000000000..019f3253d876
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.28-manual-python.patch
@@ -0,0 +1,36 @@
+From 1671e1004e18fa9bbce410050d1365374ececb6a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 18 Dec 2012 02:22:47 -0500
+Subject: [PATCH] build/test/install python bindings manually
+
+To support building for multiple python ABIs, we want to skip checks for
+python in configure, and build/test/install python bindings manually.
+---
+ configure.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index fc8d5a8..6312c37 100644
+--- a/configure.in
++++ b/configure.in
+@@ -296,7 +296,7 @@ PYTHON_INCLUDES=
+ PYTHON_SITE_PACKAGES=
+ pythondir=
+ AC_ARG_WITH(python, [  --with-python[=DIR]    Build Python bindings if found])
+-if test "$with_python" != "no" ; then
++if false ; then
+     if test -x "$with_python/bin/python"
+     then
+         echo Found python in $with_python/bin/python
+@@ -365,7 +365,7 @@ except: print 0"`
+         pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
+     fi
+ fi
+-AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
++AM_CONDITIONAL(WITH_PYTHON, test "$with_python" != "no")
+ if test "$PYTHON_INCLUDES" != ""
+ then
+     PYTHON_SUBDIR=python
+-- 
+1.8.0.2
+
diff --git a/dev-libs/libxslt/libxslt-1.1.28-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.28-r1.ebuild
new file mode 100644
index 000000000000..93a7ce1b5807
--- /dev/null
+++ b/dev-libs/libxslt/libxslt-1.1.28-r1.ebuild
@@ -0,0 +1,93 @@
+# 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.28-r1.ebuild,v 1.1 2012/12/18 07:48:47 tetromino Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils python-r1 toolchain-funcs
+
+DESCRIPTION="XSLT libraries and tools"
+HOMEPAGE="http://www.xmlsoft.org/"
+SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="crypt debug python static-libs"
+
+RDEPEND=">=dev-libs/libxml2-2.8.0:2
+	crypt?  ( >=dev-libs/libgcrypt-1.1.42:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/libxml2:2[python,${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=684621
+	epatch "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch
+
+	epatch "${FILESDIR}"/${PN}-1.1.26-disable_static_modules.patch
+
+	# Python bindings are built/tested/installed manually.
+	epatch "${FILESDIR}"/${PN}-1.1.28-manual-python.patch
+
+	eautoreconf
+	epunt_cxx
+}
+
+src_configure() {
+	# libgcrypt is missing pkg-config file, so fixing cross-compile
+	# here. see bug 267503.
+	tc-is-cross-compiler && \
+		export LIBGCRYPT_CONFIG="${SYSROOT}"/usr/bin/libgcrypt-config
+
+	econf \
+		$(use_enable static-libs static) \
+		--with-html-dir=/usr/share/doc/${PF} \
+		--with-html-subdir=html \
+		$(use_with crypt crypto) \
+		$(use_with python) \
+		$(use_with debug) \
+		$(use_with debug mem-debug)
+}
+
+src_compile() {
+	default
+	if use python; then
+		python_copy_sources
+		python_foreach_impl libxslt_py_emake
+	fi
+}
+
+src_test() {
+	default
+	use python && python_foreach_impl libxslt_py_emake test
+}
+
+src_install() {
+	default
+	dodoc FEATURES
+
+	if use python; then
+		python_foreach_impl libxslt_py_emake DESTDIR="${D}" install
+		python_foreach_impl python_optimize
+		mv "${ED}"/usr/share/doc/${PN}-python-${PV} "${ED}"/usr/share/doc/${PF}/python
+	fi
+
+	prune_libtool_files --modules
+}
+
+libxslt_py_emake() {
+	pushd "${BUILD_DIR}/python" > /dev/null || die
+	emake \
+		PYTHON="${PYTHON}" \
+		PYTHON_INCLUDES="${EPREFIX}/usr/include/${EPYTHON}" \
+		PYTHON_LIBS="$(python-config --ldflags)" \
+		PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \
+		pythondir="$(python_get_sitedir)" \
+		PYTHON_VERSION=${EPYTHON/python} "$@"
+	popd > /dev/null
+}
diff --git a/dev-libs/libxslt/libxslt-1.1.28.ebuild b/dev-libs/libxslt/libxslt-1.1.28.ebuild
index 00c11fa0ea98..548fc3eb2251 100644
--- a/dev-libs/libxslt/libxslt-1.1.28.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.28.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.28.ebuild,v 1.1 2012/11/29 13:20:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.28.ebuild,v 1.2 2012/12/18 07:48:47 tetromino Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="crypt debug python static-libs"
 
 RDEPEND=">=dev-libs/libxml2-2.8.0
-	crypt?  ( >=dev-libs/libgcrypt-1.1.42 )"
+	crypt?  ( >=dev-libs/libgcrypt-1.1.42:= )"
 DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS ChangeLog FEATURES NEWS README TODO"