4 files changed, 14 insertions, 34 deletions
diff --git a/media-plugins/gst-plugins-mplex/ChangeLog b/media-plugins/gst-plugins-mplex/ChangeLog
index bd06da188a60..2b88eb83af5b 100644
--- a/media-plugins/gst-plugins-mplex/ChangeLog
+++ b/media-plugins/gst-plugins-mplex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/gst-plugins-mplex
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-mplex/ChangeLog,v 1.50 2014/08/25 11:01:40 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-mplex/ChangeLog,v 1.51 2015/02/03 19:39:01 pacho Exp $
+
+*gst-plugins-mplex-1.4.5 (03 Feb 2015)
+
+  03 Feb 2015; Pacho Ramos <pacho@gentoo.org> +gst-plugins-mplex-1.4.5.ebuild,
+  -gst-plugins-mplex-0.10.23.ebuild, -gst-plugins-mplex-1.2.3.ebuild,
+  -gst-plugins-mplex-1.2.4.ebuild:
+  Version bump, drop old
 
   25 Aug 2014; Agostino Sarubbo <ago@gentoo.org>
   gst-plugins-mplex-0.10.23-r1.ebuild, gst-plugins-mplex-1.2.4-r1.ebuild:
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-0.10.23.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-0.10.23.ebuild
deleted file mode 100644
index 5491566a88b4..000000000000
--- a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-0.10.23.ebuild
+++ /dev/null
@@ -1,14 +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-mplex/gst-plugins-mplex-0.10.23.ebuild,v 1.11 2013/04/01 17:56:23 ago Exp $
-
-EAPI="5"
-
-inherit gst-plugins-bad
-
-DESCRIPTION="GStreamer plugin for MPEG/DVD/SVCD/VCD video/audio multiplexing"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND=">=media-video/mjpegtools-2"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.2.3.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.2.3.ebuild
deleted file mode 100644
index b59698c2ab31..000000000000
--- a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.2.3.ebuild
+++ /dev/null
@@ -1,14 +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-mplex/gst-plugins-mplex-1.2.3.ebuild,v 1.5 2014/04/18 13:57:17 ago Exp $
-
-EAPI="5"
-
-inherit gst-plugins-bad
-
-DESCRIPTION="GStreamer plugin for MPEG/DVD/SVCD/VCD video/audio multiplexing"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND=">=media-video/mjpegtools-2"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.2.4.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.4.5.ebuild
index 613bd1d84f05..bb6377973844 100644
--- a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.2.4.ebuild
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.4.5.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.2.4.ebuild,v 1.1 2014/05/31 14:56:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.4.5.ebuild,v 1.1 2015/02/03 19:39:01 pacho Exp $
 
 EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
 
-inherit gst-plugins-bad
+inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for MPEG/DVD/SVCD/VCD video/audio multiplexing"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
-RDEPEND=">=media-video/mjpegtools-2"
+RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"