Use sysconfdir for gmrunrc wrt #292856 by Łukasz Stelmach.

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

4 files changed, 95 insertions, 3 deletions

diff --git a/x11-misc/gmrun/ChangeLog b/x11-misc/gmrun/ChangeLog
index 9123823d0ebf..7d62b31ea804 100644
--- a/x11-misc/gmrun/ChangeLog
+++ b/x11-misc/gmrun/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/gmrun
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/ChangeLog,v 1.19 2009/08/09 18:54:05 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/ChangeLog,v 1.20 2010/06/06 13:13:11 ssuominen Exp $
+
+*gmrun-0.9.2-r1 (06 Jun 2010)
+
+  06 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +gmrun-0.9.2-r1.ebuild, +files/gmrun-0.9.2-sysconfdir.patch:
+  Use sysconfdir for gmrunrc wrt #292856 by Łukasz Stelmach.
 
   09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> gmrun-0.9.2.ebuild:
   Apply glibc patch only if >= 2.10 since it's not backward compatible.
diff --git a/x11-misc/gmrun/Manifest b/x11-misc/gmrun/Manifest
index 389329082c31..6f4224aa84e3 100644
--- a/x11-misc/gmrun/Manifest
+++ b/x11-misc/gmrun/Manifest
@@ -1,6 +1,8 @@
 AUX gmrun-0.9.2-gcc43.patch 1132 RMD160 21415b3c1f33f4a7e534cf57cfdb79ee7e3b30db SHA1 8e3a41313cb893825b97544dfba4a08d55b609b9 SHA256 21619fca99499bcd21f9707990158d3adda17784f2e52ee2b9263604dc4c1390
 AUX gmrun-0.9.2-glibc210.patch 421 RMD160 8d61c83c59740816ae070b0f77c79cb9ff380228 SHA1 b6b4becafb017df0334d5567bc2f675b10dafe10 SHA256 931efdd02740483b1066366a07378419d8110ba172f33467236ebd2711d4eaef
+AUX gmrun-0.9.2-sysconfdir.patch 1594 RMD160 cd8843399f8ad919b3391936771b10c590b94ceb SHA1 d549cb2e6daf9a5e62765475cef3cd42c02bff8c SHA256 0ca181e99ee651f78c3732bf6afff05b27be3f694683197e7e81672bc8b833b9
 DIST gmrun-0.9.2.tar.gz 66097 RMD160 8cae67aa63d95c8347d66b690b9cabb158319516 SHA1 ced54e287fa5665893c41d0e32940b1672027a02 SHA256 17297bce53249ccc7145931db22251b47f77ac355f78cf8abf1e87ae16341fa0
+EBUILD gmrun-0.9.2-r1.ebuild 1066 RMD160 63085cda853c73d96e094c9bd68e9bbbc61cbcb1 SHA1 8d1a152d2b0d4cce2d667864ba98792ef43ca5a9 SHA256 cc320d613742662f5647a759b56f0a7bed6756704f0b4cc967009c107a8048a9
 EBUILD gmrun-0.9.2.ebuild 1070 RMD160 e732660e0cbf849eee1cbac70e68247d174127fc SHA1 373cff88635610a678a08b11088cc5fb5aac31d6 SHA256 74a774b6e26eed4c6af9514a20eef0192130e3be504a038186c8d8ca69ff610b
