Remove old.

Package-Manager: portage-2.1.9.19/cvs/Linux x86_64

5 files changed, 17 insertions, 229 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index d7659b1faa9e..5112fe294396 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.316 2010/10/17 15:17:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.317 2010/10/20 16:41:04 pacho Exp $
+
+  20 Oct 2010; Pacho Ramos <pacho@gentoo.org>
+  -files/gnome-panel-2.24.3-daylight.patch,
+  -files/gnome-panel-2.24.3-shutdown.patch, -gnome-panel-2.26.3.ebuild:
+  Remove old.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org> gnome-panel-2.30.2.ebuild:
   alpha/ia64/sh/sparc stable wrt #324077
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 414b46ca5bc2..757ba8c6b2c3 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,16 +1,20 @@
-AUX gnome-panel-2.24.3-daylight.patch 1009 RMD160 6b84a6e00dbc350fd0bf4e1850940e7c925fb86b SHA1 87ccfb70d97038d2916d1074efb954f316be53ee SHA256 ea8c1598b5c6fddc751ee18a7aab34781aa82e936fc76b9304409304e5601a1f
-AUX gnome-panel-2.24.3-shutdown.patch 2548 RMD160 9fa99e6a7c310114af4f5d41160a3703fb3dac03 SHA1 fa2eb42aa677d8c4459903b50a1aa42def28ffb8 SHA256 ae5d2a04ae292966b6661e9cc73623cfd8204a8b3012b40c4274e449933e495e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-panel-2.28.0-clock-applet-missing-cflags.patch 717 RMD160 86c10077d3425fe805487b8d78824c8eedfc098f SHA1 b3ee6c26026154cc33c264d184934e165e2cb2b2 SHA256 b06a7a256828a0797ff18d308770cc401aa2c350aa2a2baf34fb5b9a0da8e85d
 AUX gnome-panel-2.28.0-crashes-xrandr.patch 2975 RMD160 ed032a27c2d36043158755274e321b1c5bef24b8 SHA1 edd96e390506fd04b7ceb8e1df9e59fdfee6b616 SHA256 8fb24923d7a6eacc6ff27178bde2a893f05cc5174a51332830ad376750646aa7
-DIST gnome-panel-2.24.2-logout+po.tar.bz2 75365 RMD160 dadb220e3505fdd37bbddd332a760f6d3fa9498a SHA1 1eb32102d62ee6e5ef4420a41e0647a0d3768a72 SHA256 2e67af4d204ff65092d6b37abbfe41d7baea0fc27b1ed46aa7eb3494c2d53ee6
-DIST gnome-panel-2.26.1-po.patch.bz2 74923 RMD160 8d5ef69ba9789a83eb5d00c2c7f4309c565ec37b SHA1 56b2bf2220ca25c638b4d009aa3ab57bb76f1dde SHA256 720539ee1b0e85fa6f668bce30c45120b6b821e980fedf8049b99c145d0b509c
-DIST gnome-panel-2.26.3.tar.bz2 2988811 RMD160 07b961a2224c6de0253495c6aeefdb2fb4804c8e SHA1 8fdb1e47bef9f3de9c01f830a84ecf30fda3d48f SHA256 b50fa78df3e94327e6478fbf8d0addfc0dde1f2022ffc39066bb46040ad3778e
 DIST gnome-panel-2.28.0.tar.bz2 2976766 RMD160 b3c2025b47b9d6c74aba0a2961394d94f59c4381 SHA1 667975e0f269b6b3320c04bd1bd705378c0f4927 SHA256 c1168c0c8f84692002557d60870c782f4831635080d2c52cd2a3665fb7718465
 DIST gnome-panel-2.30.2.tar.bz2 3125757 RMD160 b5828e0235a6fb5faa011179ff8fcc0574bf3c6b SHA1 4be902269d4dd4af1e988d522ae613946890ec0a SHA256 f0171c55ecdf4970f819cce66de0db99bbe43832e8a284ea0dd0c89d7d12e7b6
 DIST gnome-panel-2.32.0.2.tar.bz2 3149393 RMD160 4eafc505b3fb206b10922e5bac3f3b5dd0dc2039 SHA1 70078f67be3c98e27d9f9e6f43ac3d3ec15def02 SHA256 0563feb33cea2e055ae83709aee3673978a4bea4a10ef4d05e00af1786709238
-EBUILD gnome-panel-2.26.3.ebuild 3346 RMD160 cf4af31e7331d9045f75e354792a02853eccb1c9 SHA1 aeb09f061ba7376decfe0f2d5a4efc7d16394c89 SHA256 b1d6bacb5d21cd4e623f0277b29e6ec738e643efaab76b2831d24a63e4979c7c
 EBUILD gnome-panel-2.28.0.ebuild 3099 RMD160 18cf23ed4db38688141c5e1255d2ab58a3f4d492 SHA1 4f6cc647464c61b9165c04b962f42cbaa119442d SHA256 c84fdcee0bf4e7183927c4b757404b4b9bfef0141b6cc38dddf816720ed39d3f
 EBUILD gnome-panel-2.30.2.ebuild 2283 RMD160 58047bc1ca78d1d48aac2c0fb22be0deaa951993 SHA1 d16d773038bcac45da18e503282418e7aac49b2c SHA256 1e154f6eebf9d70d2662c377e8a678bceddfe17d8e49bced6a8a477d138fa196
 EBUILD gnome-panel-2.32.0.2.ebuild 2434 RMD160 a94671cb0bc0cc05e483a825e3bd3037c450798b SHA1 a5eab82053145c54d8004a02dc4a3b628345fbcf SHA256 c16121b66e86d587e240bbe53cef2357712643b1997a754b1011c2dd265b3405
