fix nesteddies

15 files changed, 50 insertions, 27 deletions

diff --git a/sys-apps/e2fsprogs/ChangeLog b/sys-apps/e2fsprogs/ChangeLog
index 96aeae7d0b1d..74193fb31abe 100644
--- a/sys-apps/e2fsprogs/ChangeLog
+++ b/sys-apps/e2fsprogs/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/e2fsprogs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/ChangeLog,v 1.18 2003/02/23 19:35:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/ChangeLog,v 1.19 2003/02/25 18:58:08 lostlogic Exp $
 
 *e2fsprogs-1.32-r2 (31 Dec 2002)
 
@@ -36,6 +36,9 @@
  
 *e2fsprogs-1.32 (11 Nov 2002)
 
+  25 Feb 2003; Brandon Low <lostlogic@gentoo.org> e2fsprogs-1.27-r1.ebuild e2fsprogs-1.27.ebuild e2fsprogs-1.29-r1.ebuild e2fsprogs-1.29.ebuild e2fsprogs-1.32-r1.ebuild e2fsprogs-1.32.ebuild :
+  Fix nesteddies
+
   18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
   Added mips to keywords
 
diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.27-r1.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.27-r1.ebuild
index 0fd1f11147fb..a08731ea9bd1 100644
--- a/sys-apps/e2fsprogs/e2fsprogs-1.27-r1.ebuild
+++ b/sys-apps/e2fsprogs/e2fsprogs-1.27-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.27-r1.ebuild,v 1.15 2003/02/13 15:53:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.27-r1.ebuild,v 1.16 2003/02/25 18:58:08 lostlogic Exp $
 
 IUSE="nls acl"
 
