Remove networkmanager support from 2.26.3 for stabilization since networkmanager-0.7 is not going stable (2.24* doesn't have NM support). Use 2.26.3-r1 for networkmanager support in ~arch

Package-Manager: portage-2.2_rc41/cvs/Linux i686

4 files changed, 169 insertions, 17 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 8fa74d01c33f..198924f0ccfc 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.291 2009/07/19 21:38:22 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.292 2009/09/27 15:36:44 nirbheek Exp $
+
+*gnome-applets-2.26.3-r1 (27 Sep 2009)
+
+  27 Sep 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  gnome-applets-2.26.3.ebuild, +gnome-applets-2.26.3-r1.ebuild:
+  Remove networkmanager support from 2.26.3 for stabilization since
+  networkmanager-0.7 is not going stable (2.24* doesn't have NM support).
+  Use 2.26.3-r1 for networkmanager support in ~arch
 
 *gnome-applets-2.26.3 (19 Jul 2009)
 
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index e3bcffc0558b..7dd11060364a 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnome-applets-2.26.1-automagic-networkmanager.patch 1601 RMD160 748c0b5b2f3fb088669717a3c9d3e53951891d0d SHA1 70bf11d1a628270ea32b939dd1a08117e982f052 SHA256 5102332db7758817f970ffb6ba3751ad03a8c47f1950d59d706d5f6d3ba31ac1
 AUX gnome-applets-2.26.3-documentation-fix.patch 582 RMD160 c8dc16e2e50369c539914f39eb58030d38197caf SHA1 56accfe9073a35fbba03dc794996f160f4e9da11 SHA256 8007ebd047e600b53bd3a9f6a1c8917083cb03e06b826cf0d7bfae5a6b4d4d61
 DIST gnome-applets-2.24.3.1.tar.bz2 7880607 RMD160 aa36ca16e88821a860d825bff9ab94e144e283f7 SHA1 cc9a121bb06f687c221902c24dbdbe37bd68b07f SHA256 b9a3d207b78755c49c49bf780815f3b25fd16b6c23f3815cdeb41b5c7d685185
@@ -8,13 +5,7 @@ DIST gnome-applets-2.26.2.tar.bz2 9056741 RMD160 3605219a5b3f2c9f23c34b72a226f99
 DIST gnome-applets-2.26.3.tar.bz2 9544328 RMD160 34035faeac68a44433a3a558963f2b571e650c41 SHA1 52279066e6b0e0af664b4cf6404123bf51fe2791 SHA256 f6e93d98cbb45f15fff605966eca5e4172cd4404509d612b03da748b9e2e0ee5
 EBUILD gnome-applets-2.24.3.1.ebuild 3260 RMD160 7e170270d1eafe9179ac29211ec75df83e05f403 SHA1 56f858b21a9026ed6dc92aab82e9d7b5d836964b SHA256 5c508fd83bcd4ae10d3845f9a85ba8b5c55d05f7fb79ef68e9ecbc7cc85c0a5b
 EBUILD gnome-applets-2.26.2.ebuild 3904 RMD160 b0f9afff41f2caf3b1b936a37b8562119693e926 SHA1 6f76f64815c62560f5dfb27cebf44a718ab3257b SHA256 3db4ed885e1e41a7675d8cf4f75b72c3cd9679ec53073aff065c6e03432bfcda
-EBUILD gnome-applets-2.26.3.ebuild 4194 RMD160 63e98a2897b212d15b9049c23771e48a8ef0058e SHA1 54c279d990baff993173d150c3852499acd2e1d3 SHA256 4336e4b87872d267c1b1101b554b2aeeb681817551a7b9355183da28a6bcdada
-MISC ChangeLog 42107 RMD160 c09f4b80039c54db8c6815f433ad25d7dccf56b2 SHA1 167c6fc1bab2110187e2cbed4f467402abaad717 SHA256 d925e61ffc6fee99e6840a275cff6c00689de0b880c278aa14d57a6d783c0c41
+EBUILD gnome-applets-2.26.3-r1.ebuild 4202 RMD160 0ff76f7a9c5c0d5e8712c2dcd666167de3e2e4c7 SHA1 c057adbe893ee46a4b87ba5ad9d68c2842f450f8 SHA256 ac0330b3e0a0509f281e0154ca70611aeff5332cc2ff916bdbce087a19a751f8
+EBUILD gnome-applets-2.26.3.ebuild 4209 RMD160 0a51b230cf2efdc3027be312745fd69a5d3679f4 SHA1 5da1b75727a8578f706a7bf67706b29e81497db6 SHA256 5396be193b4a75c4eb38f2193d3e106626d05fae2ad0db92f4ce8ac4ef22624c
+MISC ChangeLog 42465 RMD160 d7a2cb2bc2874b23d7f5405332240946d47369d8 SHA1 ea20dfb0f51b59f14c1b1e8b0e97d6a4e2ce382f SHA256 2b79bb4f5647c6c8153f5a59e5dbdd020d035c5241bba235b6512221dd5128a2
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpjklQACgkQ1fmVwcYIWAYBRACdH1lCs5XPAY/CYyP7QlI8VVLy
-XmIAoLealFV2hrQnHx/PBLpNFf3Ueb3W
-=egXQ
------END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..1b95d3f85b2c
--- /dev/null
+++ b/gnome-base/gnome-applets/gnome-applets-2.26.3-r1.ebuild
@@ -0,0 +1,152 @@
+# 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.3-r1.ebuild,v 1.1 2009/09/27 15:36:44 nirbheek 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
+		|| (
+			>=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
+}
diff --git a/gnome-base/gnome-applets/gnome-applets-2.26.3.ebuild b/gnome-base/gnome-applets/gnome-applets-2.26.3.ebuild
index 84304b8089b9..52e991e14401 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.26.3.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.26.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2009/07/19 21:38:23 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.26.3.ebuild,v 1.2 2009/09/27 15:36:44 nirbheek Exp $
 
 inherit autotools eutils gnome2 python
 
@@ -10,7 +10,7 @@ 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"
+IUSE="acpi apm doc gnome gstreamer hal ipv6 policykit"
 
 # TODO: configure says python stuff is optional
 # my secret script says cpufrequtils might be needed in RDEPEND
@@ -50,7 +50,6 @@ RDEPEND=">=x11-libs/gtk+-2.13
 		|| (
 			>=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 )"
@@ -91,14 +90,16 @@ src_unpack() {
 }
 
 pkg_setup() {
+	# networkmanager-0.7 is not going stable.
+	# For networkmanager support, see -r1
 	G2CONF="${G2CONF}
 		--disable-scrollkeeper
 		--disable-schemas-install
 		--enable-flags
+		--disable-networkmanager
 		$(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