Make 2.6.0-r1 and 2.7.0 multilib safe, and mark 2.6.0-r1 stable. Bug #106228

(Portage version: 2.0.52-r1)

6 files changed, 135 insertions, 20 deletions

diff --git a/dev-libs/xerces-c/ChangeLog b/dev-libs/xerces-c/ChangeLog
index dc0864ac44ef..dfb6bfbd963a 100644
--- a/dev-libs/xerces-c/ChangeLog
+++ b/dev-libs/xerces-c/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/xerces-c
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.34 2005/09/24 04:37:44 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.35 2005/10/04 16:43:31 dang Exp $
+
+  04 Oct 2005; <dang@gentoo.org> +files/xerces-c-2.6.0-multilib.patch,
+  +files/xerces-c-2.7.0-multilib.patch, xerces-c-2.6.0-r1.ebuild,
+  xerces-c-2.7.0.ebuild:
+  Make 2.6.0-r1 and 2.7.0 multilib safe, and mark 2.6.0-r1 stable.  Bug #106228
 
   24 Sep 2005; Mark Loeser <halcy0n@gentoo.org> xerces-c-2.6.0.ebuild,
   xerces-c-2.6.0-r1.ebuild:
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 4e00bcd4ea0d..753636922aca 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 43fbdbb2b473ef42a8e80289aca47123 xerces-c-2.7.0.ebuild 1208
+MD5 098fcfb182c2283daf21b927de8dc803 xerces-c-2.6.0-r1.ebuild 1226
+MD5 2d7d991c4c4b919fb8536f4a95d96f6f xerces-c-2.6.0.ebuild 1054
 MD5 3ac68a3f85fa86558b628c40c2cb6315 ChangeLog 5459
 MD5 751dbed21e1e078fa8f07ef9bf0991b2 metadata.xml 376
-MD5 476344d5392164254a77f59c3fe3ac7f xerces-c-2.6.0-r1.ebuild 1074
-MD5 2d7d991c4c4b919fb8536f4a95d96f6f xerces-c-2.6.0.ebuild 1054
-MD5 e383ccd06fa4e6dc85661e3435b21246 xerces-c-2.7.0.ebuild 1056
-MD5 df82644c18f756a618ceb4e3e378a64c files/digest-xerces-c-2.6.0 71
 MD5 df82644c18f756a618ceb4e3e378a64c files/digest-xerces-c-2.6.0-r1 71
+MD5 df82644c18f756a618ceb4e3e378a64c files/digest-xerces-c-2.6.0 71
 MD5 c9823d79de49cd66dc39de2525163280 files/digest-xerces-c-2.7.0 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDNNgsCRZPokWLroQRAr73AJ9kVEKRV9E+Lcmj3Nn23mr2YRFtIACgrOqq
