8 files changed, 216 insertions, 537 deletions
diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 49ba1ae9ff71..34852fa2dc97 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for gnome-base/gnome-applets
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.286 2009/04/27 13:57:23 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.287 2009/05/11 22:01:31 eva Exp $
+
+*gnome-applets-2.26.1 (11 May 2009)
+
+  11 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-applets-2.20.1.ebuild, -gnome-applets-2.22.3.ebuild,
+  -gnome-applets-2.24.1.ebuild, -gnome-applets-2.24.2.ebuild,
+  +gnome-applets-2.26.1.ebuild,
+  +files/gnome-applets-2.26.1-automagic-networkmanager.patch:
+  New version for GNOME 2.26. Use networkmanager, enable policykit, use
+  split python bindings, drop libgnome, gstreamer-0.8 usage. Still provide a
+  mixer applet based on gstreamer until people move to pulseaudio. Clean up
+  old revisions.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> gnome-applets-2.24.3.1:
   Stable for HPPA (bug #260063).
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index c8ee5073fadc..4537a6845d04 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,12 +1,17 @@
-DIST gnome-applets-2.20.1.tar.bz2 7490737 RMD160 f8e10ebccd43fbb147f580fcb2a949e9e5331063 SHA1 de6258cae42a827dbd4c3f1479d80157838dacc7 SHA256 d9ac9c48c007aa1444a60e947bd95359ac3e4998b074d8613082755aa22c87a8
-DIST gnome-applets-2.22.3.tar.bz2 7508373 RMD160 496d05cf2c3e4f379ffb1fb290811b6d6735586f SHA1 6b8ec95330fff2069854c9bcca662542b8da0168 SHA256 dac8527273b097a9e2debae2223022ac2b7d78c86643654d6ca5d0db51574c52
-DIST gnome-applets-2.24.1.tar.bz2 7489513 RMD160 aba4c1744e0e9c888c87b6a0c982cf125bf184fa SHA1 16d715fb437378ea26236699bea0cdd0e253c798 SHA256 355bc921158a585fd212903ce7176a18e7eed233dbfcd75573f90a87a2836723
-DIST gnome-applets-2.24.2.tar.bz2 7873299 RMD160 39410bfcb547f2a56603f4fec2fc873189a963d0 SHA1 f12a1faf80ebf08243be53a2d893dbb3cf96f6c0 SHA256 50bbf16de9c91fcc96156a154dabac490963fa768ecfea3c02f22bdc38c303b8
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gnome-applets-2.26.1-automagic-networkmanager.patch 1601 RMD160 748c0b5b2f3fb088669717a3c9d3e53951891d0d SHA1 70bf11d1a628270ea32b939dd1a08117e982f052 SHA256 5102332db7758817f970ffb6ba3751ad03a8c47f1950d59d706d5f6d3ba31ac1
 DIST gnome-applets-2.24.3.1.tar.bz2 7880607 RMD160 aa36ca16e88821a860d825bff9ab94e144e283f7 SHA1 cc9a121bb06f687c221902c24dbdbe37bd68b07f SHA256 b9a3d207b78755c49c49bf780815f3b25fd16b6c23f3815cdeb41b5c7d685185
-EBUILD gnome-applets-2.20.1.ebuild 3436 RMD160 1833b1a47b4ef03efa2bd31a6f2474754db12683 SHA1 0aac9789c0b016cc805b8264f9897517d47cef34 SHA256 c722784e37edf9f345f29048d573405ce838f038da925d480ceef870a884022a
-EBUILD gnome-applets-2.22.3.ebuild 3525 RMD160 2fcc198507e0d0c7e86f4c162c0567eef02a60d3 SHA1 de07a7dd0302a5951e0c7dd79613ec3a969bb6f5 SHA256 c3929d55849378f7bd9146cfad7ce43282fc6af483b09b548a69d65d08890df6
-EBUILD gnome-applets-2.24.1.ebuild 3250 RMD160 0091a8536010ebad518cf41ed45be40ddf146880 SHA1 a465b756a524eb5c6a5fc931c64474890110da12 SHA256 5bf91687c79548c46a7fa282ecddd9c79ae1c22decc2204566d9e95bd09eb039
-EBUILD gnome-applets-2.24.2.ebuild 3250 RMD160 3ab4683964b7e75cafa00fb36734226fb878fd4f SHA1 0383d16eadbc889b287e6aeffc64a09203d2de6a SHA256 8be7105a04feca3d8952534db809ae115f55620c40989544ae60c1963dbb7b53
+DIST gnome-applets-2.26.1.tar.bz2 8786596 RMD160 f76aa8a6b03e1375bad3bce5e2ee1b477a2e9097 SHA1 42b678064e4d0923c2130ac02f488871b9db7c88 SHA256 87a2262dd777a31dafda23d91da42f7b17e542dea51b5597ecada4fa74793a07
 EBUILD gnome-applets-2.24.3.1.ebuild 3260 RMD160 7e170270d1eafe9179ac29211ec75df83e05f403 SHA1 56f858b21a9026ed6dc92aab82e9d7b5d836964b SHA256 5c508fd83bcd4ae10d3845f9a85ba8b5c55d05f7fb79ef68e9ecbc7cc85c0a5b
-MISC ChangeLog 40883 RMD160 b6795170dbb7bb14ba1b73a0377ab84410ca73a5 SHA1 43982ac7e418d6048434f918b469e657d273c8ec SHA256 735404fd09cd354394bc654d412b63dc3853b586ff1a3e3e6b1d26cd094fef3c
+EBUILD gnome-applets-2.26.1.ebuild 3876 RMD160 4f79ae25153628d396d66bb2663ed9e4e0f0d241 SHA1 3fe55f03ec3ba8d5eba8c3f10109a9514ea450c5 SHA256 c3237ae27d8194792b470eceffd4dd8108914e71ace5c561e207f4efb8a55b25
+MISC ChangeLog 41435 RMD160 10d45f52a5762090d504ce26c241cafed2d47b3f SHA1 bbe8150321c0c827b30e0c5d167526d9ae725d68 SHA256 0edcd0f4066c8e2cdc06610adf4b9fabe80cee84b4baa2ced973745ca4be1aeb
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoIoEEACgkQ1fmVwcYIWAaVZQCg7G+K2Nmbv9Pd8sLDSW8qtQzN
+pMgAnRb523QgPKg8uQLPK1Uv9YavJwuj
+=94+P
+-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..17f366dc0eb0
--- /dev/null
+++ b/gnome-base/gnome-applets/files/gnome-applets-2.26.1-automagic-networkmanager.patch
@@ -0,0 +1,42 @@
+---
+ 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/gnome-applets-2.20.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild
deleted file mode 100644
index 89b2d630ffbb..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild
+++ /dev/null
@@ -1,135 +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/gnome-applets/gnome-applets-2.20.1.ebuild,v 1.12 2008/06/05 11:50:11 remi Exp $
-
-inherit eutils gnome2 autotools 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 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="acpi apm doc gnome gstreamer hal ipv6 test"
-
-RDEPEND=">=x11-libs/gtk+-2.11
-		>=dev-libs/glib-2.13
-		>=gnome-base/libgnome-2.8
-		>=gnome-base/libgnomeui-2.8
-		>=gnome-base/gconf-2.8
-		>=gnome-base/gnome-panel-2.13.4
-		>=gnome-base/libglade-2.4
-		>=gnome-base/gail-1.1
-		>=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 )
-		>=dev-libs/dbus-glib-0.71
-		>=x11-themes/gnome-icon-theme-2.15.91
-		>=dev-libs/libxml2-2.5.0
-		>=virtual/python-2.4
-		apm? ( sys-apps/apmd )
-		x11-apps/xrdb x11-libs/libX11
-		gnome?	(
-					gnome-base/libgnomekbd
-					gnome-base/gnome-control-center
-
-					>=gnome-extra/gucharmap-1.4
-					>=gnome-base/libgtop-2.11.92
-					>=gnome-base/gnome-vfs-2.15.4
-
-					>=dev-python/pygtk-2.6
-					>=dev-python/gnome-python-2.10
-				)
-		gstreamer?	(
-						>=media-libs/gstreamer-0.10.2
-						>=media-libs/gst-plugins-base-0.10.2
-					)"
-
-# Remove gnome-system-tools 2.14 from RDEPEND to all because it is starting
-# to cause more headache to keep it than to mask it. Supports only s-t-b-1
-# anyway.
-#	>=app-admin/system-tools-backends-1.1.3
-
-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
-		doc? (
-				app-text/docbook-sgml-utils
-				~app-text/docbook-xml-dtd-4.3
-			)
-		test? ( ~app-text/docbook-xml-dtd-4.3 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# to double check on next release
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper --enable-flags
-		$(use_with hal)
-		$(use_enable ipv6)"
-
-	if use gstreamer; then
-		G2CONF="${G2CONF} --with-gstreamer=0.10"
-	fi
-
-	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_install() {
-	gnome2_src_install
-
-	APPLETS="accessx-status battstat charpick cpufreq drivemount geyes \
-			 gkb-new gswitchit gweather invest-applet mini-commander \
-			 mixer 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_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/invest
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-2.22.3.ebuild b/gnome-base/gnome-applets/gnome-applets-2.22.3.ebuild
deleted file mode 100644
index a562e11838c5..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-2.22.3.ebuild
+++ /dev/null
@@ -1,135 +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/gnome-applets/gnome-applets-2.22.3.ebuild,v 1.9 2008/11/13 19:32:17 ranger Exp $
-
-inherit 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 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="acpi apm doc gnome gstreamer hal ipv6"
-
-# TODO: configure says python stuff is optional
-# my secret script says cpufrequtils might be needed in RDEPEND
-
-RDEPEND=">=x11-libs/gtk+-2.11
-		>=dev-libs/glib-2.15.6
-		>=gnome-base/libgnome-2.8
-		>=gnome-base/libgnomeui-2.8
-		>=gnome-base/gconf-2.8
-		>=gnome-base/gnome-panel-2.13.4
-		>=gnome-base/libglade-2.4
-		>=gnome-base/gail-1.1
-		>=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 )
-		>=dev-libs/dbus-glib-0.71
-		>=x11-themes/gnome-icon-theme-2.15.91
-		>=dev-libs/libgweather-2.22.1
-		>=virtual/python-2.4
-		apm? ( sys-apps/apmd )
-		x11-apps/xrdb x11-libs/libX11
-		gnome?	(
-					>=gnome-base/libgnomekbd-2.21.4.1
-					gnome-base/gnome-settings-daemon
-
-					>=gnome-extra/gucharmap-1.4
-					>=gnome-base/libgtop-2.11.92
-					>=gnome-base/gnome-vfs-2.15.4
-
-					>=dev-python/pygtk-2.6
-					>=dev-python/gnome-python-2.10
-				)
-		gstreamer?	(
-						>=media-libs/gstreamer-0.10.2
-						>=media-libs/gst-plugins-base-0.10.14
-					)"
-
-# Remove gnome-system-tools 2.14 from RDEPEND to all because it is starting
-# to cause more headache to keep it than to mask it. Supports only s-t-b-1
-# anyway.
-#   >=app-admin/system-tools-backends-1.1.3
-
-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
-}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--enable-flags
-		$(use_with hal)
-		$(use_enable ipv6)"
-
-	if use gstreamer; then
-		G2CONF="${G2CONF} --with-gstreamer=0.10"
-	fi
-
-	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_install() {
-	gnome2_src_install
-
-	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_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/invest
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/invest
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-2.24.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.24.1.ebuild
deleted file mode 100644
index 94b55852a63d..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-2.24.1.ebuild
+++ /dev/null
@@ -1,128 +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/gnome-applets/gnome-applets-2.24.1.ebuild,v 1.1 2008/11/08 23:29:33 eva Exp $
-
-inherit 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 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
-IUSE="acpi apm doc gnome gstreamer hal ipv6"
-
-# 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/libgnome-2.8
-		>=gnome-base/libgnomeui-2.8
-		>=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-1.4
-			>=gnome-base/libgtop-2.11.92
-
-			>=dev-python/pygtk-2.6
-			>=dev-python/gnome-python-2.10 )
-		gstreamer?	(
-			>=media-libs/gstreamer-0.10.2
-			>=media-libs/gst-plugins-base-0.10.14 )"
-
-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
-}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--enable-flags
-		$(use_with hal)
-		$(use_enable ipv6)
-		--disable-polkit"
-
-	if use gstreamer; then
-		G2CONF="${G2CONF} --with-gstreamer=0.10"
-	fi
-
-	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_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_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/invest
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/invest
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-2.24.2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.24.2.ebuild
deleted file mode 100644
index df3b282cc6fc..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-2.24.2.ebuild
+++ /dev/null
@@ -1,128 +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/gnome-applets/gnome-applets-2.24.2.ebuild,v 1.1 2008/11/29 12:14:58 eva Exp $
-
-inherit 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 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
-IUSE="acpi apm doc gnome gstreamer hal ipv6"
-
-# 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/libgnome-2.8
-		>=gnome-base/libgnomeui-2.8
-		>=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-1.4
-			>=gnome-base/libgtop-2.11.92
-
-			>=dev-python/pygtk-2.6
-			>=dev-python/gnome-python-2.10 )
-		gstreamer?	(
-			>=media-libs/gstreamer-0.10.2
-			>=media-libs/gst-plugins-base-0.10.14 )"
-
-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
-}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--enable-flags
-		$(use_with hal)
-		$(use_enable ipv6)
-		--disable-polkit"
-
-	if use gstreamer; then
-		G2CONF="${G2CONF} --with-gstreamer=0.10"
-	fi
-
-	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_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_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/invest
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/invest
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-2.26.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.26.1.ebuild
new file mode 100644
index 000000000000..9cf6e840c314
--- /dev/null
+++ b/gnome-base/gnome-applets/gnome-applets-2.26.1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2009 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.1.ebuild,v 1.1 2009/05/11 22:01:31 eva 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 ~hppa ~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 )
+	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}/${P}-automagic-networkmanager.patch"
+
+	# Make it libtool-1 compatible, bug #266248
+	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
+
+	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 gstreamer; then
+		G2CONF="${G2CONF} --with-gstreamer=0.10"
+	fi
+
+	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
+}