Fix building with glibc-2.10+ wrt #273731, thanks to Semen Maryasin.

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

5 files changed, 32 insertions, 31 deletions

diff --git a/x11-misc/glunarclock/Manifest b/x11-misc/glunarclock/Manifest
index f61f408e4fcc..527113077368 100644
--- a/x11-misc/glunarclock/Manifest
+++ b/x11-misc/glunarclock/Manifest
@@ -1,5 +1,5 @@
 AUX glunarclock-i18n-gentoo.patch 344 RMD160 470e83a339da6831802e8d7b5b18f83e6a34c13b SHA1 6767489bd883daca0d607cc945caa92969402d21 SHA256 393980afd2c67ce8398b62e3e01505ab3565a87571e6b4caa9cb46a9556b8b06
 DIST glunarclock-0.32.4.tar.gz 536136 RMD160 1ff68f2920d67f1d102297c884065f22d45144f1 SHA1 93d12a2814d1d96b30fef398b8d65d3c21a50278 SHA256 2025028be6c2cbadf8f32edfe24ed4652e51aa430889d3977d70a3fc87abd824
-EBUILD glunarclock-0.32.4.ebuild 989 RMD160 28aca6ce2152434a235975323fe33e9b7291d2e6 SHA1 3f52d41b0c9353fd60b07cd95b520c799973716d SHA256 690427e5cbde4d1a19244e44b90cce136ddab148e1f4cca96e690e838b7f0e73
-MISC ChangeLog 2622 RMD160 6c3327ac7182fe58b3a767705930730ac6a6da6b SHA1 3f213ba8ba493dd20f819f23f181692f0ce97e07 SHA256 51270c07c0729167f29b297c12dd760b5672d3a5624991c5ae37cdbd97f9ec58
+EBUILD glunarclock-0.32.4.ebuild 991 RMD160 4cef152f84766e67eeb79d432efb9a650ce7dec0 SHA1 cda10816a7077fb39458b849ee4e6cd81cba2b64 SHA256 48c6a7424e9b0bc3ad002ef8b950d872c42ab0c0297446a70a9dd68ef06ed894
+MISC ChangeLog 2760 RMD160 2033da5cc572ff104f8ef61f650b6a550962b5ee SHA1 629c93c8529c5832185cfb8264fba5d9a741aa08 SHA256 5668a46b80868abcc25eab4f2aef9f716188d1d68b69aa9a104be6b8f87ec558
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
diff --git a/x11-misc/gmrun/ChangeLog b/x11-misc/gmrun/ChangeLog
index b19d419102d4..574d0a5164ca 100644
--- a/x11-misc/gmrun/ChangeLog
+++ b/x11-misc/gmrun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/gmrun
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/ChangeLog,v 1.17 2008/12/23 23:51:47 tcunha Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/ChangeLog,v 1.18 2009/07/25 07:21:40 ssuominen Exp $
+
+  25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> gmrun-0.9.2.ebuild,
+  +files/gmrun-0.9.2-glibc210.patch:
+  Fix building with glibc-2.10+ wrt #273731, thanks to Semen Maryasin.
 
   23 Dec 2008; Tiago Cunha <tcunha@gentoo.org> gmrun-0.9.2.ebuild:
   stable sparc
diff --git a/x11-misc/gmrun/Manifest b/x11-misc/gmrun/Manifest
index f68e90eca342..3304864aeb77 100644
--- a/x11-misc/gmrun/Manifest
+++ b/x11-misc/gmrun/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
 DIST gmrun-0.9.2.tar.gz 66097 RMD160 8cae67aa63d95c8347d66b690b9cabb158319516 SHA1 ced54e287fa5665893c41d0e32940b1672027a02 SHA256 17297bce53249ccc7145931db22251b47f77ac355f78cf8abf1e87ae16341fa0
-EBUILD gmrun-0.9.2.ebuild 1047 RMD160 9e452b525e7a176374bb067ee0b30200153847bc SHA1 2ddc752a7fbf8e2ac0dc34fdf565779260304541 SHA256 c61cb13d387a2bbf3c7820d83607ec78b1d0662073ff9e35db40c27b9cef5f17
-MISC ChangeLog 1951 RMD160 77ecc75ba797a6dbdce4a770921e1916988d9f34 SHA1 7c15874618786476ac859e6459beaab801057471 SHA256 70966afae59fa6513596b173591b83322fd25491435d5635fd5c8940354c1d30
+EBUILD gmrun-0.9.2.ebuild 971 RMD160 3a6d8432a14a9165ba04d717273a4df8127e1bb8 SHA1 52d1178a8dca416f49b65cf894aa5f0f6a8109c1 SHA256 b54d42a549cdaf30fa90a579a9854b00f61fdff88870eb4bfb1be0ccdadb44ea
+MISC ChangeLog 2137 RMD160 13564c41a8356c18cf69e764042247cde1db1cfc SHA1 efd2ec185f79065b926f1b80fa415c960b075b87 SHA256 12b9734a719e328c7ee5e8c43d5ae1b858d52d3437375db9f71eb5dfe449b7a7
 MISC metadata.xml 338 RMD160 e45af7014909f8cbd76ccbc5a164d159e1b04c7e SHA1 ddf31f6d7516b6ec5cf3e179f31c4856cd432d22 SHA256 cd10c5f526519fc51527aaef8af03e72f6bfd18a8e6eadba81a0c5b928843c53
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklReV4ACgkQ/Kkm35zQzl5opwCfZpHsQYRztp4tixgiAl6xqzXE
-DnYAoJ1+q3YvAMafQIa6Rhc8keYhGcvl
-=52d3
------END PGP SIGNATURE-----
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch b/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch
new file mode 100644
index 000000000000..989183b2be46
--- /dev/null
+++ b/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch
@@ -0,0 +1,11 @@
+--- gmrun-0.9.2/src/gtkcompletionline.cc.orig	2009-06-19 22:38:14.000000000 +0400
++++ gmrun-0.9.2/src/gtkcompletionline.cc	2009-06-19 22:37:14.000000000 +0400
+@@ -376,7 +377,7 @@
+   return 0;
+ }
+ 
+-int my_alphasort(const void* va, const void* vb) {
++int my_alphasort(const dirent** va, const dirent** vb) {
+   const struct dirent** a = (const struct dirent**)va;
+   const struct dirent** b = (const struct dirent**)vb;
+ 
diff --git a/x11-misc/gmrun/gmrun-0.9.2.ebuild b/x11-misc/gmrun/gmrun-0.9.2.ebuild
index 301222ad2c85..5cdf38f344a9 100644
--- a/x11-misc/gmrun/gmrun-0.9.2.ebuild
+++ b/x11-misc/gmrun/gmrun-0.9.2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.ebuild,v 1.15 2008/12/23 23:51:47 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/gmrun-0.9.2.ebuild,v 1.16 2009/07/25 07:21:40 ssuominen Exp $
 
+EAPI=2
 inherit autotools eutils
 
 DESCRIPTION="A GTK-2 based launcher box with bash style auto completion!"
@@ -13,15 +14,15 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.2.0
+RDEPEND="x11-libs/gtk+:2
 	dev-libs/popt"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	sys-apps/sed"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${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
@@ -29,12 +30,6 @@ src_unpack() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README NEWS
 }
-
-pkg_postinst(){
-	einfo
-	einfo "Gmrun now featers a ~/.gmrunrc see /usr/share/gmrun/gmrunrc for help"
-	einfo
-}