-MISC ChangeLog 2284 RMD160 a2b046ef2d3b49c39a282bba08e1a3bf5199b6ff SHA1 8bdcfd49019c376f5cf0434adae314f3bb18f0c3 SHA256 0a8d727558d9ce280eec5363c7b95941a6371e238107b37eedacd629857a6c11
+MISC ChangeLog 2495 RMD160 20c686bc603e529e4b5a42f7c938a7bab4d9411b SHA1 f61dce40497622738acadd78df779d520ad5a1aa SHA256 836b6c62ff6b5ebfd4f2e6927fbd5a098de1f7596270f631b1a3157966543599
 MISC metadata.xml 338 RMD160 e45af7014909f8cbd76ccbc5a164d159e1b04c7e SHA1 ddf31f6d7516b6ec5cf3e179f31c4856cd432d22 SHA256 cd10c5f526519fc51527aaef8af03e72f6bfd18a8e6eadba81a0c5b928843c53
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch b/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch
new file mode 100644
index 000000000000..cd6fc1c87577
--- /dev/null
+++ b/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch
@@ -0,0 +1,45 @@
+http://bugs.gentoo.org/292856
+
+diff -ur gmrun-0.9.2.orig/config/Makefile.am gmrun-0.9.2/config/Makefile.am
+--- gmrun-0.9.2.orig/config/Makefile.am	2001-05-17 09:58:07.000000000 +0300
++++ gmrun-0.9.2/config/Makefile.am	2010-06-06 16:05:16.000000000 +0300
+@@ -1,6 +1,6 @@
+ # $Id: gmrun-0.9.2-sysconfdir.patch,v 1.1 2010/06/06 13:13:11 ssuominen Exp $
+ 
+-myrcdir = @PACKAGE_DATA_DIR@
++myrcdir = $(sysconfdir)
+ myrc_DATA = gmrunrc
+ 
+ EXTRA_DIST = gmrunrc
+diff -ur gmrun-0.9.2.orig/config.h.in gmrun-0.9.2/config.h.in
+--- gmrun-0.9.2.orig/config.h.in	2003-11-16 12:47:07.000000000 +0200
++++ gmrun-0.9.2/config.h.in	2010-06-06 16:07:14.000000000 +0300
+@@ -10,7 +10,6 @@
+ #undef HAVE_STPCPY
+ #undef HAVE_LIBSM
+ #undef PACKAGE_LOCALE_DIR
+-#undef PACKAGE_DATA_DIR
+ #undef PACKAGE_SOURCE_DIR
+ 
+ /* Define if you have the <dirent.h> header file.  */
+diff -ur gmrun-0.9.2.orig/src/Makefile.am gmrun-0.9.2/src/Makefile.am
+--- gmrun-0.9.2.orig/src/Makefile.am	2002-06-05 22:39:18.000000000 +0300
++++ gmrun-0.9.2/src/Makefile.am	2010-06-06 16:09:11.000000000 +0300
+@@ -15,3 +15,5 @@
+ 
+ gmrun_LDADD = @GTK_LIBS@ @STLPORT_LDFLAGS@
+ 
++AM_CPPFLAGS = \
++	-DPACKAGE_DATA_DIR='"$(datadir)/$(PACKAGE)"' -DPACKAGE_SYSCONF_DIR='"$(sysconfdir)"'
+diff -ur gmrun-0.9.2.orig/src/prefs.cc gmrun-0.9.2/src/prefs.cc
+--- gmrun-0.9.2.orig/src/prefs.cc	2002-08-16 13:48:22.000000000 +0300
++++ gmrun-0.9.2/src/prefs.cc	2010-06-06 16:07:14.000000000 +0300
+@@ -30,7 +30,7 @@
+ 
+ Prefs::Prefs()
+ {
+-  string file_name = PACKAGE_DATA_DIR"/";
++  string file_name = PACKAGE_SYSCONF_DIR"/";
+   file_name += GMRUNRC;
+   init(file_name);
+ 
diff --git a/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild b/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..68a5e7041e49
--- /dev/null
+++ b/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild,v 1.1 2010/06/06 13:13:11 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="A GTK-2 based launcher box with bash style auto completion!"
+HOMEPAGE="http://www.bazon.net/mishoo/gmrun.epl"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	dev-libs/popt"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-apps/sed"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-sysconfdir.patch
+
+	has_version ">=sys-libs/glibc-2.10" && epatch \
+		"${FILESDIR}"/${P}-glibc210.patch
+
+	# Disable check for STLport due to bug #164339
+	sed -i -e 's,^AC_PATH_STLPORT,dnl REMOVED ,g' configure.in
+	sed -i -e 's,@STLPORT_[A-Z]\+@,,g' src/Makefile.am
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README NEWS
+}