Clean up old revisions. Raise dependency on gstreamer, bug #498636.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C6085806)

5 files changed, 11 insertions, 196 deletions

diff --git a/media-plugins/gst-plugins-libav/ChangeLog b/media-plugins/gst-plugins-libav/ChangeLog
index 88ccc78d3501..ef36ecacdcb2 100644
--- a/media-plugins/gst-plugins-libav/ChangeLog
+++ b/media-plugins/gst-plugins-libav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/gst-plugins-libav
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v 1.38 2013/10/22 07:21:03 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v 1.39 2014/01/21 21:56:59 eva Exp $
+
+  21 Jan 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  -gst-plugins-libav-1.0.3.ebuild, -gst-plugins-libav-1.0.5.ebuild,
+  -gst-plugins-libav-1.1.0_pre20130128.ebuild, gst-plugins-libav-1.2.0.ebuild:
+  Clean up old revisions. Raise dependency on gstreamer, bug #498636.
 
   22 Oct 2013; Agostino Sarubbo <ago@gentoo.org>
   gst-plugins-libav-1.1.0_pre20130128-r1.ebuild:
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.3.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.3.ebuild
deleted file mode 100644
index d3c1702c2df4..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.3.ebuild
+++ /dev/null
@@ -1,57 +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-libav/gst-plugins-libav-1.0.3.ebuild,v 1.4 2013/02/03 23:22:12 tetromino Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic gst-plugins10
-
-MY_PN="gst-libav"
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.${GST_TARBALL_SUFFIX}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+orc"
-
-RDEPEND="
-	media-libs/gst-plugins-base:1.0
-	~virtual/ffmpeg-0.10.3
-	orc? ( >=dev-lang/orc-0.4.16 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	sed -e 's/sleep 15//' -i configure.ac configure || die
-}
-
-src_configure() {
-	GST_PLUGINS_BUILD=""
-	# always use system ffmpeg/libav if possible
-	gst-plugins10_src_configure \
-		--with-system-libav \
-		$(use_enable orc)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	default
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	if has_version "media-video/ffmpeg"; then
-		elog "Please note that upstream uses media-video/libav"
-		elog "rather than media-video/ffmpeg. If you encounter any"
-		elog "issues try to move from ffmpeg to libav."
-	fi
-}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.5.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.5.ebuild
deleted file mode 100644
index 96d967f83813..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.5.ebuild
+++ /dev/null
@@ -1,59 +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-libav/gst-plugins-libav-1.0.5.ebuild,v 1.11 2013/02/23 14:52:47 ago Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic
-
-MY_PN="gst-libav"
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+orc"
-
-RDEPEND="
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	~virtual/ffmpeg-0.10.3
-	orc? ( >=dev-lang/orc-0.4.16 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	sed -e 's/sleep 15//' -i configure.ac configure || die
-}
-
-src_configure() {
-	GST_PLUGINS_BUILD=""
-	# always use system ffmpeg/libav if possible
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="http://www.gentoo.org" \
-		--with-system-libav \
-		$(use_enable orc)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	default
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	if has_version "media-video/ffmpeg"; then
-		elog "Please note that upstream uses media-video/libav"
-		elog "rather than media-video/ffmpeg. If you encounter any"
-		elog "issues try to move from ffmpeg to libav."
-	fi
-}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.1.0_pre20130128.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.1.0_pre20130128.ebuild
deleted file mode 100644
index 6143254fd6ee..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.1.0_pre20130128.ebuild
+++ /dev/null
@@ -1,74 +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-libav/gst-plugins-libav-1.1.0_pre20130128.ebuild,v 1.12 2013/07/28 17:36:29 aballier Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic
-
-MY_PN="gst-libav"
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
-#SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-RDEPEND="
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=virtual/ffmpeg-0.10
-	orc? ( >=dev-lang/orc-0.4.16 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	sed -e 's/sleep 15//' -i configure.ac configure || die
-
-	# allow building with gstreamer-1.0.x
-	sed -e 's/REQ=1.1.0/REQ=1.0.0/' -i configure.ac configure || die
-	# Disable GBR color support; it requires >=gst-plugins-base-1.1
-	epatch -R "${FILESDIR}/${P}-gbr-color.patch"
-	# Let it be compatible with older ffmpeg/libav releases, add the compat glue
-	epatch "${FILESDIR}/${P}-compat.patch"
-	# Some muxers contains coma too.
-	epatch "${FILESDIR}/${P}-coma.patch"
-}
-
-src_configure() {
-	GST_PLUGINS_BUILD=""
-	# always use system ffmpeg/libav if possible
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="http://www.gentoo.org" \
-		--with-system-libav \
-		$(use_enable orc)
-}
-
-src_compile() {
-	# Don't build with -Werror
-	emake ERROR_CFLAGS=
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	default
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	if has_version "media-video/ffmpeg"; then
-		elog "Please note that upstream uses media-video/libav"
-		elog "rather than media-video/ffmpeg. If you encounter any"
-		elog "issues try to move from ffmpeg to libav."
-	fi
-}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild
index 3904f410e59b..b166483fa8fe 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-libav/gst-plugins-libav-1.2.0.ebuild,v 1.2 2013/10/12 08:12:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild,v 1.3 2014/01/21 21:56:59 eva Exp $
 
 EAPI="5"
 
@@ -17,8 +17,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fb
 IUSE="+orc"
 
 RDEPEND="
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
+	>=media-libs/gstreamer-1.2:1.0
+	>=media-libs/gst-plugins-base-1.2:1.0
 	>=virtual/ffmpeg-9
 	orc? ( >=dev-lang/orc-0.4.16 )
 "