[gentoo-commits] proj/gnome:master commit in: eclass/

[Gilles Dartiguelongue]

commit:     a1493bf1729411b3b06ede7bd73fc5d1994af255
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  2 14:09:54 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec  2 14:49:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a1493bf1

eclass/gst-plugins10.eclass: cleanup/updates

    * Fix cosmetic issue with EAPI=0 die message.
    * Group R/DEPEND definitions.
    * Add support for optional nls support for base pack plugins since
      they do support it.

---
 eclass/gst-plugins10.eclass |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/eclass/gst-plugins10.eclass b/eclass/gst-plugins10.eclass
index 4a18c36..db6102d 100644
--- a/eclass/gst-plugins10.eclass
+++ b/eclass/gst-plugins10.eclass
@@ -31,7 +31,7 @@ case "${EAPI:-0}" in
 		GST_EXPF="${GST_EXPF} src_configure src_compile src_install"
 		;;
 	0)
-		die "EAPI=\"${EAPI}\" is not supported anymore"
+		die "EAPI=\"${EAPI:-0}\" is not supported anymore"
 		;;
 	*)
 		die "EAPI=\"${EAPI}\" is not supported yet"
@@ -100,34 +100,32 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${GST_ORG_MODULE}/${GST_ORG_MODULE
 LICENSE="GPL-2"
 SLOT="${GST_ORG_PVP}"
 
-if [[ ${PN} != ${GST_ORG_MODULE} ]]; then
-	# Do not run test phase for invididual plugin ebuilds.
-	RESTRICT="test"
-fi
+S="${WORKDIR}/${GST_ORG_MODULE}-${PV}"
 
-RDEPEND="${RDEPEND}
+RDEPEND="
 	>=dev-libs/glib-2.6:2
 	media-libs/gstreamer:${SLOT}
 "
+DEPEND="
+	>=sys-apps/sed-4
+	virtual/pkgconfig
+"
 
-#else
-# XXX: verify with old ebuilds.
-# DEPEND="${DEPEND} dev-libs/liboil"
-
-# added to remove circular deps
-# 6/2/2006 - zaheerm
 if [[ ${PN} != ${GST_ORG_MODULE} ]]; then
+	# Do not run test phase for invididual plugin ebuilds.
+	RESTRICT="test"
 	RDEPEND="${RDEPEND} >=media-libs/${GST_ORG_MODULE}-${PV}:${SLOT}"
+else
+	IUSE="nls"
+	DEPEND="${DEPEND} nls? ( >=sys-devel/gettext-0.17 )"
 fi
 
-DEPEND="${RDEPEND} ${DEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${GST_ORG_MODULE}-${PV}"
+#if [[ ${SLOT} == "0.10" ]]; then
+# XXX: verify with old ebuilds.
+# DEPEND="${DEPEND} dev-libs/liboil"
+#fi
 
+DEPEND="${DEPEND} ${RDEPEND}"
 
 # @FUNCTION: gst-plugins10_get_plugins
 # @INTERNAL
@@ -227,6 +225,10 @@ gst-plugins10_src_configure() {
 		gst_conf="${gst_conf} --disable-schemas-compile"
 	fi
 
+	if [[ ${PN} == ${GST_ORG_MODULE} ]]; then
+		gst_conf="${gst_conf} $(use_enable nls)"
+	fi
+
 	einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..."
 	econf \
 		--with-package-name="Gentoo GStreamer ebuild" \