Patch configure to support three components in bisons versioning. Use versionator not to show bad example to our new developers. Speed up build time by disabling both static libs and examples. Use EAPI=2 functions which will be required for -r2.

Package-Manager: portage-2.1.6.2/cvs/Linux 2.6.27.7 i686

4 files changed, 89 insertions, 2 deletions

diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog
index 14dc61d89d84..aa3e9345199b 100644
--- a/media-libs/gstreamer/ChangeLog
+++ b/media-libs/gstreamer/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/gstreamer
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.213 2008/12/05 19:16:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.214 2008/12/24 11:53:03 ssuominen Exp $
+
+*gstreamer-0.10.21-r1 (24 Dec 2008)
+
+  24 Dec 2008; <ssuominen@gentoo.org>
+  +files/gstreamer-0.10.21-bison241.patch, +gstreamer-0.10.21-r1.ebuild:
+  Patch configure to support three components in bisons versioning. 
+  Use versionator not to show bad example to our new developers.
+  Speed up build time by disabling both static libs and examples.
+  Use EAPI=2 functions. It will be required for -r2.
 
 *gstreamer-0.10.21 (05 Dec 2008)
 
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index d19d725bbf82..3a68aef84cc6 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,10 +1,12 @@
 AUX gstreamer-0.10.14-gstcaps.patch 506 RMD160 7d77743a78dfae975c025f659c7f3036a6de306f SHA1 05c590413953105fcbb0e071ed1b38c6103a7802 SHA256 d77061a547f4a658548b14f2de9579989ed1190381c41bbe9a4da578c734d57e
+AUX gstreamer-0.10.21-bison241.patch 547 RMD160 257a17ee81688e3c86eb3a62e8f4146d85dc793a SHA1 8da50114a524a12695835379ee6564c769cd3a79 SHA256 136f74dab6bd8233b3ae5be771474758e7aaca06ae7b0e6a6904bda841984d55
 AUX gstreamer-0.10.21-gtkdoc.patch 816 RMD160 70b89d12357dcf8fa063ead4f337ad39b3494db9 SHA1 7b6080f563afd9e31ae28f38bcbfcab3e4bc6564 SHA256 592d2257a038aa267b4e01a0dbdc3625ab55a00f763f85b75c573e413872a0b3
 DIST gstreamer-0.10.14.tar.bz2 2004318 RMD160 6e6f75c89da223ac42a0ab3cc1642b24007a9181 SHA1 29e02be4dbf50272086e436f3fab2dcfadaaff2b SHA256 e684179e63262c7271dbc50e64ead205cae013daac7264d8effbf60fed3f2438
 DIST gstreamer-0.10.20.tar.bz2 2253801 RMD160 8b3fa0ebdd30071c820bd3a9f7fec2104ff51bff SHA1 a95e731ee2d377c80eecd61a700cfa1090aaae92 SHA256 c839c3872510890bdbdfb43a79fd8b5646f3b9164b637127fb550351dc147eba
 DIST gstreamer-0.10.21.tar.bz2 2662621 RMD160 d801ff66390ef41880cf0be1fee6f7aebf177876 SHA1 892daa9517dd7603e80b009dc059e20f4daea66f SHA256 94c185a0452b5fcddb538f6b686ff959b7afca8340c48fdbe47c87a2a459c3d3
 EBUILD gstreamer-0.10.14.ebuild 2216 RMD160 cb317baf6a9067db2168bef6651b44dec393cbc0 SHA1 cda76a7b901d36bdcae18bfec4b059aaf21d6c5e SHA256 1efc0053fc3c9ee53a55d0c3488bb2bc3cd4e0e5e4664ff6516be9aa65f3dee3
 EBUILD gstreamer-0.10.20.ebuild 1605 RMD160 2d272fc2dfa4e8ebe08f9cac87fdd21b32919181 SHA1 ec88e83229ae62d377cc68dd32196d93cdb31595 SHA256 039d93accf50fa58eb0af9696cd515f11810a86b9723434a7fcd6307ef440a0b
+EBUILD gstreamer-0.10.21-r1.ebuild 1816 RMD160 3a1890d30e9674733680314e898a42c9df5936a9 SHA1 ffbf49777607a8c47692d493486a4d073263881a SHA256 35188b653f317b3c048a51e27eff8ddd1643f4c8cd3d053d0905ccc6f08bc35a
 EBUILD gstreamer-0.10.21.ebuild 1734 RMD160 297a0b864b20c938f45b49cd26f5368c90bdbf8d SHA1 e75dde85f3808ff79b26e18b2c179424b1a80ba6 SHA256 9fdd963c15ca509e2f9f8576ed2eb8e33789ad619164fe7e32d9bb1a8062fabf
