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

(Portage version: 2.1.3_rc6)

7 files changed, 185 insertions, 1 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/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