Use Python 2 (bug #315873). Delete call to deprecated python_version().

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

diff --git a/net-print/pykota/ChangeLog b/net-print/pykota/ChangeLog
index 1cf0036a55d9216b463d792a499b48e639dbd0d9..370e3a643da3d126dfa83167ed9dd7a161163298 100644 (file)
--- a/net-print/pykota/ChangeLog
+++ b/net-print/pykota/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/pykota
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/ChangeLog,v 1.24 2008/05/21 19:00:41 dev-zero Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/ChangeLog,v 1.25 2010/06/04 19:57:02 arfrever Exp $
+
+  04 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pykota-1.25_p2437-r1.ebuild:
+  Use Python 2 (bug #315873). Delete call to deprecated python_version().
 
   21 May 2008; Tiziano Müller <dev-zero@gentoo.org>
   pykota-1.25_p2437-r1.ebuild:

diff --git a/net-print/pykota/Manifest b/net-print/pykota/Manifest
index de8f8816c50792cf374bb012cd84ac74fbca8498..4d7e95ae8fe0fe1852f1ae50663b05c62c8e9897 100644 (file)
--- a/net-print/pykota/Manifest
+++ b/net-print/pykota/Manifest
@@ -1,4 +1,4 @@
 DIST pykota-1.25_p2437.tar.bz2 1704330 RMD160 f11e46433bca09381018c301dd27e5e94672002b SHA1 db2fb846c6f6956a6766f783025f5a88b7f6d199 SHA256 b0d26ecaa2a0eaece67eb1040b0adcf4ab44f7a0d76380af20d4936afe7f7927
-EBUILD pykota-1.25_p2437-r1.ebuild 1761 RMD160 8dfb3fe766dde0b1bf677b914422f967ac9ff044 SHA1 9fb437cdc9ea86b5aabb66d9f4775937ef40fe23 SHA256 a2c59d98e6eac22cb6fc49e4910b062e2719833a015297ffb6af9dbfb5366468
-MISC ChangeLog 4532 RMD160 4058ecc5d76c22050da9960811b412833c22a057 SHA1 7acb0f842dc12e52f286944e90de204aec5a9b04 SHA256 30e5ae964c23d862c94c7948a90e7903649ecc10b69953f0595d47b2db40afed
+EBUILD pykota-1.25_p2437-r1.ebuild 1823 RMD160 81a586dd85a3946dcb1ed31b2b549d5ee99fd388 SHA1 c6399f634899bbbb838b8c74f4b5c7445f10581d SHA256 1f6ccf80684d58691fe1def89a0b6361703b775f9685312bcc0583eabef718cb
+MISC ChangeLog 4711 RMD160 b2269b9b45acd7929fd18301271f2a46ac265e73 SHA1 5befe3c9e3a6a70dfe64bb77364e764761586bbf SHA256 f4e756da95fc018de55f53e1cd03f188449541de3d8912436742efbb292d977e
 MISC metadata.xml 427 RMD160 14e37f92bd061a0656aedf02bf73e86de573390d SHA1 af1a789a217fdf9918a334ddf3539eebc6373763 SHA256 0ba8afd5307d6a4e5aeb0ae19d754460edcd913dd632632721de2e93cf79043d

diff --git a/net-print/pykota/pykota-1.25_p2437-r1.ebuild b/net-print/pykota/pykota-1.25_p2437-r1.ebuild
index fb60e4a6915e72d5fb0799b5c5a8bd6ac3a90883..8ca86c92d66ec821e5c937b163c987c225d0bd7f 100644 (file)
--- a/net-print/pykota/pykota-1.25_p2437-r1.ebuild
+++ b/net-print/pykota/pykota-1.25_p2437-r1.ebuild
@@ -1,17 +1,19 @@
-# 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/net-print/pykota/pykota-1.25_p2437-r1.ebuild,v 1.3 2009/11/29 13:51:00 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/pykota-1.25_p2437-r1.ebuild,v 1.4 2010/06/04 19:57:02 arfrever Exp $
 
-S=${WORKDIR}/${PN}
+EAPI="3"
+PYTHON_DEPEND="2"
 
-inherit python eutils distutils
+inherit distutils
 
-DESCRIPTION="Flexible print quota and accounting package for use with CUPS and
-lpd."
-SRC_URI="http://scriptkitty.com/files/${P}.tar.bz2"
+DESCRIPTION="Flexible print quota and accounting package for use with CUPS and lpd."
 HOMEPAGE="http://www.pykota.com"
-LICENSE="GPL-2"
+SRC_URI="http://scriptkitty.com/files/${P}.tar.bz2"
 
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="ldap mysql postgres snmp sqlite snmp xml"
 
 DEPEND="dev-lang/python
@@ -25,17 +27,19 @@ DEPEND="dev-lang/python
        sqlite?   ( =dev-python/pysqlite-2* )
        snmp?     ( net-analyzer/net-snmp =dev-python/pysnmp-3.4* )
        xml?      ( dev-python/jaxml )"
-
 RDEPEND="${DEPEND}"
 
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
+S="${WORKDIR}/${PN}"
 
 DOCS="README MANIFEST.in TODO SECURITY NEWS CREDITS FAQ"
 
+pkg_setup() {
+       python_set_active_version 2
+       python_pkg_setup
+}
+
 src_install() {
        mkdir -p "${D}"/etc/${PN}
-       python_version
        distutils_src_install
        #cups backend ----------------------------------------------
        mkdir -p "${D}"$(cups-config --serverbin)/backend