De-uglify fix for bug #417539 with an upstreamable patch, thanks to Rafał Mużyło and Arfrever.

(Portage version: 2.2.0_alpha109/cvs/Linux x86_64)

3 files changed, 135 insertions, 5 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index 9f452afe2b73..05c279fa1962 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libxml2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.351 2012/05/29 15:31:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.352 2012/06/04 04:36:32 tetromino Exp $
+
+  04 Jun 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libxml2-2.8.0-r1.ebuild, +files/libxml2-2.8.0-icu-linking.patch:
+  De-uglify fix for bug #417539 with an upstreamable patch, thanks to Rafał
+  Mużyło and Arfrever.
 
   29 May 2012; Brent Baude <ranger@gentoo.org> libxml2-2.8.0_rc1.ebuild:
   Marking libxml2-2.8.0_rc1 ppc64 for bug 416209
diff --git a/dev-libs/libxml2/files/libxml2-2.8.0-icu-linking.patch b/dev-libs/libxml2/files/libxml2-2.8.0-icu-linking.patch
new file mode 100644
index 000000000000..92c9a98c655c
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.8.0-icu-linking.patch
@@ -0,0 +1,125 @@
+From 6ee653ecbef38c0e57860903541f1f3c97dbe75b Mon Sep 17 00:00:00 2001
+From: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com>
+Date: Sat, 26 May 2012 17:37:43 +0000
+Subject: [PATCH] Handle ICU_LIBS as LIBADD, not LDFLAGS to prevent linking
+ errors
+
+---
+ Makefile.am                  |    2 +-
+ configure.in                 |   15 ++++++++-------
+ libxml-2.0-uninstalled.pc.in |    2 +-
+ libxml-2.0.pc.in             |    2 +-
+ 4 files changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index f82cefa..0b25666 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,7 +18,7 @@ bin_PROGRAMS = xmllint xmlcatalog
+ bin_SCRIPTS=xml2-config
+ 
+ lib_LTLIBRARIES = libxml2.la
+-libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
++libxml2_la_LIBADD = @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
+ 
+ if USE_VERSION_SCRIPT
+ LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms
+diff --git a/configure.in b/configure.in
+index 0fb4983..ac45b58 100644
+--- a/configure.in
++++ b/configure.in
+@@ -97,7 +97,7 @@ dnl
+ dnl zlib option might change flags, so we save them initially
+ dnl
+ _cppflags="${CPPFLAGS}"
+-_ldflags="${LDFLAGS}"
++_libs="${LIBS}"
+ 
+ AC_ARG_WITH(c14n,
+ [  --with-c14n             add the Canonicalization support (on)])
+@@ -154,7 +154,7 @@ AC_ARG_WITH(readline,
+   if test "$withval" != "no" -a "$withval" != "yes"; then
+     RDL_DIR=$withval
+     CPPFLAGS="${CPPFLAGS} -I$withval/include"
+-    LDFLAGS="${LDFLAGS} -L$withval/lib"
++    LIBS="${LIBS} -L$withval/lib"
+   fi
+ ])
+ AC_ARG_WITH(regexps,
+@@ -190,7 +190,7 @@ AC_ARG_WITH(zlib,
+   if test "$withval" != "no" -a "$withval" != "yes"; then
+     Z_DIR=$withval
+     CPPFLAGS="${CPPFLAGS} -I$withval/include"
+-    LDFLAGS="${LDFLAGS} -L$withval/lib"
++    LIBS="${LIBS} -L$withval/lib"
+   fi
+ ])
+ AC_ARG_WITH(lzma,
+@@ -198,7 +198,7 @@ AC_ARG_WITH(lzma,
+   if test "$withval" != "no" -a "$withval" != "yes"; then
+     LZMA_DIR=$withval
+     CPPFLAGS="${CPPFLAGS} -I$withval/include"
+-    LDFLAGS="${LDFLAGS} -L$withval/lib"
++    LIBS="${LIBS} -L$withval/lib"
+   fi
+ ])
+ AC_ARG_WITH(coverage,
+@@ -428,7 +428,7 @@ AC_SUBST(LZMA_LIBS)
+ AC_SUBST(WITH_LZMA)
+ 
+ CPPFLAGS=${_cppflags}
+-LDFLAGS=${_ldflags}
++LIBS=${_libs}
+ 
+ echo Checking headers
+ 
+@@ -1365,14 +1365,14 @@ XML_LIBTOOLLIBS="libxml2.la"
+ AC_SUBST(WITH_ICONV)
+ 
+ WITH_ICU=0
++ICU_LIBS=""
+ if test "$with_icu" != "yes" ; then
+     echo Disabling ICU support
+ else
+     ICU_CONFIG=icu-config
+     if ${ICU_CONFIG} --cflags >/dev/null 2>&1
+     then
+-        ICU_LIBS=`icu-config --ldflags`
+-        LDFLAGS="$LDFLAGS $ICU_LIBS"
++        ICU_LIBS=`${ICU_CONFIG} --ldflags`
+         WITH_ICU=1
+         echo Enabling ICU support
+     else
+@@ -1380,6 +1380,7 @@ else
+     fi
+ fi
+ AC_SUBST(WITH_ICU)
++AC_SUBST(ICU_LIBS)
+ 
+ WITH_ISO8859X=1
+ if test "$WITH_ICONV" != "1" ; then
+diff --git a/libxml-2.0-uninstalled.pc.in b/libxml-2.0-uninstalled.pc.in
+index 0a4c833..cab6834 100644
+--- a/libxml-2.0-uninstalled.pc.in
++++ b/libxml-2.0-uninstalled.pc.in
+@@ -8,5 +8,5 @@ Name: libXML
+ Version: @VERSION@
+ Description: libXML library version2.
+ Requires:
+-Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
++Libs: -L${libdir} -lxml2 @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
+ Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@
+diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in
+index 31a1b8c..f5f5f03 100644
+--- a/libxml-2.0.pc.in
++++ b/libxml-2.0.pc.in
+@@ -9,5 +9,5 @@ Version: @VERSION@
+ Description: libXML library version2.
+ Requires:
+ Libs: -L${libdir} -lxml2
+-Libs.private: @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
++Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
+ Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
+-- 
+1.7.8.6
+
diff --git a/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild b/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild
index 763d2643ea87..0771bb42efa5 100644
--- a/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.8.0-r1.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/libxml2/libxml2-2.8.0-r1.ebuild,v 1.3 2012/05/27 15:17:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild,v 1.4 2012/06/04 04:36:32 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -36,7 +36,6 @@ RDEPEND="sys-libs/zlib
 	readline? ( sys-libs/readline )"
 
 DEPEND="${RDEPEND}
-	python? ( dev-util/fix-la-relink-command )
 	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )"
 
 S="${WORKDIR}/${PN}-${PV%_rc*}"
@@ -70,6 +69,9 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-2.7.8-disable_static_modules.patch"
 
+	# Prevent liking to out-of-build-tree libxml2, bug #417539
+	epatch "${FILESDIR}/${PN}-2.8.0-icu-linking.patch"
+
 	# Please do not remove, as else we get references to PORTAGE_TMPDIR
 	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
 	# We now need to run eautoreconf at the end to prevent maintainer mode.
@@ -153,8 +155,6 @@ src_install() {
 
 	if use python; then
 		installation() {
-			# bug #417539
-			fix-la-relink-command . || die "fix-la-relink-command failed"
 			emake DESTDIR="${D}" \
 				PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \
 				docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \