use system expat (bug 178919), fix src_test (bug 179589)

Package-Manager: portage-2.1.3_rc6

8 files changed, 211 insertions, 15 deletions

diff --git a/dev-python/celementtree/ChangeLog b/dev-python/celementtree/ChangeLog
index 6af008624575..672fc6ab1094 100644
--- a/dev-python/celementtree/ChangeLog
+++ b/dev-python/celementtree/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/celementtree
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celementtree/ChangeLog,v 1.14 2007/01/18 23:39:03 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celementtree/ChangeLog,v 1.15 2007/07/03 06:41:17 hawking Exp $
+
+*celementtree-1.0.5-r1 (03 Jul 2007)
+*celementtree-1.0.2-r1 (03 Jul 2007)
+
+  03 Jul 2007; Ali Polatel <hawking@gentoo.org>
+  +files/celementtree-1.0.2-use_system_expat.patch,
+  +files/celementtree-1.0.5-use_system_expat.patch,
+  +celementtree-1.0.2-r1.ebuild, +celementtree-1.0.5-r1.ebuild:
+  revbump, use system expat (bug 178919), fix src_test (bug 179589)
 
   18 Jan 2007; Lukasz Strzygowski <lucass@gentoo.org>
   celementtree-1.0.5.ebuild:
diff --git a/dev-python/celementtree/Manifest b/dev-python/celementtree/Manifest
index c6e80147ede7..89dee72bf48f 100644
--- a/dev-python/celementtree/Manifest
+++ b/dev-python/celementtree/Manifest
@@ -1,13 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX celementtree-1.0.2-use_system_expat.patch 1060 RMD160 e7252bfbc3e7661190124fa307e120a02a7405d6 SHA1 76d8ffab0b2afc0015c9d041911fc55be6a69548 SHA256 8a66ca7b912cfac93ed939fa70b67b0f23828394f60b8ddda6288e5368a1b3af
+MD5 9f48b31d0d95759d3917f7b28045b891 files/celementtree-1.0.2-use_system_expat.patch 1060
+RMD160 e7252bfbc3e7661190124fa307e120a02a7405d6 files/celementtree-1.0.2-use_system_expat.patch 1060
+SHA256 8a66ca7b912cfac93ed939fa70b67b0f23828394f60b8ddda6288e5368a1b3af files/celementtree-1.0.2-use_system_expat.patch 1060
+AUX celementtree-1.0.5-use_system_expat.patch 1069 RMD160 609079d1b4412f6758da73d8155f2d4b5b049825 SHA1 22e0898b280a7f8d728189a3482c23b7d61e5acf SHA256 aec7cc96f85d621f68df442533b5964d5517f5922b7d1c1f9bdbdf7629fb11ea
+MD5 860ca6b95748e10cf992f35bfdc0e10c files/celementtree-1.0.5-use_system_expat.patch 1069
+RMD160 609079d1b4412f6758da73d8155f2d4b5b049825 files/celementtree-1.0.5-use_system_expat.patch 1069
+SHA256 aec7cc96f85d621f68df442533b5964d5517f5922b7d1c1f9bdbdf7629fb11ea files/celementtree-1.0.5-use_system_expat.patch 1069
 DIST cElementTree-1.0-20050126.zip 99366 RMD160 55977353f1a13ebfd616fdb732f3db1db6f661dd SHA1 aa8f8f7397d9d86d22f989058fe69abaf52ad809 SHA256 40e7220e49dc609f1b0f6121c5e44fd5b89ea6ab5039b8424225f8e33f9d648b
 DIST cElementTree-1.0.2-20050302.tar.gz 91541 RMD160 7097c5c7a8eb3829e03bbd8002a73a356e41b9ec SHA1 6a9de75ad39d02d6fd7136cdf17772564e1b8582 SHA256 7629df1dd79a400e1e2c9ee27456527bc0ee7773f7acdcab988a2d0be58f7154
 DIST cElementTree-1.0.5-20051216.tar.gz 93766 RMD160 e079d10507bd4819b2ce4771b53671c2d9ac2418 SHA1 08f4206d209905ddf3f37cb72f9fc021791d7f99 SHA256 b2e528c99837124b32598bde7a19da579203c600d71f22f4c84da0933ba09751
+EBUILD celementtree-1.0.2-r1.ebuild 1003 RMD160 c2377ea422d2bbb1eaff265a7ffec96d58401fe6 SHA1 586868ddc655bf9dec4143aed6e56422023f20bd SHA256 e5781432d4cb5bb6b4170132b991c5ad44f64ebf2c59ac10c4b2d32c63dc0a96
+MD5 3fc831c0f7e12b7d033a41d0576a7115 celementtree-1.0.2-r1.ebuild 1003
+RMD160 c2377ea422d2bbb1eaff265a7ffec96d58401fe6 celementtree-1.0.2-r1.ebuild 1003
+SHA256 e5781432d4cb5bb6b4170132b991c5ad44f64ebf2c59ac10c4b2d32c63dc0a96 celementtree-1.0.2-r1.ebuild 1003
 EBUILD celementtree-1.0.2.ebuild 780 RMD160 b66c2c5807efd4a5ac09940deeb286cc0bb491d7 SHA1 792cb964774665b925c094ba6342d7f3fd2772df SHA256 1d035aab12486bac9979ca75971b3343efe4a796a9b4f7d3a19f5dff178bb28f
 MD5 5c9b93d57356b4e01c9ddebe95b33f28 celementtree-1.0.2.ebuild 780
 RMD160 b66c2c5807efd4a5ac09940deeb286cc0bb491d7 celementtree-1.0.2.ebuild 780
 SHA256 1d035aab12486bac9979ca75971b3343efe4a796a9b4f7d3a19f5dff178bb28f celementtree-1.0.2.ebuild 780
+EBUILD celementtree-1.0.5-r1.ebuild 1035 RMD160 c355dd7f15de420ff5dc4b2612e13d84e4afe1cf SHA1 908a4731d1e1deafad517d870eaa0fee93b9bb72 SHA256 1cf59fa2108c235b2cdb3e67b5a8bcd228eb4cb4c0b7968970dcd77883bc4597
+MD5 6e25b72b24f38cccf64fc813fe1fd394 celementtree-1.0.5-r1.ebuild 1035
+RMD160 c355dd7f15de420ff5dc4b2612e13d84e4afe1cf celementtree-1.0.5-r1.ebuild 1035
+SHA256 1cf59fa2108c235b2cdb3e67b5a8bcd228eb4cb4c0b7968970dcd77883bc4597 celementtree-1.0.5-r1.ebuild 1035
 EBUILD celementtree-1.0.5.ebuild 1007 RMD160 2672a656bd51d2e71b5708719c333ed87796afef SHA1 dad8d335745a8a87b92fc534ae7165f46db52e0e SHA256 138cff0a20e12cdc630973f945a0e818ae6c883540f204ddde807eb10a29e49f
 MD5 d5f19028a1e062213ce545fbb3c7e54b celementtree-1.0.5.ebuild 1007
 RMD160 2672a656bd51d2e71b5708719c333ed87796afef celementtree-1.0.5.ebuild 1007
@@ -16,10 +29,10 @@ EBUILD celementtree-1.0.ebuild 779 RMD160 2d1bfe3c60317679abfa11badc4651eea6b2e4
 MD5 b7ef6462120a252d886bfddc70ba8e55 celementtree-1.0.ebuild 779
 RMD160 2d1bfe3c60317679abfa11badc4651eea6b2e47d celementtree-1.0.ebuild 779
 SHA256 5944bf3a681abf3ed92a8039b442a0ef99cf0c24735d532a0bd2aa0fb1df3b80 celementtree-1.0.ebuild 779
-MISC ChangeLog 2193 RMD160 0245098ab40b34d3b98467364b4657111fcea310 SHA1 296bfcea2ff41397c224340fa2767b52bf504196 SHA256 ece3b8394076b87da76ab53109e10e68349e1358cf6f69dd336d268b4ca895b5
-MD5 0cada5c4033a88893ee644d82d4ef8d5 ChangeLog 2193
-RMD160 0245098ab40b34d3b98467364b4657111fcea310 ChangeLog 2193
-SHA256 ece3b8394076b87da76ab53109e10e68349e1358cf6f69dd336d268b4ca895b5 ChangeLog 2193
+MISC ChangeLog 2554 RMD160 53c4d0b2347f75ca914c5cc8b1809a5574c3dfa9 SHA1 b7531b98573566721db7887bd9b654e209e8167c SHA256 a92ee706259ca85d14e32cd1be4439de99c17bcd0e12c0e1b040a5da922b61a2
+MD5 15d0be8c969a8d7d7bcdfc17e4517f78 ChangeLog 2554
+RMD160 53c4d0b2347f75ca914c5cc8b1809a5574c3dfa9 ChangeLog 2554
+SHA256 a92ee706259ca85d14e32cd1be4439de99c17bcd0e12c0e1b040a5da922b61a2 ChangeLog 2554
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb metadata.xml 160
@@ -30,13 +43,12 @@ SHA256 5f49ac6ddb57e69a8ac2044297f31a51f68f4f89b49c23d41faaa9f65b0b4635 files/di
 MD5 46d6a62f6b49281cf7ba0723c2d908fd files/digest-celementtree-1.0.2 280
 RMD160 0ede6879c61337e0840e7f239538e9031c3cd7f0 files/digest-celementtree-1.0.2 280
 SHA256 20772bd285921ce1a6522842aa26252230bdaa2a51051be2e647b494f66c2446 files/digest-celementtree-1.0.2 280
+MD5 46d6a62f6b49281cf7ba0723c2d908fd files/digest-celementtree-1.0.2-r1 280
+RMD160 0ede6879c61337e0840e7f239538e9031c3cd7f0 files/digest-celementtree-1.0.2-r1 280
+SHA256 20772bd285921ce1a6522842aa26252230bdaa2a51051be2e647b494f66c2446 files/digest-celementtree-1.0.2-r1 280
 MD5 a9a2a2b36b51e8bced65285b3f366309 files/digest-celementtree-1.0.5 280
 RMD160 e89cdc2388e78b3fc0acc2e353f7fa3727522a59 files/digest-celementtree-1.0.5 280
 SHA256 ee20dd84fb1e9814d421384117eb4b607a4a665cbb13bccd87338744acdf77e8 files/digest-celementtree-1.0.5 280
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFsAUj2jLqHNfbg2URAq09AJwNnonJL5Mi5sB0Nd/0ey6PZnhsOQCg0sXq
-Nr0YQD0KssF8btmStCX0Wqg=
-=jrGn
------END PGP SIGNATURE-----
+MD5 a9a2a2b36b51e8bced65285b3f366309 files/digest-celementtree-1.0.5-r1 280
+RMD160 e89cdc2388e78b3fc0acc2e353f7fa3727522a59 files/digest-celementtree-1.0.5-r1 280
+SHA256 ee20dd84fb1e9814d421384117eb4b607a4a665cbb13bccd87338744acdf77e8 files/digest-celementtree-1.0.5-r1 280
diff --git a/dev-python/celementtree/celementtree-1.0.2-r1.ebuild b/dev-python/celementtree/celementtree-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..eb2d0fd9186f
--- /dev/null
+++ b/dev-python/celementtree/celementtree-1.0.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celementtree/celementtree-1.0.2-r1.ebuild,v 1.1 2007/07/03 06:41:17 hawking Exp $
+
+inherit eutils distutils
+
+MY_P="cElementTree-${PV}-20050302"
+DESCRIPTION="The cElementTree module is a C implementation of the ElementTree API"
+HOMEPAGE="http://effbot.org/zone/celementtree.htm"
+SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
+
+LICENSE="ElementTree"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+IUSE="doc"
+DEPEND=">=dev-lang/python-2.1.3-r1
+	>=dev-python/elementtree-1.2
+	>=dev-libs/expat-1.95.8"
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-use_system_expat.patch"
+}
+
+src_install() {
+	distutils_src_install
+	if use doc; then
+		insinto /usr/share/doc/${PF}/samples
+		doins samples/*
+		doins selftest.py
+	fi
+}
+
+src_test() {
+	PYTHONPATH="$(ls -d build/lib.*)" "${python}" selftest.py \
+		|| die "tests failed"
+}
diff --git a/dev-python/celementtree/celementtree-1.0.5-r1.ebuild b/dev-python/celementtree/celementtree-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..6466cdf39a86
--- /dev/null
+++ b/dev-python/celementtree/celementtree-1.0.5-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celementtree/celementtree-1.0.5-r1.ebuild,v 1.1 2007/07/03 06:41:17 hawking Exp $
+
+inherit distutils eutils
+
+MY_P="cElementTree-${PV}-20051216"
+DESCRIPTION="The cElementTree module is a C implementation of the ElementTree API"
+HOMEPAGE="http://effbot.org/zone/celementtree.htm"
+SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
+
+LICENSE="ElementTree"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+IUSE="doc"
+DEPEND=">=dev-lang/python-2.1.3-r1
+	>=dev-python/elementtree-1.2
+	>=dev-libs/expat-1.95.8"
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-use_system_expat.patch"
+}
+
+src_install() {
+	distutils_src_install
+	if use doc; then
+		insinto /usr/share/doc/${PF}/samples
+		doins samples/*
+		doins selftest.py
+	fi
+}
+
+src_test() {
+	PYTHONPATH="$(ls -d build/lib.*)" "${python}" selftest.py \
+		|| die "tests failed"
+}
diff --git a/dev-python/celementtree/files/celementtree-1.0.2-use_system_expat.patch b/dev-python/celementtree/files/celementtree-1.0.2-use_system_expat.patch
new file mode 100644
index 000000000000..d6e067009a82
--- /dev/null
+++ b/dev-python/celementtree/files/celementtree-1.0.2-use_system_expat.patch
@@ -0,0 +1,43 @@
+diff -u a/selftest.py b/selftest.py
+--- a/selftest.py	2005-03-25 11:48:38.000000000 +0200
++++ b/selftest.py	2007-07-03 08:24:58.000000000 +0300
+@@ -176,8 +176,6 @@
+     </ns0:root>
+ 
+     >>> parser = ElementTree.XMLParser()
+-    >>> parser.version
+-    'Expat 1.95.8'
+     >>> parser.feed(open("samples/simple.xml").read())
+     >>> print serialize(parser.close())
+     <root>
+diff -u a/setup.py b/setup.py
+--- a/setup.py	2005-03-25 11:48:38.000000000 +0200
++++ b/setup.py	2007-07-03 08:25:54.000000000 +0300
+@@ -23,15 +23,6 @@
+ # --------------------------------------------------------------------
+ # expat library
+ 
+-sources = [
+-    "expat/xmlparse.c",
+-    "expat/xmlrole.c",
+-    "expat/xmltok.c",
+-    ]
+-
+-includes = [
+-    "expat",
+-    ]
+ 
+ defines = [
+     ("XML_STATIC", None),
+@@ -60,9 +51,9 @@
+ # distutils declarations
+ 
+ celementtree_module = Extension(
+-    "cElementTree", ["cElementTree.c"] + sources,
++    "cElementTree", ["cElementTree.c"],
+     define_macros=defines,
+-    include_dirs=includes,
++    libraries=['expat'],
+     )
+ 
+ try:
diff --git a/dev-python/celementtree/files/celementtree-1.0.5-use_system_expat.patch b/dev-python/celementtree/files/celementtree-1.0.5-use_system_expat.patch
new file mode 100644
index 000000000000..fb90e59a4492
--- /dev/null
+++ b/dev-python/celementtree/files/celementtree-1.0.5-use_system_expat.patch
@@ -0,0 +1,44 @@
+diff -u a/selftest.py b/selftest.py
+--- a/selftest.py	2005-12-16 23:57:47.000000000 +0200
++++ b/selftest.py	2007-07-03 08:07:45.000000000 +0300
+@@ -176,8 +176,6 @@
+     </ns0:root>
+ 
+     >>> parser = ElementTree.XMLParser()
+-    >>> parser.version
+-    'Expat 1.95.8'
+     >>> parser.feed(open("samples/simple.xml").read())
+     >>> print serialize(parser.close())
+     <root>
+diff -u a/setup.py b/setup.py
+--- a/setup.py	2005-12-16 23:57:47.000000000 +0200
++++ b/setup.py	2007-07-03 08:00:57.000000000 +0300
+@@ -23,16 +23,6 @@
+ # --------------------------------------------------------------------
+ # expat library
+ 
+-sources = [
+-    "expat/xmlparse.c",
+-    "expat/xmlrole.c",
+-    "expat/xmltok.c",
+-    ]
+-
+-includes = [
+-    "expat",
+-    ]
+-
+ defines = [
+     ("XML_STATIC", None),
+     ]
+@@ -63,9 +53,9 @@
+ 
+ ext_modules.append(
+     Extension(
+-        "cElementTree", ["cElementTree.c"] + sources,
++        "cElementTree", ["cElementTree.c"],
+         define_macros=defines,
+-        include_dirs=includes,
++        libraries=['expat'],
+         )
+     )
+ 
diff --git a/dev-python/celementtree/files/digest-celementtree-1.0.2-r1 b/dev-python/celementtree/files/digest-celementtree-1.0.2-r1
new file mode 100644
index 000000000000..cdf3956f29bb
--- /dev/null
+++ b/dev-python/celementtree/files/digest-celementtree-1.0.2-r1
@@ -0,0 +1,3 @@
+MD5 70372441ffa9e45233876b024bf66bbe cElementTree-1.0.2-20050302.tar.gz 91541
+RMD160 7097c5c7a8eb3829e03bbd8002a73a356e41b9ec cElementTree-1.0.2-20050302.tar.gz 91541
+SHA256 7629df1dd79a400e1e2c9ee27456527bc0ee7773f7acdcab988a2d0be58f7154 cElementTree-1.0.2-20050302.tar.gz 91541
diff --git a/dev-python/celementtree/files/digest-celementtree-1.0.5-r1 b/dev-python/celementtree/files/digest-celementtree-1.0.5-r1
new file mode 100644
index 000000000000..43916b188b32
--- /dev/null
+++ b/dev-python/celementtree/files/digest-celementtree-1.0.5-r1
@@ -0,0 +1,3 @@
+MD5 b6896e742e39f594046b07e58f1d25fe cElementTree-1.0.5-20051216.tar.gz 93766
+RMD160 e079d10507bd4819b2ce4771b53671c2d9ac2418 cElementTree-1.0.5-20051216.tar.gz 93766
+SHA256 b2e528c99837124b32598bde7a19da579203c600d71f22f4c84da0933ba09751 cElementTree-1.0.5-20051216.tar.gz 93766