Version bump, drop old

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

4 files changed, 14 insertions, 34 deletions

diff --git a/media-plugins/gst-plugins-x264/ChangeLog b/media-plugins/gst-plugins-x264/ChangeLog
index 2285bb47f407..93c972d1c8f6 100644
--- a/media-plugins/gst-plugins-x264/ChangeLog
+++ b/media-plugins/gst-plugins-x264/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/gst-plugins-x264
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x264/ChangeLog,v 1.79 2014/09/15 08:23:07 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x264/ChangeLog,v 1.80 2015/02/03 20:14:15 pacho Exp $
+
+*gst-plugins-x264-1.4.5 (03 Feb 2015)
+
+  03 Feb 2015; Pacho Ramos <pacho@gentoo.org> +gst-plugins-x264-1.4.5.ebuild,
+  -gst-plugins-x264-0.10.19.ebuild, -gst-plugins-x264-1.2.3.ebuild,
+  -gst-plugins-x264-1.2.4.ebuild:
+  Version bump, drop old
 
   15 Sep 2014; Agostino Sarubbo <ago@gentoo.org>
   gst-plugins-x264-0.10.19-r1.ebuild, gst-plugins-x264-1.2.4-r1.ebuild:
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-0.10.19.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-0.10.19.ebuild
deleted file mode 100644
index d2f70f9f109e..000000000000
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-0.10.19.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-x264/gst-plugins-x264-0.10.19.ebuild,v 1.17 2013/07/07 20:28:40 tetromino Exp $
-
-EAPI="5"
-
-inherit gst-plugins-ugly
-
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE=""
-
-# 20111220 ensures us X264_BUILD >= 120
-RDEPEND=">=media-libs/x264-0.0.20111220:="
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.2.3.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.2.3.ebuild
deleted file mode 100644
index 9626eec5201d..000000000000
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-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-x264/gst-plugins-x264-1.2.3.ebuild,v 1.8 2014/04/19 17:45:20 ago Exp $
-
-EAPI="5"
-
-inherit gst-plugins-ugly
-
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE=""
-
-# 20111220 ensures us X264_BUILD >= 120
-RDEPEND=">=media-libs/x264-0.0.20111220:="
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.2.4.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.4.5.ebuild
index ac6de90acd1b..6613fed5d58a 100644
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.2.4.ebuild
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-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-x264/gst-plugins-x264-1.2.4.ebuild,v 1.1 2014/05/31 15:23:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x264/gst-plugins-x264-1.4.5.ebuild,v 1.1 2015/02/03 20:14:15 pacho Exp $
 
 EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
 
-inherit gst-plugins-ugly
+inherit gstreamer
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 # 20111220 ensures us X264_BUILD >= 120
-RDEPEND=">=media-libs/x264-0.0.20111220:="
+RDEPEND=">=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"