summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-05-08 16:08:39 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-05-08 16:08:39 +0000
commit7b53cbee39834bfbfc489c0abc6dc41f65928fe7 (patch)
treeadf7552929c47795de543edcfda4c5f46eba0fb7 /dev-python/4suite
parent[sys-cluster/glusterfs] Version bump per bug #311467 (diff)
downloadhistorical-7b53cbee39834bfbfc489c0abc6dc41f65928fe7.tar.gz
historical-7b53cbee39834bfbfc489c0abc6dc41f65928fe7.tar.bz2
historical-7b53cbee39834bfbfc489c0abc6dc41f65928fe7.zip
Improve handling of package versions with '+' character.
Package-Manager: portage-HEAD/cvs/Linux x86_64
Diffstat (limited to 'dev-python/4suite')
-rw-r--r--dev-python/4suite/4suite-1.0.2-r1.ebuild12
-rw-r--r--dev-python/4suite/Manifest2
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-python/4suite/4suite-1.0.2-r1.ebuild b/dev-python/4suite/4suite-1.0.2-r1.ebuild
index 9845d880d2e3..269ed69bae8e 100644
--- a/dev-python/4suite/4suite-1.0.2-r1.ebuild
+++ b/dev-python/4suite/4suite-1.0.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/4suite/4suite-1.0.2-r1.ebuild,v 1.8 2009/09/23 17:51:25 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/4suite/4suite-1.0.2-r1.ebuild,v 1.9 2010/05/08 16:08:39 arfrever Exp $
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
inherit distutils eutils
@@ -30,6 +31,9 @@ src_prepare() {
epatch "${FILESDIR}/${P}-amd64_python2.5.patch"
epatch "${FILESDIR}/${P}-config.patch"
+ # Improve handling of package versions with '+' character.
+ sed -e $'/self._original = vstring/a\\\n vstring = vstring.rstrip(\'+\')' -i Ft/Lib/DistExt/Version.py || die "sed failed"
+
if ! use doc; then
sed -e "/'build_docs'/d" -i Ft/Lib/DistExt/Build.py || die "sed failed"
fi
@@ -50,5 +54,5 @@ src_configure() {
src_install() {
rm -fr profile test
distutils_src_install $(use_with doc docs)
- rm -fr "${D}"usr/$(get_libdir)/python*/site-packages/{profiles,tests}
+ rm -fr "${ED}"usr/$(get_libdir)/python*/site-packages/{profiles,tests}
}
diff --git a/dev-python/4suite/Manifest b/dev-python/4suite/Manifest
index 8d1291d7bf89..bc8eddd9695d 100644
--- a/dev-python/4suite/Manifest
+++ b/dev-python/4suite/Manifest
@@ -1,6 +1,6 @@
AUX 4suite-1.0.2-amd64_python2.5.patch 659 RMD160 0edb4506c5152b6c13c24885bc9a5f0a8e0c68bb SHA1 3d1bf97de8986f405fa4059c9439b239929c9815 SHA256 a6b5120f36cd3d533e29f3460a9809f2d9cdf97b8b03bdad99c53ee936e9eb64
AUX 4suite-1.0.2-config.patch 653 RMD160 e90ab21bbcdd208250a69e1fc36f04d2c58f5c30 SHA1 390a883802c16e431890b767ec16b1351308d8c7 SHA256 8969a49f94f961f0692f33d49d432c03ac8351fa46cd7bb8c98adb252069c349
DIST 4Suite-XML-1.0.2.tar.bz2 1286713 RMD160 710de215ac110745a36ab4fec7d718cbcab45bd6 SHA1 d8799b093c4853860c8d7cb9ffccd28adf17b928 SHA256 5a4546dc1fad9b240a46c1b967fae317857cd2d2689e4226de1647083bf6ac3c
-EBUILD 4suite-1.0.2-r1.ebuild 1380 RMD160 3c5dc6b67c26cdfaab1ef3592f08cd5404bd60e8 SHA1 7ab8b61fb9637903d1885768c7d95ac67d5d9d08 SHA256 07e9187e3930b7d8b77d641ca0b3939bfcf65984b00765bd0d505172e553a538
+EBUILD 4suite-1.0.2-r1.ebuild 1591 RMD160 12687834f1d097aceec59fd7c48556c2ea38f910 SHA1 b37a9fc2d3f43b4f7a407b5e5048fe8d1f8abb5d SHA256 d9222cfd6754a0fed423ac9b46997f4bf41946a3b42fbb312869e55ff52ff406
MISC ChangeLog 6623 RMD160 64e2df972e22da8764c799914fd72ae7b7e641fb SHA1 b7fddcc674bdc8b971992cc912ebf9f2401ca1fc SHA256 0226b0ada17c08f96c8098973e1c58c974fc7b949612252e78c4a799b6dc9258
MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4