Version bump, migrate to new python eclasses (#486962 by hasufell), drop old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 38 insertions, 158 deletions

diff --git a/media-sound/soundconverter/ChangeLog b/media-sound/soundconverter/ChangeLog
index 506cff12fa65..289b5432195e 100644
--- a/media-sound/soundconverter/ChangeLog
+++ b/media-sound/soundconverter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/soundconverter
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundconverter/ChangeLog,v 1.33 2013/02/25 12:18:29 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundconverter/ChangeLog,v 1.34 2014/05/20 19:29:33 pacho Exp $
+
+*soundconverter-2.1.3 (20 May 2014)
+
+  20 May 2014; Pacho Ramos <pacho@gentoo.org> +soundconverter-2.1.3.ebuild,
+  -soundconverter-1.5.4.ebuild, -soundconverter-2.0.1.ebuild,
+  -soundconverter-2.0.3.ebuild:
+  Version bump, migrate to new python eclasses (#486962 by hasufell), drop old.
 
   25 Feb 2013; Agostino Sarubbo <ago@gentoo.org> soundconverter-2.0.4.ebuild:
   Stable for x86, wrt bug #457404
diff --git a/media-sound/soundconverter/soundconverter-1.5.4.ebuild b/media-sound/soundconverter/soundconverter-1.5.4.ebuild
deleted file mode 100644
index a8acdea79b34..000000000000
--- a/media-sound/soundconverter/soundconverter-1.5.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundconverter/soundconverter-1.5.4.ebuild,v 1.7 2012/05/05 08:50:46 mgorny Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 python
-
-DESCRIPTION="A simple sound converter application for the GNOME environment."
-HOMEPAGE="http://soundconverter.berlios.de"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aac flac mp3 vorbis"
-
-# upstream reported, please remove as soon as it's fixed
-# http://developer.berlios.de/bugs/?func=detailbug&bug_id=17726&group_id=3213
-RESTRICT="test"
-
-RDEPEND=">=dev-python/pygtk-2.12
-	dev-python/pygobject:2
-	dev-python/gconf-python
-	dev-python/libgnome-python
-	dev-python/gnome-vfs-python
-	gnome-base/libglade
-	gnome-base/gconf
-	=dev-python/gst-python-0.10*
-	=media-plugins/gst-plugins-gnomevfs-0.10*
-	vorbis? (
-		=media-plugins/gst-plugins-vorbis-0.10*
-		=media-plugins/gst-plugins-ogg-0.10*
-	)
-	mp3? (
-		=media-plugins/gst-plugins-lame-0.10*
-		=media-plugins/gst-plugins-mad-0.10*
-		=media-plugins/gst-plugins-taglib-0.10*
-	)
-	flac? ( =media-plugins/gst-plugins-flac-0.10* )
-	aac? ( =media-plugins/gst-plugins-faac-0.10* )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog README TODO"
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	python_convert_shebangs -r 2 .
-}
diff --git a/media-sound/soundconverter/soundconverter-2.0.3.ebuild b/media-sound/soundconverter/soundconverter-2.0.3.ebuild
deleted file mode 100644
index 4188345d98d3..000000000000
--- a/media-sound/soundconverter/soundconverter-2.0.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundconverter/soundconverter-2.0.3.ebuild,v 1.3 2012/10/17 11:07:19 ago Exp $
-
-EAPI=4
-
-GCONF_DEBUG=no
-PYTHON_DEPEND="2:2.7"
-
-inherit gnome2 multilib python
-
-DESCRIPTION="A simple audiofile converter application for the GNOME environment"
-HOMEPAGE="http://soundconverter.org/"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aac flac mp3 vorbis"
-
-RDEPEND="dev-python/gconf-python
-	dev-python/gnome-vfs-python
-	=dev-python/gst-python-0.10*
-	dev-python/pygobject:2
-	>=dev-python/pygtk-2.12
-	dev-python/libgnome-python
-	gnome-base/libglade
-	aac? (
-		=media-plugins/gst-plugins-faac-0.10*
-		=media-plugins/gst-plugins-faad-0.10*
-		)
-	flac? ( =media-plugins/gst-plugins-flac-0.10* )
-	mp3? (
-		=media-plugins/gst-plugins-lame-0.10*
-		=media-plugins/gst-plugins-mad-0.10*
-		=media-plugins/gst-plugins-taglib-0.10*
-		)
-	vorbis? (
-		=media-plugins/gst-plugins-ogg-0.10*
-		=media-plugins/gst-plugins-vorbis-0.10*
-		)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	>py-compile
-	python_convert_shebangs -r 2 .
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/${PN}
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${PN}
-	gnome2_pkg_postrm
-}
diff --git a/media-sound/soundconverter/soundconverter-2.0.1.ebuild b/media-sound/soundconverter/soundconverter-2.1.3.ebuild
index f70dc3c2ac1c..e0140663aa72 100644
--- a/media-sound/soundconverter/soundconverter-2.0.1.ebuild
+++ b/media-sound/soundconverter/soundconverter-2.1.3.ebuild
@@ -1,13 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundconverter/soundconverter-2.0.1.ebuild,v 1.3 2012/05/05 08:50:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundconverter/soundconverter-2.1.3.ebuild,v 1.1 2014/05/20 19:29:33 pacho Exp $
 
-EAPI=4
+# TODO: convert
+#	dev-python/gconf-python
+#	dev-python/gnome-vfs-python
+#	dev-python/libgnome-python
+# See bug #477814
 
-GCONF_DEBUG=no
-PYTHON_DEPEND="2:2.7"
+EAPI=5
 
-inherit gnome2 multilib python
+GCONF_DEBUG=no
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2 multilib python-single-r1
 
 DESCRIPTION="A simple audiofile converter application for the GNOME environment"
 HOMEPAGE="http://soundconverter.org/"
@@ -16,13 +21,15 @@ SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="aac flac mp3 vorbis"
+IUSE="aac flac mp3 opus vorbis"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="dev-python/gconf-python
+RDEPEND="${PYTHON_DEPS}
+	dev-python/gconf-python
 	dev-python/gnome-vfs-python
-	=dev-python/gst-python-0.10*
-	dev-python/pygobject:2
-	>=dev-python/pygtk-2.12
+	=dev-python/gst-python-0.10*[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
 	dev-python/libgnome-python
 	gnome-base/libglade
 	aac? (
@@ -38,31 +45,24 @@ RDEPEND="dev-python/gconf-python
 	vorbis? (
 		=media-plugins/gst-plugins-ogg-0.10*
 		=media-plugins/gst-plugins-vorbis-0.10*
-		)"
+		)
+	opus? (
+		=media-plugins/gst-plugins-opus-0.10*
+		)
+"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	dev-util/intltool
 	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	python_set_active_version 2
-	python_pkg_setup
-}
+	sys-devel/gettext
+"
 
 src_prepare() {
-	>py-compile
-	python_convert_shebangs -r 2 .
+	python_fix_shebang .
 	gnome2_src_prepare
 }
 
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/${PN}
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${PN}
-	gnome2_pkg_postrm
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
 }