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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 46 insertions, 180 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/Manifest b/media-sound/soundconverter/Manifest
index 4ac92fe37ace..f4f222b2c613 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,30 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST soundconverter-1.5.4.tar.gz 241383 SHA256 980ba4d65c76747aa223b2913e1193a183c312c7e3b13733b636c6131938aac4
-DIST soundconverter-2.0.1.tar.xz 187908 SHA256 0e2060d2edb4134adebdb4c724bdcbfb32a10b7fee1a8fceb563d0ec155f7ce5
-DIST soundconverter-2.0.3.tar.xz 180588 SHA256 545c516f6f099b09401b9151d4e5f841e66a52d489b2ed8d59dd0099b1b99e76 SHA512 fa5ec710240667f0dfa054e8e3f88f01d8c171061675b47221500983b6c027b85ef1d31688e9331936d01af5ef526bc2eea731c3823d60d286ab345b61b4fed7 WHIRLPOOL cdad90f2c5f0732e65dd488bee3b2f7b1011620beabba859a4b92e11e1911ccfcfffb6fd0543ce66bd0f85758cb5a5ed3f2bf4454dac2e743cac4d5119266356
 DIST soundconverter-2.0.4.tar.xz 188072 SHA256 6112fcd61119f830838a8763ccafffd760f1d47541b416810d9394a0505742c8 SHA512 af1c00143b0dd5f78fa7343b0ca4959bc39fb9c2428ba6217e420a711ea10eefa6b6283fe183088fa4945dbae50b59347314da9e40a02275b0a092859475ca37 WHIRLPOOL 579fefe8500261a7bb1f5f66422f0c0fc81879be66ac02139d8e4c476d7223a399df31a7ea682d36cbab9206a8ad8e5b0cd2529e531502f6030c1c7a6c0ee168
-EBUILD soundconverter-1.5.4.ebuild 1526 SHA256 4b23125e4cb642b1c6f7e7e765b578eaad2addef25d8e3ba730715c18cc6d3a3 SHA512 8c2846e650f393458222466e454aad9c7048a9f2f3179d7b4636316f4167b21f7b49204f6bcc9b734a3809fd9fadea1ffa7ff347683d7fd251ad185d04f73fdf WHIRLPOOL 5b29dec418d5de185861f35cc7e32ddd02f10505f2e1738355137c179b4755f53f3023ea5ffe34284b6daa367d7056afb83585f92995548768e90305c439ffc2
-EBUILD soundconverter-2.0.1.ebuild 1599 SHA256 73a04cad86ae27bdbc4bda670a66a0f52ae65037e38cf78c78c5d42895f04746 SHA512 280a3feb9b88ec16ff55529f9b18fba7c4a56a6f217959bdbc6b8eb6628eeb7b2c7bb64b90d08fd41176e7996707e78ed1083b8457fb3d2da6df4721e3ebd93b WHIRLPOOL ea9e32c3ba275d88ffac18b3215ddeb6bf34f648362341f0379a096391a2835c55e2579f867fc8f0d3bc47e899756a6d7088ebc138989d35c1a3e346826666e7
-EBUILD soundconverter-2.0.3.ebuild 1594 SHA256 886adcbf0c39306b3d65f91db222b99c0f9dd4992ca96c4f453fc32f1ae94760 SHA512 b56db352f0f51222cd1a0d2e3aa42bc6e24b4cd3c46a61a0faa0e46eb6d1b4499699a179724bcde9a255012dbe17cad662244c17cba11f03012b9b19e49e2e14 WHIRLPOOL ed4ee84d4e2c728ace020c9434fbf57761ecdea15cb720be4039958f5ebdc82f1c440f50fb7ce36922585060b9d9ca2ed833df299f898271c4940d121a334555
+DIST soundconverter-2.1.3.tar.xz 193176 SHA256 26a78f14210af911c12b71f3452a77bceb5fc6b1f6b626de4d4c961299a76cd1 SHA512 0768630d0fb7e89d37cba793e150eda81b98edd536a41f529e99812451ae8134b7257da7c97ceb3d8780ae640d9c8d23665103d0c08ef0811bbc01ec07ee41d0 WHIRLPOOL 823839018b1f6bb1a914354fd02fcb9c0721d3727b747e908cd97899ef4b6f773d2d98cd724bb15b2b7be0316c9a6e7c3e4e9829db65163a77ef9290168fdc04
 EBUILD soundconverter-2.0.4.ebuild 1651 SHA256 52593dbf84decf2b4d23995eb979e9da67c4637d88cc1e1570ee1b78e6380587 SHA512 d32973df80b93e94705f5b45f6c4732431adb0c42d178ba926d307b4a6c16d73e535d67d2c592f7a28d7ad998247b58f3996af34e27882b68c2489f309ad8102 WHIRLPOOL 08e075a25ef9ffcdb79f3f383ee3dbddd3183cbe9ca9774450c97053919387bd065db75e36bf6ebb39e46d8fbbb429238c054b46beaafb62b2bc1f25c7578140
