Version bump, drop old

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

4 files changed, 71 insertions, 89 deletions

diff --git a/media-sound/soundconverter/ChangeLog b/media-sound/soundconverter/ChangeLog
index 6635b1ec7a3d..5886fd9529ff 100644
--- a/media-sound/soundconverter/ChangeLog
+++ b/media-sound/soundconverter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/soundconverter
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundconverter/ChangeLog,v 1.36 2014/07/23 15:23:09 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundconverter/ChangeLog,v 1.37 2015/02/03 20:24:13 pacho Exp $
+
+*soundconverter-2.1.4 (03 Feb 2015)
+
+  03 Feb 2015; Pacho Ramos <pacho@gentoo.org> +soundconverter-2.1.4.ebuild,
+  -soundconverter-2.0.4.ebuild:
+  Version bump, drop old
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> soundconverter-2.1.3.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 7913357170ef..6aaa72b21cab 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,26 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST soundconverter-2.0.4.tar.xz 188072 SHA256 6112fcd61119f830838a8763ccafffd760f1d47541b416810d9394a0505742c8 SHA512 af1c00143b0dd5f78fa7343b0ca4959bc39fb9c2428ba6217e420a711ea10eefa6b6283fe183088fa4945dbae50b59347314da9e40a02275b0a092859475ca37 WHIRLPOOL 579fefe8500261a7bb1f5f66422f0c0fc81879be66ac02139d8e4c476d7223a399df31a7ea682d36cbab9206a8ad8e5b0cd2529e531502f6030c1c7a6c0ee168
 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
+DIST soundconverter-2.1.4.tar.xz 193428 SHA256 2b125dda38f5d494d97fa43c8a238b6354510f9a0540d6e912eea59b4f22bf4a SHA512 27f24c40e965cc4c2f7045956b7856cc4d2b840b95b8da9363d0b987cf8d65616db484f2266516070d8018efdfed33d9a84b64e7cf8cad5e6d4d08b1409d9ad9 WHIRLPOOL 6241a96dfcd4b6ea8f31d945b941a6b0d9f06dc6869f1ad92d18e1e924987e5a4fec743707e763b481718fa92d96ec52a331439ea7ea1adefa47eac5ee2e956d
 EBUILD soundconverter-2.1.3.ebuild 1704 SHA256 a4e23f74fc59400e52102019993853914083f7f599ef31aadaab9db2f182e79f SHA512 dca70f5992c366f6fcf2578192b34ef61083c200fe57453aa08e5a2996216bd640cc094528ea3d36f3189d7828573eec1ee38cfa3a77413377fc5d0be9ffc38a WHIRLPOOL adf498ae5478f334e2a9a4a82f28ed0fcddea0000085770f06b4520ad0d5c69621d96cb35f882a709bdfdb824383426232b38adc60d78135c8113d7132a00aab
-MISC ChangeLog 5363 SHA256 7bda5d07285f8d014615b4ca92f2ec669f357f7b8bfa16f24b0b617daf994041 SHA512 d543fa6d082184811d8baf271db8c168fda6cf219434a62dd8bbeada8052aee673043751bc2f6273b0dc5de2a78d6016ca534a7b7c4990c64badea3969a542e6 WHIRLPOOL 542785ad7a547cbe1ad6b7fdae7eb2fdc4bf439ef922e608850f6262689522346f72c295c9a776c954825c20d5d96fa3a6a1c7d7eca041ce14d03cd387ab7c81
+EBUILD soundconverter-2.1.4.ebuild 1612 SHA256 6b1cbc400c5287d7dc4ba997ac3d12516b15d2493d9d0dbdfe80d48f6946103c SHA512 697c2769950949c7b1cce3573a208c463771a20dfda819681ce40f50019db46972abade4468885b44f8bdf06460bd2716e597f82cc78f60b64bb4ede4210f1f2 WHIRLPOOL ddb609d18a4fa9e05df7bda462945adc65bd146a3ba98cd8d99a7af4df1217dc55d2ede9d6fa3db11b3105347019735ee1212a285a179e179051147d9f8c877e
+MISC ChangeLog 5536 SHA256 94daf2eb17fa2faf0b9c8769371e1110817d26298e0a0b7fa22f4eb717c6aeca SHA512 764d1dfdbe5b43c0973c53e4b9189fd3be28904e62e4b2d13453e86bca4527b0f0b38af2b9bd98ed96b2322a51261acf29ce1fafc331ad6cdc7e6cbd38119d87 WHIRLPOOL f8f6e90cfeab94b0985b419fe0936e5e7510224a2008be31e6199d5a6acdc0dc634fc846b3b8b7a6783ad72834b59d163bcd2f3d216d590ba0ebfd31c2e3d609
 MISC metadata.xml 289 SHA256 5cd022b38224e316b134dd7809b45b40f338d0de2b447c6c0248681ce3763775 SHA512 42029fda888d9de77a5bb5d3e13dfa630a90f6c6f7c42c85394880d1894f37c8aacfbee8687486d390b462dcf54989dc01b4eeaad752266bf98259b1dc5e859a WHIRLPOOL 7194b9b2ed77c0dac896e6ee0ded63410e1bc443058a5fa5592626bd7d295fd14aa82c5f9da7ff2049c0cba0210a87a603fc4b6af8c59f8e26c1d97512e9821f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9NeAAoJELp701BxlEWfRNoP/03jV6QlaI6lPcTdO2irU90c
