summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-09 18:54:05 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-09 18:54:05 +0000
commitb7bca05f455ac3856448f34d3aff17b9a51c910e (patch)
treec1701cc454a157e85743c78216a9a98fbd556295 /x11-misc
parentStable for HPPA (bug #280470). (diff)
downloadhistorical-b7bca05f455ac3856448f34d3aff17b9a51c910e.tar.gz
historical-b7bca05f455ac3856448f34d3aff17b9a51c910e.tar.bz2
historical-b7bca05f455ac3856448f34d3aff17b9a51c910e.zip
Apply glibc patch only if >= 2.10 since it's not backward compatible.
Package-Manager: portage-2.2_rc36/cvs/Linux x86_64
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/gmrun/ChangeLog5
-rw-r--r--x11-misc/gmrun/Manifest4
-rw-r--r--x11-misc/gmrun/gmrun-0.9.2.ebuild11
3 files changed, 14 insertions, 6 deletions
diff --git a/x11-misc/gmrun/ChangeLog b/x11-misc/gmrun/ChangeLog
index 574d0a5164ca..9123823d0ebf 100644
--- a/x11-misc/gmrun/ChangeLog
+++ b/x11-misc/gmrun/ChangeLog
@@ -1,6 +1,9 @@
# 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.18 2009/07/25 07:21:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/ChangeLog,v 1.19 2009/08/09 18:54:05 ssuominen Exp $
+
+ 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.
25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> gmrun-0.9.2.ebuild,
+files/gmrun-0.9.2-glibc210.patch:
diff --git a/x11-misc/gmrun/Manifest b/x11-misc/gmrun/Manifest
index 3304864aeb77..389329082c31 100644
--- a/x11-misc/gmrun/Manifest
+++ b/x11-misc/gmrun/Manifest
@@ -1,6 +1,6 @@
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 971 RMD160 3a6d8432a14a9165ba04d717273a4df8127e1bb8 SHA1 52d1178a8dca416f49b65cf894aa5f0f6a8109c1 SHA256 b54d42a549cdaf30fa90a579a9854b00f61fdff88870eb4bfb1be0ccdadb44ea
-MISC ChangeLog 2137 RMD160 13564c41a8356c18cf69e764042247cde1db1cfc SHA1 efd2ec185f79065b926f1b80fa415c960b075b87 SHA256 12b9734a719e328c7ee5e8c43d5ae1b858d52d3437375db9f71eb5dfe449b7a7
+EBUILD gmrun-0.9.2.ebuild 1070 RMD160 e732660e0cbf849eee1cbac70e68247d174127fc SHA1 373cff88635610a678a08b11088cc5fb5aac31d6 SHA256 74a774b6e26eed4c6af9514a20eef0192130e3be504a038186c8d8ca69ff610b
+MISC ChangeLog 2284 RMD160 a2b046ef2d3b49c39a282bba08e1a3bf5199b6ff SHA1 8bdcfd49019c376f5cf0434adae314f3bb18f0c3 SHA256 0a8d727558d9ce280eec5363c7b95941a6371e238107b37eedacd629857a6c11
MISC metadata.xml 338 RMD160 e45af7014909f8cbd76ccbc5a164d159e1b04c7e SHA1 ddf31f6d7516b6ec5cf3e179f31c4856cd432d22 SHA256 cd10c5f526519fc51527aaef8af03e72f6bfd18a8e6eadba81a0c5b928843c53
diff --git a/x11-misc/gmrun/gmrun-0.9.2.ebuild b/x11-misc/gmrun/gmrun-0.9.2.ebuild
index 5cdf38f344a9..5848e9b597e9 100644
--- a/x11-misc/gmrun/gmrun-0.9.2.ebuild
+++ b/x11-misc/gmrun/gmrun-0.9.2.ebuild
@@ -1,6 +1,6 @@
# 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.16 2009/07/25 07:21:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/gmrun-0.9.2.ebuild,v 1.17 2009/08/09 18:54:05 ssuominen Exp $
EAPI=2
inherit autotools eutils
@@ -21,8 +21,13 @@ DEPEND="${RDEPEND}
sys-apps/sed"
src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc43.patch \
- "${FILESDIR}"/${P}-glibc210.patch
+ epatch "${FILESDIR}"/${P}-gcc43.patch
+
+ # ugly but it's not backwards compatible
+ if has_version ">=sys-libs/glibc-2.10"; then
+ epatch "${FILESDIR}"/${P}-glibc210.patch
+ fi
+
# 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