summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2011-06-26 12:30:57 +0000
committerFabian Groffen <grobian@gentoo.org>2011-06-26 12:30:57 +0000
commit87b9224f7bcaa0bd4edf2f90ab77843d450f64dd (patch)
treebf6fb647312d17c34a65286c23f9b53db6c7f60c /sys-apps/darwin-miscutils
parentInitial commit of configure-trackpoint, a configuration utility for app-lapto... (diff)
downloadhistorical-87b9224f7bcaa0bd4edf2f90ab77843d450f64dd.tar.gz
historical-87b9224f7bcaa0bd4edf2f90ab77843d450f64dd.tar.bz2
historical-87b9224f7bcaa0bd4edf2f90ab77843d450f64dd.zip
(Try to) resolve naming conflict on OSX Lion, bug #372751
Package-Manager: portage-2.2.01.18826-prefix/cvs/Darwin powerpc
Diffstat (limited to 'sys-apps/darwin-miscutils')
-rw-r--r--sys-apps/darwin-miscutils/ChangeLog5
-rw-r--r--sys-apps/darwin-miscutils/Manifest10
-rw-r--r--sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild5
3 files changed, 13 insertions, 7 deletions
diff --git a/sys-apps/darwin-miscutils/ChangeLog b/sys-apps/darwin-miscutils/ChangeLog
index ca5d31066f67..2a4b37dcaf96 100644
--- a/sys-apps/darwin-miscutils/ChangeLog
+++ b/sys-apps/darwin-miscutils/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/darwin-miscutils
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/ChangeLog,v 1.7 2011/04/02 15:36:37 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/ChangeLog,v 1.8 2011/06/26 12:30:57 grobian Exp $
+
+ 26 Jun 2011; Fabian Groffen <grobian@gentoo.org> darwin-miscutils-8.ebuild:
+ (Try to) resolve naming conflict on OSX Lion, bug #372751
*darwin-miscutils-8 (02 Apr 2011)
diff --git a/sys-apps/darwin-miscutils/Manifest b/sys-apps/darwin-miscutils/Manifest
index 2d8eb5131b23..da27a411a3cb 100644
--- a/sys-apps/darwin-miscutils/Manifest
+++ b/sys-apps/darwin-miscutils/Manifest
@@ -20,13 +20,13 @@ EBUILD darwin-miscutils-4-r1.ebuild 3147 RMD160 2576ccfcbdffb9568d43aafb7a885b15
EBUILD darwin-miscutils-5-r1.ebuild 4349 RMD160 a65cbe1ee6739be94a123421a670c3b6d05ce7fc SHA1 f0c44570eb26b14b43eeabab4694e7a7b01aeeea SHA256 debdbc3ccc0148c43237017913497c38dd4ea4ea2aa01217f8a8e320c7b4e74f
EBUILD darwin-miscutils-6-r1.ebuild 4413 RMD160 321d15d1cc99b0747900877c619d6fe331d0c60e SHA1 bd2fc8ba088c53f2286abb1888b866cd12805a93 SHA256 e27449491437aaa64673c7650eea04b77062989e536812da4b17d9b78739feb9
EBUILD darwin-miscutils-7.ebuild 4301 RMD160 67f0f5847af7f47bac35c532443b650bbfd192e0 SHA1 2142789b21412994edb502960263b34c9a05ef61 SHA256 25c01bd12e8187920523a6068a388163dc4ee65010347d1e23344404a6eabc7d
-EBUILD darwin-miscutils-8.ebuild 4080 RMD160 8796aa3b47377a8d646d064059ff217e35dfafde SHA1 629cb95e4e5ca16b0ac04c7acdc190ce28be32e9 SHA256 7cf1d2faf47aa1a6ef2ee131cc0569fe0f468df1c310a050cdc6762aaccf0a6c
-MISC ChangeLog 2852 RMD160 0ade86e1b0e04101d0dc92161e76bb4451d4b5e9 SHA1 2bbbd5b5a8940e909f7ff045d81688dbd9406dcc SHA256 c5d2d04eee2151bc4bf6210e4bb83d0b3454ea666726a59fe27bd995134c3218
+EBUILD darwin-miscutils-8.ebuild 4198 RMD160 6f03c754416784718d571b44877853156ff2adf0 SHA1 d875098256dc7796d0bb30628ee76cc643594823 SHA256 bffb30bb2e4a99868596c3a8acf4c6a863d58afab7cbcc19e812cdf880a4a309
+MISC ChangeLog 2991 RMD160 c5346c62f66d8f4e4791b401e7a7e58736555c4c SHA1 ac9b0fdc90d6e4b9c2740fabc67bee1da7d9c272 SHA256 67a4516a668ab45bf17ed9c8e52799a5c2c6e2ddf8811a117c2558b68723c992
MISC metadata.xml 160 RMD160 baab82f4bc435813cfde4796d42840882a9a4f8f SHA1 144e248704973cfad031c92a930aad01a62a2fda SHA256 27667dd7db1d188c12342624ec5ff2155717821d646e442aef9a691c65539ac4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (Darwin)
-iEYEARECAAYFAk2XQiwACgkQX3X2B8XHTonmNgCeMPewjHUePPGfKBaMWrUpDEp0
-aTAAnAsr2Fi4r4lQjDG1ztPzCWHSNiAW
-=f9ba
+iEYEARECAAYFAk4HJl8ACgkQX3X2B8XHTokS5QCcD2TDRfWaxpGTDWfiAx3s0mZN
++04AoI/GNLINKoBS452Z9S8YneRI1JJt
+=vo9/
-----END PGP SIGNATURE-----
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
index 39ec65d6374f..f04eced81148 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild,v 1.1 2011/04/02 15:36:37 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild,v 1.2 2011/06/26 12:30:57 grobian Exp $
EAPI="3"
@@ -26,6 +26,9 @@ S=${WORKDIR}
src_prepare() {
cd "${S}"/shell_cmds-${SHELL_VER}
epatch "${FILESDIR}"/${PN}-6-w64.patch
+ # deal with OSX Lion
+ cd "${S}"/developer_cmds-${DEV_VER}
+ sed -i -e 's/getline/ugetline/g' unifdef/unifdef.c || die
}
src_compile() {