-917kEX+7xoVq1LI8MkzRYcZBoKhv+XLE9AY2WauQKdF4qVnK/mKBrT5kgs4nTmqp
-Vh+ITgIIg/6S5PfFcD32WRNu0dNADuGeqStNxMNbnsRkyHttH2RaaVMtq9kZoqaY
-QdmInnpYTi8zJtQF6PAzi50QASmAvjK4+bwGSVYQJzXIYbh1dNfP0Y5PrUkTc7W5
-on7XLL7+ZtcZnPTr1nGQFeut2+hIdJKI8rAEKD9By5i9D2mP3cO/PFJstUGNEgaZ
-vXeu8GiZHRRfH9iLtD7+RE2Fv9sfIGK5Rlx+UU+jDp25t4eXQH32G0cgR6P2XF4e
-t+n9/kNT230SnJzB+5I+Tf8yedYWuDaj7QLkDp+SZ447VJ77l5nfwKDPu6UeyqJb
-qIR48zuewt4CEsrcQ+4MXxMnIs2TbBOVX3UIx/T1LFJYSh1+lkUtY6UTUtdSZR/f
-bIDGdD+no3+SixL7nZfGs/DJEVTlGVdmAESG+zqF/BTMj41cIOWDyXUH/WAd+xmz
-fqj6j+YLoUqW1SAL2L2GeN5nhtOHe2vAS2Zj5bIE0R7PcKl8L8bF/QV429iVdIUC
-UQrftlXDvo4WQ+OtvivrHL6BSBstHyr3FPznXjzlOIIgX4mRJYH+e7GmD5cHwFGA
-3TTu7ywTEo9uaQrGe1d+
-=p42H
+iEYEAREIAAYFAlTRLm4ACgkQCaWpQKGI+9Q7twCfYQAXEwbrpK501AGXBMIOZ33c
+cMoAn05SHFArhxPMvYq7DC3IGdIRSn9c
+=Ez0F
 -----END PGP SIGNATURE-----
diff --git a/media-sound/soundconverter/soundconverter-2.0.4.ebuild b/media-sound/soundconverter/soundconverter-2.0.4.ebuild
deleted file mode 100644
index 0ce16e1b30fe..000000000000
--- a/media-sound/soundconverter/soundconverter-2.0.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundconverter/soundconverter-2.0.4.ebuild,v 1.3 2013/02/25 12:18:29 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 opus 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*
-		)
-	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
-}
-
-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.1.4.ebuild b/media-sound/soundconverter/soundconverter-2.1.4.ebuild
new file mode 100644
index 000000000000..6e0f3bd73940
--- /dev/null
+++ b/media-sound/soundconverter/soundconverter-2.1.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundconverter/soundconverter-2.1.4.ebuild,v 1.1 2015/02/03 20:24:13 pacho Exp $
+
+EAPI=5
+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/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aac flac mp3 opus vorbis"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/gnome-vfs-python[${PYTHON_USEDEP}]
+	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[${PYTHON_USEDEP}]
+	gnome-base/libglade[${PYTHON_USEDEP}]
+	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 )
+	opus? (	media-plugins/gst-plugins-opus:0.10 )
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_prepare() {
+	python_fix_shebang .
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
+}