From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A5AA4138202 for ; Sun, 2 Dec 2012 14:50:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7BF6F21C027; Sun, 2 Dec 2012 14:50:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B7C6E21C027 for ; Sun, 2 Dec 2012 14:50:40 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C3FBC33D9EC for ; Sun, 2 Dec 2012 14:50:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 67D08E5449 for ; Sun, 2 Dec 2012 14:50:38 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1354459799.a1493bf1729411b3b06ede7bd73fc5d1994af255.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: eclass/ X-VCS-Repository: proj/gnome X-VCS-Files: eclass/gst-plugins10.eclass X-VCS-Directories: eclass/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: a1493bf1729411b3b06ede7bd73fc5d1994af255 X-VCS-Branch: master Date: Sun, 2 Dec 2012 14:50:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4cc57430-081a-4455-936c-d9431b61f4e3 X-Archives-Hash: 967020f94896c18a2be7ee06d5fb46ed commit: a1493bf1729411b3b06ede7bd73fc5d1994af255 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Dec 2 14:09:54 2012 +0000 Commit: Gilles Dartiguelongue gentoo 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" \