Version bump. Closes bug #250999. Thanks to Nanikata for the patch. Changes to 0.8.4 to fix ebuild.minorsyn

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.27-gentoo-r7 i686

5 files changed, 109 insertions, 11 deletions

diff --git a/dev-python/pyxml/ChangeLog b/dev-python/pyxml/ChangeLog
index 15e365468de2..b702597eeee9 100644
--- a/dev-python/pyxml/ChangeLog
+++ b/dev-python/pyxml/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/pyxml
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/ChangeLog,v 1.48 2008/12/27 18:31:28 neurogeek Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/ChangeLog,v 1.49 2009/03/04 19:46:54 neurogeek Exp $
+
+*pyxml-0.8.4-r2 (04 Mar 2009)
+
+  04 Mar 2009; Jesus Rivero <neurogeek@gentoo.org>
+  +files/pyxml-0.8.4-python-2.6.patch, pyxml-0.8.4.ebuild,
+  +pyxml-0.8.4-r2.ebuild:
+  Version bump. Closes bug #250999. Thanks to Nanikata for the patch.
+  Changes to 0.8.4 to fix ebuild.minorsyn
 
   27 Dec 2008; Jesus Rivero <neurogeek@gentoo.org> pyxml-0.8.4-r1.ebuild:
   Added python_mod_optimize to postinstall phase
diff --git a/dev-python/pyxml/Manifest b/dev-python/pyxml/Manifest
index f0d40480e235..748645a4561e 100644
--- a/dev-python/pyxml/Manifest
+++ b/dev-python/pyxml/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pyxml-0.8.4-python-2.6.patch 1749 RMD160 f8eb2f581a953e8a2b2968cea9a88fe5a1353243 SHA1 787a92081dd172aa36d5c52344e74ef922073bc0 SHA256 03c4eb073c58e7c28a22ff702a296ba4c4fe11a64d931ada6216d1876c6118e8
 DIST PyXML-0.8.4.tar.gz 734954 RMD160 976e618d99fb29840e36eb2c7662c1d0a1f2bca9 SHA1 6f30d5907b75ef76809c19e0103d78f4a5fb027c SHA256 9fab66f9584fb8e67aebd8745a5c97bf1c5a2e2e461adf68862bcec64e448c13
 EBUILD pyxml-0.8.4-r1.ebuild 1367 RMD160 d1d9d3d38debf6edd8d5e90e55ba5925b7f03a0c SHA1 16e147dbde08b34bedebbc9b64ca21f6c28f7f2b SHA256 e7bd4162771d7ac8bafc6806f5c2fdca509243a8ede521f3fd562e8cdd5a1e2f
