Fix building with USE="-nls" wrt #237046 by Christophe LEFEBVRE.

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

4 files changed, 83 insertions, 13 deletions

diff --git a/x11-misc/grun/ChangeLog b/x11-misc/grun/ChangeLog
index 2533e50a5922..6f604fb391ea 100644
--- a/x11-misc/grun/ChangeLog
+++ b/x11-misc/grun/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/grun
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/grun/ChangeLog,v 1.29 2009/02/02 23:56:08 nelchael Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/grun/ChangeLog,v 1.30 2009/12/23 15:36:29 ssuominen Exp $
+
+*grun-0.9.3-r1 (23 Dec 2009)
+
+  23 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> +grun-0.9.3-r1.ebuild,
+  +files/grun-0.9.3-no_nls.patch:
+  Fix building with USE="-nls" wrt #237046 by Christophe LEFEBVRE.
 
   02 Feb 2009; Krzysiek Pawlik <nelchael@gentoo.org> ChangeLog:
   Fix ChangeLog entries.
diff --git a/x11-misc/grun/Manifest b/x11-misc/grun/Manifest
index c67976437093..41fb6f462a13 100644
--- a/x11-misc/grun/Manifest
+++ b/x11-misc/grun/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX grun-0.9.3-no_nls.patch 334 RMD160 4f287302c758e425aa75d6689d4a02c0c9129b3c SHA1 0a78f7e1932919d46d7d46101a05ea1a2e2cb129 SHA256 d715418fd98c81f3b3ddb80e11f6106ff7c8b4e2de91aa1d6775e7a6ae2cac80
 DIST grun-0.9.3.tar.gz 368318 RMD160 efb7c197de41c2060042b9111ceba3aa8e02b67c SHA1 53ed0f6d449331b6967d3f49d67072c8714a1305 SHA256 c484d80e4636a69c6ad6491a4769f555be20595e67cb4bfd34c3c91e501b95dd
 DIST grun_0.9.2-14.1.diff.gz 142379 RMD160 8e26f2d20a65a616b18df28aa8da5dd0162fb3ea SHA1 1922e61baa65ea9ac9bd5c0ef783625d61079c63 SHA256 c9a527199fb5b2080e018683989d413bc53ef8f55a440ab333d5d063b0e6dbfc
 DIST grun_0.9.2.orig.tar.gz 113745 RMD160 16b97485badd41da671012538b19388975ee9670 SHA1 3b4a06b75aa07aa5d19a4594566773db34ea937d SHA256 5286a6b3ae2e0d05b36b99278947b3f9732a00a920f0321dab02e464f4a0d3c2
 EBUILD grun-0.9.2-r1.ebuild 1967 RMD160 3922a925c6def5f46815f31f38ba553e7619b481 SHA1 1835420c43881f838d5808aa4ea60b1a01b2355f SHA256 9a23d3ae6db785e39bd0f5cbf2473547e83138eb63164cffeafe9d658a58f8ef
+EBUILD grun-0.9.3-r1.ebuild 1746 RMD160 2048bc77824c51b32d8e8febd96b3dc80132d250 SHA1 b6683b93d7d212e60fd1260c702ccf52ec0929ec SHA256 e1ffdb90d93a2861989d65d1cd089d946761d72bc9b0411fcba1bbf253ecf7e4
 EBUILD grun-0.9.3.ebuild 1708 RMD160 f878dbf421b96748db7494ae6947744c41e57c22 SHA1 5df3a96fe3c75af6032a6581fadbbd4f7bdfce5d SHA256 3fe6570d30a2124aba49e18705b67e3c5d7d960caee7c331699f03f0ceea54c3
-MISC ChangeLog 3279 RMD160 19eecf9334c0f11ccd31c0753db161513554b9f0 SHA1 52b82d249ae63452e6b373722c8391a27f8a1ebb SHA256 79224dd12e7b494a3a4997c61cb059678b04abde4217779820901cd98016d205
+MISC ChangeLog 3489 RMD160 a7e3be4812536315cdc5501bed3df4bf8486703c SHA1 b9438f8ae47347e58b74441f8c6c4d07dca05b06 SHA256 31d277d7043f9a8f0b2c568f5f553f433ca9d20570bcc66b2b5e37f480542505
 MISC metadata.xml 231 RMD160 edee523a81eb20b171a5dd298e8507ecd49230f6 SHA1 f78294e25f7fd11c0954f753892ece303fc491b3 SHA256 f9af69429b315694d8f6094781bf242d6235450fc58aba6e9e35e28099cc334a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmHiB0ACgkQgo/w9rxVVVEL+QCgthDOwJ9TD+bog0Wq+zxTe6aL
-4IUAn2QPF2BR8wncoBJxhiDGa6ejTYy9
-=bQjk
------END PGP SIGNATURE-----
diff --git a/x11-misc/grun/files/grun-0.9.3-no_nls.patch b/x11-misc/grun/files/grun-0.9.3-no_nls.patch
new file mode 100644
index 000000000000..52acf68a4c05
--- /dev/null
+++ b/x11-misc/grun/files/grun-0.9.3-no_nls.patch
@@ -0,0 +1,12 @@
+diff -ur grun-0.9.3.orig/grun.c grun-0.9.3/grun.c
+--- grun-0.9.3.orig/grun.c	2008-01-14 08:28:10.000000000 +0200
++++ grun-0.9.3/grun.c	2009-12-23 17:34:34.000000000 +0200
+@@ -30,8 +30,6 @@
+ 
+ #if defined (HAVE_GETTEXT) || defined (HAVE_CATGETS)
+ #include <libintl.h>
+-#else
+-#include "intl/libintl.h"
+ #endif
+ 
+ #define PATH_CHAR	":"
diff --git a/x11-misc/grun/grun-0.9.3-r1.ebuild b/x11-misc/grun/grun-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..981296c7e3a6
--- /dev/null
+++ b/x11-misc/grun/grun-0.9.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/grun/grun-0.9.3-r1.ebuild,v 1.1 2009/12/23 15:36:29 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="a GTK+ application launcher with nice features such as a history"
+HOMEPAGE="http://code.google.com/p/grun/"
+SRC_URI="http://grun.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="nls"
+
+RDEPEND=">=x11-libs/gtk+-2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no_nls.patch
+}
+
+src_configure() {
+	[[ -z ${TERM} ]] && TERM=xterm
+
+	econf \
+		$(use_enable nls) \
+		--disable-gtktest \
+		--enable-testfile \
+		--enable-associations \
+		--with-default-xterm=${TERM}
+}
+
+src_install() {
+	einstall || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+}
+
+pkg_postinst() {
+	elog "It is recommended to bind grun to a keychain. Fluxbox users can"
+	elog "do this by appending e.g. the following line to ~/.fluxbox/keys:"
+	elog
+	elog "Mod4 r :ExecCommand grun"
+	elog
+	elog "Then reconfigure Fluxbox (using the menu) and hit <WinKey>-<r>"
+	elog
+	elog "The default system-wide definition file for associating file"
+	elog "extensions with applications is /usr/share/grun/gassoc, the"
+	elog "default system-wide definition file for recognized console"
+	elog "applications is /usr/share/grun/consfile. They can be overridden"
+	elog "on a per user basis by ~/.gassoc and ~/.consfile respectively."
+	elog
+	elog "To change the default terminal application grun uses, adjust the"
+	elog "TERM environment variable accordingly and remerge grun, e.g."
+	elog
+	elog "TERM=Eterm emerge grun"
+}