version bump for GNOME 2.20

(Portage version: 2.1.3.11)

4 files changed, 135 insertions, 1 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 6ce09116f398..254897ac5b45 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,13 @@
 # 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.248 2007/09/23 04:56:49 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.249 2007/10/04 04:25:18 compnerd Exp $
+
+*control-center-2.20.0.1 (04 Oct 2007)
+
+  04 Oct 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/control-center-2.19.90-no-esd.patch,
+  +control-center-2.20.0.1.ebuild:
+  Version bump for GNOME 2.20
 
   22 Sep 2007; Tom Gall <tgall@gentoo.org> control-center-2.18.1.ebuild:
   stable on ppc64
diff --git a/gnome-base/control-center/control-center-2.20.0.1.ebuild b/gnome-base/control-center/control-center-2.20.0.1.ebuild
new file mode 100644
index 000000000000..e918b1a17f89
--- /dev/null
+++ b/gnome-base/control-center/control-center-2.20.0.1.ebuild
@@ -0,0 +1,104 @@
+# 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.0.1.ebuild,v 1.1 2007/10/04 04:25:18 compnerd Exp $
+
+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 )
+	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
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 )
+	)
+	eds? ( >=gnome-extra/evolution-data-server-1.7 )
+	!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
+	>=media-libs/gst-plugins-base-0.10.2
+	>=media-libs/gstreamer-0.10.2"
+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"
+
+	epatch "${FILESDIR}/${PN}-2.19.90-no-esd.patch"
+
+	# Fix tests
+	echo "capplets/appearance/data/gnome-appearance-properties.desktop.in" >> "${S}/po/POTFILES.skip"
+	echo "capplets/appearance/data/gnome-theme-installer.desktop.in" >> "${S}/po/POTFILES.skip"
+	echo "capplets/appearance/data/gnome-appearance-properties.desktop.in" >> "${S}/po/POTFILES.skip"
+	echo "capplets/appearance/data/gnome-theme-installer.desktop.in" >> "${S}/po/POTFILES.skip"
+
+	eautoreconf
+}
diff --git a/gnome-base/control-center/files/control-center-2.19.90-no-esd.patch b/gnome-base/control-center/files/control-center-2.19.90-no-esd.patch
new file mode 100644
index 000000000000..5c00d733315b
--- /dev/null
+++ b/gnome-base/control-center/files/control-center-2.19.90-no-esd.patch
@@ -0,0 +1,20 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-control-center-2.19.90.orig/configure.in gnome-control-center-2.19.90/configure.in
+--- gnome-control-center-2.19.90.orig/configure.in	2007-08-13 18:01:24.000000000 -0400
++++ gnome-control-center-2.19.90/configure.in	2007-08-27 20:48:02.000000000 -0400
+@@ -100,7 +100,7 @@ PKG_CHECK_MODULES(LIBSLAB, $COMMON_MODUL
+ PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
+ PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0)
+ PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON,
+-  [gtk+-2.0 gconf-2.0 libgnomeui-2.0 esound gnome-desktop-2.0 libglade-2.0])
++  [gtk+-2.0 gconf-2.0 libgnomeui-2.0 gnome-desktop-2.0 libglade-2.0])
+ PKG_CHECK_MODULES(OLD_CAPPLET, libgnomeui-2.0 libglade-2.0)
+ PKG_CHECK_MODULES(GNOME, libgnomeui-2.0)
+ PKG_CHECK_MODULES(GTK, gtk+-2.0)
+@@ -432,7 +432,6 @@ AC_SUBST(GST_LIBS)
+ AC_SUBST(GST_CFLAGS)
+ 
+ if test "x$have_gstreamer" = "xyes"; then
+-  PKG_CHECK_MODULES(SOUND_CAPPLET, esound)
+   SOUND_CAPPLET_LIBS="$SOUND_CAPPLET_LIBS $GST_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10"
+   SOUND_CAPPLET_CFLAGS="$SOUND_CAPPLET_CFLAGS $GST_CFLAGS"
+   AC_SUBST(SOUND_CAPPLET_LIBS)
diff --git a/gnome-base/control-center/files/digest-control-center-2.20.0.1 b/gnome-base/control-center/files/digest-control-center-2.20.0.1
new file mode 100644
index 000000000000..fb039fbbd2ec
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.20.0.1
@@ -0,0 +1,3 @@
+MD5 2c14dab486227fe15451468780f11b74 gnome-control-center-2.20.0.1.tar.bz2 2290108
+RMD160 5da149dbd78bb2daaadb4d548cce12561028807c gnome-control-center-2.20.0.1.tar.bz2 2290108
+SHA256 46feb6e00cba24269887ec1d3fce57323d4b3314dfa8ec280c7669c389df0997 gnome-control-center-2.20.0.1.tar.bz2 2290108