Dropped a stale patch. Some minor cleanups.

Package-Manager: portage-2.1.2.2

4 files changed, 29 insertions, 77 deletions

diff --git a/dev-libs/xerces-c/ChangeLog b/dev-libs/xerces-c/ChangeLog
index a296ca45d8f8..691ca4e0a126 100644
--- a/dev-libs/xerces-c/ChangeLog
+++ b/dev-libs/xerces-c/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/xerces-c
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.47 2006/10/21 22:37:28 vapier Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.48 2007/03/15 19:52:40 dev-zero Exp $
+
+  15 Mar 2007; Tiziano Müller <dev-zero@gentoo.org>
+  -files/xerces-c-2.6.0-multilib.patch, xerces-c-2.7.0-r1.ebuild:
+  Dropped a stale patch. Some minor cleanups.
 
   21 Oct 2006; Mike Frysinger <vapier@gentoo.org> xerces-c-2.7.0-r1.ebuild:
   Respect EXTRA_ECONF #146651 by Triphon Penakov.
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index c5b83c847e15..871f33ac59c4 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX xerces-c-2.6.0-multilib.patch 3023 RMD160 10a1b4993442ddde4e0c2cfb4370595276fa2b1d SHA1 18ce4adeb8e4f62a7dbb83bd9fd91785a741590b SHA256 8fe3c6f70e110eccbf3773356ad652ee52ecdfbdc0516813d02c166cacfe00d6
-MD5 1c36cac94e6f0dcfd2addbb34ac332e2 files/xerces-c-2.6.0-multilib.patch 3023
-RMD160 10a1b4993442ddde4e0c2cfb4370595276fa2b1d files/xerces-c-2.6.0-multilib.patch 3023
-SHA256 8fe3c6f70e110eccbf3773356ad652ee52ecdfbdc0516813d02c166cacfe00d6 files/xerces-c-2.6.0-multilib.patch 3023
 AUX xerces-c-2.7.0-libpath.patch 1586 RMD160 44df40b77aefb2d446e84940f06420bb5dce8e21 SHA1 defaad81f4044b03aedc2d38da6e83725f5d0f61 SHA256 c981098908bb4acdb4f3d893983bed113e0d8fc2be717bcff4458261017b26cd
 MD5 982c9efab0d8818be37ee027e379e2d8 files/xerces-c-2.7.0-libpath.patch 1586
 RMD160 44df40b77aefb2d446e84940f06420bb5dce8e21 files/xerces-c-2.7.0-libpath.patch 1586
@@ -14,14 +10,14 @@ MD5 dd35713fae90dbd73f534c31b98591e7 files/xerces-c-2.7.0-multilib.patch 3267
 RMD160 2fbd2a9400ff4bf962c04667b825945eca2e6c8d files/xerces-c-2.7.0-multilib.patch 3267
 SHA256 5b070554239570f31c1fe6736a69b45305e03bf34166ba3ca813c8e92aee47ca files/xerces-c-2.7.0-multilib.patch 3267
 DIST xerces-c-src_2_7_0.tar.gz 12368496 RMD160 d01f10b4c0a9c53bf4bcdba388981c9ca7d6268d SHA1 f16fcd4722e92127095fe6c6456bda20c24e5e98 SHA256 79525d283630305fa68169eafe08805d2585273f8344069df5c40ce967fd0e1c