-MISC ChangeLog 4847 SHA256 1026402031fbbb1f76694f5595a3d8dd6a9134f46e7c3b4bbe44e59103715216 SHA512 864488d0c4b063f5d0d99e918f57e7c9c428e142cddb0987e21e0efb3f52011e77824b69b23d6dc16ac5b77b28afa124fdddb4e01f5b0c1edd0172b45faf005b WHIRLPOOL 2ccb81252e932ffc14f87ca41f6697b352a2c90d2aaa3be10850d484da13a1f817f1819d892966dedc253a9abb40311c9f4e752c8e205177eaec37c1f7f6a00d
+EBUILD soundconverter-2.1.3.ebuild 1708 SHA256 6012c236a3c409e48a8d262e8d6ffec2b6dbe3ac8aa7fc6aebf81724ff29273e SHA512 65ea40596653c6e71c7a29b4ba62c6222eba5b8962ec6df38f1cf9635a03a595f770f5bb0991c2852ce23d4897312e3a934b743ec1f97a75cf6e9e45e0a37a70 WHIRLPOOL 9fcf02d26e94f884e18a86221a47aba5891644f645cfbe48dbc87fe47c9e387c19dc6284ea003b0b8364544d4797334502a127c0aa93ea458d3e7484e6737692
+MISC ChangeLog 5137 SHA256 2cff8987f355dff3a0d7ccf8a237593c0b55dceabbc423f10625171bfc73f414 SHA512 a91af88ebc14ce5138e2fd9728d98d1461cab45614ab70e8fbf6b5ea67e8ad476e0fc8654f7a66815aa60549d8a22bb324bed0f5b3e6482eac5daece2c2f7ec4 WHIRLPOOL 86cbfdc90e317b2aa0804a3bd0d4e2981cc9f129b3d3811f0b798f2cbae7bf0036a23d65e613dc858690ec5f5459762206196fbc68904bbda2a071056cb1f00d
 MISC metadata.xml 289 SHA256 5cd022b38224e316b134dd7809b45b40f338d0de2b447c6c0248681ce3763775 SHA512 42029fda888d9de77a5bb5d3e13dfa630a90f6c6f7c42c85394880d1894f37c8aacfbee8687486d390b462dcf54989dc01b4eeaad752266bf98259b1dc5e859a WHIRLPOOL 7194b9b2ed77c0dac896e6ee0ded63410e1bc443058a5fa5592626bd7d295fd14aa82c5f9da7ff2049c0cba0210a87a603fc4b6af8c59f8e26c1d97512e9821f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRK1aWAAoJELp701BxlEWfFrwP/jEbPiTY4tWdDIamT2zdHRYD
-avotdbUkATPSmG+0onsksuVS0c6lCTM7B7Bl5GamY3enbAo8hTDXGL8UZmQfVpNJ
-xfb4c7GCzMakDiuXDrl0xOaumvznS3CP0u8z9YMgrch6gOIb5Wz1L0GqQilMpsEt
-X9GrwK+kn72gUWZm+UOM5GgCktv7IVqExhQ7meH8sJm4XfKTL0yNCbK90fmuBirT
-JgirjWv7l3Z2KneIp8dykvUO+Fjubv9/Zb0eZDjmdL4XmLvwTOYo95jEioKwkA28
-I3OqcRHY3qZsLR1rkmetDEHK3zq6haQ32uBkDkcBNfvcJZkYc+3cfGg4rhOUKngz
-5hvBSKnVQCXsXe8P8ABDUSqdOWvnKiL53/RhT16mXhVcunLQRTa31k0QwWdzSAIK
-Y291X2GnuTMBpx9BfwtKfwYOoAHJ+KSdoJ8CdqJw4IJHxLIgyPWhH9jbCp1KsMlb
-fcFmhyuBdSaM9c12M59ArdsJE7jqrvmZCet9hRf7ehx0Kgi26eSPaUYHhTMfZ2M8
-7PL2UCGAHmaA85tn3qqmFC+f4LN2LXaJd0n1Lbdtwzw2UxQtwPARS8b83HxBuh+j
-+mnYtd93L2G0OPuw254WP46Qjuol0iLgu2+A5Kr+0TY62ksKOoB+qfoK+U5Fn5ut
-XegbztYgdPd0i8BY/UH2
-=nPuN
+iEYEAREIAAYFAlN7rR4ACgkQCaWpQKGI+9T7NwCfT6WNSiZpZf6HKvVnqJWid/4Z
+lfMAniaRX5J556WMoW5R2ey6OpiQDtU6
+=683/
 -----END PGP SIGNATURE-----
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
 }