Bump to gksu-2.0.0-r2

	- Fix nautilus extension directory. Bug #241586
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo-r1 x86_64)

3 files changed, 104 insertions, 1 deletions

diff --git a/x11-libs/gksu/ChangeLog b/x11-libs/gksu/ChangeLog
index 8b1d9e15d029..57d3d3d6a1ee 100644
--- a/x11-libs/gksu/ChangeLog
+++ b/x11-libs/gksu/ChangeLog
@@ -1,6 +1,14 @@
 # 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.48 2008/05/24 16:13:46 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gksu/ChangeLog,v 1.49 2008/10/29 19:01:34 dang Exp $
+
+*gksu-2.0.0-r2 (29 Oct 2008)
+
+  29 Oct 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gksu-2.0.0-new-nautilus.patch, +gksu-2.0.0-r2.ebuild:
+  Bump to gksu-2.0.0-r2
+
+  - Fix nautilus extension directory. Bug #241586
 
   24 May 2008; Daniel Gryniewicz <dang@gentoo.org> gksu-2.0.0-r1.ebuild:
   Oops, forgot the dep on gnome-terminal
diff --git a/x11-libs/gksu/files/gksu-2.0.0-new-nautilus.patch b/x11-libs/gksu/files/gksu-2.0.0-new-nautilus.patch
new file mode 100644
index 000000000000..ac953ff0b88d
--- /dev/null
+++ b/x11-libs/gksu/files/gksu-2.0.0-new-nautilus.patch
@@ -0,0 +1,24 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gksu-2.0.0.orig/nautilus-gksu/Makefile.am gksu-2.0.0/nautilus-gksu/Makefile.am
+--- gksu-2.0.0.orig/nautilus-gksu/Makefile.am	2006-09-14 22:45:10.000000000 -0400
++++ gksu-2.0.0/nautilus-gksu/Makefile.am	2008-10-29 14:42:51.000000000 -0400
+@@ -2,7 +2,7 @@ AM_CFLAGS = -g -O2 -Wall
+ INCLUDES = ${NAUTILUS_CFLAGS}
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
+ 
+-nautilus_extensiondir=$(libdir)/nautilus/extensions-1.0
++nautilus_extensiondir=$(libdir)/nautilus/extensions-2.0
+ nautilus_extension_LTLIBRARIES = libnautilus-gksu.la
+ libnautilus_gksu_la_SOURCES = libnautilus-gksu.c
+ libnautilus_gksu_la_LDFLAGS = LDFLAGS = -module -avoid-version -no-undefined
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gksu-2.0.0.orig/nautilus-gksu/Makefile.in gksu-2.0.0/nautilus-gksu/Makefile.in
+--- gksu-2.0.0.orig/nautilus-gksu/Makefile.in	2006-09-23 16:23:10.000000000 -0400
++++ gksu-2.0.0/nautilus-gksu/Makefile.in	2008-10-29 14:42:55.000000000 -0400
+@@ -241,7 +241,7 @@ target_alias = @target_alias@
+ AM_CFLAGS = -g -O2 -Wall
+ INCLUDES = ${NAUTILUS_CFLAGS}
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
+-nautilus_extensiondir = $(libdir)/nautilus/extensions-1.0
++nautilus_extensiondir = $(libdir)/nautilus/extensions-2.0
+ nautilus_extension_LTLIBRARIES = libnautilus-gksu.la
+ libnautilus_gksu_la_SOURCES = libnautilus-gksu.c
+ libnautilus_gksu_la_LDFLAGS = LDFLAGS = -module -avoid-version -no-undefined
diff --git a/x11-libs/gksu/gksu-2.0.0-r2.ebuild b/x11-libs/gksu/gksu-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..58a64f76b7b5
--- /dev/null
+++ b/x11-libs/gksu/gksu-2.0.0-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2008 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-r2.ebuild,v 1.1 2008/10/29 19:01:34 dang Exp $
+
+inherit gnome2 fixheadtails eutils autotools
+
+DESCRIPTION="A gtk+ frontend for libgksu"
+HOMEPAGE="http://www.nongnu.org/gksu/"
+SRC_URI="http://people.debian.org/~kov/gksu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc gnome"
+
+RDEPEND=">=x11-libs/libgksu-2
+	>=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
+		)"
+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"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+	ht_fix_file "${S}/gksu-migrate-conf.sh"
+
+	epatch "${FILESDIR}"/${P}-gnome-2.22.patch
+
+	# Fix the nautilus extension directory. Bug #241586
+	epatch "${FILESDIR}"/${P}-new-nautilus.patch
+
+	if use gnome ; then
+		sed -i 's/x-terminal-emulator/gnome-terminal/' gksu.desktop
+	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
+	fi
+
+	eautoreconf
+}
+
+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
+	einfo ""
+	einfo "A note on gksudo:  It actually runs sudo to get it's work done"
+	einfo "However, by default, Gentoo's sudo wipes your environment."
+	einfo "This means that gksudo will fail to run any X-based programs."
+	einfo "You need to either add yourself to wheel and uncomment this line"
+	einfo "in your /etc/sudoers:"
+	einfo "Defaults:%wheel   !env_reset"
+	einfo "Or remove the env_reset line entirely.  This can cause security"
+	einfo "problems; if you don't trust your users, don't do this, use gksu"
+	einfo "instead."
+}