Doesn't build without gstreamer anymore

Package-Manager: portage-2.1.2.9

3 files changed, 28 insertions, 21 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 2f33bfd363b7..3737c3e8a440 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.235 2007/06/02 02:56:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.236 2007/06/11 19:36:48 dang Exp $
+
+  11 Jun 2007; Daniel Gryniewicz <dang@gentoo.org>
+  control-center-2.18.1.ebuild:
+  Doesn't build without gstreamer anymore
 
   02 Jun 2007; Brent Baude <ranger@gentoo.org> control-center-2.16.3.ebuild:
   Marking control-center-2.16.3 ppc stable for bug #171107
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index 495468f1e6a4..78c7ed1dc544 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX control-center-2.11-gentoo_xcursor.patch 527 RMD160 bf455b0cf0c98c303c0885d5bcc7a72005b63108 SHA1 dc3e5afcb696034069d2ddc4d87c2905532e914c SHA256 682ed264c5ac0ed848b5cf3e856ee4440201be94f81b3dad4066233aaec48d9a
 MD5 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527
 RMD160 bf455b0cf0c98c303c0885d5bcc7a72005b63108 files/control-center-2.11-gentoo_xcursor.patch 527
@@ -43,14 +46,14 @@ EBUILD control-center-2.18.0.ebuild 2689 RMD160 bfe1f126c42ae9c4b0ffcffb2f161116
 MD5 9353d981b21565d9e4d2bf55b4d699b8 control-center-2.18.0.ebuild 2689
 RMD160 bfe1f126c42ae9c4b0ffcffb2f16111602e371d0 control-center-2.18.0.ebuild 2689
 SHA256 5819505572225f236f4d2d5edc9db740093ed0882fdf43a17ed3887b28724034 control-center-2.18.0.ebuild 2689
-EBUILD control-center-2.18.1.ebuild 2861 RMD160 d488ee1ca9bdb683abaeb8874bfea2a890663330 SHA1 21e1128b5f35bc3583c8e424fc879c63f5ffabe3 SHA256 eec827f898af10c00a31c0b948c47c1b99e7ba9a14896a9b55cabdd16ea55613
-MD5 1d52f323fefe9f74ac272872fa928871 control-center-2.18.1.ebuild 2861
-RMD160 d488ee1ca9bdb683abaeb8874bfea2a890663330 control-center-2.18.1.ebuild 2861
-SHA256 eec827f898af10c00a31c0b948c47c1b99e7ba9a14896a9b55cabdd16ea55613 control-center-2.18.1.ebuild 2861
-MISC ChangeLog 31661 RMD160 8300f391fb4614981cbb2f25945cb3ed724c5482 SHA1 33e133dcb7856eaea892f5206b518f2391bd35b7 SHA256 ca273da0fc1e3dd69333465e6aed8c8102c6a3fc8a8cfbc7d4f21addf95a1c59
-MD5 d80e4fc9cdd431afad3a7c2b339c225a ChangeLog 31661
-RMD160 8300f391fb4614981cbb2f25945cb3ed724c5482 ChangeLog 31661
-SHA256 ca273da0fc1e3dd69333465e6aed8c8102c6a3fc8a8cfbc7d4f21addf95a1c59 ChangeLog 31661
+EBUILD control-center-2.18.1.ebuild 2736 RMD160 bc88324c583d2f6474babf42c541a7b772a10605 SHA1 fc2cd819ccba878fd992744d7f20a8b7f1b0fd21 SHA256 fc7088f1bea480ce9701ed8567d53f90778065fdc909c50fa2d58bfbe01e1de1
+MD5 75dea71dd74b3fc1cb4f11e4e153a072 control-center-2.18.1.ebuild 2736
+RMD160 bc88324c583d2f6474babf42c541a7b772a10605 control-center-2.18.1.ebuild 2736
+SHA256 fc7088f1bea480ce9701ed8567d53f90778065fdc909c50fa2d58bfbe01e1de1 control-center-2.18.1.ebuild 2736
+MISC ChangeLog 31785 RMD160 d824c8e4c76fc43d4ad63a33424151961214a8a0 SHA1 97a0979bdfbe694fdca6392a918ef2f455981745 SHA256 49a1a552c809ebab51c2e9dde8c76fe774664d4ecf5cf04e51ca6bf98bd896d8
+MD5 422ae0e6c2088ff2b9239b28a0f060d4 ChangeLog 31785
+RMD160 d824c8e4c76fc43d4ad63a33424151961214a8a0 ChangeLog 31785
+SHA256 49a1a552c809ebab51c2e9dde8c76fe774664d4ecf5cf04e51ca6bf98bd896d8 ChangeLog 31785
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -70,3 +73,10 @@ SHA256 f4de778088f40660791efd4cd3ad394f8e179726da7297ca20ea1269f0b7a77f files/di
 MD5 f84d983b3484feb31c85348fa89d37d0 files/digest-control-center-2.18.1 271
 RMD160 f191c70a67df5a477abd305cfb019055a3bb6c45 files/digest-control-center-2.18.1 271
 SHA256 cf2bc498f431016785a9c2b0d2dca076c48dc66ac884bcfd4a8593f0be501df7 files/digest-control-center-2.18.1 271
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGbaRtomPajV0RnrERAlCUAJ9ZrMuDHygGoUjPKvc28jJAcaz7jwCdG9+A
+gaXx+JUbZt4WnWmekaTLl0s=
+=oFdk
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/control-center/control-center-2.18.1.ebuild b/gnome-base/control-center/control-center-2.18.1.ebuild
index 2f5b460332ca..d125d66c1da9 100644
--- a/gnome-base/control-center/control-center-2.18.1.ebuild
+++ b/gnome-base/control-center/control-center-2.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.18.1.ebuild,v 1.3 2007/05/01 16:05:23 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.18.1.ebuild,v 1.4 2007/06/11 19:36:48 dang Exp $
 
 inherit eutils gnome2 autotools
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa eds esd gstreamer hal"
+IUSE="alsa eds esd hal"
 
 RDEPEND=">=gnome-base/gnome-vfs-2.2
 	>=media-libs/fontconfig-1
@@ -54,10 +54,8 @@ RDEPEND=">=gnome-base/gnome-vfs-2.2
 	)
 	eds? ( >=gnome-extra/evolution-data-server-1.7 )
 	!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
-	gstreamer?	(
-		>=media-libs/gst-plugins-base-0.10.2
-		>=media-libs/gstreamer-0.10.2
-	)"
+	>=media-libs/gst-plugins-base-0.10.2
+	>=media-libs/gstreamer-0.10.2"
 
 DEPEND="${RDEPEND}
 	x11-proto/kbproto
@@ -80,16 +78,11 @@ pkg_setup() {
 		--disable-update-mimedb \
 		--disable-scrollkeeper  \
 		--enable-vfs-methods    \
+		--enable-gstreamer=0.10 \
 		$(use_enable esd)       \
 		$(use_enable alsa)      \
 		$(use_enable hal)       \
 		$(use_enable eds aboutme)"
-
-	if use gstreamer ; then
-		G2CONF="${G2CONF} --enable-gstreamer=0.10"
-	else
-		G2CONF="${G2CONF} --enable-gstreamer=no"
-	fi
 }
 
 src_unpack() {