-iX27XqMq9CSuDo32Q6VNuSY=
-=S3Rk
------END PGP SIGNATURE-----
+MD5 dd35713fae90dbd73f534c31b98591e7 files/xerces-c-2.7.0-multilib.patch 3267
+MD5 1c36cac94e6f0dcfd2addbb34ac332e2 files/xerces-c-2.6.0-multilib.patch 3023
diff --git a/dev-libs/xerces-c/files/xerces-c-2.6.0-multilib.patch b/dev-libs/xerces-c/files/xerces-c-2.6.0-multilib.patch
new file mode 100644
index 000000000000..752202bf0f16
--- /dev/null
+++ b/dev-libs/xerces-c/files/xerces-c-2.6.0-multilib.patch
@@ -0,0 +1,49 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN xerces-c-src_2_6_0.orig/obj/Makefile.in xerces-c-src_2_6_0/obj/Makefile.in
+--- xerces-c-src_2_6_0.orig/obj/Makefile.in	2004-09-17 05:58:09.000000000 -0400
++++ xerces-c-src_2_6_0/obj/Makefile.in	2005-10-04 12:36:28.000000000 -0400
+@@ -46,6 +46,7 @@
+ include ../src/xercesc/Makefile.incl
+ 
+ LIB=${XERCESCROOT}/lib
++MLIBDIR=lib
+ ## OS390BATCH
+ ifeq (${OS390BATCH},1)
+ BATCH_TARGET = "//'${LOADMOD}(IXM4C55)'"
+@@ -235,26 +236,26 @@
+ ifeq (${OS390BATCH},1)
+ 	@echo "Nothing to do for OS390BATCH ..."
+ else
+-	-mkdir -p ${DESTDIR}${PREFIX}/lib
++	-mkdir -p ${DESTDIR}${PREFIX}/${MLIBDIR}
+ ifeq (${PLATFORM}, CYGWIN)
+ 	-mkdir -p ${DESTDIR}${PREFIX}/bin
+ 	$(CP) ${FQ_SO_NAME} ${DESTDIR}${PREFIX}/bin
+-	$(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/lib
+-	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_NAME}.a libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_NAME}.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxerces.dll.a)
++	$(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/${MLIBDIR}
++	(cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${LINK_NAME}.a libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_NAME}.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxerces.dll.a)
+ 
+ 	$(CP) ${FQ_SO_DEPDOM} ${DESTDIR}${PREFIX}/bin
+-	$(CP) $(XML_LIB_DIR)/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/lib
+-	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_DEPDOM}.a libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_NAME}.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxercesdepdom.dll.a)
++	$(CP) $(XML_LIB_DIR)/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/${MLIBDIR}
++	(cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${LINK_DEPDOM}.a libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_NAME}.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxercesdepdom.dll.a)
+ else
+-	$(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/lib
+-	(cd ${DESTDIR}$(PREFIX)/lib; ln -s ${REAL_NAME} ${SO_NAME}; ln -s ${REAL_NAME} ${LINK_NAME})
++	$(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/${MLIBDIR}
++	(cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; ln -s ${REAL_NAME} ${SO_NAME}; ln -s ${REAL_NAME} ${LINK_NAME})
+ 	
+-	$(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/lib
+-	(cd ${DESTDIR}$(PREFIX)/lib; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM})	
++	$(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/${MLIBDIR}
++	(cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM})	
+ endif
+ ifeq (${PLATFORM},OS390)
+-	$(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib
+-	$(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib	
++	$(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/${MLIBDIR}
++	$(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/${MLIBDIR}	
+ endif
+ endif
+ 
diff --git a/dev-libs/xerces-c/files/xerces-c-2.7.0-multilib.patch b/dev-libs/xerces-c/files/xerces-c-2.7.0-multilib.patch
new file mode 100644
index 000000000000..eca810996b54
--- /dev/null
+++ b/dev-libs/xerces-c/files/xerces-c-2.7.0-multilib.patch
@@ -0,0 +1,49 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN xerces-c-src.orig/obj/Makefile.in xerces-c-src/obj/Makefile.in
+--- xerces-c-src.orig/obj/Makefile.in	2005-08-26 12:19:57.000000000 -0400
++++ xerces-c-src/obj/Makefile.in	2005-10-04 12:01:33.000000000 -0400
+@@ -46,6 +46,7 @@
+ include ../src/xercesc/Makefile.incl
+ 
+ LIB=${XERCESCROOT}/lib
++MLIBDIR=lib
+ ## OS390BATCH
+ ifeq (${OS390BATCH},1)
+ BATCH_TARGET = "//'${LOADMOD}(IXM4C56)'"
+@@ -223,26 +224,26 @@
+ ifeq (${OS390BATCH},1)
+ 	@echo "Nothing to do for OS390BATCH ..."
+ else
+-	-mkdir -p ${DESTDIR}${PREFIX}/lib
++	-mkdir -p ${DESTDIR}${PREFIX}/${MLIBDIR}
+ ifeq (${PLATFORM}, CYGWIN)
+ 	-mkdir -p ${DESTDIR}${PREFIX}/bin
+ 	$(CP) ${FQ_SO_NAME} ${DESTDIR}${PREFIX}/bin
+-	$(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/lib
+-	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_NAME}.a libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_NAME}.a; rm -f libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxerces.dll.a)
++	$(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/${MLIBDIR}
++	(cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${LINK_NAME}.a libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_NAME}.a; rm -f libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxerces.dll.a)
+ 
+ 	$(CP) ${FQ_SO_DEPDOM} ${DESTDIR}${PREFIX}/bin
+-	$(CP) $(XML_LIB_DIR)/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/lib
+-	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_DEPDOM}.a libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_DEPDOM}.a; rm -f libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxercesdepdom.dll.a)
++	$(CP) $(XML_LIB_DIR)/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/${MLIBDIR}
++	(cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${LINK_DEPDOM}.a libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_DEPDOM}.a; rm -f libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxercesdepdom.dll.a)
+ else
+-	$(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/lib
+-	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_NAME}; ln -s ${REAL_NAME} ${SO_NAME}; rm -f ${LINK_NAME}; ln -s ${REAL_NAME} ${LINK_NAME})
++	$(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/${MLIBDIR}
++	(cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${SO_NAME}; ln -s ${REAL_NAME} ${SO_NAME}; rm -f ${LINK_NAME}; ln -s ${REAL_NAME} ${LINK_NAME})
+ 	
+-	$(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/lib
+-	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM})	
++	$(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/${MLIBDIR}
++	(cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM})	
+ endif
+ ifeq (${PLATFORM},OS390)
+-	$(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib
+-	$(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib	
++	$(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/${MLIBDIR}
++	$(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/${MLIBDIR}	
+ endif
+ endif
+ 
diff --git a/dev-libs/xerces-c/xerces-c-2.6.0-r1.ebuild b/dev-libs/xerces-c/xerces-c-2.6.0-r1.ebuild
index 388e02479f9b..210bfa508057 100644
--- a/dev-libs/xerces-c/xerces-c-2.6.0-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-2.6.0-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 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.6.0-r1.ebuild,v 1.8 2005/09/24 04:37:44 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-2.6.0-r1.ebuild,v 1.9 2005/10/04 16:43:31 dang Exp $
+
+inherit eutils multilib
 
 MY_PV=${PV//./_}
 MY_P=${PN}-src_${MY_PV}
@@ -10,7 +12,7 @@ SRC_URI="http://archive.apache.org/dist/xml/xerces-c/Xerces-C_2_6_0/${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="doc"
 
 DEPEND="virtual/libc
@@ -18,6 +20,14 @@ DEPEND="virtual/libc
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix multilib install
+	epatch ${FILESDIR}/${P}-multilib.patch
+}
+
 src_compile() {
 	export XERCESCROOT=${S}
 	cd src/xercesc
@@ -28,7 +38,7 @@ src_compile() {
 src_install () {
 	export XERCESCROOT=${S}
 	cd ${S}/src/xercesc
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} MLIBDIR=$(get_libdir) install || die
 
 	if use doc; then
 		dodir /usr/share/doc/${P}
diff --git a/dev-libs/xerces-c/xerces-c-2.7.0.ebuild b/dev-libs/xerces-c/xerces-c-2.7.0.ebuild
index 116202d24caa..a43c4ed43b7e 100644
--- a/dev-libs/xerces-c/xerces-c-2.7.0.ebuild
+++ b/dev-libs/xerces-c/xerces-c-2.7.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 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.1 2005/09/05 00:34:31 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-2.7.0.ebuild,v 1.2 2005/10/04 16:43:31 dang Exp $
+
+inherit eutils multilib
 
 MY_PV=${PV//./_}
 MY_P=${PN}-src_${MY_PV}
@@ -18,6 +20,14 @@ DEPEND="virtual/libc
 
 S=${WORKDIR}/xerces-c-src
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix multilib install
+	epatch ${FILESDIR}/${P}-multilib.patch
+}
+
 src_compile() {
 	export XERCESCROOT=${S}
 	cd src/xercesc
@@ -28,7 +38,7 @@ src_compile() {
 src_install () {
 	export XERCESCROOT=${S}
 	cd ${S}/src/xercesc
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} MLIBDIR=$(get_libdir) install || die
 
 	if use doc; then
 		dodir /usr/share/doc/${P}