Version bump. Remove old. Many updates since 1.2.x series as this is a many months overdue next stable cycle upgrade

(Portage version: 2.2.15/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 41 insertions, 218 deletions

diff --git a/media-libs/gst-plugins-base/ChangeLog b/media-libs/gst-plugins-base/ChangeLog
index c9474624cb43..b129007131c2 100644
--- a/media-libs/gst-plugins-base/ChangeLog
+++ b/media-libs/gst-plugins-base/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/gst-plugins-base
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/ChangeLog,v 1.258 2014/10/11 12:41:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/ChangeLog,v 1.259 2014/12/24 18:43:16 leio Exp $
+
+*gst-plugins-base-1.4.5 (24 Dec 2014)
+
+  24 Dec 2014; Mart Raudsepp <leio@gentoo.org> -gst-plugins-base-1.2.3.ebuild,
+  -gst-plugins-base-1.2.4.ebuild, +gst-plugins-base-1.4.5.ebuild,
+  -files/gst-plugins-base-0.10.31-fix-tag-test-linking.patch,
+  -files/gst-plugins-base-0.10.32-fix-tests-encodebin.patch:
+  Version bump. Remove old. Many updates since 1.2.x series as this is
+  a many months overdue next stable cycle upgrade.
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org>
   gst-plugins-base-0.10.36-r1.ebuild:
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.31-fix-tag-test-linking.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.31-fix-tag-test-linking.patch
deleted file mode 100644
index a055efcd24a0..000000000000
--- a/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.31-fix-tag-test-linking.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fix tests on fresh upgrade, Gentoo bug #352944.
-
-Without this, the generated tests/check/libs/tag libtool has /usr/lib before
-local paths, because the library that comes from system gstreamer core package
-is listed before the internal ones.
-
---- a/tests/check/Makefile.am
-+++ b/tests/check/Makefile.am
-@@ -227,8 +227,8 @@
- 	$(GST_BASE_CFLAGS) \
- 	$(AM_CFLAGS)
- libs_tag_LDADD = \
--	$(GST_BASE_LIBS) \
--	$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la $(LDADD)
-+	$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \
-+	$(GST_BASE_LIBS) $(LDADD)
- 
- libs_pbutils_CFLAGS = \
- 	$(GST_PLUGINS_BASE_CFLAGS) \
---- a/tests/check/Makefile.in
-+++ b/tests/check/Makefile.in
-@@ -1003,8 +1003,8 @@
- 	$(AM_CFLAGS)
- 
- libs_tag_LDADD = \
--	$(GST_BASE_LIBS) \
--	$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la $(LDADD)
-+	$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \
-+	$(GST_BASE_LIBS) $(LDADD)
- 
- libs_pbutils_CFLAGS = \
- 	$(GST_PLUGINS_BASE_CFLAGS) \
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.32-fix-tests-encodebin.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.32-fix-tests-encodebin.patch
deleted file mode 100644
index 23cf617135c0..000000000000
--- a/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.32-fix-tests-encodebin.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-commit fc608d4dcd0257549c6018aac9ee5c2dec52bbee
-Author: Tim-Philipp Müller
-Date:   Wed Jan 26 15:42:48 2011 +0000
-
-    tests: don't run encodebin test if vorbis or theora plugins aren't available
-
-Minimal Makefile.in patch added manually to avoid eautoreconf
-
-diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
-index 0cc03a4..f284716 100644
---- a/tests/check/Makefile.am
-+++ b/tests/check/Makefile.am
-@@ -77,6 +77,16 @@ else
- check_theora =
- endif
- 
-+if USE_VORBIS
-+if USE_THEORA
-+check_encodebin = elements/encodebin
-+else
-+check_encodebin =
-+endif
-+else
-+check_encodebin =
-+endif
-+
- if USE_PLUGIN_SUBPARSE
- check_subparse = elements/subparse
- else
-@@ -106,7 +116,7 @@ check_PROGRAMS = \
- 	elements/audiotestsrc \
- 	elements/decodebin \
- 	elements/decodebin2 \
--	elements/encodebin \
-+	$(check_encodebin) \
- 	elements/ffmpegcolorspace \
- 	elements/gdpdepay \
- 	elements/gdppay \
---- a/tests/check/Makefile.in
-+++ b/tests/check/Makefile.in
-@@ -43,7 +43,7 @@
- 	elements/audioconvert$(EXEEXT) elements/audiorate$(EXEEXT) \
- 	elements/audioresample$(EXEEXT) elements/audiotestsrc$(EXEEXT) \
- 	elements/decodebin$(EXEEXT) elements/decodebin2$(EXEEXT) \
--	elements/encodebin$(EXEEXT) elements/ffmpegcolorspace$(EXEEXT) \
-+	$(am__EXEEXT_11) elements/ffmpegcolorspace$(EXEEXT) \
- 	elements/gdpdepay$(EXEEXT) elements/gdppay$(EXEEXT) \
- 	elements/multifdsink$(EXEEXT) elements/playbin$(EXEEXT) \
-	elements/playbin2$(EXEEXT) $(am__EXEEXT_8) \
-@@ -114,7 +114,9 @@
- @USE_VORBIS_TRUE@	pipelines/vorbisdec$(EXEEXT) \
- @USE_VORBIS_TRUE@	elements/vorbistag$(EXEEXT)
- @USE_THEORA_TRUE@am__EXEEXT_7 = pipelines/theoraenc$(EXEEXT)
-+@USE_THEORA_TRUE@@USE_VORBIS_TRUE@am__EXEEXT_11 =  \
-+@USE_THEORA_TRUE@@USE_VORBIS_TRUE@	elements/encodebin$(EXEEXT)
- @USE_PLUGIN_SUBPARSE_TRUE@am__EXEEXT_8 = elements/subparse$(EXEEXT)
- @HAVE_ORC_TRUE@am__EXEEXT_9 = orc/adder$(EXEEXT) \
- @HAVE_ORC_TRUE@	orc/audioconvert$(EXEEXT) orc/volume$(EXEEXT) \
- @HAVE_ORC_TRUE@	orc/videoscale$(EXEEXT) \
-@@ -932,6 +933,9 @@
- 
- @USE_THEORA_FALSE@check_theora = 
- @USE_THEORA_TRUE@check_theora = pipelines/theoraenc
-+@USE_THEORA_FALSE@@USE_VORBIS_TRUE@check_encodebin = 
-+@USE_THEORA_TRUE@@USE_VORBIS_TRUE@check_encodebin = elements/encodebin
-+@USE_VORBIS_FALSE@check_encodebin = 
- @USE_PLUGIN_SUBPARSE_FALSE@check_subparse = 
- @USE_PLUGIN_SUBPARSE_TRUE@check_subparse = elements/subparse
- @HAVE_ORC_FALSE@check_orc = 
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.2.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.2.3.ebuild
deleted file mode 100644
index 4dd8f191a3f6..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.2.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-1.2.3.ebuild,v 1.10 2014/04/21 10:29:26 ago Exp $
-
-EAPI="5"
-
-inherit gst-plugins-base gst-plugins10
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X"
-REQUIRED_USE="
-	ivorbis? ( ogg )
-	theora? ( ogg )
-	vorbis? ( ogg )
-"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.32:2
-	>=media-libs/gstreamer-${PV}:1.0[introspection?]
-	sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-0.9.1 )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-	ivorbis? ( media-libs/tremor )
-	ogg? ( >=media-libs/libogg-1 )
-	orc? ( >=dev-lang/orc-0.4.18 )
-	pango? ( >=x11-libs/pango-1.22 )
-	theora? ( >=media-libs/libtheora-1.1[encode] )
-	vorbis? ( >=media-libs/libvorbis-1 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXv )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	X? (
-		x11-proto/videoproto
-		x11-proto/xextproto
-		x11-proto/xproto )
-"
-
-src_prepare() {
-	# The AC_PATH_XTRA macro unnecessarily pulls in libSM and libICE even
-	# though they are not actually used. This needs to be fixed upstream by
-	# replacing AC_PATH_XTRA with PKG_CONFIG calls.
-	sed -i -e 's:X_PRE_LIBS -lSM -lICE:X_PRE_LIBS:' "${S}"/configure || die
-}
-
-src_configure() {
-	gst-plugins10_src_configure \
-		$(use_enable alsa) \
-		$(use_enable introspection) \
-		$(use_enable ivorbis) \
-		$(use_enable ogg) \
-		$(use_enable orc) \
-		$(use_enable pango) \
-		$(use_enable theora) \
-		$(use_enable vorbis) \
-		$(use_enable X x) \
-		$(use_enable X xshm) \
-		$(use_enable X xvideo) \
-		--disable-debug \
-		--disable-examples \
-		--disable-freetypetest \
-		--disable-static
-	# cdparanoia and libvisual are split out, per leio's request
-
-	# bug #366931, flag-o-matic for the whole thing is overkill
-	if [[ ${CHOST} == *86-*-darwin* ]] ; then
-		sed -i \
-			-e '/FLAGS = /s|-O[23]|-O1|g' \
-			gst/audioconvert/Makefile \
-			gst/volume/Makefile || die
-	fi
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	DOCS="AUTHORS NEWS README RELEASE"
-	default
-	prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.2.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.4.5.ebuild
index dfafd2db5611..e6c659fd4017 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.2.4.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.4.5.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-1.2.4.ebuild,v 1.1 2014/05/31 14:01:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-1.4.5.ebuild,v 1.1 2014/12/24 18:43:16 leio Exp $
 
 EAPI="5"
-inherit gst-plugins-base gst-plugins10
+
+GST_ORG_MODULE="gst-plugins-base"
+inherit gstreamer
 
 DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
@@ -19,28 +21,28 @@ REQUIRED_USE="
 
 RDEPEND="
 	app-text/iso-codes
-	>=dev-libs/glib-2.32:2
-	>=media-libs/gstreamer-1.2.0:1.0[introspection?]
-	sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-0.9.1 )
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-	ivorbis? ( media-libs/tremor )
-	ogg? ( >=media-libs/libogg-1 )
-	orc? ( >=dev-lang/orc-0.4.18 )
-	pango? ( >=x11-libs/pango-1.22 )
-	theora? ( >=media-libs/libtheora-1.1[encode] )
-	vorbis? ( >=media-libs/libvorbis-1 )
+	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.18[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
 	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXv )
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.12
 	X? (
-		x11-proto/videoproto
-		x11-proto/xextproto
-		x11-proto/xproto )
+		>=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
 "
 
 src_prepare() {
@@ -50,10 +52,10 @@ src_prepare() {
 	sed -i -e 's:X_PRE_LIBS -lSM -lICE:X_PRE_LIBS:' "${S}"/configure || die
 }
 
-src_configure() {
-	gst-plugins10_src_configure \
+multilib_src_configure() {
+	gstreamer_multilib_src_configure \
 		$(use_enable alsa) \
-		$(use_enable introspection) \
+		$(multilib_native_use_enable introspection) \
 		$(use_enable ivorbis) \
 		$(use_enable ogg) \
 		$(use_enable orc) \
@@ -76,14 +78,17 @@ src_configure() {
 			gst/audioconvert/Makefile \
 			gst/volume/Makefile || die
 	fi
-}
 
-src_compile() {
-	default
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
 }
 
-src_install() {
+multilib_src_install_all() {
 	DOCS="AUTHORS NEWS README RELEASE"
-	default
+	einstalldocs
 	prune_libtool_files --modules
 }