Version bump, drop old

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

3 files changed, 65 insertions, 73 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/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
+}