-MISC ChangeLog 43332 RMD160 a4be21de46f80c3c30763d3c2dda3a26d49d1e04 SHA1 a6385ae726a2b4554276ad0b552d31d9ea198ad8 SHA256 8ade10a6465ffb6f9bcdc57effdcc46fd75f50fcd43a0c24bab4bb610b7cf05d
+MISC ChangeLog 43507 RMD160 4d2aed6498cbd6c84eb9507b340f01847ac8650a SHA1 3b6ab6b5ef9d19d027bcb1a77aeed3fc21862638 SHA256 fa2d8ec45d93d1cf35d606cd03c8e5bfebf0172022ae05e94c4505991961addc
 MISC metadata.xml 374 RMD160 9f8a135b00284a040f08bf8e7899cccab4151f16 SHA1 bbb2909c690abb23de3685b93e48c1497adbf688 SHA256 69c9f86e95c7553d0ff7f84838cde89d1537206aa0de8869ee6a1aeec3cde403
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAky/G6UACgkQCaWpQKGI+9ScMQCgiGFCr1F4VrQHuka/xSOqGoXV
+x8wAnRR43Z+o7K5iobXDWyadt98Ktv4g
+=Ep5H
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.24.3-daylight.patch b/gnome-base/gnome-panel/files/gnome-panel-2.24.3-daylight.patch
deleted file mode 100644
index 508aa0d6cdf5..000000000000
--- a/gnome-base/gnome-panel/files/gnome-panel-2.24.3-daylight.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugzilla.gnome.org/show_bug.cgi?id=569737
-https://bugs.gentoo.org/show_bug.cgi?id=256859
-
---- gnome-panel-2.24.3/applets/clock/clock.c.old	2009-01-29 21:59:18 +0000
-+++ gnome-panel-2.24.3/applets/clock/clock.c	2009-01-29 21:59:29 +0000
-@@ -653,7 +653,7 @@
-                 time (&now_t);
-                 localtime_r (&now_t, &now);
- 
--                if (daylight && now.tm_isdst) {
-+                if (now.tm_isdst>0) {
-                         zone = tzname[1];
-                 } else {
-                         zone = tzname[0];
---- gnome-panel-2.24.3/applets/clock/clock-location.c.old	2009-01-29 22:00:15 +0000
-+++ gnome-panel-2.24.3/applets/clock/clock-location.c	2009-01-29 22:00:29 +0000
-@@ -337,7 +337,7 @@
-         now_t = time (NULL);
-         localtime_r (&now_t, &now);
- 
--        if (daylight && now.tm_isdst) {
-+        if (now.tm_isdst>0) {
-                 clock_location_set_tzname (this, tzname[1]);
-         } else {
-                 clock_location_set_tzname (this, tzname[0]);
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch b/gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch
deleted file mode 100644
index aefb74cb0740..000000000000
--- a/gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-# Fix shutdown without gdm
-# https://bugs.gentoo.org/show_bug.cgi?id=259138
---- a/gnome-panel/panel-gdm.c	2009-02-15 20:33:57.000000000 +0000
-+++ b/gnome-panel/panel-gdm.c	2009-02-15 20:38:47.000000000 +0000
-@@ -233,6 +233,15 @@
-         char               *response;
- 
-         g_assert (data->fd <= 0);
-+        
-+	if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS))
-+	  strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH);
-+	else if (g_file_test ("/tmp/.gdm_socket", G_FILE_TEST_EXISTS))
-+	  strcpy (addr.sun_path, "/tmp/.gdm_socket");
-+	else {
-+		gdm_shutdown_protocol_connection (data);
-+		return FALSE;	
-+	}        
- 
-         data->fd = socket (AF_UNIX, SOCK_STREAM, 0);
-         if (data->fd < 0) {
-@@ -242,11 +251,6 @@
-                 return FALSE;
-         }
- 
--	if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS))
--	  strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH);
--	else
--	  strcpy (addr.sun_path, "/tmp/.gdm_socket");
--
- 	addr.sun_family = AF_UNIX;
- 
-         if (connect (data->fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) {
-@@ -398,6 +402,16 @@
-         gdm_shutdown_protocol_connection (&gdm_protocol_data);
- }
- 
-+gboolean
-+gdm_available (void)
-+{
-+	if (!gdm_init_protocol_connection (&gdm_protocol_data))
-+		return FALSE;
-+
-+	gdm_shutdown_protocol_connection (&gdm_protocol_data);
-+	return TRUE;
-+}
-+
- void
- gdm_new_login (void)
- {
---- a/gnome-panel/panel-gdm.h	2009-02-15 20:33:57.000000000 +0000
-+++ b/gnome-panel/panel-gdm.h	2009-02-15 20:38:58.000000000 +0000
-@@ -46,6 +46,7 @@
- void            gdm_set_logout_action (GdmLogoutAction action);
- GdmLogoutAction gdm_get_logout_action (void);
- void            gdm_new_login         (void);
-+gboolean        gdm_available         (void);
- 
- G_END_DECLS
- 
---- a/gnome-panel/panel-logout.c	2009-02-15 20:33:57.000000000 +0000
-+++ b/gnome-panel/panel-logout.c	2009-02-15 20:40:48.000000000 +0000
-@@ -341,10 +341,12 @@
- 		// FIXME need to verify that this response can be used
- 		logout_dialog->priv->default_response = PANEL_LOGOUT_DIALOG_LOGOUT;
- 
--		//FIXME is gdm running?
--		gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
--				       _("_Switch User"),
--				       PANEL_LOGOUT_RESPONSE_SWITCH_USER);
-+		//FIXME need to have a more flexible test for availability
-+		if (gdm_available())
-+			gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
-+					        _("_Switch User"),
-+					        PANEL_LOGOUT_RESPONSE_SWITCH_USER);
-+
- 		gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
- 				       GTK_STOCK_CANCEL,
- 				       GTK_RESPONSE_CANCEL);
diff --git a/gnome-base/gnome-panel/gnome-panel-2.26.3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.26.3.ebuild
deleted file mode 100644
index 455afc45e9d1..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.26.3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.26.3.ebuild,v 1.11 2010/07/19 22:12:53 jer Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-MY_P="${PN}-2.24.2"
-MY_P_PO="${PN}-2.26.1"
-DESCRIPTION="The GNOME panel"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${MY_P}-logout+po.tar.bz2
-	mirror://gentoo/${MY_P_PO}-po.patch.bz2"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc eds networkmanager policykit"
-
-RDEPEND=">=gnome-base/gnome-desktop-2.26.0
-	>=x11-libs/pango-1.15.4
-	>=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.15.1
-	>=dev-libs/libgweather-2.24.1
-	dev-libs/libxml2
-	>=gnome-base/libglade-2.5
-	>=gnome-base/libgnome-2.13
-	>=gnome-base/libgnomeui-2.5.4
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/orbit-2.4
-	>=x11-libs/libwnck-2.19.5
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/gnome-menus-2.11.1
-	>=gnome-base/libbonobo-2.20.4
-	gnome-base/librsvg
-	>=dev-libs/dbus-glib-0.71
-	>=sys-apps/dbus-1.1.2
-	x11-libs/libXau
-	>=x11-libs/cairo-1.0.0
-	eds? ( >=gnome-extra/evolution-data-server-1.6 )
-	networkmanager? ( >=net-misc/networkmanager-0.6 )
-	policykit? (
-		>=sys-auth/policykit-0.7
-		>=gnome-extra/policykit-gnome-0.7 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	gnome-base/gnome-common
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	~app-text/docbook-xml-dtd-4.1.2
-	>=dev-util/gtk-doc-am-1
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--with-in-process-applets=clock,notification-area,wncklet
-		$(use_enable policykit polkit)
-		$(use_enable networkmanager network-manager)
-		$(use_enable eds)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Allow logout/shutdown without gnome-session 2.24, bug #246170
-	epatch "${WORKDIR}/${MY_P}-logout.patch"
-	epatch "${WORKDIR}/${MY_P_PO}-po.patch"
-	echo "gnome-panel/panel-logout.c" >> po/POTFILES.in
-
-	# Fixes build on BSD, bug #256859
-	epatch "${FILESDIR}/${PN}-2.24.3-daylight.patch"
-
-	# Fixes shutdown without gdm, bug #259138
-	epatch "${FILESDIR}/${PN}-2.24.3-shutdown.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-
-	# FIXME: tarball generated with broken gtk-doc, revisit me.
-	if use doc; then
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
-			-i gtk-doc.make || die "sed 1 failed"
-	else
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \
-			-i gtk-doc.make || die "sed 2 failed"
-	fi
-
-	# Make it libtool-1 compatible, bug #271652
-	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-pkg_postinst() {
-	local entries="${ROOT}etc/gconf/schemas/panel-default-setup.entries"
-	local gconftool="${ROOT}usr/bin/gconftool-2"
-
-	if [ -e "$entries" ]; then
-		einfo "setting panel gconf defaults..."
-
-		GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")"
-
-		"${gconftool}" --direct --config-source \
-			"${GCONF_CONFIG_SOURCE}" --load="${entries}"
-	fi
-
-	# Calling this late so it doesn't process the GConf schemas file we already
-	# took care of.
-	gnome2_pkg_postinst
-}