Bump to 2.0.2. Closes #263074.

Package-Manager: portage-2.2_rc25/cvs/Linux x86_64

4 files changed, 27 insertions, 65 deletions

diff --git a/x11-libs/gksu/ChangeLog b/x11-libs/gksu/ChangeLog
index 57d3d3d6a1ee..e1d940e02cad 100644
--- a/x11-libs/gksu/ChangeLog
+++ b/x11-libs/gksu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gksu
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gksu/ChangeLog,v 1.49 2008/10/29 19:01:34 dang Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gksu/ChangeLog,v 1.50 2009/03/22 17:42:10 eva Exp $
+
+*gksu-2.0.2 (22 Mar 2009)
+
+  22 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org> -gksu-1.9.1.ebuild,
+  -gksu-2.0.0-r1.ebuild, +gksu-2.0.2.ebuild:
+  Bump to 2.0.2. Closes #263074.
 
 *gksu-2.0.0-r2 (29 Oct 2008)
 
diff --git a/x11-libs/gksu/gksu-1.9.1.ebuild b/x11-libs/gksu/gksu-1.9.1.ebuild
deleted file mode 100644
index 47fb5bd42b02..000000000000
--- a/x11-libs/gksu/gksu-1.9.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gksu/gksu-1.9.1.ebuild,v 1.9 2007/07/22 02:52:52 dberkholz Exp $
-
-inherit gnome2 fixheadtails
-
-DESCRIPTION="A gtk+ frontend for libgksu"
-HOMEPAGE="http://www.nongnu.org/gksu/"
-SRC_URI="http://people.debian.org/~kov/gksu/old_stuff/gksu/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="${IUSE} nls"
-
-RDEPEND=">=x11-libs/libgksu-1.9.2
-	>=x11-libs/gtk+-2.4.0
-	>=gnome-base/gconf-2.0
-	>=gnome-base/gnome-keyring-0.4.3
-	app-admin/sudo
-	>=gnome-base/orbit-2.12.2
-	dev-libs/atk
-	x11-libs/pango
-	x11-libs/cairo
-	media-libs/libpng
-	nls? ( sys-devel/gettext )
-	>=dev-libs/glib-2.8.4
-	>=x11-libs/libX11-1.0.0"
-
-DEPEND="${RDEPEND}"
-
-GCONF2="$(use_enable nls)"
-USE_DESTDIR="1"
-
-src_unpack() {
-	gnome2_src_unpack
-	ht_fix_file "${S}/gksu-migrate-conf.sh"
-}
-
-src_install() {
-	gnome2_src_install
-	chmod +x "${D}/usr/share/gksu/gksu-migrate-conf.sh"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	einfo 'updating configuration'
-	"${ROOT}"/usr/share/gksu/gksu-migrate-conf.sh
-}
diff --git a/x11-libs/gksu/gksu-2.0.0-r1.ebuild b/x11-libs/gksu/gksu-2.0.2.ebuild
index 86603a7d0e68..bc50b1bf68f0 100644
--- a/x11-libs/gksu/gksu-2.0.0-r1.ebuild
+++ b/x11-libs/gksu/gksu-2.0.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gksu/gksu-2.0.0-r1.ebuild,v 1.3 2008/05/24 19:12:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gksu/gksu-2.0.2.ebuild,v 1.1 2009/03/22 17:42:10 eva Exp $
+
+EAPI="2"
 
 inherit gnome2 fixheadtails eutils autotools
 
@@ -13,34 +15,36 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc gnome"
 
-RDEPEND=">=x11-libs/libgksu-2
+RDEPEND=">=x11-libs/libgksu-2.0.8
 	>=x11-libs/gtk+-2.4.0
 	>=gnome-base/gconf-2.0
 	gnome? (
 		>=gnome-base/gnome-vfs-2
 		>=gnome-base/nautilus-2
-		x11-terms/gnome-terminal
-		)"
+		x11-terms/gnome-terminal )"
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="$(use_enable doc gtk-doc) $(use_enable gnome nautilus-extension)"
-	USE_DESTDIR="1"
+	G2CONF="${G2CONF} 
+		$(use_enable gnome nautilus-extension)"
 }
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
+
 	ht_fix_file "${S}/gksu-migrate-conf.sh"
 
-	epatch "${FILESDIR}"/${P}-gnome-2.22.patch
+	# Fix nautilus plugin linking
+	epatch "${FILESDIR}"/${PN}-2.0.0-gnome-2.22.patch
 
 	if use gnome ; then
-		sed -i 's/x-terminal-emulator/gnome-terminal/' gksu.desktop
+		sed 's/x-terminal-emulator/gnome-terminal/' \
+			-i gksu.desktop || die "sed 1 failed"
 	else
-		sed -i 's/dist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)/dist_desktop_DATA =/' Makefile.am
-		sed -i 's/dist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)/dist_desktop_DATA =/' Makefile.in
+		sed 's/dist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)/dist_desktop_DATA =/' \
+			-i Makefile.am Makefile.in || die "sed 2 failed"
 	fi
 
 	eautoreconf
diff --git a/x11-libs/gksu/metadata.xml b/x11-libs/gksu/metadata.xml
index db6463e7f79b..2545189a06ff 100644
--- a/x11-libs/gksu/metadata.xml
+++ b/x11-libs/gksu/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <maintainer>
-  <email>dang@gentoo.org</email>
-    <name>Daniel Gryniewicz</name>
+	<email>dang@gentoo.org</email>
+	<name>Daniel Gryniewicz</name>
 </maintainer>
 </pkgmetadata>