diff options
| -rw-r--r-- | app-cdr/serpentine/ChangeLog | 6 | ||||
| -rw-r--r-- | app-cdr/serpentine/serpentine-0.9-r2.ebuild | 25 |
2 files changed, 19 insertions, 12 deletions
diff --git a/app-cdr/serpentine/ChangeLog b/app-cdr/serpentine/ChangeLog index 3fd09674b03e..4356feb26e2d 100644 --- a/app-cdr/serpentine/ChangeLog +++ b/app-cdr/serpentine/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-cdr/serpentine # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/serpentine/ChangeLog,v 1.27 2011/04/13 17:12:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/serpentine/ChangeLog,v 1.28 2011/04/16 19:45:06 arfrever Exp $ + + 16 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + serpentine-0.9-r2.ebuild: + Use Python 2 (bug #308329). 13 Apr 2011; Pacho Ramos <pacho@gentoo.org> serpentine-0.9-r2.ebuild: Fix gnome-python dependencies, bug #352914. diff --git a/app-cdr/serpentine/serpentine-0.9-r2.ebuild b/app-cdr/serpentine/serpentine-0.9-r2.ebuild index 1e0cc86c9782..c0dca4242be5 100644 --- a/app-cdr/serpentine/serpentine-0.9-r2.ebuild +++ b/app-cdr/serpentine/serpentine-0.9-r2.ebuild @@ -1,10 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/serpentine/serpentine-0.9-r2.ebuild,v 1.6 2011/04/13 17:12:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/serpentine/serpentine-0.9-r2.ebuild,v 1.7 2011/04/16 19:45:06 arfrever Exp $ +EAPI="3" GCONF_DEBUG=no +PYTHON_DEPEND="2" -inherit autotools eutils gnome2 mono multilib python +inherit autotools eutils gnome2 mono python DESCRIPTION="An application for writing CD-Audio discs. It aims for simplicity, usability and compability." HOMEPAGE="http://irrepupavel.com/projects/serpentine/" @@ -15,12 +17,11 @@ SLOT="0" KEYWORDS="~amd64 ppc x86" IUSE="muine" -RDEPEND=">=dev-lang/python-2.4 - >=dev-python/pygtk-2.6 +RDEPEND=">=dev-python/pygtk-2.6:2 >=dev-python/gst-python-0.10 dev-python/gconf-python dev-python/gnome-vfs-python - dev-python/pygobject + dev-python/pygobject:2 >=media-plugins/gst-plugins-gnomevfs-0.10 muine? ( media-sound/muine ) dev-python/pyxml" @@ -30,14 +31,14 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" pkg_setup() { + python_set_active_version 2 + python_pkg_setup + G2CONF="${G2CONF} $(use_enable muine)" DOCS="AUTHORS ChangeLog NEWS README TODO" } -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { echo serpentine/gtkutil.py >> po/POTFILES.skip echo serpentine/plugins/plugsuspend.py >> po/POTFILES.skip @@ -49,14 +50,16 @@ src_unpack() { intltoolize --force --copy --automake || die "intltoolize failed." eautoreconf + + python_convert_shebangs -r $(python_get_version) . } pkg_postinst() { gnome2_pkg_postinst - python_mod_optimize $(python_get_sitedir)/${PN} + python_mod_optimize ${PN} } pkg_postrm() { gnome2_pkg_postrm - python_mod_cleanup $(python_get_sitedir)/${PN} + python_mod_cleanup ${PN} } |