summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-03-30 23:03:35 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-03-30 23:03:35 +0000
commit61c74f66157d2239619305f925556fe5e870a251 (patch)
tree527aa5d61b5fea977f2e5b946fd37a517f0313e0 /app-cdr
parentrename jpilot-Mail to jpilot-mail (diff)
downloadgentoo-2-61c74f66157d2239619305f925556fe5e870a251.tar.gz
gentoo-2-61c74f66157d2239619305f925556fe5e870a251.tar.bz2
gentoo-2-61c74f66157d2239619305f925556fe5e870a251.zip
Use Python 2 (bug #308325).
(Portage version: 2.2.0_alpha29_p4/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/gtkcdlabel/ChangeLog8
-rw-r--r--app-cdr/gtkcdlabel/gtkcdlabel-1.12.ebuild21
-rw-r--r--app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild20
3 files changed, 35 insertions, 14 deletions
diff --git a/app-cdr/gtkcdlabel/ChangeLog b/app-cdr/gtkcdlabel/ChangeLog
index e3294cf1cbda..bb449728d8ec 100644
--- a/app-cdr/gtkcdlabel/ChangeLog
+++ b/app-cdr/gtkcdlabel/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-cdr/gtkcdlabel
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/ChangeLog,v 1.37 2009/04/30 18:06:18 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/ChangeLog,v 1.38 2011/03/30 23:03:34 arfrever Exp $
+
+ 30 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ gtkcdlabel-1.12.ebuild, gtkcdlabel-1.14.ebuild:
+ Use Python 2 (bug #308325).
*gtkcdlabel-1.14 (30 Apr 2009)
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-1.12.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.12.ebuild
index 355f8c6a252f..6cfa33205b25 100644
--- a/app-cdr/gtkcdlabel/gtkcdlabel-1.12.ebuild
+++ b/app-cdr/gtkcdlabel/gtkcdlabel-1.12.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.12.ebuild,v 1.5 2008/07/27 16:13:12 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.12.ebuild,v 1.6 2011/03/30 23:03:35 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+
+inherit python
DESCRIPTION="a GUI frontend to cdlabelgen which is a program that can generate a variety of CD tray covers."
HOMEPAGE="http://gtkcdlabel.sourceforge.net"
@@ -11,13 +16,17 @@ SLOT="0"
KEYWORDS="amd64 ppc sparc x86"
IUSE=""
-DEPEND=">=dev-lang/python-2.5
- >=app-cdr/cdlabelgen-3
+DEPEND=">=app-cdr/cdlabelgen-3
dev-python/pygtk"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ python_convert_shebangs -r 2 .
+}
src_install() {
- dobin usr/bin/${PN}.py || die "dobin failed."
+ newbin usr/bin/${PN}.py ${PN} || die "dobin failed"
insinto /usr/share
- doins -r usr/share/{applications,${PN},pixmaps} || die "doins failed."
+ doins -r usr/share/{applications,${PN},pixmaps} || die "doins failed"
dodoc usr/share/doc/${PN}/{AUTHORS,README}
}
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild
index 4eb3dc730aab..b1c7772f2066 100644
--- a/app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild
+++ b/app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild,v 1.1 2009/04/30 18:06:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild,v 1.2 2011/03/30 23:03:34 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+
+inherit python
DESCRIPTION="a GUI frontend to cdlabelgen which is a program that can generate a variety of CD tray covers."
HOMEPAGE="http://gtkcdlabel.sourceforge.net"
@@ -11,13 +16,16 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE=""
-RDEPEND=">=dev-lang/python-2.5
- >=app-cdr/cdlabelgen-4
+DEPEND=">=app-cdr/cdlabelgen-4
dev-python/pygtk"
-DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ python_convert_shebangs -r 2 .
+}
src_install() {
- dobin usr/bin/${PN}.py || die "dobin failed"
+ newbin usr/bin/${PN}.py ${PN} || die "dobin failed"
insinto /usr/share
doins -r usr/share/{applications,${PN},pixmaps} || die "doins failed"
dodoc usr/share/doc/${PN}/{AUTHORS,README}