Fix bug #158469

Package-Manager: portage-2.1.5.2

3 files changed, 80 insertions, 5 deletions

diff --git a/x11-libs/gksu/ChangeLog b/x11-libs/gksu/ChangeLog
index 2fdef75065b6..4c210bd25544 100644
--- a/x11-libs/gksu/ChangeLog
+++ b/x11-libs/gksu/ChangeLog
@@ -1,6 +1,13 @@
 # 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.46 2008/05/02 15:36:49 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gksu/ChangeLog,v 1.47 2008/05/24 16:11:15 dang Exp $
+
+*gksu-2.0.0-r1 (24 May 2008)
+
+  24 May 2008; Daniel Gryniewicz <dang@gentoo.org> +gksu-2.0.0-r1.ebuild:
+  Bug #158469
+  - Only install gksu.desktop if use gnome
+  - Make it use gnome-terminal
 
   02 May 2008; Doug Goldstein <cardoe@gentoo.org> gksu-2.0.0.ebuild:
   remove global scoped variables
diff --git a/x11-libs/gksu/Manifest b/x11-libs/gksu/Manifest
index c5755ac1b146..1faa5ac90480 100644
--- a/x11-libs/gksu/Manifest
+++ b/x11-libs/gksu/Manifest
@@ -5,13 +5,14 @@ AUX gksu-2.0.0-gnome-2.22.patch 629 RMD160 fa9301fff5389891af1f74f9da51635000820
 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 2055 RMD160 8c52c341e3dfb11b2e5f336da4ad97aa54935f97 SHA1 b2bab49835d28bd29f1eda208aff6a8ffbb314b2 SHA256 4073dc8873e3c6cadfff03bbdfd451c0b595a76b1853d88f7dbcff2e6dc86b20
 EBUILD gksu-2.0.0.ebuild 1736 RMD160 fb2bf0aea4cb56f924840ce505f2b97c700a9efe SHA1 d9d5332fb5e622bdafdda1772c6879f0a368e6ad SHA256 b6629277e0faa3f0c4af1a00e90b9f18d175220f8a69cef47d17532d0df7d438
-MISC ChangeLog 5871 RMD160 991d109d508d97fa85beee6f129474d21f8e3a47 SHA1 1e9c2b75d9c00514ba92674ac255778e935ae5ae SHA256 9a794bea0a8f4e4a20ae1cbaca12e313f68b35120544147b21ac19d70c9f6ff5
+MISC ChangeLog 6062 RMD160 ea807d520876201a90409dc3031550e6c0fdf457 SHA1 2477fef17748fa70bd6c7a2eace13af3796a8485 SHA256 18cea1263f29d53181a774b81a37fc98bcc01a56c3036aa7c4c16cbeb2717754
 MISC metadata.xml 253 RMD160 e1dda0cee52f7759dd137d288dacc865dd211027 SHA1 f04021419226bd57c9c960fbcf798d9c249d22d8 SHA256 39d57d5a8be47e8247d2b8659b092c4421f2eef9cc83e541755a9eb34dcb667c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgbNSAACgkQoeSe8B0zEfw56gCfeXZPcwgkgfqhPQcFVpKqXMgl
-X1EAniBk5rUlSiZUYlUXEgGx1Ru0/ULx
-=Kr1M
+iD8DBQFIOD5OomPajV0RnrERAut3AJ9NAPHiFFoLPE1a/OOrwhKfuDG7xgCcDWKu
+idudQqeqq0enEHaaCrgewUs=
+=ETdH
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gksu/gksu-2.0.0-r1.ebuild b/x11-libs/gksu/gksu-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..aa53362294b2
--- /dev/null
+++ b/x11-libs/gksu/gksu-2.0.0-r1.ebuild
@@ -0,0 +1,67 @@
+# 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-r1.ebuild,v 1.1 2008/05/24 16:11:15 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
+		)"
+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
+
+	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."
+}