Use python.eclass for forcing python2 instead of python3 wrt #363765 by Ewgenij Starostin and John J. Aylward

(Portage version: 2.2.0_alpha127/cvs/Linux x86_64)

2 files changed, 36 insertions, 21 deletions

diff --git a/media-gfx/comix/ChangeLog b/media-gfx/comix/ChangeLog
index da43ea0282b0..81385e383a7e 100644
--- a/media-gfx/comix/ChangeLog
+++ b/media-gfx/comix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/comix
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/comix/ChangeLog,v 1.58 2011/11/22 17:53:07 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/comix/ChangeLog,v 1.59 2012/09/14 10:33:16 ssuominen Exp $
+
+  14 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> comix-4.0.4.ebuild:
+  Use python.eclass for forcing python2 instead of python3 wrt #363765 by
+  Ewgenij Starostin and John J. Aylward
 
   22 Nov 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #82110
diff --git a/media-gfx/comix/comix-4.0.4.ebuild b/media-gfx/comix/comix-4.0.4.ebuild
index 5619f6c6a79e..6d49458e4c78 100644
--- a/media-gfx/comix/comix-4.0.4.ebuild
+++ b/media-gfx/comix/comix-4.0.4.ebuild
@@ -1,43 +1,54 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/comix/comix-4.0.4.ebuild,v 1.1 2010/02/11 00:52:38 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/comix/comix-4.0.4.ebuild,v 1.2 2012/09/14 10:33:16 ssuominen Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
 
 inherit python
 
 DESCRIPTION="A GTK image viewer specifically designed to handle comic books."
 HOMEPAGE="http://comix.sourceforge.net"
-SRC_URI="mirror://sourceforge/comix/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+LANGS=" ca cs es fr hr hu id ja ko pl pt_BR ru sv zh_CN zh_TW"
+IUSE="rar $(echo ${LANGS//\ /\ linguas_})"
+
 RDEPEND=">=dev-python/imaging-1.1.5
 	>=dev-python/pygtk-2.12
 	rar? ( || ( app-arch/unrar app-arch/rar ) )"
-LANGS=" ca cs es fr hr hu id ja ko pl pt_BR ru sv zh_CN zh_TW"
-IUSE="rar $(echo ${LANGS//\ /\ linguas_})"
 
-src_unpack() {
-	unpack ${A}
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
 	# do not install .pyc into /usr/share
 	local pythondir="$(python_get_sitedir)/comix"
 	pythondir="${pythondir/\/usr\/}"
-	sed -i -e "s:share/comix/src:${pythondir}:g" "${S}"/install.py || die
-}
-
-src_compile() {
-	einfo "Nothing to be compiled."
+	sed -i -e "s:share/comix/src:${pythondir}:g" install.py || die
+	python_convert_shebangs -r 2 install.py mime/comicthumb src/comix.py
 }
 
 src_install() {
 	dodir /usr
-	python install.py install --no-mime --dir "${D}"usr || die
-	insinto /usr/share/mime/packages/
-	doins "${S}"/mime/comix.xml || die
-	insinto /etc/gconf/schemas/
-	doins "${S}"/mime/comicbook.schemas || die
-	dobin "${S}"/mime/comicthumb || die
-	dodoc ChangeLog README || die
+	python2 install.py install --no-mime --dir "${D}"usr || die
+
+	insinto /usr/share/mime/packages
+	doins mime/comix.xml
+
+	insinto /etc/gconf/schemas
+	doins mime/comicbook.schemas
+
+	dobin mime/comicthumb
+	dodoc ChangeLog README
 
+	local lang
 	for lang in ${LANGS} ; do
 		use linguas_${lang} || rm -r "${D}"/usr/share/locale/${lang}
 	done