Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sys-libs
diff options
context:
space:
mode:
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/readline/ChangeLog7
-rw-r--r--sys-libs/readline/Manifest28
-rw-r--r--sys-libs/readline/readline-4.3-r5.ebuild33
-rw-r--r--sys-libs/readline/readline-4.3-r6.ebuild33
-rw-r--r--sys-libs/readline/readline-5.0.ebuild16
5 files changed, 67 insertions, 50 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 928c0f28d6c8..bba61fcd9f71 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-libs/readline
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.32 2004/07/29 02:11:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.33 2004/08/15 06:33:08 lv Exp $
+
+ 14 Aug 2004; Travis Tilley <lv@gentoo.org> readline-4.3-r5.ebuild,
+ readline-4.3-r6.ebuild, readline-5.0.ebuild:
+ added CONF_LIBDIR support and changed make install to einstall to avoid a
+ sandbox violation that occurs when CONF_LIBDIR is set
*readline-5.0 (28 Jul 2004)
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 6c3a291cd512..3a8eed170c15 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f19ba1438b0df6503e1ee5a84e8a8fb9 ChangeLog 4503
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 385f8424e1428cda9fee00ec0daba35b readline-4.1-r5.ebuild 1833
-MD5 352d67b1ec9917cbbd245bda6f111065 readline-5.0.ebuild 1805
MD5 ac164994b20c7bc74a5f8d09af7ff48a readline-4.3-r4.ebuild 2425
-MD5 98f278379fa07a891ecea1808517ae00 readline-4.3-r5.ebuild 2334
-MD5 bf6d10a86339034df6d4b89d92b42776 readline-4.3-r6.ebuild 2439
-MD5 f9e8af7cdcf7ac973c77fc6a712af5de files/digest-readline-4.1-r5 64
+MD5 385f8424e1428cda9fee00ec0daba35b readline-4.1-r5.ebuild 1833
+MD5 4c954d49102f33015ee3793070f4d6a4 readline-4.3-r6.ebuild 2750
+MD5 775a883b744197f124b229f90af95d5b readline-5.0.ebuild 2143
+MD5 4038f394769d0eda619f9c1baf7a0f4f readline-4.3-r5.ebuild 2645
+MD5 3041dc65a39fa750b1d15397ea5548ea ChangeLog 4748
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
MD5 630ead02f80504e86e85dc4957bd27cb files/digest-readline-5.0 65
+MD5 d0d23a9f000344da88a00a248d0af60c files/readline4.3-mbutil.patch 1678
+MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504
+MD5 f9e8af7cdcf7ac973c77fc6a712af5de files/digest-readline-4.1-r5 64
MD5 e9b856acd523c385a29d67cd3475885e files/digest-readline-4.3-r4 177
MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
-MD5 d0d23a9f000344da88a00a248d0af60c files/readline4.3-mbutil.patch 1678
MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348
-MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFBCFzwHTu7gpaalycRAjOlAKCJDdmwT6baTZaUdOu9fKUGUbUKkgCeOzyd
-0sV4K1PiqIrkw9O7Cax6G5M=
-=Rs4H
------END PGP SIGNATURE-----
diff --git a/sys-libs/readline/readline-4.3-r5.ebuild b/sys-libs/readline/readline-4.3-r5.ebuild
index cddeaf2920ec..df8d33fdebd3 100644
--- a/sys-libs/readline/readline-4.3-r5.ebuild
+++ b/sys-libs/readline/readline-4.3-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r5.ebuild,v 1.13 2004/07/29 02:11:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r5.ebuild,v 1.14 2004/08/15 06:33:08 lv Exp $
inherit eutils gnuconfig
@@ -35,6 +35,14 @@ src_unpack() {
gnuconfig_update
}
+pkg_setup() {
+ # this adds support for installing to lib64/lib32. since only portage
+ # 2.0.51 will have this functionality supported in dolib and friends,
+ # and since it isnt expected that many profiles will define it, we need
+ # to make this variable default to lib.
+ [ -z "${CONF_LIBDIR}" ] && export CONF_LIBDIR="lib"
+}
+
src_compile() {
econf --with-curses || die
@@ -45,27 +53,25 @@ src_compile() {
src_install() {
- make prefix=${D}/usr mandir=${D}/usr/share/man \
- infodir=${D}/usr/share/info install || die
+ einstall || die
cd ${S}/shlib
- make prefix=${D}/usr mandir=${D}/usr/share/man \
- infodir=${D}/usr/share/info install || die
+ einstall || die
cd ${S}
- dodir /lib
- mv ${D}/usr/lib/*.so* ${D}/lib
- rm -f ${D}/lib/*.old
+ dodir /${CONF_LIBDIR}
+ mv ${D}/usr/${CONF_LIBDIR}/*.so* ${D}/${CONF_LIBDIR}
+ rm -f ${D}/${CONF_LIBDIR}/*.old
# bug #4411
gen_usr_ldscript libreadline.so
gen_usr_ldscript libhistory.so
# end bug #4411
- dosym libhistory.so.${PV/a/} /lib/libhistory.so
- dosym libreadline.so.${PV/a/} /lib/libreadline.so
+ dosym libhistory.so.${PV/a/} /${CONF_LIBDIR}/libhistory.so
+ dosym libreadline.so.${PV/a/} /${CONF_LIBDIR}/libreadline.so
# Needed because make install uses ${D} for the link
- dosym libhistory.so.${PV/a/} /lib/libhistory.so.4
- dosym libreadline.so.${PV/a/} /lib/libreadline.so.4
- chmod 755 ${D}/lib/*.${PV/a/}
+ dosym libhistory.so.${PV/a/} /${CONF_LIBDIR}/libhistory.so.4
+ dosym libreadline.so.${PV/a/} /${CONF_LIBDIR}/libreadline.so.4
+ chmod 755 ${D}/${CONF_LIBDIR}/*.${PV/a/}
dodoc CHANGELOG CHANGES README USAGE
docinto ps
@@ -74,6 +80,7 @@ src_install() {
# Backwards compatibility #29865
if [ -e ${ROOT}/lib/libreadline.so.4.1 ] ; then
+ [ "${CONF_LIBDIR}" != "lib" ] && dodir /lib
cp -a ${ROOT}/lib/libreadline.so.4.1 ${D}/lib/
touch ${D}/lib/libreadline.so.4.1
fi
diff --git a/sys-libs/readline/readline-4.3-r6.ebuild b/sys-libs/readline/readline-4.3-r6.ebuild
index c4b6b806ad63..0fa26df2e936 100644
--- a/sys-libs/readline/readline-4.3-r6.ebuild
+++ b/sys-libs/readline/readline-4.3-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r6.ebuild,v 1.3 2004/07/29 02:11:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r6.ebuild,v 1.4 2004/08/15 06:33:08 lv Exp $
inherit eutils gnuconfig
@@ -36,6 +36,14 @@ src_unpack() {
gnuconfig_update
}
+pkg_setup() {
+ # this adds support for installing to lib64/lib32. since only portage
+ # 2.0.51 will have this functionality supported in dolib and friends,
+ # and since it isnt expected that many profiles will define it, we need
+ # to make this variable default to lib.
+ [ -z "${CONF_LIBDIR}" ] && export CONF_LIBDIR="lib"
+}
+
src_compile() {
econf --with-curses || die
@@ -46,28 +54,26 @@ src_compile() {
src_install() {
- make prefix=${D}/usr mandir=${D}/usr/share/man \
- infodir=${D}/usr/share/info install || die
+ einstall || die
cd ${S}/shlib
- make prefix=${D}/usr mandir=${D}/usr/share/man \
- infodir=${D}/usr/share/info install || die
+ einstall || die
cd ${S}
if ! use macos; then
- dodir /lib
- mv ${D}/usr/lib/*.so* ${D}/lib
- rm -f ${D}/lib/*.old
+ dodir /${CONF_LIBDIR}
+ mv ${D}/usr/${CONF_LIBDIR}/*.so* ${D}/${CONF_LIBDIR}
+ rm -f ${D}/${CONF_LIBDIR}/*.old
# bug #4411
gen_usr_ldscript libreadline.so
gen_usr_ldscript libhistory.so
# end bug #4411
- dosym libhistory.so.${PV/a/} /lib/libhistory.so
- dosym libreadline.so.${PV/a/} /lib/libreadline.so
+ dosym libhistory.so.${PV/a/} /${CONF_LIBDIR}/libhistory.so
+ dosym libreadline.so.${PV/a/} /${CONF_LIBDIR}/libreadline.so
# Needed because make install uses ${D} for the link
- dosym libhistory.so.${PV/a/} /lib/libhistory.so.4
- dosym libreadline.so.${PV/a/} /lib/libreadline.so.4
- chmod 755 ${D}/lib/*.${PV/a/}
+ dosym libhistory.so.${PV/a/} /${CONF_LIBDIR}/libhistory.so.4
+ dosym libreadline.so.${PV/a/} /${CONF_LIBDIR}/libreadline.so.4
+ chmod 755 ${D}/${CONF_LIBDIR}/*.${PV/a/}
fi
dodoc CHANGELOG CHANGES README USAGE
@@ -77,6 +83,7 @@ src_install() {
# Backwards compatibility #29865
if [ -e ${ROOT}/lib/libreadline.so.4.1 ] ; then
+ [ "${CONF_LIBDIR}" != "lib" ] && dodir /lib
cp -a ${ROOT}/lib/libreadline.so.4.1 ${D}/lib/
touch ${D}/lib/libreadline.so.4.1
fi
diff --git a/sys-libs/readline/readline-5.0.ebuild b/sys-libs/readline/readline-5.0.ebuild
index cbe4939bf6fb..28c8d190e58e 100644
--- a/sys-libs/readline/readline-5.0.ebuild
+++ b/sys-libs/readline/readline-5.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.0.ebuild,v 1.1 2004/07/29 02:11:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.0.ebuild,v 1.2 2004/08/15 06:33:08 lv Exp $
inherit eutils gnuconfig
@@ -36,15 +36,23 @@ src_unpack() {
gnuconfig_update
}
+pkg_setup() {
+ # this adds support for installing to lib64/lib32. since only portage
+ # 2.0.51 will have this functionality supported in dolib and friends,
+ # and since it isnt expected that many profiles will define it, we need
+ # to make this variable default to lib.
+ [ -z "${CONF_LIBDIR}" ] && export CONF_LIBDIR="lib"
+}
+
src_compile() {
econf --with-curses || die
emake || die
}
src_install() {
- make install DESTDIR=${D} || die
- dodir /lib
- mv ${D}/usr/lib/*.so* ${D}/lib
+ einstall || die
+ dodir /${CONF_LIBDIR}
+ mv ${D}/usr/${CONF_LIBDIR}/*.so* ${D}/${CONF_LIBDIR}
# Bug #4411
gen_usr_ldscript libreadline.so