-EBUILD xerces-c-2.7.0-r1.ebuild 1352 RMD160 2bd8eda9d870f03d38ed5763239addb07c479e36 SHA1 a151322951946a41e1b13899c34a92a75ed4f856 SHA256 0d133dd79e8856ceed331563d4290612738274ed9085dd02fc4fe5d4f8dd06e3
-MD5 08ea4fbe5c4140810d164540a0a10cbf xerces-c-2.7.0-r1.ebuild 1352
-RMD160 2bd8eda9d870f03d38ed5763239addb07c479e36 xerces-c-2.7.0-r1.ebuild 1352
-SHA256 0d133dd79e8856ceed331563d4290612738274ed9085dd02fc4fe5d4f8dd06e3 xerces-c-2.7.0-r1.ebuild 1352
-MISC ChangeLog 7375 RMD160 cd5349db10a18ef0fff131cb9e5549c98f125016 SHA1 cc5dcf0206a8c101c6f5d18ac8ba2df25b24d17c SHA256 6d628c6efc8061cbb28587ab78efdfec2c427b7e5f4c88b581bf14b62cca8b38
-MD5 17f679681410be1167dbeca6cd3930d7 ChangeLog 7375
-RMD160 cd5349db10a18ef0fff131cb9e5549c98f125016 ChangeLog 7375
-SHA256 6d628c6efc8061cbb28587ab78efdfec2c427b7e5f4c88b581bf14b62cca8b38 ChangeLog 7375
+EBUILD xerces-c-2.7.0-r1.ebuild 1423 RMD160 1935f499415f8f168a19b23e1ccd7ebc45afd840 SHA1 4bf66e23c23a28bc5aa213a75ee25b3284718828 SHA256 1572b2cfaf5d0ccdc0db3d5547b6e05f308d17a4f7d4151dc1d4f488b5974812
+MD5 966b05967d75d44f8f48c219a0641484 xerces-c-2.7.0-r1.ebuild 1423
+RMD160 1935f499415f8f168a19b23e1ccd7ebc45afd840 xerces-c-2.7.0-r1.ebuild 1423
+SHA256 1572b2cfaf5d0ccdc0db3d5547b6e05f308d17a4f7d4151dc1d4f488b5974812 xerces-c-2.7.0-r1.ebuild 1423
+MISC ChangeLog 7543 RMD160 daab695be4fcb0893b5bbe1ccffdaccbab01296b SHA1 2387e2ffc9311df91827dab7c9ddb327b5cd1122 SHA256 f0146d0a06b47f185d9492044fbbec524677acb05705f752e2622f23a89bbb6e
+MD5 bf90e57e315a232af68cae430faf9842 ChangeLog 7543
+RMD160 daab695be4fcb0893b5bbe1ccffdaccbab01296b ChangeLog 7543
+SHA256 f0146d0a06b47f185d9492044fbbec524677acb05705f752e2622f23a89bbb6e ChangeLog 7543
 MISC metadata.xml 288 RMD160 fcb3d012a456083859a741268ac90d35d227008f SHA1 5e1e318ecd30c5ac92dcf77834e0c0d4a4d42146 SHA256 f604779759edc8b476cd4ca07ec16632800c50c8ad533200f3ed33ce1feda24c
 MD5 d05e32602038e6618af423d058ab9f0e metadata.xml 288
 RMD160 fcb3d012a456083859a741268ac90d35d227008f metadata.xml 288
@@ -30,9 +26,9 @@ MD5 e23057657c4260149bf108c0f9547eb4 files/digest-xerces-c-2.7.0-r1 262
 RMD160 a1a1f5f8af81f8c2ebec1c16999c340eae4be4e9 files/digest-xerces-c-2.7.0-r1 262
 SHA256 fae21766bf97df44da549625ffa34a39997d0479c8ab2bdf0c80ba84decb433e files/digest-xerces-c-2.7.0-r1 262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFOqFPamhnQswr0vIRAh5vAJ9LLLCC9pUQukgRtDdv0g3qoZCVDwCeIJjV
-VhdmZAl8GDmIxbzqc3VYxuA=
-=C5Js
+iD8DBQFF+aQnGwVqY66cHjARAgs2AJ9NACVTjAa9RlL9qxIiyTdnNYjymACfQB2w
+eSlnJuCIl6A2I9njWQPqb/E=
+=U7N9
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index 752202bf0f16..000000000000
--- a/dev-libs/xerces-c/files/xerces-c-2.6.0-multilib.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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/xerces-c-2.7.0-r1.ebuild b/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild
index af27dd0c96ef..3a2dfa5d3806 100644
--- a/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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-r1.ebuild,v 1.9 2006/10/21 22:37:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild,v 1.10 2007/03/15 19:52:40 dev-zero Exp $
 
-inherit eutils multilib
+inherit eutils multilib versionator
+
+MY_PN="xerces-c-src"
+MY_P=${MY_PN}_$(replace_all_version_separators _)
 
-MY_PV=${PV//./_}
-MY_P=${PN}-src_${MY_PV}
 DESCRIPTION="Xerces-C++ is a validating XML parser written in a portable subset of C++."
 HOMEPAGE="http://xml.apache.org/xerces-c/index.html"
 SRC_URI="mirror://apache/xml/xerces-c/source/${MY_P}.tar.gz"
@@ -17,7 +18,7 @@ IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
 
-S="${WORKDIR}"/xerces-c-src
+S=${WORKDIR}/${MY_PN}
 
 pkg_setup() {
 	eval unset ${!LC_*} LANG
@@ -29,21 +30,21 @@ src_unpack() {
 	cd "${S}"
 
 	# Fix multilib install
-	epatch "${FILESDIR}"/${P}-multilib.patch
-	epatch "${FILESDIR}"/${P}-libpath.patch
+	epatch "${FILESDIR}/${P}-multilib.patch"
+	epatch "${FILESDIR}/${P}-libpath.patch"
 }
 
 src_compile() {
 	export XERCESCROOT="${S}"
 	cd src/xercesc
 	./runConfigure -plinux -P/usr ${EXTRA_ECONF}
-	emake -j1 || die
+	emake -j1 || die "emake failed"
 }
 
 src_install () {
 	export XERCESCROOT="${S}"
 	cd "${S}"/src/xercesc
-	make DESTDIR="${D}" MLIBDIR=$(get_libdir) install || die
+	emake DESTDIR="${D}" MLIBDIR=$(get_libdir) install || die "emake failed"
 
 	if use doc; then
 		dodir /usr/share/doc/${P}