readline failed to install correctly when lib64 was a directory, CONF_LIBDIR wasnt set, and when using portage 2.0.50. to fix this i've converted the ebuilds to using the new get_libdir function, set --libdir=/usr/$(get_libdir), and changed einstall to make DESTDIR=${D} install (since the version in 2.0.50 doesnt set libdir, breaking sandbox)

5 files changed, 64 insertions, 75 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 3d3fd118c31e..dfbdeda65352 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,14 @@
 # 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.34 2004/08/24 04:36:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.35 2004/08/26 11:51:25 lv Exp $
+
+  26 Aug 2004; Travis Tilley <lv@gentoo.org> readline-4.3-r5.ebuild,
+  readline-4.3-r6.ebuild, readline-5.0.ebuild:
+  readline failed to install correctly when lib64 was a directory, CONF_LIBDIR
+  wasnt set, and when using portage 2.0.50. to fix this i've converted the
+  ebuilds to using the new get_libdir function, set
+  --libdir=/usr/$(get_libdir), and changed einstall to make DESTDIR=${D}
+  install (since the version in 2.0.50 doesnt set libdir, breaking sandbox)
 
   24 Aug 2004; Sven Wegener <swegener@gentoo.org> readline-4.1-r5.ebuild,
   readline-4.3-r4.ebuild, readline-4.3-r5.ebuild, readline-4.3-r6.ebuild,
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 07ca147a5698..2dfc98df3669 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 f72f4f19fcbf7bf962ae885d077142e0 readline-4.1-r5.ebuild 1762
 MD5 b9d2162607bb3d3508798a68cadd2c34 readline-4.3-r4.ebuild 2354
-MD5 0db1f5e16c684012ab48640a06f1a96e readline-4.3-r5.ebuild 2578
-MD5 417504db86de5cd0688b9779779140c3 readline-4.3-r6.ebuild 2682
-MD5 42d6aaf0f23d68a9ef3dedbd24556cff readline-5.0.ebuild 2044
-MD5 b372faf6eaa58081fef315c29a362b2b ChangeLog 5007
+MD5 f72f4f19fcbf7bf962ae885d077142e0 readline-4.1-r5.ebuild 1762
+MD5 92020b909df68acab79ef479f5fd8ce4 readline-4.3-r6.ebuild 2744
+MD5 d70232128e61a0654204d95cbe2ec3c5 readline-5.0.ebuild 2094
+MD5 83dda0cb2f24ebf73ac0a8c92bc41661 readline-4.3-r5.ebuild 2640
+MD5 e77c38fd3671a1fbcb8af63e8909b158 ChangeLog 5473
+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 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348
-MD5 630ead02f80504e86e85dc4957bd27cb files/digest-readline-5.0 65
-MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504
-MD5 d0d23a9f000344da88a00a248d0af60c files/readline4.3-mbutil.patch 1678
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-
-iD8DBQFBKsXrI1lqEGTUzyQRAqcHAKDRjaE8BKjJEo8DMRmtwy24zdrNhQCgsNDM
-sKKcI+CfBd62LLs2R/hmQ/s=
-=C3SY
------END PGP SIGNATURE-----
diff --git a/sys-libs/readline/readline-4.3-r5.ebuild b/sys-libs/readline/readline-4.3-r5.ebuild
index f3fc650eac56..b35db37f25db 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.15 2004/08/24 04:36:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r5.ebuild,v 1.16 2004/08/26 11:51:25 lv Exp $
 
 inherit eutils gnuconfig
 
@@ -34,16 +34,11 @@ 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
+	# the --libdir= is needed because if lib64 is a directory, it will default
+	# to using that... even if CONF_LIBDIR isnt set or we're using a version
+	# of portage without CONF_LIBDIR support.
+	econf --with-curses --libdir=/usr/$(get_libdir) || die
 
 	emake || die
 	cd shlib
