Fix collision with dev-python/docutils (bug #247424).

Set Python 2 as active version of Python.
Package-Manager: portage-15841-svn/cvs/Linux x86_64

3 files changed, 40 insertions, 27 deletions

diff --git a/app-text/pylize/ChangeLog b/app-text/pylize/ChangeLog
index 81344693956d..068804f2f419 100644
--- a/app-text/pylize/ChangeLog
+++ b/app-text/pylize/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/pylize
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pylize/ChangeLog,v 1.12 2010/01/17 13:44:51 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pylize/ChangeLog,v 1.13 2010/03/29 20:50:03 arfrever Exp $
+
+  29 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pylize-1.3b.ebuild:
+  Fix collision with dev-python/docutils (bug #247424). Set Python 2 as
+  active version of Python.
 
   17 Jan 2010; Christian Faulhammer <fauli@gentoo.org> pylize-1.3b.ebuild:
   stable x86, bug 299383
diff --git a/app-text/pylize/Manifest b/app-text/pylize/Manifest
index 560e5672b1f6..627b5c080594 100644
--- a/app-text/pylize/Manifest
+++ b/app-text/pylize/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST pylize-1.1b.tar.bz2 52914 RMD160 1f3ba59f108de2fc895a2ea5c878da9398ec9ad5 SHA1 54f521d78dc94ae8693a1530c9f5783d64193434 SHA256 15760624f30f14580b8d6ece25e780ce5831b7b22dd28c8b232a83e148f0ca9f
 DIST pylize-1.3b.tar.bz2 70979 RMD160 a6f6b686fadcac6b38af916cc0b2f634d3591ff1 SHA1 2c821fd813d2d4222c5173befc56f9f3ff3f5b45 SHA256 8de876e2581a556e23d538b3ed5b970929a51c236b24c1fd5161c26c8c42bb44
-EBUILD pylize-1.1b.ebuild 1033 RMD160 21a13a31d0255d9afd2a63e8e0381a770b245eab SHA1 0bdaca131823e58cfad25c06add2a7206d422065 SHA256 56ae015e879ba4fa932fdc5e35285a401583a9cc7627652a37773efebd88c7a3
-EBUILD pylize-1.3b.ebuild 889 RMD160 2436f2cc22cce3f7667dfd381b9fd6fe4a582c23 SHA1 150ddf46c5ccf183c408c86d05302e814692624f SHA256 d21027ebe9afc0948df17d8601c38e00d0f1f3fb55c3d6be3a2c13ddba68e857
-MISC ChangeLog 1380 RMD160 e98821b32a9d63163037332d7213b46167ab1f3e SHA1 0ef59c7cd1027ed05899149843dd056b4c00ad1d SHA256 07d3fb27ba18656b3c6cb5cc3ae6b38ed58c96f15dc9b95c0130248ba7ec315c
+EBUILD pylize-1.3b.ebuild 1343 RMD160 ce1adb3e6113aa834249aa1b431e787194c5dbe5 SHA1 bf0461c16fc30fa503696c7b2a7293f19222ea72 SHA256 fbdf8d6660f5befdd5c43bba3ed465b0f75f95e43c9a80dc332f3d0e68548b4a
+MISC ChangeLog 1579 RMD160 4444d49aa52a6f4a673d8ed60350d311a597e8ae SHA1 2b0ec6e5aaf1e970468511dc4fcce398ea02afbd SHA256 c8dab4d68969379cd5099a5f1a511f5b677733240dcd508166b2b7260ef5f5cb
 MISC metadata.xml 536 RMD160 b4334b0bba4130253c62161294957caaf8b46579 SHA1 2f2b3281c3abc0600e6593a51f5fcb31747fddd4 SHA256 8c9933d9f6a4cd262ef6ad324eac510a3a374af22cb6b2ff01a06eb05a92b2c0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktTFFkACgkQNQqtfCuFnePWuQCgjmEpg3RBO0MjCQ2fsbsdefYm
-8B8An3idWFMsW8QhNjvXn2z2Jw3xDWLm
-=dijW
------END PGP SIGNATURE-----
diff --git a/app-text/pylize/pylize-1.3b.ebuild b/app-text/pylize/pylize-1.3b.ebuild
index 494d5d0d3f98..e137a41bae5b 100644
--- a/app-text/pylize/pylize-1.3b.ebuild
+++ b/app-text/pylize/pylize-1.3b.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pylize/pylize-1.3b.ebuild,v 1.3 2010/01/17 13:44:51 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pylize/pylize-1.3b.ebuild,v 1.4 2010/03/29 20:50:03 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit python
 
@@ -11,25 +14,42 @@ SRC_URI="http://www.chrisarndt.de/en/software/pylize/download/${P}.tar.bz2"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc x86"
+KEYWORDS="~amd64 ppc x86"
 
-DEPEND="virtual/python
-	dev-python/empy
+DEPEND="dev-python/empy
 	dev-python/imaging"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python_set_active_version 2
+}
 
 src_compile() {
-	einfo "no need to compile"
+	:
 }
 
 src_install() {
-	python install.py ${D}/usr || die
+	"$(PYTHON)" install.py "${ED}usr" || die "Installation failed"
+
+	# Fix paths in pylize.
+	sed \
+		-e "s:^sys_libdir.*:sys_libdir = \'/usr/share/pylize\':" \
+		-e "s:sys.path.insert(0, sys_libdir):sys.path.remove('/usr/bin'):" \
+		-e "s:from roman import dec2roman:from pylize_roman import dec2roman:" \
+		-i "${ED}usr/bin/pylize" || die "sed failed"
 
-	# Fix Data dir in code
-	sed -e "s:^sys_libdir.*:sys_libdir = \'/usr/share/pylize\':" -i ${D}/usr/bin/pylize
+	# Rename roman.py to pylize_roman.py to avoid collision.
+	rm -f "${ED}usr/share/pylize/roman.py"
+	insinto $(python_get_sitedir)
+	newins lib/roman.py pylize_roman.py
 
-	python_version
-	insinto /usr/lib/python${PYVER}/site-packages
-	doins lib/roman.py
+	dodoc Changelog README README.empy TODO
+}
+
+pkg_postinst() {
+	python_mod_optimize pylize_roman.py
+}
 
-	dodoc COPYING Changelog README README.empy TODO
+pkg_postrm() {
+	python_mod_cleanup pylize_roman.py
 }