All liboil using versions are now gone from the tree, so simply the orc handling logic and remove support for econfing those removed old versions.

1 files changed, 11 insertions, 33 deletions

diff --git a/eclass/gst-plugins-ugly.eclass b/eclass/gst-plugins-ugly.eclass
index cc9847e30bec..08f146d08e6e 100644
--- a/eclass/gst-plugins-ugly.eclass
+++ b/eclass/gst-plugins-ugly.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-ugly.eclass,v 1.22 2011/03/17 21:12:40 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-ugly.eclass,v 1.23 2011/05/04 02:23:40 leio Exp $
 
 # Author : foser <foser@gentoo.org>
 
@@ -11,8 +11,7 @@
 #
 # 3rd party applications using gstreamer now should depend on a set of plugins as
 # defined in the source, in case of spider usage obtain recommended plugins to use from
-# Gentoo developers responsible for gstreamer <gnome@gentoo.org>, the application developer
-# or the gstreamer team.
+# Gentoo developers responsible for gstreamer <gstreamer@gentoo.org>.
 
 inherit eutils versionator gst-plugins10
 
@@ -23,16 +22,12 @@ inherit eutils versionator gst-plugins10
 
 MY_PN=gst-plugins-ugly
 MY_P=${MY_PN}-${PV}
+
 # All relevant configure options for gst-plugins-ugly
 # need a better way to extract these.
 my_gst_plugins_ugly="a52dec amrnb amrwb cdio dvdread lame mad mpeg2dec sidplay
 twolame x264"
 
-# dvdnav and id3tag disabled/removed since -ugly-0.10.13
-if ! version_is_at_least "0.10.13"; then
-	my_gst_plugins_bad+=" dvdnav id3tag"
-fi
-
 GST_UGLY_EXPORTED_FUNCTIONS="src_unpack src_compile src_install"
 
 case "${EAPI:-0}" in
@@ -51,15 +46,10 @@ esac
 # exports must be ALWAYS after inherit
 EXPORT_FUNCTIONS ${GST_UGLY_EXPORTED_FUNCTIONS}
 
-if version_is_at_least "0.10.16"; then
-	# Ensure GST_ORC is set to a default. This fact is also relied on in
-	# gst-plugins-ugly_src_configure, signalling it's >=0.10.16 and has orc options
-	GST_ORC=${GST_ORC:-"no"}
-	if [[ ${GST_ORC} == "yes" ]]; then
-		IUSE="+orc"
-	fi
-else
-	unset GST_ORC
+# Ensure GST_ORC is set to a default.
+GST_ORC=${GST_ORC:-"no"}
+if [[ ${GST_ORC} == "yes" ]]; then
+	IUSE="+orc"
 fi
 
 #SRC_URI="mirror://gnome/sources/gst-plugins/${PV_MAJ_MIN}/${MY_P}.tar.bz2"
@@ -81,13 +71,6 @@ DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
 	dev-util/pkgconfig"
 
-# -ugly-0.10.16 uses orc optionally instead of liboil unconditionally.
-# While <0.10.16 configure always checks for liboil, it is linked to only by a52dec,
-# so we only builddep for all packages, and have a RDEPEND in old gst-plugins-a52dec
-if ! version_is_at_least "0.10.16"; then
-DEPEND="${DEPEND} >=dev-libs/liboil-0.3.8"
-fi
-
 RESTRICT=test
 fi
 
@@ -110,15 +93,10 @@ gst-plugins-ugly_src_configure() {
 		gst_conf="${gst_conf} --enable-${plugin} "
 	done
 
-	gst_orc_conf=""
-	if [[ -n ${GST_ORC} ]]; then
-		if [[ ${GST_ORC} == "yes" ]]; then
-			gst_orc_conf="$(use_enable orc)"
-		else
-			gst_orc_conf="--disable-orc"
-		fi
+	gst_orc_conf="--disable-orc"
+	if [[ ${GST_ORC} == "yes" ]]; then
+		gst_orc_conf="$(use_enable orc)"
 	fi
-	#else leave gst_orc_conf empty, as $PV is less than 0.10.16, so no --enable/disable-orc yet
 
 	cd ${S}
 	econf ${gst_orc_conf} ${@} --with-package-name="Gentoo GStreamer Ebuild" --with-package-origin="http://www.gentoo.org" ${gst_conf} || die "./configure failure"