Bump to fix the library issue for everyone that upgraded. Thanks to Phil Pennock <gentoo AT spodhuis DOT demon DOT nl> for the report; bug #118340

(Portage version: 2.1_pre3-r1)

5 files changed, 56 insertions, 14 deletions

diff --git a/dev-libs/xerces-c/ChangeLog b/dev-libs/xerces-c/ChangeLog
index e1c6ec2a921e..1d9db47e9e7f 100644
--- a/dev-libs/xerces-c/ChangeLog
+++ b/dev-libs/xerces-c/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/xerces-c
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.37 2006/01/07 11:46:14 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.38 2006/01/09 01:38:42 halcy0n Exp $
+
+*xerces-c-2.7.0-r1 (09 Jan 2006)
+
+  09 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/xerces-c-2.7.0-libpath.patch, -xerces-c-2.7.0.ebuild,
+  +xerces-c-2.7.0-r1.ebuild:
+  Bump to fix the library issue for everyone that upgraded. Thanks to Phil
+  Pennock <gentoo AT spodhuis DOT demon DOT nl> for the report; bug #118340
 
   07 Jan 2006; Simon Stelling <blubb@gentoo.org> xerces-c-2.7.0.ebuild:
   stable on amd64
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 835b086204c8..1ccc153ad662 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,8 +1,9 @@
 MD5 95906a252c28678b4edece93c163a02f ChangeLog 5972
 MD5 df82644c18f756a618ceb4e3e378a64c files/digest-xerces-c-2.6.0-r1 71
-MD5 c9823d79de49cd66dc39de2525163280 files/digest-xerces-c-2.7.0 72
+MD5 c9823d79de49cd66dc39de2525163280 files/digest-xerces-c-2.7.0-r1 72
 MD5 1c36cac94e6f0dcfd2addbb34ac332e2 files/xerces-c-2.6.0-multilib.patch 3023
+MD5 982c9efab0d8818be37ee027e379e2d8 files/xerces-c-2.7.0-libpath.patch 1586
 MD5 dd35713fae90dbd73f534c31b98591e7 files/xerces-c-2.7.0-multilib.patch 3267
 MD5 751dbed21e1e078fa8f07ef9bf0991b2 metadata.xml 376
 MD5 1733ed8f5b1ad4592d93366c40016a92 xerces-c-2.6.0-r1.ebuild 1212
-MD5 6df21f86fd2710300d45ce529b2788d6 xerces-c-2.7.0.ebuild 1196
+MD5 c869979b934d4e5c6079b3a6a4f2a2bf xerces-c-2.7.0-r1.ebuild 1259
diff --git a/dev-libs/xerces-c/files/digest-xerces-c-2.7.0 b/dev-libs/xerces-c/files/digest-xerces-c-2.7.0-r1
index d170a338592a..d170a338592a 100644
--- a/dev-libs/xerces-c/files/digest-xerces-c-2.7.0
+++ b/dev-libs/xerces-c/files/digest-xerces-c-2.7.0-r1
diff --git a/dev-libs/xerces-c/files/xerces-c-2.7.0-libpath.patch b/dev-libs/xerces-c/files/xerces-c-2.7.0-libpath.patch
new file mode 100644
index 000000000000..3d430ffa9db7
--- /dev/null
+++ b/dev-libs/xerces-c/files/xerces-c-2.7.0-libpath.patch
@@ -0,0 +1,32 @@
+--- xerces-c-src/src/xercesc/Makefile.incl.orig	2006-01-08 20:05:35.000000000 -0500
++++ xerces-c-src/src/xercesc/Makefile.incl	2006-01-08 20:08:19.000000000 -0500
+@@ -348,23 +348,23 @@
+ 
+         ifeq (${BITSTOBUILD}, 64)
+             ifeq (${TRANSCODER}, ICU)
+-                ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata
++                ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib -licuuc -licudata
+             else
+-                ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib
++                ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib
+             endif
+ 
+             ifeq (${MESSAGELOADER}, ICU)
+-                ALLLIBS = ${LIBS} -L/usr/lib64 -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lXercesMessages
++                ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib -licuuc -licudata -lXercesMessages
+             endif
+         else
+             ifeq (${TRANSCODER}, ICU)
+-                ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata
++                ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib -licuuc -licudata
+             else
+-                ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib
++                ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib
+             endif
+ 
+             ifeq (${MESSAGELOADER}, ICU)
+-                ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lXercesMessages
++                ALLLIBS = ${LIBS} -L${XERCESCROOT}/lib -licuuc -licudata -lXercesMessages
+             endif
+         endif
+ 
diff --git a/dev-libs/xerces-c/xerces-c-2.7.0.ebuild b/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild
index 1e7dcd9060aa..b2ba87e81231 100644
--- a/dev-libs/xerces-c/xerces-c-2.7.0.ebuild
+++ b/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-2.7.0.ebuild,v 1.5 2006/01/07 11:46:14 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild,v 1.1 2006/01/09 01:38:42 halcy0n Exp $
 
 inherit eutils multilib
 
@@ -17,36 +17,37 @@ IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
 
-S=${WORKDIR}/xerces-c-src
+S="${WORKDIR}"/xerces-c-src
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Fix multilib install
-	epatch ${FILESDIR}/${P}-multilib.patch
+	epatch "${FILESDIR}"/${P}-multilib.patch
+	epatch "${FILESDIR}"/${P}-libpath.patch
 }
 
 src_compile() {
-	export XERCESCROOT=${S}
+	export XERCESCROOT="${S}"
 	cd src/xercesc
 	./runConfigure -plinux -P/usr
 	emake -j1 || die
 }
 
 src_install () {
-	export XERCESCROOT=${S}
-	cd ${S}/src/xercesc
-	make DESTDIR=${D} MLIBDIR=$(get_libdir) install || die
+	export XERCESCROOT="${S}"
+	cd "${S}"/src/xercesc
+	make DESTDIR="${D}" MLIBDIR=$(get_libdir) install || die
 
 	if use doc; then
 		dodir /usr/share/doc/${P}
-		cp -pPR ${S}/samples ${D}/usr/share/doc/${P}
-		cd ${S}/doc; doxygen
+		cp -pPR "${S}"/samples "${D}"/usr/share/doc/${P}
+		cd "${S}"/doc; doxygen
 		dohtml -r html
 	fi
 
-	cd ${S}
+	cd "${S}"
 	dodoc STATUS credits.txt version.incl
 	dohtml Readme.html