fix esd builds (bug #201730)

Package-Manager: portage-2.1.4_rc9

4 files changed, 120 insertions, 15 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index f214ac7ea9ca..7c5023b8b571 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,12 @@
 # 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.258 2007/11/29 05:30:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.259 2007/12/13 07:23:12 compnerd Exp $
+
+*control-center-2.20.1-r1 (13 Dec 2007)
+
+  13 Dec 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +control-center-2.20.1-r1.ebuild:
+  The esd patch should only be applied if esd is disabled (bug #201730)
 
   29 Nov 2007; Jeroen Roovers <jer@gentoo.org> control-center-2.20.1.ebuild:
   Stable for HPPA (bug #199740).
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index 5c24f5aa44e8..2c943658868e 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,6 +1,3 @@
------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
@@ -32,14 +29,18 @@ EBUILD control-center-2.18.1.ebuild 2806 RMD160 fbb5e5e426b92514ccbb5a98f00f02df
 MD5 99b774c280b282f1d9229e109e570a2a control-center-2.18.1.ebuild 2806
 RMD160 fbb5e5e426b92514ccbb5a98f00f02df808aed24 control-center-2.18.1.ebuild 2806
 SHA256 a2a238dd23d3cc160feb1eb5569914960baf7e3e5847e8861ee4baa15f387c0d control-center-2.18.1.ebuild 2806
+EBUILD control-center-2.20.1-r1.ebuild 2656 RMD160 380c0a963a3f17945958056eb1c797038c7dba0d SHA1 648119dd942fac1e6285a25ca8d4c84d469a3a5a SHA256 d4a7bdf00d0b99a880bf1c0a4d2c73be092d031258196995c7f5f7a68fac1dcc
+MD5 ddaf9efc86391c9bac27f81e6eba730e control-center-2.20.1-r1.ebuild 2656
+RMD160 380c0a963a3f17945958056eb1c797038c7dba0d control-center-2.20.1-r1.ebuild 2656
+SHA256 d4a7bdf00d0b99a880bf1c0a4d2c73be092d031258196995c7f5f7a68fac1dcc control-center-2.20.1-r1.ebuild 2656
 EBUILD control-center-2.20.1.ebuild 2586 RMD160 11cbaf33cadead6b0236a2b58e3c997dbeff7e2a SHA1 4107f264213e09bb8cebd75a45a3ff49a3ee2e83 SHA256 2c24ed3c9009d3ae851eb890fac94378829f7d3005e53b6334a10fa0f5065320
 MD5 78f7726793b462adddf65650065f633d control-center-2.20.1.ebuild 2586
 RMD160 11cbaf33cadead6b0236a2b58e3c997dbeff7e2a control-center-2.20.1.ebuild 2586
 SHA256 2c24ed3c9009d3ae851eb890fac94378829f7d3005e53b6334a10fa0f5065320 control-center-2.20.1.ebuild 2586
-MISC ChangeLog 34848 RMD160 a8f317d5bbc45e3937d7035c87afbfb71e152dc4 SHA1 0dfea29b04ca936d144731b2e8524ff941212639 SHA256 58d13cc729b5029908e202a7c8afb47a4faaae2255ea0ebb5cb5189026bd6ef5
-MD5 fdf23b5ae90449e1926f043ef8bbe313 ChangeLog 34848
-RMD160 a8f317d5bbc45e3937d7035c87afbfb71e152dc4 ChangeLog 34848
-SHA256 58d13cc729b5029908e202a7c8afb47a4faaae2255ea0ebb5cb5189026bd6ef5 ChangeLog 34848
+MISC ChangeLog 35059 RMD160 4a19e079a162a5af5422d8e3a8c776787e00d1db SHA1 24d37d9c952fe1642ffc5237745b0cfdd737fcc5 SHA256 48cfa9c8b1dcf350de3ed69517c2ed8cac93d9f7d54daf58190927b6216b04c2
+MD5 8489421972b9b5bd89ca472fa78f1779 ChangeLog 35059
+RMD160 4a19e079a162a5af5422d8e3a8c776787e00d1db ChangeLog 35059
+SHA256 48cfa9c8b1dcf350de3ed69517c2ed8cac93d9f7d54daf58190927b6216b04c2 ChangeLog 35059
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -53,10 +54,6 @@ SHA256 cf2bc498f431016785a9c2b0d2dca076c48dc66ac884bcfd4a8593f0be501df7 files/di
 MD5 e4ad65f913bb0f8bd38e017cfd9a09a1 files/digest-control-center-2.20.1 289
 RMD160 9e20b544b119f6bfefd460a7a49bf6b6eebc76ae files/digest-control-center-2.20.1 289
 SHA256 eaabb8385f5f1c9d7aea8e916626f9db23a1f3e01ad159c26e9a50aa8000ce84 files/digest-control-center-2.20.1 289
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHToTBkeYb6olFHJcRAoMQAKDExTClZqKOIF20lbrTPc4bnB4GvwCgnBtR
-xyscNw8gJ4cfWNfFcgf7z6k=
-=Vndv
------END PGP SIGNATURE-----
+MD5 e4ad65f913bb0f8bd38e017cfd9a09a1 files/digest-control-center-2.20.1-r1 289
+RMD160 9e20b544b119f6bfefd460a7a49bf6b6eebc76ae files/digest-control-center-2.20.1-r1 289
+SHA256 eaabb8385f5f1c9d7aea8e916626f9db23a1f3e01ad159c26e9a50aa8000ce84 files/digest-control-center-2.20.1-r1 289
diff --git a/gnome-base/control-center/control-center-2.20.1-r1.ebuild b/gnome-base/control-center/control-center-2.20.1-r1.ebuild
new file mode 100644
index 000000000000..c29124ea9b2c
--- /dev/null
+++ b/gnome-base/control-center/control-center-2.20.1-r1.ebuild
@@ -0,0 +1,99 @@
+# 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.20.1-r1.ebuild,v 1.1 2007/12/13 07:23:12 compnerd Exp $
+EAPI="1"
+
+inherit eutils gnome2 autotools
+
+DESCRIPTION="The gnome2 Desktop configuration tool"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="mirror://gnome/sources/gnome-${PN}/${PVP[0]}.${PVP[1]}/gnome-${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa eds esd hal"
+
+RDEPEND=">=gnome-base/gnome-vfs-2.2
+	>=media-libs/fontconfig-1
+	>=virtual/xft-2.1.2
+	x11-apps/xmodmap
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXdmcp
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXxf86misc
+	x11-libs/libXau
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/pango
+	>=dev-libs/glib-2.13.0
+	>=x11-libs/gtk+-2.11.6
+	>=gnome-base/libbonobo-2
+	>=gnome-base/libgnomeui-2.2
+	>=gnome-base/nautilus-2.6
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonoboui-2.2
+	>=gnome-base/gnome-desktop-2.2
+	>=gnome-base/librsvg-2
+	>=gnome-base/gnome-menus-2.11.1
+	>=gnome-base/gnome-panel-2
+	>=gnome-base/libgnomekbd-0.1
+	esd? ( >=media-sound/esound-0.2.38 )
+	hal? ( >=sys-apps/hal-0.5.6 )
+	dev-libs/libxml2
+	>=x11-wm/metacity-2.8.6-r1
+	>=x11-libs/libxklavier-3.2
+	>=gnome-base/libgnome-2.2
+	media-libs/freetype
+	>=gnome-base/orbit-2.12.4
+	>=dev-libs/dbus-glib-0.71
+	eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
+	!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
+	>=media-libs/gst-plugins-base-0.10.2
+	media-plugins/gst-plugins-gconf
+	>=media-libs/gstreamer-0.10.2
+	media-plugins/gst-plugins-meta:0.10"
+DEPEND="${RDEPEND}
+	x11-proto/kbproto
+	x11-proto/xextproto
+	x11-libs/libxkbfile
+	x11-proto/xf86miscproto
+	x11-proto/scrnsaverproto
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	>=app-text/gnome-doc-utils-0.10.1
+	app-text/scrollkeeper
+	gnome-base/gnome-common
+	dev-util/desktop-file-utils"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+S="${WORKDIR}/gnome-${P}"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-schemas-install \
+		--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)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Allow building with scrollkeeper
+	epatch "${FILESDIR}/${PN}-2.18.1-gnome-doc-utils-fix.patch"
+
+	# This patch is conditional (bug #201730)
+	use esd || epatch "${FILESDIR}/${PN}-2.19.90-no-esd.patch"
+
+	eautoreconf
+}
diff --git a/gnome-base/control-center/files/digest-control-center-2.20.1-r1 b/gnome-base/control-center/files/digest-control-center-2.20.1-r1
new file mode 100644
index 000000000000..5c610176955f
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.20.1-r1
@@ -0,0 +1,3 @@
+MD5 d7420f0fc28937573a13bc5c1633b23b gnome-control-center-2.20.1.tar.bz2 2292719
+RMD160 ce5c5a270679f779fbec59aa887aba239b3f1d84 gnome-control-center-2.20.1.tar.bz2 2292719
+SHA256 631d7621584a27a0edc43f05c6e2b45d6c44c1bc570abaa155472ca9b321d4d0 gnome-control-center-2.20.1.tar.bz2 2292719