Use Python 2 and fix deprecation warnings (bug #312219).

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/dev-tex/crosstex/ChangeLog b/dev-tex/crosstex/ChangeLog
index ea750e2565e17c8d14503ca80e3afae1d1eebecd..c62b04043b900cc0506054b7ac65f221fb9ac422 100644 (file)
--- a/dev-tex/crosstex/ChangeLog
+++ b/dev-tex/crosstex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tex/crosstex
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/crosstex/ChangeLog,v 1.5 2008/10/16 22:03:07 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/crosstex/ChangeLog,v 1.6 2010/06/12 20:25:13 arfrever Exp $
+
+  12 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  crosstex-0.6.ebuild:
+  Use Python 2 and fix deprecation warnings (bug #312219).
 
   16 Oct 2008; Alexis Ballier <aballier@gentoo.org> -crosstex-0.5.6.ebuild:
   remove old

diff --git a/dev-tex/crosstex/Manifest b/dev-tex/crosstex/Manifest
index bdb402b57d50ea30d5e47311789be5b9f3002be6..bc62190f1b056d213049df9cca11efab98468b58 100644 (file)
--- a/dev-tex/crosstex/Manifest
+++ b/dev-tex/crosstex/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST crosstex-0.6.tar.gz 2366411 RMD160 8dc49c06d1987117c7bf7022991dd919b7ee6a5d SHA1 a61f0cbaf5087cd95b8b5d9f03b8093b2b169888 SHA256 86a52ca110848faa66ec3cf0ef851b3591bbac46b50fee3d63399df493957473
-EBUILD crosstex-0.6.ebuild 1000 RMD160 409333196dff5b2867567a9a57cc6d89a2edfc25 SHA1 d6fea0197893cd43d6a74d79d63c7d6d7268cf2d SHA256 80ab0540a67e491f8172c9f977fabca1e000c6c929ee59d6e9cfed7848103973
-MISC ChangeLog 904 RMD160 b743c37c98a08f45432f17c0627626e1e8813c1b SHA1 50ead4f33020645ba257001e46aa9a414f2fdb85 SHA256 d1c207c1b514cebf3c0290e2a3de891adcc991cc3c1648de1ef4cb88389d3b14
+EBUILD crosstex-0.6.ebuild 1091 RMD160 4ef907ba8a01cccfbe27a48a6304319f089ee74b SHA1 b67e26007e5a0b0e0bbe6631a897e60a37e5ba17 SHA256 984e70ed82d199076f6d42b71fbfaa8387929e157095bec4d87d81dcf764a0b3
+MISC ChangeLog 1060 RMD160 efe3248c5e62d726077a6442c0814de72510fd4e SHA1 50e65352d342ad225d1ccb4e8779ccf5a75601bf SHA256 5c1ba669fa06c26a1648b9d0a8763b74571ae9bfbbd9e8465c06515b2270ce84
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkj3uiIACgkQvFcC4BYPU0ozmgCfUYK9zns9hVGetsnOZlYaj0eG
-WpwAmgIWimx27QqZZ7TVA8/v9PkH/PTr
-=ljfu
------END PGP SIGNATURE-----

diff --git a/dev-tex/crosstex/crosstex-0.6.ebuild b/dev-tex/crosstex/crosstex-0.6.ebuild
index c2e8a25363db51c261dc38bde431de493c00735f..7ee68a3b305cc73763b9f92e822ad97e72709031 100644 (file)
--- a/dev-tex/crosstex/crosstex-0.6.ebuild
+++ b/dev-tex/crosstex/crosstex-0.6.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/crosstex/crosstex-0.6.ebuild,v 1.1 2008/08/07 22:41:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/crosstex/crosstex-0.6.ebuild,v 1.2 2010/06/12 20:25:13 arfrever Exp $
 
-inherit python
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit multilib python
 
 DESCRIPTION="CrossTeX - object oriented BibTeX replacement"
 HOMEPAGE="http://www.cs.cornell.edu/people/egs/crosstex/"
@@ -13,19 +16,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
-RDEPEND="dev-lang/python
-       dev-python/ply"
+RDEPEND="dev-python/ply"
 DEPEND="${RDEPEND}"
 
-src_install() {
-       python_version
+pkg_setup() {
+       python_set_active_version 2
+       python_pkg_setup
+}
 
-       cd "${S}"
+src_install() {
        emake \
                ROOT="${D}" \
                PREFIX="/usr" \
-               LIBDIR="/$(get_libdir)/python${PYVER}/site-packages" \
-               install || die "make install failed"
+               LIBDIR="/$(get_libdir)/python$(python_get_version)/site-packages" \
+               install || die "emake install failed"
+
+       python_convert_shebangs -r $(python_get_version) "${D}"
+       python_need_rebuild
 
        insinto /usr/share/doc/${PF}
        doins "${PN}".pdf
@@ -36,10 +43,9 @@ src_install() {
 }
 
 pkg_postinst() {
-       python_version
-       python_mod_optimize     /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+       python_mod_optimize ${PN}
 }
 
 pkg_postrm() {
-       python_mod_cleanup
+       python_mod_cleanup ${PN}
 }