Bump for the 0.9 release, remove old

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

6 files changed, 10 insertions, 265 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index 9f4fda810aa4..f7ffb2d76fd8 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/nm-applet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.66 2011/08/22 13:57:12 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.67 2011/08/23 23:18:30 nirbheek Exp $
+
+*nm-applet-0.9.0 (23 Aug 2011)
+
+  23 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -nm-applet-0.8.1-r2.ebuild, -files/nm-applet-0.8.1-fix-bluetooth-dep.patch,
+  -files/nm-applet-0.8.1-fix-compilation-with-DGSEAL_ENABLE.patch,
+  -nm-applet-0.8.2.ebuild, -nm-applet-0.9_rc3.ebuild, +nm-applet-0.9.0.ebuild:
+  Bump for the 0.9 release, remove old
 
   22 Aug 2011; Tony Vroon <chainsaw@gentoo.org> nm-applet-0.8.4.ebuild:
   Marked stable on AMD64 based on arch testing by Elijah El Lazkani, Agostino
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.8.1-fix-bluetooth-dep.patch b/gnome-extra/nm-applet/files/nm-applet-0.8.1-fix-bluetooth-dep.patch
deleted file mode 100644
index ead490fc0c22..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-0.8.1-fix-bluetooth-dep.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e523771e0d68c347763a004a3f9ac100db5cfbb2 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Tue, 24 Aug 2010 16:05:01 +0000
-Subject: build: allow explicit enabling/disabling of gnome-bluetooth dep (bgo #627663)
-
----
-diff --git a/configure.ac b/configure.ac
-index 1ab81f4..b2dd2cd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,12 +97,24 @@ fi
- AC_SUBST(DBUS_SYS_DIR)
- 
- dnl Check for gnome-bluetooth
--PKG_CHECK_MODULES(GNOME_BLUETOOTH,
--		  gconf-2.0
--		  gnome-bluetooth-1.0 >= 2.27.6
--		  libnm-util >= 0.8.1
--		  libnm-glib >= 0.8.1,
--		  have_gbt=yes, have_gbt=no)
-+AC_ARG_WITH([bluetooth],
-+	    AS_HELP_STRING([--with-bluetooth|--without-bluetooth], [Enable Bluetooth support]),
-+	    with_bluetooth="$withval",with_bluetooth=yes)
-+have_gbt=no
-+case "${with_bluetooth}" in
-+	no)	AC_MSG_NOTICE(Bluetooth support disabled)
-+		;;
-+	*)
-+		AC_MSG_CHECKING(for gnome-bluetooth)
-+		PKG_CHECK_MODULES(GNOME_BLUETOOTH,
-+				  gconf-2.0
-+				  gnome-bluetooth-1.0 >= 2.27.6
-+				  libnm-util >= 0.8.1
-+				  libnm-glib >= 0.8.1,
-+				  have_gbt=yes, have_gbt=no)
-+		;;
-+esac
-+
- AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
- 
- AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
---
-cgit v0.8.3.1
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.8.1-fix-compilation-with-DGSEAL_ENABLE.patch b/gnome-extra/nm-applet/files/nm-applet-0.8.1-fix-compilation-with-DGSEAL_ENABLE.patch
deleted file mode 100644
index d4317d6f186e..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-0.8.1-fix-compilation-with-DGSEAL_ENABLE.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 0e85376c5e7512225023918461881cb13aea22f3 Mon Sep 17 00:00:00 2001
-From: Mirsal Ennaime <mirsal.ennaime@gmail.com>
-Date: Mon, 02 Aug 2010 22:19:35 +0000
-Subject: applet: fix compilation with -DGSEAL_ENABLE (bgo #615653)
-
-This patch substitutes all direct access to Gtk+ object fields
-with accessor functions in order to fulfill the UseGseal goal
-as described at http://live.gnome.org/GnomeGoals/UseGseal
-
-It also requires to bump the required Gtk+ version to 2.18
----
-diff --git a/configure.ac b/configure.ac
-index 5871561..e11aa21 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -72,7 +72,7 @@ PKG_CHECK_MODULES(NMA,
- 		 libnm-glib >= 0.8.1
- 		 libnm-util >= 0.8.1
- 		 libnm-glib-vpn >= 0.8.1
--		 gtk+-2.0 >= 2.14
-+		 gtk+-2.0 >= 2.18
- 		 libglade-2.0
- 		 gmodule-export-2.0
- 		 gconf-2.0
-diff --git a/src/applet.c b/src/applet.c
-index 2734045..d7ab47f 100644
---- a/src/applet.c
-+++ b/src/applet.c
-@@ -482,6 +482,7 @@ applet_new_menu_item_helper (NMConnection *connection,
- static gboolean
- menu_title_item_expose (GtkWidget *widget, GdkEventExpose *event)
- {
-+	GtkAllocation allocation;
- 	GtkStyle *style;
- 	GtkWidget *label;
- 	PangoFontDescription *desc;
-@@ -509,7 +510,8 @@ menu_title_item_expose (GtkWidget *widget, GdkEventExpose *event)
- 	/* We also need to reposition the cairo context so that (0, 0) is the
- 	 * top-left of where we're supposed to start drawing.
- 	 */
--	cairo_translate (cr, widget->allocation.x, widget->allocation.y);
-+	gtk_widget_get_allocation (widget, &allocation);
-+	cairo_translate (cr, allocation.x, allocation.y);
- 
- 	text = gtk_label_get_text (GTK_LABEL (label));
- 
-diff --git a/src/utils/nma-bling-spinner.c b/src/utils/nma-bling-spinner.c
-index 5522046..ceecaf8 100644
---- a/src/utils/nma-bling-spinner.c
-+++ b/src/utils/nma-bling-spinner.c
-@@ -71,26 +71,23 @@ draw (GtkWidget *widget, cairo_t *cr)
- 	double radius;
- 	double half;
- 	int i;
--	int width, height;
- 
-+	GtkAllocation allocation;
- 	NmaBlingSpinnerPrivate *priv;
- 
- 	priv = NMA_BLING_SPINNER_GET_PRIVATE (widget);
- 
- 	cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
- 
--	width = widget->allocation.width;
--	height = widget->allocation.height;
--
--	if ( (width < 12) || (height <12) )
-+	gtk_widget_get_allocation (widget, &allocation);
-+	if ((allocation.width < 12) || (allocation.height < 12))
- 		gtk_widget_set_size_request(widget, 12, 12);
- 
--	//x = widget->allocation.x + widget->allocation.width / 2;
--	//y = widget->allocation.y + widget->allocation.height / 2;
--	x = widget->allocation.width / 2;
--	y = widget->allocation.height / 2;
--	radius = MIN (widget->allocation.width	/ 2,
--				  widget->allocation.height / 2);
-+	//x = allocation.x + allocation.width / 2;
-+	//y = allocation.y + allocation.height / 2;
-+	x = allocation.width / 2;
-+	y = allocation.height / 2;
-+	radius = MIN (allocation.width / 2, allocation.height / 2);
- 	half = priv->lines / 2;
- 
- 	/*FIXME: render in B&W for non transparency */
-@@ -154,7 +151,7 @@ nma_bling_spinner_init (NmaBlingSpinner *spinner)
- 	priv->current = 0;
- 	priv->timeout = 0;
- 
--	GTK_WIDGET_SET_FLAGS (GTK_WIDGET (spinner), GTK_NO_WINDOW);
-+	gtk_widget_set_has_window (GTK_WIDGET (spinner), FALSE);
- }
- 
- static gboolean
---
-cgit v0.8.3.1
diff --git a/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild
deleted file mode 100644
index e380de826c6f..000000000000
--- a/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild,v 1.5 2011/03/29 14:15:18 ssuominen Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils autotools
-
-MY_PN="${PN/nm-applet/network-manager-applet}"
-
-DESCRIPTION="Gnome applet for NetworkManager."
-HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bluetooth"
-
-# FIXME: bluetooth is automagic
-# XXX: depend on dbus-1.2.6 when it goes stable
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=dev-libs/dbus-glib-0.74
-	>=sys-apps/dbus-1.2
-	>=x11-libs/gtk+-2.18:2
-	>=gnome-base/gconf-2.20:2
-	>=gnome-extra/polkit-gnome-0.92
-	>=x11-libs/libnotify-0.4.3
-	>=gnome-base/libglade-2:2.0
-	>=gnome-base/gnome-keyring-2.20
-
-	>=dev-libs/libnl-1.1
-	>=net-misc/networkmanager-${PV}
-	>=net-wireless/wireless-tools-28_pre9
-	>=net-wireless/wpa_supplicant-0.5.7
-	net-misc/mobile-broadband-provider-info
-	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-# USE_DESTDIR="1"
-
-src_prepare() {
-	# Fix compilation with DGSEAL_ENABLE gentoo bug #330363
-	epatch "${FILESDIR}/${P}-fix-compilation-with-DGSEAL_ENABLE.patch"
-	epatch "${FILESDIR}/${P}-fix-bluetooth-dep.patch"
-
-	epatch "${FILESDIR}"/${PN}-0.8.2-libnotify-0.7.patch
-
-	eautoreconf
-}
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup () {
-	G2CONF="${G2CONF}
-		--disable-more-warnings
-		--localstatedir=/var"
-}
diff --git a/gnome-extra/nm-applet/nm-applet-0.8.2.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.2.ebuild
deleted file mode 100644
index 30c942f40a11..000000000000
--- a/gnome-extra/nm-applet/nm-applet-0.8.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.2.ebuild,v 1.5 2011/03/06 23:08:10 nirbheek Exp $
-
-EAPI=2
-inherit eutils gnome2
-
-MY_PN="${PN/nm-applet/network-manager-applet}"
-
-DESCRIPTION="Gnome applet for NetworkManager."
-HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bluetooth"
-
-# FIXME: bluetooth is automagic
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=dev-libs/dbus-glib-0.88
-	>=sys-apps/dbus-1.4.1
-	>=x11-libs/gtk+-2.18:2
-	>=gnome-base/gconf-2.20:2
-	>=x11-libs/libnotify-0.4.3
-	>=gnome-base/libglade-2:2.0
-	>=gnome-base/gnome-keyring-2.20
-
-	>=dev-libs/libnl-1.1
-	>=net-misc/networkmanager-${PV}
-	>=net-wireless/wireless-tools-28_pre9
-	>=net-wireless/wpa_supplicant-0.5.7
-	net-misc/mobile-broadband-provider-info
-	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )
-	>=sys-auth/polkit-0.96-r1"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-pkg_setup () {
-	G2CONF="${G2CONF}
-		--disable-more-warnings
-		--localstatedir=/var"
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-	gnome2_src_prepare
-}
diff --git a/gnome-extra/nm-applet/nm-applet-0.9_rc3.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.0.ebuild
index 2d5881168e95..aae50ca00d6f 100644
--- a/gnome-extra/nm-applet/nm-applet-0.9_rc3.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.9.0.ebuild
@@ -1,21 +1,16 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9_rc3.ebuild,v 1.3 2011/08/16 10:16:20 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.0.ebuild,v 1.1 2011/08/23 23:18:30 nirbheek Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
 GNOME_ORG_MODULE="network-manager-applet"
-GNOME_ORG_PVP="0.8"
-REAL_PV="0.8.9997"
 
 inherit gnome2
 
 DESCRIPTION="GNOME applet for NetworkManager"
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-# Replace our fake _rc version with the actual version
-SRC_URI="${SRC_URI//${PV}/${REAL_PV}}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -40,9 +35,6 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.40"
 
-# Replace our fake _rc version with the actual version
-S="${WORKDIR}/${GNOME_ORG_MODULE}-${REAL_PV}"
-
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF}