Version bump for 2.18.1

(Portage version: 2.1.2.4)

5 files changed, 132 insertions, 1 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 68e856453cad..3fd59942df69 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.224 2007/04/01 11:54:06 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.225 2007/04/17 02:49:37 compnerd Exp $
+
+*control-center-2.18.1 (17 Apr 2007)
+
+  17 Apr 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/control-center-2.18.1-gnome-doc-utils-fix.patch,
+  +control-center-2.18.1.ebuild:
+  Version bump for 2.18.1
 
   01 Apr 2007; Marinus Schraal <foser@gentoo.org> control-center-2.18.0.ebuild :
   Disable mimedb update during configure
diff --git a/gnome-base/control-center/control-center-2.18.1.ebuild b/gnome-base/control-center/control-center-2.18.1.ebuild
new file mode 100644
index 000000000000..15e82ca7f17f
--- /dev/null
+++ b/gnome-base/control-center/control-center-2.18.1.ebuild
@@ -0,0 +1,109 @@
+# 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.1 2007/04/17 02:49:37 compnerd Exp $
+
+inherit eutils gnome2 autotools
+
+DESCRIPTION="The gnome2 Desktop configuration tool"
+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"
+
+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.8
+	>=x11-libs/gtk+-2.10
+	>=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
+	esd? ( media-sound/esound )
+	hal? ( >=sys-apps/hal-0.5.6 )
+	dev-libs/libxml2
+	>=x11-wm/metacity-2.8.6-r1
+	>=x11-libs/libxklavier-2.91
+	>=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 ) )
+	gstreamer?	(
+		>=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.3.2
+	app-text/scrollkeeper
+	gnome-base/gnome-common
+	dev-util/desktop-file-utils"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-schemas-install \
+		--disable-update-mimedb \
+		--disable-scrollkeeper  \
+		--enable-vfs-methods    \
+		$(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() {
+	gnome2_src_unpack
+
+	# Gentoo-specific support for xcursor themes. See bug #103638.
+	epatch ${FILESDIR}/${PN}-2.11-gentoo_xcursor.patch
+
+	# Disable the master pty check, as it causes sandbox violations
+	epatch ${FILESDIR}/${PN}-2.13.5-disable-master-pty.patch
+
+	# Allow building with scrollkeeper
+	epatch ${FILESDIR}/${PN}-2.18.1-gnome-doc-utils-fix.patch
+
+	eautoreconf
+	intltoolize --force || die
+}
diff --git a/gnome-base/control-center/files/control-center-2.18.1-gnome-doc-utils-fix.patch b/gnome-base/control-center/files/control-center-2.18.1-gnome-doc-utils-fix.patch
new file mode 100644
index 000000000000..a89dc4f3c921
--- /dev/null
+++ b/gnome-base/control-center/files/control-center-2.18.1-gnome-doc-utils-fix.patch
@@ -0,0 +1,11 @@
+--- gnome-doc-utils.make.orig	2007-04-14 16:50:19.000000000 -0500
++++ gnome-doc-utils.make	2007-04-14 16:52:06.000000000 -0500
+@@ -116,7 +116,7 @@
+ 	$(filter $(LINGUAS),$(DOC_LINGUAS)),					\
+ 	$(DOC_LINGUAS))
+ 
+-_DOC_ABS_SRCDIR = @abs_srcdir@
++_DOC_ABS_SRCDIR = "`pwd`/@abs_srcdir@"
+ 
+ 
+ ################################################################################
diff --git a/gnome-base/control-center/files/digest-control-center-2.16.3 b/gnome-base/control-center/files/digest-control-center-2.16.3
index 4aa3656d43d2..afb437dca017 100644
--- a/gnome-base/control-center/files/digest-control-center-2.16.3
+++ b/gnome-base/control-center/files/digest-control-center-2.16.3
@@ -1,2 +1,3 @@
+MD5 75ec00d864a69684abc561546fb762bb control-center-2.16.3.tar.bz2 2025478
 RMD160 313804094b0ad0f5dd801d71fc1214798290ed99 control-center-2.16.3.tar.bz2 2025478
 SHA256 6bffec96f9014b3742df80f193b68877e31b26b2a1cc0ba961fcba15a22af9d9 control-center-2.16.3.tar.bz2 2025478
diff --git a/gnome-base/control-center/files/digest-control-center-2.18.1 b/gnome-base/control-center/files/digest-control-center-2.18.1
new file mode 100644
index 000000000000..817d7b5167b9
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.18.1
@@ -0,0 +1,3 @@
+MD5 bae0fd0f9e32f374bd7236d98788b13f control-center-2.18.1.tar.bz2 2150134
+RMD160 f3980d2348a699f646d87ec27c61f27057594302 control-center-2.18.1.tar.bz2 2150134
+SHA256 3bb1474a6914d5a210a6f21368c48c9c302918a4ab94a5282b84b57ebc432c87 control-center-2.18.1.tar.bz2 2150134