@@ -55,7 +55,7 @@ src_install() {
 	
 	if [ "`use nls`" ]
 	then
-		( cd po; make DESTDIR=${D} install || die )
+		( cd po; make DESTDIR=${D} install ) || die
 	fi
 	
 	dodoc COPYING ChangeLog README RELEASE-NOTES SHLIBS
diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.27.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.27.ebuild
index 33e87f45e435..0750ec1f2399 100644
--- a/sys-apps/e2fsprogs/e2fsprogs-1.27.ebuild
+++ b/sys-apps/e2fsprogs/e2fsprogs-1.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.27.ebuild,v 1.16 2003/02/13 15:53:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.27.ebuild,v 1.17 2003/02/25 18:58:08 lostlogic Exp $
 
 IUSE="nls"
 
@@ -49,7 +49,7 @@ src_install() {
 	
 	if [ "`use nls`" ]
 	then
-		( cd po; make DESTDIR=${D} install || die )
+		( cd po; make DESTDIR=${D} install ) || die
 	fi
 	
 	dodoc COPYING ChangeLog README RELEASE-NOTES SHLIBS
diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.29-r1.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.29-r1.ebuild
index f552f0f777a6..0f32d3380120 100644
--- a/sys-apps/e2fsprogs/e2fsprogs-1.29-r1.ebuild
+++ b/sys-apps/e2fsprogs/e2fsprogs-1.29-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.29-r1.ebuild,v 1.4 2003/02/13 15:53:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.29-r1.ebuild,v 1.5 2003/02/25 18:58:08 lostlogic Exp $
 
 IUSE="nls"
 
@@ -53,7 +53,7 @@ src_install() {
 	
 	if [ "`use nls`" ]
 	then
-		( cd po; make DESTDIR=${D} install || die )
+		( cd po; make DESTDIR=${D} install ) || die
 	fi
 	
 	dodoc COPYING ChangeLog README RELEASE-NOTES SHLIBS
diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.29.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.29.ebuild
index a2e1dfe40b93..b837127dc080 100644
--- a/sys-apps/e2fsprogs/e2fsprogs-1.29.ebuild
+++ b/sys-apps/e2fsprogs/e2fsprogs-1.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.29.ebuild,v 1.6 2003/02/13 15:53:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.29.ebuild,v 1.7 2003/02/25 18:58:08 lostlogic Exp $
 
 IUSE="nls"
 
@@ -49,7 +49,7 @@ src_install() {
 	
 	if [ "`use nls`" ]
 	then
-		( cd po; make DESTDIR=${D} install || die )
+		( cd po; make DESTDIR=${D} install ) || die
 	fi
 	
 	dodoc COPYING ChangeLog README RELEASE-NOTES SHLIBS
diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.32-r1.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.32-r1.ebuild
index 410c47cd7a1f..624e53941fa3 100644
--- a/sys-apps/e2fsprogs/e2fsprogs-1.32-r1.ebuild
+++ b/sys-apps/e2fsprogs/e2fsprogs-1.32-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.32-r1.ebuild,v 1.2 2003/02/13 15:53:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.32-r1.ebuild,v 1.3 2003/02/25 18:58:08 lostlogic Exp $
 
 IUSE="nls"
 
@@ -54,7 +54,7 @@ src_install() {
 	
 	if [ "`use nls`" ]
 	then
-		( cd po; make DESTDIR=${D} install || die )
+		( cd po; make DESTDIR=${D} install ) || die
 	fi
 	
 	dodoc COPYING ChangeLog README RELEASE-NOTES SHLIBS
diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.32.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.32.ebuild
index ebd8d03d117f..ab5579fc346e 100644
--- a/sys-apps/e2fsprogs/e2fsprogs-1.32.ebuild
+++ b/sys-apps/e2fsprogs/e2fsprogs-1.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.32.ebuild,v 1.5 2003/02/13 15:54:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.32.ebuild,v 1.6 2003/02/25 18:58:08 lostlogic Exp $
 
 IUSE="nls"
 
@@ -47,7 +47,7 @@ src_install() {
 	
 	if [ "`use nls`" ]
 	then
-		( cd po; make DESTDIR=${D} install || die )
+		( cd po; make DESTDIR=${D} install ) || die
 	fi
 	
 	dodoc COPYING ChangeLog README RELEASE-NOTES SHLIBS
diff --git a/sys-apps/lvm-user/ChangeLog b/sys-apps/lvm-user/ChangeLog
index d2f1cdead68f..d3fccc5c8e2f 100644
--- a/sys-apps/lvm-user/ChangeLog
+++ b/sys-apps/lvm-user/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/lvm-user
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/ChangeLog,v 1.15 2003/02/23 21:48:58 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/ChangeLog,v 1.16 2003/02/25 18:58:08 lostlogic Exp $
 
   23 Jan 2003; Daniel Robbins <drobbins@gentoo.org> lvm-user-1.0.6.ebuild:
   misplaced sed dependency is now a a DEPEND rather than an RDEPEND. No
@@ -25,6 +25,9 @@
 
 *lvm-user-1.0.5 (01 Aug 2002)
 
+  25 Feb 2003; Brandon Low <lostlogic@gentoo.org> lvm-user-1.0.1_rc4-r1.ebuild lvm-user-1.0.1_rc4.ebuild lvm-user-1.0.3.ebuild lvm-user-1.0.4.ebuild lvm-user-1.0.5.ebuild :
+  Fix nesteddies
+
   01 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> lvm-user-1.0.5.ebuild :
   
   Version bump, ebuild cleanup.
diff --git a/sys-apps/lvm-user/lvm-user-1.0.1_rc4-r1.ebuild b/sys-apps/lvm-user/lvm-user-1.0.1_rc4-r1.ebuild
index ef98ccb23a2d..4d2c5c300c0a 100644
--- a/sys-apps/lvm-user/lvm-user-1.0.1_rc4-r1.ebuild
+++ b/sys-apps/lvm-user/lvm-user-1.0.1_rc4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.1_rc4-r1.ebuild,v 1.6 2003/02/13 16:04:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.1_rc4-r1.ebuild,v 1.7 2003/02/25 18:58:08 lostlogic Exp $
 
 NV=1.0.1-rc4
 S=${WORKDIR}/LVM/${NV}
@@ -19,7 +19,9 @@ src_compile() {
 	cd ${S}
 	#This ebuild doesn't like this opt setting; closes bug #598
 	export CFLAGS="${CFLAGS/-fomit-frame-pointer/}"
-	[ -f "Makefile" ] && ( make clean || die )
+	if [ -f "Makefile" ]; then
+		make clean || die
+	fi
 	CFLAGS="${CFLAGS} -I${KS}/include" \
 		./configure --prefix=/ \
 		--mandir=/usr/share/man \
diff --git a/sys-apps/lvm-user/lvm-user-1.0.1_rc4.ebuild b/sys-apps/lvm-user/lvm-user-1.0.1_rc4.ebuild
index 6027cf744a38..ee5ba7ce5594 100644
--- a/sys-apps/lvm-user/lvm-user-1.0.1_rc4.ebuild
+++ b/sys-apps/lvm-user/lvm-user-1.0.1_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.1_rc4.ebuild,v 1.8 2003/02/13 16:04:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.1_rc4.ebuild,v 1.9 2003/02/25 18:58:08 lostlogic Exp $
 
 #our version, but with "eh" formatting
 NV=1.0.1-rc4
@@ -18,7 +18,9 @@ KS=/usr/src/linux
 
 src_compile() {
 	cd ${S}
-	[ -f "Makefile" ] && ( make clean || die )
+	if [ -f "Makefile" ];then
+		make clean || die
+	fi
 	CFLAGS="${CFLAGS} -I${KS}/include" \
 		./configure --prefix=/ \
 		--mandir=/usr/share/man \
diff --git a/sys-apps/lvm-user/lvm-user-1.0.3.ebuild b/sys-apps/lvm-user/lvm-user-1.0.3.ebuild
index b204b6a8f2e6..9478fbab4d1b 100644
--- a/sys-apps/lvm-user/lvm-user-1.0.3.ebuild
+++ b/sys-apps/lvm-user/lvm-user-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.3.ebuild,v 1.8 2003/02/13 16:04:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.3.ebuild,v 1.9 2003/02/25 18:58:08 lostlogic Exp $
 
 NV=1.0.3
 S=${WORKDIR}/LVM/${NV}
@@ -19,7 +19,9 @@ src_compile() {
 	cd ${S}
 	#This ebuild doesn't like this opt setting; closes bug #598
 	export CFLAGS="${CFLAGS/-fomit-frame-pointer/}"
-	[ -f "Makefile" ] && ( make clean || die )
+	if [ -f "Makefile" ]; then
+		make clean || die
+	fi
 	CFLAGS="${CFLAGS} -I${KS}/include" \
 		./configure --prefix=/ \
 		--mandir=/usr/share/man \
diff --git a/sys-apps/lvm-user/lvm-user-1.0.4.ebuild b/sys-apps/lvm-user/lvm-user-1.0.4.ebuild
index 592aa8e9b1bc..176045379299 100644
--- a/sys-apps/lvm-user/lvm-user-1.0.4.ebuild
+++ b/sys-apps/lvm-user/lvm-user-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.4.ebuild,v 1.9 2003/02/13 16:04:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.4.ebuild,v 1.10 2003/02/25 18:58:08 lostlogic Exp $
 
 NV=1.0.4
 S=${WORKDIR}/LVM/${NV}
@@ -21,7 +21,9 @@ src_compile() {
 	cd ${S}
 	#This ebuild doesn't like this opt setting; closes bug #598
 	export CFLAGS="${CFLAGS/-fomit-frame-pointer/}"
-	[ -f "Makefile" ] && ( make clean || die )
+	if [ -f "Makefile" ]; then
+		make clean || die
+	fi
 	CFLAGS="${CFLAGS} -I${KS}/include" \
 		./configure --prefix=/ \
 		--mandir=/usr/share/man \
diff --git a/sys-apps/lvm-user/lvm-user-1.0.5.ebuild b/sys-apps/lvm-user/lvm-user-1.0.5.ebuild
index 7dbe2da534e0..eca66c286d26 100644
--- a/sys-apps/lvm-user/lvm-user-1.0.5.ebuild
+++ b/sys-apps/lvm-user/lvm-user-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.5.ebuild,v 1.8 2003/02/13 16:04:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lvm-user/lvm-user-1.0.5.ebuild,v 1.9 2003/02/25 18:58:08 lostlogic Exp $
 
 inherit flag-o-matic
 
@@ -21,7 +21,9 @@ KS=/usr/src/linux
 src_compile() {
 	addwrite /dev/stderr
 	filter-flags -fomit-frame-pointer
-	[ -f "Makefile" ] && ( make clean || die )
+	if [ -f "Makefile" ];then
+		make clean || die
+	fi
 	CFLAGS="${CFLAGS} -I${KS}/include" \
 		./configure --prefix=/ \
 		--mandir=/usr/share/man \
diff --git a/sys-apps/xfsprogs/ChangeLog b/sys-apps/xfsprogs/ChangeLog
index 3fbbc1d071fa..2f346dfe6b29 100644
--- a/sys-apps/xfsprogs/ChangeLog
+++ b/sys-apps/xfsprogs/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/xfsprogs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsprogs/ChangeLog,v 1.14 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsprogs/ChangeLog,v 1.15 2003/02/25 18:58:08 lostlogic Exp $
 
 *xfsprogs-2.3.6-r2 (26 Dec 2002)
 
@@ -66,6 +66,9 @@
 
 *xfsprogs-1.3.13 (14 July 2002)
 
+  25 Feb 2003; Brandon Low <lostlogic@gentoo.org> xfsprogs-1.3.13.ebuild :
+  Fix massively long line
+
   14 Jul 2002; phoen][x <phoenix@gentoo.org> xfsprogs-1.3.13.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
 
diff --git a/sys-apps/xfsprogs/xfsprogs-1.3.13.ebuild b/sys-apps/xfsprogs/xfsprogs-1.3.13.ebuild
index 8a85a3522660..76a743e43772 100644
--- a/sys-apps/xfsprogs/xfsprogs-1.3.13.ebuild
+++ b/sys-apps/xfsprogs/xfsprogs-1.3.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsprogs/xfsprogs-1.3.13.ebuild,v 1.10 2003/02/13 16:22:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsprogs/xfsprogs-1.3.13.ebuild,v 1.11 2003/02/25 18:58:08 lostlogic Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="xfs filesystem utilities"
@@ -25,7 +25,11 @@ src_compile() {
 	# 3) we remove a hard-coded "-O1"
 	# 4) we fix some Makefile-created library symlinks that contains absolute paths
 	cp include/builddefs include/builddefs.orig
-	sed -e 's:^PKG_\(.*\)_DIR = \(.*\)$:PKG_\1_DIR = ${DESTDIR}\2:' -e "s:/usr/share/doc/${PN}:/usr/share/doc/${PF}:" -e 's:-O1::' -e '/-S $(PKG/d' include/builddefs.orig > include/builddefs || die
+	sed -e 's:^PKG_\(.*\)_DIR = \(.*\)$:PKG_\1_DIR = ${DESTDIR}\2:' \
+	    -e "s:/usr/share/doc/${PN}:/usr/share/doc/${PF}:" \
+	    -e 's:-O1::' \
+	    -e '/-S $(PKG/d' \
+	    include/builddefs.orig > include/builddefs || die
 	emake || die
 }