Remove old.

(Portage version: 2.1.9.19/cvs/Linux x86_64)

4 files changed, 7 insertions, 208 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index ad616f20ca0c..28ba1f4fa99b 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.324 2010/10/17 15:20:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.325 2010/10/20 16:31:36 pacho Exp $
+
+  20 Oct 2010; Pacho Ramos <pacho@gentoo.org>
+  -files/gnome-applets-2.26.1-automagic-networkmanager.patch,
+  -gnome-applets-2.26.3-r1.ebuild,
+  -files/gnome-applets-2.26.3-documentation-fix.patch:
+  Remove old.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org>
   gnome-applets-2.30.0-r1.ebuild:
diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.26.1-automagic-networkmanager.patch b/gnome-base/gnome-applets/files/gnome-applets-2.26.1-automagic-networkmanager.patch
deleted file mode 100644
index 17f366dc0eb0..000000000000
--- a/gnome-base/gnome-applets/files/gnome-applets-2.26.1-automagic-networkmanager.patch
+++ /dev/null
@@ -1,42 +0,0 @@
----
- Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=266056
-
- configure.in |   23 +++++++++++++++--------
- 1 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 113f3b3..3c42952 100644
---- a/configure.in
-+++ b/configure.in
-@@ -311,16 +311,23 @@ AC_SUBST(LIBGWEATHER_LIBS)
- AM_CONDITIONAL(BUILD_LIBGWEATHER_APPLETS, $build_libgweather_applets)
- 
- dnl -- check for NetworkManager -----------------------------------------------
--PKG_CHECK_MODULES(NETWORKMANAGER, NetworkManager >= $NETWORKMANAGER_REQUIRED,
--		  HAVE_NETWORKMANAGER="yes", HAVE_NETWORKMANAGER="no")
--
--if test "x$HAVE_NETWORKMANAGER" = "xyes"; then
--	AC_DEFINE(HAVE_NETWORKMANAGER, 1, [NetworkManager available])
-+AC_ARG_ENABLE([networkmanager],
-+	AC_HELP_STRING([--enable-networkmanager], 
-+	[Enable NetworkManager support @<:@default=yes@:>@]),
-+	ENABLE_NETWORKMANAGER=$enableval, ENABLE_NETWORKMANAGER=yes)
-+
-+HAVE_NETWORKMANAGER=no
-+if test "x$ENABLE_NETWORKMANAGER" = "xyes"; then
-+   PKG_CHECK_MODULES(NETWORKMANAGER, NetworkManager >= $NETWORKMANAGER_REQUIRED,
-+   		HAVE_NETWORKMANAGER=yes, HAVE_NETWORKMANAGER=no)
-+
-+   if x$HAVE_NETWORKMANAGER = xyes; then
-+      AC_DEFINE(HAVE_NETWORKMANAGER, 1, [NetworkManager available])
-+      AC_SUBST(NETWORKMANAGER_CFLAGS)
-+      AC_SUBST(NETWORKMANAGER_LIBS)
-+   fi
- fi
- 
--AC_SUBST(NETWORKMANAGER_CFLAGS)
--AC_SUBST(NETWORKMANAGER_LIBS)
--
- dnl -- check for the Mixer ----------------------------------------------------
- AC_ARG_ENABLE([mixer-applet],
-     AC_HELP_STRING([--enable-mixer-applet], [Enable the gstreamer-based mixer applet.]),
diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.26.3-documentation-fix.patch b/gnome-base/gnome-applets/files/gnome-applets-2.26.3-documentation-fix.patch
deleted file mode 100644
index 0daa88cc29e2..000000000000
--- a/gnome-base/gnome-applets/files/gnome-applets-2.26.3-documentation-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Subject: Fix documentation to validate.
-Gnome: https://bugzilla.gnome.org/show_bug.cgi?id=589058
---- mixer/docs/zh_CN/mixer_applet2.xml	2009-07-19 23:29:32.000000000 +0200
-+++ mixer/docs/zh_CN/mixer_applet2.xml	2009-07-19 23:29:56.000000000 +0200
-@@ -252,7 +252,7 @@
- 		  </varlistentry> 
- 		</variablelist> 
- 
--<para>单击<guibutton>关闭</guibutton>可关闭<guilabel>音量控制首选项<guilabel>对话框。</guilabel></guilabel></para>
-+<para>单击<guibutton>关闭</guibutton>可关闭<guilabel>音量控制首选项</guilabel>对话框。</para>
- 
- </sect1>
- </article>
diff --git a/gnome-base/gnome-applets/gnome-applets-2.26.3-r1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.26.3-r1.ebuild
deleted file mode 100644
index 4cd268f94217..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-2.26.3-r1.ebuild
+++ /dev/null
@@ -1,152 +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-applets/gnome-applets-2.26.3-r1.ebuild,v 1.7 2010/07/20 15:34:01 jer Exp $
-
-inherit autotools eutils gnome2 python
-
-DESCRIPTION="Applets for the GNOME Desktop and Panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="acpi apm doc gnome gstreamer hal ipv6 networkmanager policykit"
-
-# TODO: configure says python stuff is optional
-# my secret script says cpufrequtils might be needed in RDEPEND
-
-RDEPEND=">=x11-libs/gtk+-2.13
-	>=dev-libs/glib-2.18.0
-	>=gnome-base/gconf-2.8
-	>=gnome-base/gnome-panel-2.13.4
-	>=x11-libs/libxklavier-2.91
-	>=x11-libs/libwnck-2.9.3
-	>=gnome-base/gnome-desktop-2.11.1
-	>=x11-libs/libnotify-0.3.2
-	hal? ( >=sys-apps/hal-0.5.3 )
-	>=sys-apps/dbus-1.1.2
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/libxml2-2.5.0
-	>=x11-themes/gnome-icon-theme-2.15.91
-	>=dev-libs/libgweather-2.22.1
-	>=virtual/python-2.4
-	apm? ( sys-apps/apmd )
-	x11-libs/libX11
-	gnome?	(
-		>=gnome-base/libgnomekbd-2.21.4.1
-		gnome-base/gnome-settings-daemon
-
-		>=gnome-extra/gucharmap-2.23
-		>=gnome-base/libgtop-2.11.92
-
-		>=dev-python/pygobject-2.6
-		>=dev-python/pygtk-2.6
-		>=dev-python/libgnome-python-2.10
-		>=dev-python/gconf-python-2.10
-		>=dev-python/gnome-applets-python-2.10 )
-	gstreamer?	(
-		>=media-libs/gstreamer-0.10.2
-		>=media-libs/gst-plugins-base-0.10.14
-		|| (
-			>=media-plugins/gst-plugins-alsa-0.10.14
-			>=media-plugins/gst-plugins-oss-0.10.14 ) )
-	networkmanager? ( >=net-misc/networkmanager-0.7.0 )
-	policykit? (
-		>=sys-auth/policykit-0.7
-		>=gnome-extra/policykit-gnome-0.7 )"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/pkgconfig-0.19
-	>=dev-util/intltool-0.35
-	dev-libs/libxslt
-	~app-text/docbook-xml-dtd-4.3
-	doc? ( app-text/docbook-sgml-utils )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	# Networmanager is automagic, bug #266056
-	epatch "${FILESDIR}/${PN}-2.26.1-automagic-networkmanager.patch"
-
-	# Make it libtool-1 compatible, bug #266248
-	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
-
-	# Invest applet tests need gconf/proxy/...
-	sed 's/^TESTS.*/TESTS=/g' -i invest-applet/invest/Makefile.am \
-		invest-applet/invest/Makefile.in || die "disabling invest tests failed"
-
-	# Fix documentation validation, upstream bug #589058
-	epatch "${FILESDIR}/${P}-documentation-fix.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--enable-flags
-		$(use_enable gstreamer mixer-applet)
-		$(use_with hal)
-		$(use_enable ipv6)
-		$(use_enable networkmanager)
-		$(use_enable policykit polkit)"
-
-	if ! use ppc && ! use apm && ! use acpi; then
-		G2CONF="${G2CONF} --disable-battstat"
-	fi
-
-	if use ppc && ! use apm; then
-		G2CONF="${G2CONF} --disable-battstat"
-	fi
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check || die "emake check failed"
-}
-
-src_install() {
-	gnome2_src_install
-
-	local APPLETS="accessx-status battstat charpick cpufreq drivemount geyes
-			 gkb-new gswitchit gweather invest-applet mini-commander
-			 mixer modemlights multiload null_applet stickynotes trashapplet"
-
-	# modemlights is out because it needs system-tools-backends-1
-
-	for applet in ${APPLETS} ; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO ; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use acpi && ! use hal ; then
-		elog "It is highly recommended that you install acpid if you use the"
-		elog "battstat applet to prevent any issues with other applications "
-		elog "trying to read acpi information."
-	fi
-
-	# check for new python modules on bumps
-	python_mod_optimize $(python_get_sitedir)/invest
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/invest
-}