$(get_libdir)-ized and fixed a sandbox violation when libdir is set. marked stable on amd64 for this fix.

3 files changed, 27 insertions, 23 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index da4ef76a14de..7517e2ee320b 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.32 2004/09/13 07:51:58 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.33 2004/09/22 21:57:26 lv Exp $
+
+  22 Sep 2004; Travis Tilley <lv@gentoo.org> e2fsprogs-1.35-r1.ebuild:
+  $(get_libdir)-ized and fixed a sandbox violation when libdir is set. marked
+  stable on amd64 for this fix.
 
 *e2fsprogs-1.35-r1 (13 Sep 2004)
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 2cd105b4a745..9b5fb88ef92b 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,19 +1,19 @@
-MD5 7295f3452399877281fc761d36c48eba e2fsprogs-1.32-r2.ebuild 2276
 MD5 5854a4ebf286618336853006fb70fa44 e2fsprogs-1.33.ebuild 2471
 MD5 2edb0d073060c192284a71d32d02adcc e2fsprogs-1.34-r1.ebuild 2884
-MD5 11f6d7ba53227f4104cf0c76fc29d554 e2fsprogs-1.34.ebuild 2768
 MD5 2ee511ac5e5941604b071c9a3ff3c916 e2fsprogs-1.35.ebuild 2794
+MD5 7295f3452399877281fc761d36c48eba e2fsprogs-1.32-r2.ebuild 2276
+MD5 11f6d7ba53227f4104cf0c76fc29d554 e2fsprogs-1.34.ebuild 2768
+MD5 6c8313aa6b7b48205fe836828dfabf39 ChangeLog 8248
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 096833618f49c2da6f1d0692ee12f4b5 ChangeLog 8070
-MD5 b8cc11a779fcaf0522dda9e4a4848496 e2fsprogs-1.35-r1.ebuild 2977
-MD5 db361eb5cdf39ddae07e9f794d308b42 files/digest-e2fsprogs-1.32-r2 67
+MD5 2710bf67bdd33a490d90f3bbe5aa9cc0 e2fsprogs-1.35-r1.ebuild 3080
+MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
+MD5 f079047f6885f762f6fa838b55236cb2 files/e2fsprogs-sed-locale.patch 5989
+MD5 b3b97c7ba36458e2842891e96e1ce0de files/e2fsprogs-1.34-swap-symlink.diff 1091
 MD5 3307c0c209b26bf447ff2840b7118862 files/digest-e2fsprogs-1.33 67
 MD5 9c39bba6702e492a7a01624ae60587bc files/digest-e2fsprogs-1.34 67
-MD5 9c39bba6702e492a7a01624ae60587bc files/digest-e2fsprogs-1.34-r1 67
 MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35 67
-MD5 0b77829b4c6500ac9722143384ddda95 files/e2fsprogs-1.27ea-0.8.21.diff 15214
-MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
 MD5 d9d69b54c577273521f4b8c2013a7a09 files/e2fsprogs-1.34-kernel-2.6-fix.patch 934
-MD5 b3b97c7ba36458e2842891e96e1ce0de files/e2fsprogs-1.34-swap-symlink.diff 1091
-MD5 f079047f6885f762f6fa838b55236cb2 files/e2fsprogs-sed-locale.patch 5989
+MD5 0b77829b4c6500ac9722143384ddda95 files/e2fsprogs-1.27ea-0.8.21.diff 15214
+MD5 db361eb5cdf39ddae07e9f794d308b42 files/digest-e2fsprogs-1.32-r2 67
+MD5 9c39bba6702e492a7a01624ae60587bc files/digest-e2fsprogs-1.34-r1 67
 MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35-r1 67
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild
index b00b0f41ac22..18a31c3cc7d0 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.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-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild,v 1.1 2004/09/13 07:51:58 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild,v 1.2 2004/09/22 21:57:26 lv Exp $
 
 inherit eutils flag-o-matic gnuconfig
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm hppa ~amd64 ~ia64 ~ppc64 ~s390"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm hppa amd64 ~ia64 ~ppc64 ~s390"
 IUSE="nls static"
 
 DEPEND="virtual/libc
@@ -53,7 +53,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall libdir=zapme || die
+	make DESTDIR=${D} libdir=/zapme install || die
 	#evil e2fsprogs makefile -- I'll get you!
 	rm -rf ${D}/zapme
 
@@ -68,22 +68,22 @@ src_install() {
 	docinto e2fsck
 	dodoc e2fsck/ChangeLog e2fsck/CHANGES
 
-	dodir /lib /bin /sbin
-	cd ${D}/usr/lib
-	mv * ../../lib
-	cd ${D}/lib
-	mv *.a ../usr/lib
+	dodir /$(get_libdir) /bin /sbin
+	cd ${D}/usr/$(get_libdir)
+	mv * ../../$(get_libdir)
+	cd ${D}/$(get_libdir)
+	mv *.a ../usr/$(get_libdir)
 	local mylib=""
 	local x=""
 	#install ldscripts to fix bug #4411
-	cd ${D}/usr/lib
+	cd ${D}/usr/$(get_libdir)
 	for x in *.a
 	do
 		[ ! -f ${x} ] && continue
 		gen_usr_ldscript ${x/a}so
 	done
 	#normalize evil symlinks
-	cd ${D}/lib
+	cd ${D}/$(get_libdir)
 	for x in *
 	do
 		[ ! -L ${x} ] && continue
@@ -111,10 +111,10 @@ src_install() {
 	# a 'make install'.  They are the template files for
 	# /bin/compile_et.
 
-	cd ${S}/lib/et
+	cd ${S}/$(get_libdir)/et
 	insinto /usr/share/et
 	doins et_c.awk et_h.awk
-	cd ${S}/lib/ss
+	cd ${S}/$(get_libdir)/ss
 	insinto /usr/share/ss
 	doins ct_c.awk
 }