-MISC ChangeLog 27447 RMD160 d9bad355d38999bd499ba0cdd486a6df541a0d92 SHA1 ecf81c4c191cd1b940f55d6b5744115960827662 SHA256 17d633946cd18b9bc4c50ad0f7eeca3676bfb25ece02cf79e86f20eac2c6a8c4
+MISC ChangeLog 27849 RMD160 6639b0c959530fb673f01e9128b866e3a85ad324 SHA1 d3289972ba62c872e64247cdb40d18616c15cf8f SHA256 519453c05d8b1479769e90385f109e4772b97b100c713484892bda28b90550b1
 MISC metadata.xml 181 RMD160 51814fbdcf7f32cfe70018b3af7fc798e41ff90d SHA1 faf40c45bd66b0072b95556cf7ab097d3be19511 SHA256 22c215902ccdc7fd8cdb765750fb23ea9d9b6c9d3edb1b45325c3469f8f6ffc5
diff --git a/media-libs/gstreamer/files/gstreamer-0.10.21-bison241.patch b/media-libs/gstreamer/files/gstreamer-0.10.21-bison241.patch
new file mode 100644
index 000000000000..1a941a66386c
--- /dev/null
+++ b/media-libs/gstreamer/files/gstreamer-0.10.21-bison241.patch
@@ -0,0 +1,14 @@
+--- common/m4/gst-parser.m4	2008/07/20 19:55:14	1.12
++++ common/m4/gst-parser.m4	2008/12/15 07:06:26	1.13
+@@ -15,10 +15,7 @@
+   bison_version=`$BISON_PATH --version | head -n 1 |  sed 's/^[[^0-9]]*//' | sed 's/[[^0-9]]*$//' | cut -d' ' -f1`
+   AC_MSG_CHECKING([bison version $bison_version >= $bison_min_version])
+ 
+-  if perl -w <<EOF
+-    exit ($bison_version < $bison_min_version) ? 0 : 1;
+-EOF 
+-  then 
++  if perl -we "exit ((v$bison_version ge v$bison_min_version) ? 0 : 1)"; then 
+     AC_MSG_RESULT([yes])
+   else 
+     AC_MSG_ERROR([no])
diff --git a/media-libs/gstreamer/gstreamer-0.10.21-r1.ebuild b/media-libs/gstreamer/gstreamer-0.10.21-r1.ebuild
new file mode 100644
index 000000000000..ea93faa821f9
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-0.10.21-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.21-r1.ebuild,v 1.1 2008/12/24 11:53:03 ssuominen Exp $
+
+EAPI=2
+
+inherit autotools eutils multilib versionator
+#inherit libtool versionator
+
+# Create a major/minor combo for our SLOT and executables suffix
+PV_MAJ_MIN=$(get_version_component_range '1-2')
+
+DESCRIPTION="Streaming media framework"
+HOMEPAGE="http://gstreamer.sourceforge.net"
+SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT=${PV_MAJ_MIN}
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug nls test"
+
+RDEPEND=">=dev-libs/glib-2.12:2
+	dev-libs/libxml2
+	>=dev-libs/check-0.9.2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	# Needed for sane .so versioning on Gentoo/FreeBSD
+	#elibtoolize
+	epatch "${FILESDIR}"/${P}-gtkdoc.patch \
+		"${FILESDIR}"/${P}-bison241.patch
+	AT_M4DIR="common/m4" eautoreconf
+}
+
+src_configure() {
+	# Disable static archives, dependency tracking  to and examples 
+	# to speed up build time
+	econf \
+		--disable-static \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		--disable-valgrind \
+		--disable-examples \
+		$(use_enable test tests) \
+		--with-package-name="GStreamer ebuild for Gentoo" \
+		--with-package-origin="http://packages.gentoo.org/package/media-libs/gstreamer"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE
+
+	# Remove unversioned binaries to allow SLOT installations in future
+	cd "${D}"/usr/bin
+	local gst_bins
+	for gst_bins in $(ls *-${PV_MAJ_MIN}); do
+		rm ${gst_bins/-${PV_MAJ_MIN}/}
+	done
+}