4 files changed, 13 insertions, 41 deletions
diff --git a/media-plugins/gst-plugins-cdparanoia/ChangeLog b/media-plugins/gst-plugins-cdparanoia/ChangeLog
index 6754195dda5d..f190b63546e4 100644
--- a/media-plugins/gst-plugins-cdparanoia/ChangeLog
+++ b/media-plugins/gst-plugins-cdparanoia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/gst-plugins-cdparanoia
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-cdparanoia/ChangeLog,v 1.245 2014/10/11 12:51:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-cdparanoia/ChangeLog,v 1.246 2014/12/24 19:15:18 leio Exp $
+
+*gst-plugins-cdparanoia-1.4.5 (24 Dec 2014)
+
+  24 Dec 2014; Mart Raudsepp <leio@gentoo.org>
+  -gst-plugins-cdparanoia-0.10.36.ebuild, -gst-plugins-cdparanoia-1.2.3.ebuild,
+  -gst-plugins-cdparanoia-1.2.4.ebuild, +gst-plugins-cdparanoia-1.4.5.ebuild:
+  Version bump. No functional changes
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org>
   gst-plugins-cdparanoia-0.10.36-r1.ebuild:
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-0.10.36.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-0.10.36.ebuild
deleted file mode 100644
index 456e34e5b7e2..000000000000
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-0.10.36.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-0.10.36.ebuild,v 1.12 2013/03/27 14:12:17 ago Exp $
-
-EAPI="5"
-
-inherit gst-plugins-base gst-plugins10
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=media-sound/cdparanoia-3.10.2-r3"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	gst-plugins10_system_link \
-		gst-libs/gst/audio:gstreamer-audio \
-		gst-libs/gst/cdda:gstreamer-cdda
-}
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.2.3.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.2.3.ebuild
deleted file mode 100644
index b692337f4152..000000000000
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.2.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.2.3.ebuild,v 1.10 2014/04/21 10:29:40 ago Exp $
-
-EAPI="5"
-
-inherit gst-plugins-base gst-plugins10
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=media-sound/cdparanoia-3.10.2-r3"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	gst-plugins10_system_link gst-libs/gst/audio:gstreamer-audio
-}
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.2.4.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.4.5.ebuild
index d05843c4b1c1..4af56575df7c 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.2.4.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.4.5.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.2.4.ebuild,v 1.1 2014/05/31 14:22:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.4.5.ebuild,v 1.1 2014/12/24 19:15:18 leio Exp $
 
 EAPI="5"
 
-inherit gst-plugins-base gst-plugins10
+GST_ORG_MODULE=gst-plugins-base
+inherit gstreamer
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=media-sound/cdparanoia-3.10.2-r3"
+RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	gst-plugins10_system_link gst-libs/gst/audio:gstreamer-audio
+	gstreamer_system_link gst-libs/gst/audio:gstreamer-audio
 }