@@ -52,25 +47,27 @@ src_compile() {
 
 
 src_install() {
-	einstall || die
+	# portage 2.0.50's einstall causes sandbox violations if lib64 is a
+	# directory, since readline's configure automatically sets libdir for you.
+	make DESTDIR="${D}" install || die
 	cd ${S}/shlib
-	einstall || die
+	make DESTDIR="${D}" install || die
 
 	cd ${S}
 
-	dodir /${CONF_LIBDIR}
-	mv ${D}/usr/${CONF_LIBDIR}/*.so* ${D}/${CONF_LIBDIR}
-	rm -f ${D}/${CONF_LIBDIR}/*.old
+	dodir /$(get_libdir)
+	mv ${D}/usr/$(get_libdir)/*.so* ${D}/$(get_libdir)
+	rm -f ${D}/$(get_libdir)/*.old
 	# bug #4411
 	gen_usr_ldscript libreadline.so
 	gen_usr_ldscript libhistory.so
 	# end bug #4411
-	dosym libhistory.so.${PV/a/} /${CONF_LIBDIR}/libhistory.so
-	dosym libreadline.so.${PV/a/} /${CONF_LIBDIR}/libreadline.so
+	dosym libhistory.so.${PV/a/} /$(get_libdir)/libhistory.so
+	dosym libreadline.so.${PV/a/} /$(get_libdir)/libreadline.so
 	# Needed because make install uses ${D} for the link
-	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/}
+	dosym libhistory.so.${PV/a/} /$(get_libdir)/libhistory.so.4
+	dosym libreadline.so.${PV/a/} /$(get_libdir)/libreadline.so.4
+	chmod 755 ${D}/$(get_libdir)/*.${PV/a/}
 
 	dodoc CHANGELOG CHANGES README USAGE
 	docinto ps
@@ -79,7 +76,7 @@ src_install() {
 
 	# Backwards compatibility #29865
 	if [ -e ${ROOT}/lib/libreadline.so.4.1 ] ; then
-		[ "${CONF_LIBDIR}" != "lib" ] && dodir /lib
+		[ "$(get_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 20007ed08947..d628f1880637 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.5 2004/08/24 04:36:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r6.ebuild,v 1.6 2004/08/26 11:51:25 lv Exp $
 
 inherit eutils gnuconfig
 
@@ -35,16 +35,11 @@ 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
+	# the --libdir= is needed because if lib64 is a directory, it will default
+	# to using that... even if CONF_LIBDIR isnt set or we're using a version
+	# of portage without CONF_LIBDIR support.
+	econf --with-curses --libdir=/usr/$(get_libdir) || die
 
 	emake || die
 	cd shlib
@@ -53,26 +48,28 @@ src_compile() {
 
 
 src_install() {
-	einstall || die
+	# portage 2.0.50's einstall causes sandbox violations if lib64 is a
+	# directory, since readline's configure automatically sets libdir for you.
+	make DESTDIR="${D}" install || die
 	cd ${S}/shlib
-	einstall || die
+	make DESTDIR="${D}" install || die
 
 	cd ${S}
 
 	if ! use macos; then
-		dodir /${CONF_LIBDIR}
-		mv ${D}/usr/${CONF_LIBDIR}/*.so* ${D}/${CONF_LIBDIR}
-		rm -f ${D}/${CONF_LIBDIR}/*.old
+		dodir /$(get_libdir)
+		mv ${D}/usr/$(get_libdir)/*.so* ${D}/$(get_libdir)
+		rm -f ${D}/$(get_libdir)/*.old
 		# bug #4411
 		gen_usr_ldscript libreadline.so
 		gen_usr_ldscript libhistory.so
 		# end bug #4411
-		dosym libhistory.so.${PV/a/} /${CONF_LIBDIR}/libhistory.so
-		dosym libreadline.so.${PV/a/} /${CONF_LIBDIR}/libreadline.so
+		dosym libhistory.so.${PV/a/} /$(get_libdir)/libhistory.so
+		dosym libreadline.so.${PV/a/} /$(get_libdir)/libreadline.so
 		# Needed because make install uses ${D} for the link
-		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/}
+		dosym libhistory.so.${PV/a/} /$(get_libdir)/libhistory.so.4
+		dosym libreadline.so.${PV/a/} /$(get_libdir)/libreadline.so.4
+		chmod 755 ${D}/$(get_libdir)/*.${PV/a/}
 	fi
 
 	dodoc CHANGELOG CHANGES README USAGE
@@ -82,7 +79,7 @@ src_install() {
 
 	# Backwards compatibility #29865
 	if [ -e ${ROOT}/lib/libreadline.so.4.1 ] ; then
-		[ "${CONF_LIBDIR}" != "lib" ] && dodir /lib
+		[ "$(get_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 07fe5287699e..81896f12ce8a 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.3 2004/08/24 04:36:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.0.ebuild,v 1.4 2004/08/26 11:51:25 lv Exp $
 
 inherit eutils gnuconfig
 
@@ -34,23 +34,20 @@ 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
+	# the --libdir= is needed because if lib64 is a directory, it will default
+	# to using that... even if CONF_LIBDIR isnt set or we're using a version
+	# of portage without CONF_LIBDIR support.
+	econf --with-curses --libdir=/usr/$(get_libdir) || die
 	emake || die
 }
 
 src_install() {
-	einstall || die
-	dodir /${CONF_LIBDIR}
-	mv ${D}/usr/${CONF_LIBDIR}/*.so* ${D}/${CONF_LIBDIR}
+	# portage 2.0.50's einstall causes sandbox violations if lib64 is a
+	# 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)
 
 	# Bug #4411
 	gen_usr_ldscript libreadline.so