summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKito Danya Dietrich <kito@gentoo.org>2005-09-10 17:07:07 +0000
committerKito Danya Dietrich <kito@gentoo.org>2005-09-10 17:07:07 +0000
commitc1e7b9b3cd135d4fca7bdf042b809bf2edab341e (patch)
tree9cc7e844e121d08d6ad743c046c650d53561bdae /sys-libs
parentFixing digest for 2.10.0 (bug #104814) (diff)
downloadhistorical-c1e7b9b3cd135d4fca7bdf042b809bf2edab341e.tar.gz
historical-c1e7b9b3cd135d4fca7bdf042b809bf2edab341e.tar.bz2
historical-c1e7b9b3cd135d4fca7bdf042b809bf2edab341e.zip
~ppc-macos keyword. Keep shlibs in /usr/lib and skip gen_usr_ldscript on
Package-Manager: portage-2.0.51.22
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/readline/ChangeLog6
-rw-r--r--sys-libs/readline/Manifest28
-rw-r--r--sys-libs/readline/readline-5.0-r2.ebuild17
3 files changed, 24 insertions, 27 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index bb7c3dccd27f..3a231bf113cd 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/readline
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.49 2005/07/16 04:16:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.50 2005/09/10 17:07:07 kito Exp $
+
+ 10 Sep 2005; Kito <kito@gentoo.org> readline-5.0-r2.ebuild:
+ ~ppc-macos keyword. Keep shlibs in /usr/lib and skip gen_usr_ldscript on
+ Darwin userland.
16 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+files/readline-5.0-darwin.patch, readline-5.0-r2.ebuild:
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index a05e0caa5dbc..f447a36f5bf9 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,26 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e16aefe27f29117c7a4e7be342e920b4 readline-4.3-r6.ebuild 3090
+MD5 85bd6fb457998211094c6642b09ca0b6 ChangeLog 7437
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 0792ff0d21adbb17383beb31706f3aca readline-5.0-r2.ebuild 2726
MD5 82ac0eae5f66926062b260f7d09de7c0 readline-4.3-r5.ebuild 2764
-MD5 2c703c8222b128bdf5ecfe1f1248779e ChangeLog 7280
-MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
-MD5 a0bad5c8ba91f5c50ea6c2c97a76f2d1 files/readline-5.0-self-insert.patch 2463
-MD5 fe45d673627dab53fb3fcffcb4f55e4e files/readline-5.0-solaris.patch 756
-MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504
+MD5 e16aefe27f29117c7a4e7be342e920b4 readline-4.3-r6.ebuild 3090
+MD5 be63a6866bb1fdc499ee29d48f42fac0 readline-5.0-r2.ebuild 2780
MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
-MD5 cd1beb3627cb585cac6adcb530a01823 files/readline-5.0-parallel.patch 849
+MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348
MD5 e3ee94eed45baf4ca76736da56d72bad files/digest-readline-5.0-r2 350
-MD5 d5f28667389d9681136307274ebc1f28 files/readline-5.0-no_rpath.patch 363
+MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504
MD5 b908c05444b4c9edbeefa1977345182e files/readline-5.0-darwin.patch 461
MD5 b6bf5c9721fc8c623377b40768d18dae files/readline-5.0-del-backspace-policy.patch 1475
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDC8EngIKl8Uu19MoRAqHfAJsH6aZ7422gXSb4ok6dWBHnow2xhgCeJs2y
-Vx61UHP/fjR69+x/8jwap5g=
-=F7Wl
------END PGP SIGNATURE-----
+MD5 d5f28667389d9681136307274ebc1f28 files/readline-5.0-no_rpath.patch 363
+MD5 cd1beb3627cb585cac6adcb530a01823 files/readline-5.0-parallel.patch 849
+MD5 a0bad5c8ba91f5c50ea6c2c97a76f2d1 files/readline-5.0-self-insert.patch 2463
+MD5 fe45d673627dab53fb3fcffcb4f55e4e files/readline-5.0-solaris.patch 756
diff --git a/sys-libs/readline/readline-5.0-r2.ebuild b/sys-libs/readline/readline-5.0-r2.ebuild
index b03fd9fdb1bd..e20dfdf21f1c 100644
--- a/sys-libs/readline/readline-5.0-r2.ebuild
+++ b/sys-libs/readline/readline-5.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.0-r2.ebuild,v 1.7 2005/08/24 00:36:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.0-r2.ebuild,v 1.8 2005/09/10 17:07:07 kito Exp $
inherit eutils multilib
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/readline/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
IUSE=""
# We must be certain that we have a bash that is linked
@@ -57,12 +57,15 @@ src_install() {
# directory, since readline's configure automatically sets libdir for you.
make DESTDIR="${D}" install || die
dodir /$(get_libdir)
- mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
- chmod a+rx "${D}"/$(get_libdir)/*.so*
- # Bug #4411
- gen_usr_ldscript libreadline.so
- gen_usr_ldscript libhistory.so
+ if ! use userland_Darwin ; then
+ mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
+ chmod a+rx "${D}"/$(get_libdir)/*.so*
+
+ # Bug #4411
+ gen_usr_ldscript libreadline.so
+ gen_usr_ldscript libhistory.so
+ fi
dodoc CHANGELOG CHANGES README USAGE NEWS
docinto ps