fix esd builds (bug #201730)

(Portage version: 2.1.4_rc9)

3 files changed, 109 insertions, 1 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/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