Fix nautilus extension directoryfor nautilus-3. Add patch for building with >=glib-2.31 (thanks to biohazrd for reporting in bug #401437 comment #1). Add some missing dependencies.

Package-Manager: portage-2.2.0_alpha99/cvs/Linux x86_64

6 files changed, 195 insertions, 12 deletions

diff --git a/x11-libs/gksu/ChangeLog b/x11-libs/gksu/ChangeLog
index 35505794dc12..c092cfab5008 100644
--- a/x11-libs/gksu/ChangeLog
+++ b/x11-libs/gksu/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/gksu
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gksu/ChangeLog,v 1.62 2011/01/06 21:27:29 dang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gksu/ChangeLog,v 1.63 2012/04/07 23:55:39 tetromino Exp $
+
+*gksu-2.0.2-r1 (07 Apr 2012)
+
+  07 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gksu-2.0.2.ebuild,
+  +gksu-2.0.2-r1.ebuild, +files/gksu-2.0.2-glib-2.31.patch,
+  +files/gksu-2.0.2-nautilus-dir.patch:
+  Fix nautilus extension directoryfor nautilus-3. Add patch for building with
+  >=glib-2.31 (thanks to biohazrd for reporting in bug #401437 comment #1). Add
+  some missing dependencies.
 
   06 Jan 2011; Daniel Gryniewicz <dang@gentoo.org>
   -files/gksu-2.0.0-gnome-2.22.patch:
diff --git a/x11-libs/gksu/Manifest b/x11-libs/gksu/Manifest
index d715eff50b72..475bfc0bdba2 100644
--- a/x11-libs/gksu/Manifest
+++ b/x11-libs/gksu/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX gksu-2.0.2-glib-2.31.patch 870 RMD160 b29898d45705fea12354acacdcb3c28e7b1cc49b SHA1 668a67415f6279876f7ad5916f9db74938fa49c7 SHA256 028fc1396265d51e90c209c4b3959e2f645f51c3104987ef08339821271d995c
+AUX gksu-2.0.2-nautilus-dir.patch 2640 RMD160 3d34bbe5a494f4c93d7af26efe23d6e76e9aea9f SHA1 ce42dcb1077f297cf3088688b4f92dea7a821884 SHA256 e37d1259a6a0c807369585417ceb661c2b00f4960921e80bf8d43fc5d51a6a11
 DIST gksu-2.0.2.tar.gz 468121 RMD160 2864cb95529532c698b1be75914f30a70bb8145f SHA1 dae634e3ed2aa8c3f2bebac17d875bcb49d825cc SHA256 a1de3dca039d88c195fcdc9516379439a1d699750417f1e655aa2101a955ee5a
-EBUILD gksu-2.0.2.ebuild 2028 RMD160 71c206291092b64d1e5e714760224cc371405afd SHA1 0399a67fc2de7de00c81b766ff5432cb5316fd46 SHA256 598e78d745e11338afbbb65ab9e8cb4b0275b9134697c4a82e7795c6676ad4b2
-MISC ChangeLog 8036 RMD160 640c40e29d12047fdec245db48d211a4fa90a663 SHA1 000b2b2a2002661348c037c88be604a326c1f037 SHA256 1f96eaf625c0602c7353275f8101d61e959ccec582ec3b04f21af094ccf84ec8
+EBUILD gksu-2.0.2-r1.ebuild 2299 RMD160 d94af09958d37ecd0fdbcd4bda3e1f29455252b5 SHA1 17ba15ed7a547cf55a7e0d024426b39e745432ae SHA256 66a7a21af64e026aa678277e27119a3982746cf2e16e64d4b29950733db5a533
+EBUILD gksu-2.0.2.ebuild 2183 RMD160 9f6772ee63139bc837c288ec2abee9086316db07 SHA1 50e2c52e4800914d14502e3de9c37f538c60c5c6 SHA256 b9adadcb1607e9b644766d0cf69ecd5bd4f3770ab6c723dde289690fcfb04144
+MISC ChangeLog 8437 RMD160 b171581a81e8e8236b7352d125cf26b2b4bdae0d SHA1 5481f814c28d8c4f81deb49e2b6700d86ac308fe SHA256 98a6522158c9092fc75fd7b9689f1248263112efc191153887d6cf354d28c8d5
 MISC metadata.xml 249 RMD160 232402c3dc66cb4d08397ad2538d236cca544d43 SHA1 4c3a20bb527f8ca870393e2ab0fd97cd9757c271 SHA256 f67a6a51147ab0cff4490c7119c4edb3ae1b1b8587b92a806a937c9eb92cdfa5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk0mM8EACgkQomPajV0RnrEYEACfR80h86HH4TkVaBnWJn4DKrdO
-ZNkAn2fqkhdeGzNQVrTJXDtlfP2WePlf
-=w/LA
+iF4EAREIAAYFAk+A1AEACgkQdjK8w9WeBnB+9wD/f+lWtgjZMH+DfiL1MreJh1sn
+ORNroyGrEzMQSpS3zN8A/AsJRwb37fAxf32DFcrrouLPEa1bXzVT6uTnEz1Fd7i/
+=PoFk
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch b/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch
new file mode 100644
index 000000000000..fd711a321acf
--- /dev/null
+++ b/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch
@@ -0,0 +1,29 @@
+From 10c7e67e11a56e2fe1acf9b085772bc995d35bc0 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 7 Apr 2012 17:57:36 -0400
+Subject: [PATCH] Fix glib includes for building with >=glib-2.31
+
+glib-2.31 and newer no longer allow most glib subheaders to be included
+directly.
+
+https://savannah.nongnu.org/bugs/index.php?36127
+---
+ nautilus-gksu/libnautilus-gksu.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/nautilus-gksu/libnautilus-gksu.c b/nautilus-gksu/libnautilus-gksu.c
+index 8e44d29..4acf3f8 100644
+--- a/nautilus-gksu/libnautilus-gksu.c
++++ b/nautilus-gksu/libnautilus-gksu.c
+@@ -5,7 +5,7 @@
+ #include <string.h>
+ #include <pthread.h>
+ 
+-#include <glib/gkeyfile.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ #include <gio/gio.h>
+ #include <libnautilus-extension/nautilus-extension-types.h>
+-- 
+1.7.8.5
+
diff --git a/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch b/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch
new file mode 100644
index 000000000000..bc21b56c663f
--- /dev/null
+++ b/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch
@@ -0,0 +1,58 @@
+From d7ee2b46dad2070982b035a3136ccbb5787e9ed4 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 7 Apr 2012 19:39:03 -0400
+Subject: [PATCH] Fix nautilus extensions directory for nautilus-3
+
+The gksu nautilus extension works with both nautilus-2 and nautilus-3,
+so we should not assume that the extension is always installed in
+/usr/lib/nautilus/extensions-2.0
+
+https://savannah.nongnu.org/bugs/index.php?36129
+---
+ configure.ac              |   14 +++++++++++++-
+ nautilus-gksu/Makefile.am |    2 +-
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 21d33bb..d65c586 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -64,9 +64,21 @@ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test x$use_libtool = xyes)
+ 
+ AC_ARG_ENABLE(nautilus-extension, [  --enable-nautilus-extension  Build the nautilus extensions module [default=yes]], enable_nautilus_extension="$enableval", enable_nautilus_extension=yes)
+ AM_CONDITIONAL(ENABLE_NAUTILUS_EXTENSION, test x$enable_nautilus_extension = xyes)
++AC_ARG_WITH(nautilus-extensions-dir,
++  AS_HELP_STRING([--with-nautilus-extension-dir=DIR],
++    [Directory where nautilus extensions have to be installed (usually /usr/lib/nautilus/extensions-2.0 or -3.0)]))
+ 
+ if test x$enable_nautilus_extension = xyes; then
+-   PKG_CHECK_MODULES(NAUTILUS, [libgksu2 >= 2.0.0, libnautilus-extension])
++  PKG_CHECK_MODULES(NAUTILUS, [libgksu2 >= 2.0.0, libnautilus-extension])
++  if test "x$with_nautilus_extension_dir" = x; then
++    AC_MSG_CHECKING([for Nautilus extensions directory])
++    with_nautilus_extension_dir=`pkg-config --variable=extensiondir libnautilus-extension`
++    if test "x$with_nautilus_extension_dir" = x; then
++      AC_MSG_ERROR([not found. You can specify the extensions directory manually using --with-nautilus-extension-dir=DIR])
++    fi
++    AC_MSG_RESULT($with_nautilus_extension_dir)
++  fi
++  AC_SUBST(NAUTILUS_EXTENSION_DIR, [$with_nautilus_extensios_dir])
+ fi
+ 
+ AC_CONFIG_FILES([
+diff --git a/nautilus-gksu/Makefile.am b/nautilus-gksu/Makefile.am
+index 3a70c78..cbe4d00 100644
+--- a/nautilus-gksu/Makefile.am
++++ b/nautilus-gksu/Makefile.am
+@@ -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-2.0
++nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR)
+ nautilus_extension_LTLIBRARIES = libnautilus-gksu.la
+ libnautilus_gksu_la_SOURCES = libnautilus-gksu.c
+ libnautilus_gksu_la_LDFLAGS = LDFLAGS = -module -avoid-version -no-undefined
+-- 
+1.7.8.5
+
diff --git a/x11-libs/gksu/gksu-2.0.2-r1.ebuild b/x11-libs/gksu/gksu-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..4cff17be908c
--- /dev/null
+++ b/x11-libs/gksu/gksu-2.0.2-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gksu/gksu-2.0.2-r1.ebuild,v 1.1 2012/04/07 23:55:39 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 fixheadtails
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc gnome"
+
+RDEPEND=">=x11-libs/libgksu-2.0.8
+	>=x11-libs/gtk+-2.4:2
+	>=gnome-base/gconf-2
+	gnome? (
+		>=gnome-base/nautilus-2
+		x11-terms/gnome-terminal )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable gnome nautilus-extension)"
+}
+
+src_prepare() {
+	ht_fix_file "${S}/gksu-migrate-conf.sh"
+
+	# https://savannah.nongnu.org/bugs/index.php?36127
+	epatch "${FILESDIR}/${PN}-2.0.2-glib-2.31.patch"
+
+	if use gnome ; then
+		sed 's/x-terminal-emulator/gnome-terminal/' \
+			-i gksu.desktop || die "sed 1 failed"
+
+		# Conditional patch to avoid eautoreconf
+		# https://savannah.nongnu.org/bugs/index.php?36129
+		epatch "${FILESDIR}/${PN}-2.0.2-nautilus-dir.patch"
+		eautoreconf
+	else
+		sed 's/dist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)/dist_desktop_DATA =/' \
+			-i Makefile.am Makefile.in || die "sed 2 failed"
+	fi
+
+	gnome2_src_prepare
+}
+
+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."
+}
diff --git a/x11-libs/gksu/gksu-2.0.2.ebuild b/x11-libs/gksu/gksu-2.0.2.ebuild
index 18f534f8d7c2..fa28af0fd92e 100644
--- a/x11-libs/gksu/gksu-2.0.2.ebuild
+++ b/x11-libs/gksu/gksu-2.0.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gksu/gksu-2.0.2.ebuild,v 1.12 2011/01/06 15:28:15 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gksu/gksu-2.0.2.ebuild,v 1.13 2012/04/07 23:55:39 tetromino Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
 
-inherit gnome2 fixheadtails
+inherit eutils gnome2 fixheadtails
 
 DESCRIPTION="A gtk+ frontend for libgksu"
 HOMEPAGE="http://www.nongnu.org/gksu/"
@@ -23,6 +23,8 @@ RDEPEND=">=x11-libs/libgksu-2.0.8
 		>=gnome-base/nautilus-2
 		x11-terms/gnome-terminal )"
 DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
 	doc? ( dev-util/gtk-doc )"
 
 pkg_setup() {
@@ -37,6 +39,9 @@ src_prepare() {
 
 	ht_fix_file "${S}/gksu-migrate-conf.sh"
 
+	# https://savannah.nongnu.org/bugs/index.php?36127
+	epatch "${FILESDIR}/${PN}-2.0.2-glib-2.31.patch"
+
 	if use gnome ; then
 		sed 's/x-terminal-emulator/gnome-terminal/' \
 			-i gksu.desktop || die "sed 1 failed"