-EBUILD pyxml-0.8.4.ebuild 1120 RMD160 7a475be334f1c1b995f9f4b9fcf20481c73b73cd SHA1 fd4cf5779aad66a06777691f689a484fc8d3a8c8 SHA256 62d1234c641e60f207d3c41dc8efcc562e787cc5e0204f8cc6bb107b056bdbc5
-MISC ChangeLog 7326 RMD160 cf865d3b4907803a60a5139b6ffe2aa2a969cfb9 SHA1 4f4c356fa0682a0913c1d04a323eec1d8b58d0ff SHA256 bdf324fb36e32048acb9007dd5c437e53e7108a37d0634f6c4d64b2a04ae9ae8
+EBUILD pyxml-0.8.4-r2.ebuild 1452 RMD160 a102276076bb634131b235a1fd3d034b43203ae8 SHA1 14fb824a83dd0f48c4040c62130cbc78bf430d5c SHA256 3386c012338c4fbf0c6c9bb4473c8ee0d2364af1d0320d7694179b82b0bd5e69
+EBUILD pyxml-0.8.4.ebuild 1126 RMD160 0775db2e85e75fddc27d1ca554de436093dfdd2f SHA1 f4cf89b9fb93e2f145d5d8ad3566b14004add337 SHA256 3a9c1966133cc4166469b27791f2094efaf737d3e914a6615faf0334ecc7971b
+MISC ChangeLog 7606 RMD160 9a816e1e9ec206fc773ea72cd29481a146a16b8d SHA1 b6ec2070b2a0b308d7b63839103b8a480f7afe26 SHA256 1e8d67b2aee655089663c8a0330a0fbfacbd40bc240f134664281281ed431ade
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklWdIgACgkQdIssYB9vBoPtlQCcD19fb2b4cbhm8nHsQcRHyJct
-BW4An0XI4YLlcD/m6FKHT0pcSbwr5fd5
-=akqb
+iEYEARECAAYFAkmu2tcACgkQdIssYB9vBoOJFgCfdJ4yj0cQaEHCYhi6iwq+ALlN
+HCMAnid/YWzCHS8MA1HpgJF35Pwoh1ro
+=pD1j
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyxml/files/pyxml-0.8.4-python-2.6.patch b/dev-python/pyxml/files/pyxml-0.8.4-python-2.6.patch
new file mode 100644
index 000000000000..d29b0b6a9eb2
--- /dev/null
+++ b/dev-python/pyxml/files/pyxml-0.8.4-python-2.6.patch
@@ -0,0 +1,28 @@
+diff -rupN PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py
+--- PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	2008-12-15 16:54:36.000000000 +0900
++++ PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	2008-12-15 16:57:02.000000000 +0900
+@@ -24,8 +24,8 @@ class ParsedAbbreviatedAbsoluteLocationP
+         self._rel = rel
+         nt = ParsedNodeTest.ParsedNodeTest('node', '')
+         ppl = ParsedPredicateList.ParsedPredicateList([])
+-        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
+-        self._step = ParsedStep.ParsedStep(as, nt, ppl)
++        as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
++        self._step = ParsedStep.ParsedStep(as_, nt, ppl)
+         return
+ 
+     def evaluate(self, context):
+diff -rupN PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py
+--- PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py	2008-12-15 16:54:36.000000000 +0900
++++ PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py	2008-12-15 16:58:58.000000000 +0900
+@@ -28,8 +28,8 @@ class ParsedAbbreviatedRelativeLocationP
+         self._right = right
+         nt = ParsedNodeTest.ParsedNodeTest('node','')
+         ppl = ParsedPredicateList.ParsedPredicateList([])
+-        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
+-        self._middle = ParsedStep.ParsedStep(as, nt, ppl)
++        as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
++        self._middle = ParsedStep.ParsedStep(as_, nt, ppl)
+ 
+     def evaluate(self, context):
+         res = []
diff --git a/dev-python/pyxml/pyxml-0.8.4-r2.ebuild b/dev-python/pyxml/pyxml-0.8.4-r2.ebuild
new file mode 100644
index 000000000000..0ff6cf6fcf5e
--- /dev/null
+++ b/dev-python/pyxml/pyxml-0.8.4-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r2.ebuild,v 1.1 2009/03/04 19:46:54 neurogeek Exp $
+
+inherit distutils
+
+MY_P=${P/pyxml/PyXML}
+
+DESCRIPTION="A collection of libraries to process XML with Python"
+HOMEPAGE="http://pyxml.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples"
+
+DEPEND=">=dev-libs/expat-1.95.6"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack(){
+	distutils_src_unpack
+	epatch "${FILESDIR}"/${P}-python-2.6.patch
+}
+
+src_compile() {
+	local myconf
+
+	# if you want to use 4Suite, then their XSLT/XPATH is
+	# better according to the docs
+	if has_version "dev-python/4suite"; then
+		myconf="--without-xslt --without-xpath"
+	fi
+
+	# use the already-installed shared copy of libexpat
+	distutils_src_compile --with-libexpat=/usr ${myconf}
+}
+
+src_install() {
+	DOCS="ANNOUNCE CREDITS doc/*.txt"
+	distutils_src_install
+
+	doman doc/man/*
+	if use doc; then
+		dohtml -A api,web -r doc/*
+		insinto /usr/share/doc/${PF} && doins doc/*.tex
+	fi
+	use examples && cp -r demo "${D}"/usr/share/doc/${PF}
+}
+
+pkg_postinst(){
+	python_mod_optimize "$(python_get_sitedir)/_xmlplus"
+}
+
+src_test() {
+	cd test
+	PYTHONPATH="$(ls -d ../build/lib.*)" "${python}" regrtest.py \
+		|| die "tests failed"
+}
diff --git a/dev-python/pyxml/pyxml-0.8.4.ebuild b/dev-python/pyxml/pyxml-0.8.4.ebuild
index 47c539d27826..a9deb8a48b71 100644
--- a/dev-python/pyxml/pyxml-0.8.4.ebuild
+++ b/dev-python/pyxml/pyxml-0.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.4.ebuild,v 1.16 2007/07/03 07:46:12 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.4.ebuild,v 1.17 2009/03/04 19:46:54 neurogeek Exp $
 
 inherit python distutils
 
@@ -39,6 +39,6 @@ src_install() {
 	doman doc/man/*
 	dohtml -A api,web -r doc/*
 	insinto /usr/share/doc/${PF} && doins doc/*.tex
-	cp -r demo ${D}/usr/share/doc/${PF}
-	dodir /usr/share/${PN} && cp -r test ${D}/usr/share/${PN}
+	cp -r demo "${D}/usr/share/doc/${PF}"
+	dodir /usr/share/${PN} && cp -r test "${D}/usr/share/${PN}"
 }