diff options
| author |   Zaheer Abbas Merali <zaheerm@gentoo.org> | 2006-02-06 17:45:19 +0000 |
|---|---|---|
| committer | Zaheer Abbas Merali <zaheerm@gentoo.org> | 2006-02-06 17:45:19 +0000 |
| commit | d08ab32aa2df50ff38bc9abc453ddd38278f5d1c (patch) | |
| tree | e22295d85780bc6bc9fc58e598137c45ba440ee1 /eclass | |
| parent | Fixing dependencies and closing bug #121741. (diff) | |
| download | gentoo-2-d08ab32aa2df50ff38bc9abc453ddd38278f5d1c.tar.gz gentoo-2-d08ab32aa2df50ff38bc9abc453ddd38278f5d1c.tar.bz2 gentoo-2-d08ab32aa2df50ff38bc9abc453ddd38278f5d1c.zip | |
Fixes circular dep bug #121714
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/gst-plugins-bad.eclass | 11 | ||||
| -rw-r--r-- | eclass/gst-plugins-base.eclass | 9 | ||||
| -rw-r--r-- | eclass/gst-plugins-good.eclass | 10 | ||||
| -rw-r--r-- | eclass/gst-plugins-ugly.eclass | 9 | ||||
| -rw-r--r-- | eclass/gst-plugins.eclass | 6 |
5 files changed, 30 insertions, 15 deletions
diff --git a/eclass/gst-plugins-bad.eclass b/eclass/gst-plugins-bad.eclass index 1db364fd5b38..54c8d8ee04e7 100644 --- a/eclass/gst-plugins-bad.eclass +++ b/eclass/gst-plugins-bad.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-bad.eclass,v 1.1 2006/01/21 01:29:12 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-bad.eclass,v 1.2 2006/02/06 17:45:19 zaheerm Exp $ # # Original Author: Saleem Abdulrasool <compnerd@gentoo.org> @@ -19,14 +19,17 @@ MY_P=${MY_PN}-${PV} SRC_URI="http://gstreamer.freedesktop.org/src/gst-plugins-bad/${MY_P}.tar.bz2" -RDEPEND=">=media-libs/gstreamer-0.10 - >=media-libs/gst-plugins-base-0.10 +# added to remove circular deps +# 6/2/2006 - zaheerm +if [ "${PN}" != "${MY_PN}" ]; then +RDEPEND="=media-libs/gstreamer-0.10* + =media-libs/gst-plugins-base-0.10* >=dev-libs/glib-2.6 >=dev-libs/liboil-0.3" DEPEND="${RDEPEND} sys-apps/sed sys-devel/gettext" - +fi S=${WORKDIR}/${MY_P} gst-plugins-bad_src_unpack() { diff --git a/eclass/gst-plugins-base.eclass b/eclass/gst-plugins-base.eclass index 94611e0018f0..dbbf1a6c6602 100644 --- a/eclass/gst-plugins-base.eclass +++ b/eclass/gst-plugins-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-base.eclass,v 1.2 2006/01/01 01:14:59 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-base.eclass,v 1.3 2006/02/06 17:45:18 zaheerm Exp $ # Author : foser <foser@gentoo.org> @@ -34,10 +34,13 @@ SRC_URI="http://gstreamer.freedesktop.org/src/gst-plugins-base/${MY_P}.tar.bz2" S=${WORKDIR}/${MY_P} -RDEPEND="=media-libs/${MY_P}" +# added to remove circular deps +# 6/2/2006 - zaheerm +if [ "${PN}" != "${MY_PN}" ]; then +RDEPEND="=media-libs/gst-plugins-base-0.10*" DEPEND="${RDEPEND} >=sys-apps/sed-4" - +fi ### # public functions diff --git a/eclass/gst-plugins-good.eclass b/eclass/gst-plugins-good.eclass index efc7b716cfb7..85932a4aae68 100644 --- a/eclass/gst-plugins-good.eclass +++ b/eclass/gst-plugins-good.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-good.eclass,v 1.3 2006/01/01 01:14:59 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-good.eclass,v 1.4 2006/02/06 17:45:18 zaheerm Exp $ # Author : foser <foser@gentoo.org>, zaheerm <zaheerm@gentoo.org> @@ -32,11 +32,13 @@ my_gst_plugins_good="gconf gconftool oss aalib aalibtest cairo esd esdtest flac SRC_URI="http://gstreamer.freedesktop.org/src/gst-plugins-good/${MY_P}.tar.bz2" S=${WORKDIR}/${MY_P} - -RDEPEND=">=media-libs/gst-plugins-base-0.9" +# added to remove circular deps +# 6/2/2006 - zaheerm +if [ "${PN}" != "${MY_PN}" ]; then +RDEPEND="=media-libs/gst-plugins-base-0.10*" DEPEND="${RDEPEND} >=sys-apps/sed-4" - +fi ### # public functions diff --git a/eclass/gst-plugins-ugly.eclass b/eclass/gst-plugins-ugly.eclass index a82d532d137b..4bc71a701c66 100644 --- a/eclass/gst-plugins-ugly.eclass +++ b/eclass/gst-plugins-ugly.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 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.4 2006/01/01 01:14:59 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-ugly.eclass,v 1.5 2006/02/06 17:45:18 zaheerm Exp $ # Author : foser <foser@gentoo.org> @@ -33,10 +33,13 @@ SRC_URI="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/${MY_P}.tar.bz2" S=${WORKDIR}/${MY_P} -RDEPEND=">=media-libs/gst-plugins-base-0.9" +# added to remove circular deps +# 6/2/2006 - zaheerm +if [ "${PN}" != "${MY_PN}" ]; then +RDEPEND="=media-libs/gst-plugins-base-0.10*" DEPEND="${RDEPEND} >=sys-apps/sed-4" - +fi ### # public functions diff --git a/eclass/gst-plugins.eclass b/eclass/gst-plugins.eclass index ba4692cf9760..fff6cb049d78 100644 --- a/eclass/gst-plugins.eclass +++ b/eclass/gst-plugins.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins.eclass,v 1.31 2005/09/09 13:09:28 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins.eclass,v 1.32 2006/02/06 17:45:18 zaheerm Exp $ # Author : foser <foser@gentoo.org> @@ -52,10 +52,14 @@ SLOT=${PV_MAJ_MIN} S=${WORKDIR}/${MY_P} +# added to remove circular deps +# 6/2/2006 - zaheerm +if [ "${P}" != "${MY_P}" ]; then RDEPEND="=media-libs/${MY_P}*" DEPEND="${RDEPEND} >=sys-apps/sed-4" +fi ### # internal functions |