cleaning up old revisions.

(Portage version: 2.1.5_rc6)

6 files changed, 8 insertions, 309 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index c60b8cf0e685..969c8c372347 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.268 2008/04/24 21:00:31 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.269 2008/05/01 13:23:09 eva Exp $
+
+  01 May 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/control-center-2.11-gentoo_xcursor.patch,
+  -files/control-center-2.13.5-disable-master-pty.patch,
+  -files/control-center-2.18.1-fbsd.patch, -control-center-2.18.1.ebuild,
+  -control-center-2.22.0.ebuild:
+  cleaning up old revisions.
 
   24 Apr 2008; Daniel Gryniewicz <dang@gentoo.org>
   control-center-2.20.3.ebuild:
diff --git a/gnome-base/control-center/control-center-2.18.1.ebuild b/gnome-base/control-center/control-center-2.18.1.ebuild
deleted file mode 100644
index d274500ee5ad..000000000000
--- a/gnome-base/control-center/control-center-2.18.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2008 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.18 2008/04/10 21:47:07 eva 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 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
-	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-plugins/gst-plugins-gconf
-	>=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"
-
-# 23 files missing from POTFILES.skip - too much to be worth the trouble to fix
-RESTRICT="test"
-
-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
-
-	# 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"
-
-	# Build on fbsd.  Bug #176655
-	epatch "${FILESDIR}/${PN}-2.18.1-fbsd.patch"
-
-	eautoreconf
-	intltoolize --force || die
-}
diff --git a/gnome-base/control-center/control-center-2.22.0.ebuild b/gnome-base/control-center/control-center-2.22.0.ebuild
deleted file mode 100644
index ba1fca46cd79..000000000000
--- a/gnome-base/control-center/control-center-2.22.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2008 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.22.0.ebuild,v 1.2 2008/04/10 21:47:07 eva 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=">=virtual/xft-2.1.2
-		 >=x11-libs/gtk+-2.11.6
-		 >=dev-libs/glib-2.15.5
-		 >=gnome-base/gconf-2.0
-		 >=gnome-base/libglade-2
-		 >=gnome-base/librsvg-2.0
-		 >=gnome-base/nautilus-2.6
-		 >=media-libs/fontconfig-1
-		 >=dev-libs/dbus-glib-0.73
-		 >=gnome-base/gnome-vfs-2.2
-		 >=x11-libs/libxklavier-3.3
-		 >=x11-wm/metacity-2.21.21
-		 >=gnome-base/gnome-panel-2.0
-		 >=gnome-base/libgnomekbd-2.21.4.1
-		 >=gnome-base/gnome-desktop-2.21.4
-		 >=gnome-base/gnome-menus-2.11.1
-		 gnome-base/eel
-		 gnome-base/gnome-settings-daemon
-
-		>=media-libs/gstreamer-0.10.1.2
-		>=media-libs/gst-plugins-base-0.10.1.2
-		>=media-plugins/gst-plugins-gconf-0.10
-		media-plugins/gst-plugins-meta:0.10
-
-		x11-libs/pango
-		dev-libs/libxml2
-		media-libs/freetype
-
-		!arm? ( alsa? ( >=media-libs/alsa-lib-0.9.0 ) )
-		eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
-		esd? ( >=media-sound/esound-0.2.28 )
-		hal? ( >=sys-apps/hal-0.5.6 )
-
-		>=gnome-base/libbonobo-2
-		>=gnome-base/libgnome-2.2
-		>=gnome-base/libbonoboui-2
-		>=gnome-base/libgnomeui-2.2
-
-		x11-apps/xmodmap
-		x11-libs/libXScrnSaver
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXxf86misc
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXcursor"
-DEPEND="${RDEPEND}
-		x11-proto/scrnsaverproto
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/xf86miscproto
-		x11-proto/kbproto
-		x11-proto/randrproto
-		x11-proto/renderproto
-
-		sys-devel/gettext
-		>=dev-util/intltool-0.35
-		>=dev-util/pkgconfig-0.19
-		dev-util/desktop-file-utils
-
-		app-text/scrollkeeper
-		gnome-base/gnome-common
-		>=app-text/gnome-doc-utils-0.10.1"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-S="${WORKDIR}/gnome-${P}"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-update-mimedb \
-			--enable-vfs-methods              \
-			--enable-gstreamer=0.10           \
-			$(use_enable alsa)                \
-			$(use_enable eds aboutme)         \
-			$(use_enable esd)                 \
-			$(use_enable hal)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Allow building with scrollkeeper
-	epatch "${FILESDIR}/${PN}-2.18.1-gnome-doc-utils-fix.patch"
-	eautoreconf
-}
diff --git a/gnome-base/control-center/files/control-center-2.11-gentoo_xcursor.patch b/gnome-base/control-center/files/control-center-2.11-gentoo_xcursor.patch
deleted file mode 100644
index e3ee78f84f58..000000000000
--- a/gnome-base/control-center/files/control-center-2.11-gentoo_xcursor.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- capplets/mouse/gnome-mouse-properties.c.orig	2005-08-25 00:33:26.000000000 +0100
-+++ capplets/mouse/gnome-mouse-properties.c	2005-08-25 00:39:48.000000000 +0100
-@@ -650,9 +650,11 @@
- 	// add the XCursor themes - paths taken from <xc/lib/Xcursor.library.c>
- 	const gchar* const paths[] = {
- 		"%s/.icons/",
-+		"%s/.cursors/",
- 		"/usr/share/icons/",
- 		"/usr/share/pixmaps/",
--		"/usr/X11R6/lib/X11/icons/",
-+		"/usr/share/cursors/xorg-x11/",
-+		"/usr/share/pixmaps/xorg-x11/",
- 		NULL
- 	};
- 	const gchar* const * iterator;
diff --git a/gnome-base/control-center/files/control-center-2.13.5-disable-master-pty.patch b/gnome-base/control-center/files/control-center-2.13.5-disable-master-pty.patch
deleted file mode 100644
index 8775f168188e..000000000000
--- a/gnome-base/control-center/files/control-center-2.13.5-disable-master-pty.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -u -ruN control-center-2.13.5.orig/configure.in control-center-2.13.5/configure.in
---- control-center-2.13.5.orig/configure.in	2006-01-16 11:42:19.000000000 -0500
-+++ control-center-2.13.5/configure.in	2006-01-18 11:22:11.000000000 -0500
-@@ -292,39 +292,39 @@
- 
- dnl -----  aix loads module ldterm by default and wants no ptem
- dnl -----  ptmx takes precedence
--AC_MSG_CHECKING([for master pty])
--if test -r /dev/ptc ; then
--  if test -r /dev/ptmx ; then
--    AC_DEFINE_UNQUOTED(MASTERPTYDEV, "/dev/ptmx", [hp and sun style pty master])
--    AC_MSG_RESULT(ptmx)
--  else
--    AC_DEFINE_UNQUOTED(MASTERPTYDEV, "/dev/ptc", [aix style pty master])
--    AC_MSG_RESULT(ptc)
--  fi
--elif test -r /dev/ptmx ; then
--  AC_DEFINE_UNQUOTED(MASTERPTYDEV, "/dev/ptmx", [hp and sun style pty master])
--  AC_MSG_RESULT(ptmx)
--else
--  AC_DEFINE_UNQUOTED(MASTERPTYDEV, "/dev/null", [lets see what happens])
--fi
--
--dnl -----  this will succeed on solaris and fail on hpux
--AC_MSG_CHECKING(if your system supports the ttcompat streams module)
--AC_RUN_IFELSE([AC_LANG_SOURCE([[
--#include <stdio.h>
--#include <fcntl.h>
--#include <stropts.h>
--main()
--{ int line;
--
--  if ( (line = open("/dev/ptmx", O_RDWR)) >= 0 &&
--       ioctl(line, I_PUSH, "ttcompat") == 0 )
--    exit(0);
--  exit(1);
--}
--]])],[AC_DEFINE(HAVE_TTCOMPAT, 1,
--             "Define if your system supports the ttcompat streams module")
--   AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(assuming no)])
-+dnl AC_MSG_CHECKING([for master pty])
-+dnl if test -r /dev/ptc ; then
-+dnl   if test -r /dev/ptmx ; then
-+dnl     AC_DEFINE_UNQUOTED(MASTERPTYDEV, "/dev/ptmx", [hp and sun style pty master])
-+dnl     AC_MSG_RESULT(ptmx)
-+dnl   else
-+dnl     AC_DEFINE_UNQUOTED(MASTERPTYDEV, "/dev/ptc", [aix style pty master])
-+dnl     AC_MSG_RESULT(ptc)
-+dnl   fi
-+dnl elif test -r /dev/ptmx ; then
-+dnl   AC_DEFINE_UNQUOTED(MASTERPTYDEV, "/dev/ptmx", [hp and sun style pty master])
-+dnl   AC_MSG_RESULT(ptmx)
-+dnl else
-+dnl   AC_DEFINE_UNQUOTED(MASTERPTYDEV, "/dev/null", [lets see what happens])
-+dnl fi
-+dnl 
-+dnl dnl -----  this will succeed on solaris and fail on hpux
-+dnl AC_MSG_CHECKING(if your system supports the ttcompat streams module)
-+dnl AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+dnl #include <stdio.h>
-+dnl #include <fcntl.h>
-+dnl #include <stropts.h>
-+dnl main()
-+dnl { int line;
-+dnl 
-+dnl   if ( (line = open("/dev/ptmx", O_RDWR)) >= 0 &&
-+dnl        ioctl(line, I_PUSH, "ttcompat") == 0 )
-+dnl     exit(0);
-+dnl   exit(1);
-+dnl }
-+dnl ]])],[AC_DEFINE(HAVE_TTCOMPAT, 1,
-+dnl              "Define if your system supports the ttcompat streams module")
-+dnl    AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(assuming no)])
- 
- AC_MSG_CHECKING([whether to enable About Me])
- AC_ARG_ENABLE([aboutme],
diff --git a/gnome-base/control-center/files/control-center-2.18.1-fbsd.patch b/gnome-base/control-center/files/control-center-2.18.1-fbsd.patch
deleted file mode 100644
index 1017e0d6703e..000000000000
--- a/gnome-base/control-center/files/control-center-2.18.1-fbsd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN control-center-2.18.1.orig/libslab/directory-tile.c control-center-2.18.1/libslab/directory-tile.c
---- control-center-2.18.1.orig/libslab/directory-tile.c	2007-03-18 13:04:44.000000000 -0400
-+++ control-center-2.18.1/libslab/directory-tile.c	2007-05-01 11:53:39.000000000 -0400
-@@ -644,5 +644,5 @@ static void
- disown_spawned_child (gpointer user_data)
- {
- 	setsid  ();
--	setpgrp ();
-+	setpgid (0, 0);
- }