Bump to gksu-2.0.0-r2

	- Fix nautilus extension directory. Bug #241586
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo-r1 x86_64

4 files changed, 117 insertions, 2 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/Manifest b/x11-libs/gksu/Manifest
index f0b4be121bff..9c130d5ec5d3 100644
--- a/x11-libs/gksu/Manifest
+++ b/x11-libs/gksu/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gksu-2.0.0-gnome-2.22.patch 629 RMD160 fa9301fff5389891af1f74f9da5163500082083a SHA1 813d7cd2ac823ca14210293d927ab98e34719321 SHA256 2171c58f95e353f6b5f4886c6f6fb8737765dbe9e24826eada1e17e329e72d19
+AUX gksu-2.0.0-new-nautilus.patch 1561 RMD160 26d44be3f0e4363e76806aad2456bc5592881de7 SHA1 7a0811e6f9f4d14a6048ca2df388dc57968b4b4a SHA256 69979a5577b993caba241e2a0a8a38fbe2a8637cabf7c12f825b168e0718e5e8
 DIST gksu-1.9.1.tar.gz 422819 RMD160 f1f4a0de14c1e55cb8d6310b88be6b7411396dca SHA1 598de48f4674a2ae3d8349a815a832e9f7160837 SHA256 5b3300a8591558500def398471620b0788b345b39ac42bcf3dad823fea3e273d
 DIST gksu-2.0.0.tar.gz 440748 RMD160 5045d7c4ca56e8ca2fb7049c7e86c382cda67df2 SHA1 f15d568f43ecbeedd050b8f09b1da94a7d574de5 SHA256 8148faf12bb2bbd321b08c1207e7aa5ae93d5cc8b8809e2de6ce5af1e1c5b85b
 EBUILD gksu-1.9.1.ebuild 1130 RMD160 a9aa919dd9a1f0328693fbd64dfc57bb3d5d2c65 SHA1 842c5a5f931c9a005e7e39ab4fb70f2c83083991 SHA256 c0e22c87b7ce6b5c45ae7887beed86d81cf3a465b7fe454198f46d5b439c16a1
 EBUILD gksu-2.0.0-r1.ebuild 2086 RMD160 3e7487f4eba7c1d8c2533929708af5a06fbd078c SHA1 20e80f096df5a272e5726bad5192e81907eb4bfe SHA256 f87622e2fa9fe1ea1b8023c3a46fec6b2a33a7d705bab78aa6edeebd96b2606c
+EBUILD gksu-2.0.0-r2.ebuild 2181 RMD160 82f467543396c959fac3fc031127d79430d8d00d SHA1 1eeab55997ab5707e1ce979b4643a3ccf66ade6f SHA256 6bda73f3dc4833020e5d2e8ee1af0a95b6f2fcda1b84dc010097814cbff838bc
 EBUILD gksu-2.0.0.ebuild 1736 RMD160 fb2bf0aea4cb56f924840ce505f2b97c700a9efe SHA1 d9d5332fb5e622bdafdda1772c6879f0a368e6ad SHA256 b6629277e0faa3f0c4af1a00e90b9f18d175220f8a69cef47d17532d0df7d438
-MISC ChangeLog 6177 RMD160 e795e6aba069769762921e3e677ea22715e849ed SHA1 3a3e2ed1e4727a27432a6d2e3292e93b21dd0021 SHA256 7c79f4a24167a76752d086b8fe7139291109611240e8cb1e31b1f6ede362ab99
+MISC ChangeLog 6397 RMD160 75af92cc86b35f895449fbb4add1f8d51258d331 SHA1 21d8d034129761606699fd7f3d0c34131903942d SHA256 6a10ca53f4b242c9b192f1cd05bf760416faf49a71b3789f413724dc919d8b02
 MISC metadata.xml 253 RMD160 e1dda0cee52f7759dd137d288dacc865dd211027 SHA1 f04021419226bd57c9c960fbcf798d9c249d22d8 SHA256 39d57d5a8be47e8247d2b8659b092c4421f2eef9cc83e541755a9eb34dcb667c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iD8DBQFJCLMYomPajV0RnrERAgikAJ9tQ7CBaR7aapCg8EIhNCxplcDSDwCeLyno
+Df5CulKZh60gxulb61fEVU0=
+=TX6f
+-----END PGP SIGNATURE-----
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."
+}