Modernized ebuilds and fixed symlinks

8 files changed, 93 insertions, 82 deletions

diff --git a/sys-apps/attr/ChangeLog b/sys-apps/attr/ChangeLog
index 0997c2e39343..7ea0162cf849 100644
--- a/sys-apps/attr/ChangeLog
+++ b/sys-apps/attr/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/attr
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/ChangeLog,v 1.4 2002/09/27 20:01:06 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/ChangeLog,v 1.5 2002/10/05 08:25:36 bcowan Exp $
 
 *attr-2.0.9 (27 Sep 2002)
 
@@ -9,6 +9,10 @@
   
   version bump thanks to Hanno Boeck <hanno@gentoo.org>
 
+  05 Oct 2002; Brad Cowan <bcowan@gentoo.org> attr-2.0.9.ebuild :
+  
+  Fixed symlinks and "modernized" ebuild.
+
 *attr-20020330.ebuild (14 July 2002)
 
   21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
diff --git a/sys-apps/attr/attr-2.0.9.ebuild b/sys-apps/attr/attr-2.0.9.ebuild
index d73c5c007e40..dda5bace39a4 100644
--- a/sys-apps/attr/attr-2.0.9.ebuild
+++ b/sys-apps/attr/attr-2.0.9.ebuild
@@ -1,40 +1,43 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.0.9.ebuild,v 1.2 2002/10/04 06:22:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.0.9.ebuild,v 1.3 2002/10/05 08:25:36 bcowan Exp $
 
 S=${WORKDIR}/${P}
+
 DESCRIPTION="xfs extended attributes tools"
+
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
+
 KEYWORDS="x86 ppc sparc sparc64"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
-DEPEND="virtual/glibc sys-devel/autoconf sys-devel/make"
-RDEPEND="virtual/glibc"
+DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-	cd ${S}
-	export OPTIMIZER="${CFLAGS}"
-	export DEBUG=-DNDEBUG
+	OPTIMIZER="${CFLAGS}"
+	DEBUG=-DNDEBUG
+	
 	autoconf || die
-	./configure --prefix=/usr || die
-	# 1) add a ${DESTDIR} prefix to all install paths so we can relocate during the "install" phase
-	# 2) we also set the /usr/share/doc/ directory to the correct value.
-	# 3) we remove a hard-coded "-O1"
-	# 4) we fix some Makefile-created library symlinks that contains absolute paths
+	
+	./configure --prefix=/usr \
+		    --libexecdir=/lib || die
+	
 	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:../$(INSTALL) -S \(.*\) $(PKG_.*_DIR)/\(.*$\)::' \
 		include/builddefs.orig > include/builddefs || die
+	
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install install-lib install-dev || die
-	#dosym /usr/lib/libattr.a /lib/libattr.a
-	#dosym /usr/lib/libattr.la /lib/libattr.la
-	#dosym /lib/libattr.so /usr/lib/libattr.so
+	dosym /lib/libattr.a /usr/lib/libattr.a
+	dosym /lib/libattr.la /usr/lib/libattr.la
+	dosym /usr/lib/libattr.so /lib/libattr.so
 }
diff --git a/sys-apps/dmapi/ChangeLog b/sys-apps/dmapi/ChangeLog
index e82858a45fe2..ff4d58253231 100644
--- a/sys-apps/dmapi/ChangeLog
+++ b/sys-apps/dmapi/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/dmapi
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/ChangeLog,v 1.4 2002/09/27 20:01:06 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/ChangeLog,v 1.5 2002/10/05 08:25:36 bcowan Exp $
 
 *dmapi-2.0.5 (27 Sep 2002)
 
@@ -9,6 +9,10 @@
   
   version bump thanks to Hanno Boeck <hanno@gentoo.org>
 
+  05 Oct 2002; Brad Cowan <bcowan@gentoo.org> dmapi-2.0.5.ebuild :
+  
+  Fixed symlinks and "modernized" ebuild.
+  
 *dmapi-20020330.ebuild (14 July 2002)
 
   21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
diff --git a/sys-apps/dmapi/dmapi-2.0.5.ebuild b/sys-apps/dmapi/dmapi-2.0.5.ebuild
index 1683219badca..f4d1479cfb49 100644
--- a/sys-apps/dmapi/dmapi-2.0.5.ebuild
+++ b/sys-apps/dmapi/dmapi-2.0.5.ebuild
@@ -1,37 +1,44 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-2.0.5.ebuild,v 1.2 2002/10/04 06:24:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-2.0.5.ebuild,v 1.3 2002/10/05 08:25:36 bcowan Exp $
 
 S=${WORKDIR}/${P}
+
 DESCRIPTION="XFS data management API library"
+
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
+
 KEYWORDS="x86 ppc sparc sparc64"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
-DEPEND="virtual/glibc sys-devel/autoconf sys-devel/make sys-apps/xfsprogs"
-RDEPEND="virtual/glibc"
+DEPEND="sys-apps/xfsprogs"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-	cd ${S}
-	export OPTIMIZER="${CFLAGS}"
-	export DEBUG=-DNDEBUG
+	OPTIMIZER="${CFLAGS}"
+	DEBUG=-DNDEBUG
+	
 	autoconf || die
-	./configure --prefix=/usr || die
-	# 1) add a ${DESTDIR} prefix to all install paths so we can relocate during the "install" phase
-	# 2) we also set the /usr/share/doc/ directory to the correct value.
-	# 3) we remove a hard-coded "-O1"
-	# 4) we fix some Makefile-created library symlinks that contains absolute paths
+	
+	./configure --prefix=/usr \
+		    --libexecdir=/lib || die
+	
 	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:../$(INSTALL) -S \(.*\) $(PKG_.*_DIR)/\(.*$\)::' \
 		include/builddefs.orig > include/builddefs || die
+	
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install install-dev || die
+
+	dosym /lib/libdm.a /usr/lib/libdm.a
+	dosym /lib/libdm.la /usr/lib/libdm.la
+        dosym /usr/lib/libdm.so /lib/libdm.so
 }
diff --git a/sys-apps/xfsdump/ChangeLog b/sys-apps/xfsdump/ChangeLog
index 0ca01e088292..7055684ec34f 100644
--- a/sys-apps/xfsdump/ChangeLog
+++ b/sys-apps/xfsdump/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/xfsdump
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsdump/ChangeLog,v 1.4 2002/09/27 20:01:06 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsdump/ChangeLog,v 1.5 2002/10/05 08:25:36 bcowan Exp $
 
 *xfsdump-2.1.5 (27 Sep 2002)
 
@@ -9,6 +9,10 @@
   
   version bump thanks to Hanno Boeck <hanno@gentoo.org>
 
+  05 Oct 2002; Brad Cowan <bcowan@gentoo.org> xfsdump-2.1.5.ebuild :
+  
+  "Modernized" ebuild.
+
 *xfsdump-20020330.ebuild (14 July 2002)
 
   21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
diff --git a/sys-apps/xfsdump/xfsdump-2.1.5.ebuild b/sys-apps/xfsdump/xfsdump-2.1.5.ebuild
index 4daf441dd1e4..6132f106faff 100644
--- a/sys-apps/xfsdump/xfsdump-2.1.5.ebuild
+++ b/sys-apps/xfsdump/xfsdump-2.1.5.ebuild
@@ -1,28 +1,30 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsdump/xfsdump-2.1.5.ebuild,v 1.2 2002/10/04 06:32:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsdump/xfsdump-2.1.5.ebuild,v 1.3 2002/10/05 08:25:36 bcowan Exp $
 
 S=${WORKDIR}/${P}
+
 DESCRIPTION="xfs dump/restore utilities"
+
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
+
 KEYWORDS="x86 ppc"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
-DEPEND="virtual/glibc sys-devel/autoconf sys-devel/make sys-apps/e2fsprogs sys-apps/xfsprogs sys-apps/dmapi sys-apps/attr"
-RDEPEND="virtual/glibc"
+DEPEND="sys-apps/e2fsprogs sys-apps/xfsprogs sys-apps/dmapi sys-apps/attr"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-	cd ${S}
-	export OPTIMIZER="${CFLAGS}"
-	export DEBUG=-DNDEBUG
+	OPTIMIZER="${CFLAGS}"
+	DEBUG=-DNDEBUG
+	
 	autoconf || die
-	./configure --prefix=/usr || die
-	# 1) add a ${DESTDIR} prefix to all install paths so we can relocate during the "install" phase
-	# 2) we also set the /usr/share/doc/ directory to the correct value.
-	# 3) we remove a hard-coded "-O1"
-	# 4) we fix some Makefile-created library symlinks that contains absolute paths
+	
+	./configure --prefix=/usr \
+		    --libexecdir=/lib || die
+	
 	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:-S \(.*\) $(PKG_.*_DIR)/\(.*$\):-S \1 \2:' include/builddefs.orig > include/builddefs || die
 	# 5) We now fix some absolute path symlinks in various makefiles
@@ -32,6 +34,7 @@ src_compile() {
 		cp ${x}/Makefile ${x}/Makefile.orig
 		sed -e 's:$(INSTALL) -S $(PKG_.*_DIR)/\(.*\) \(.*/.*\):$(INSTALL) -S ../../sbin/\1 \2:' ${x}/Makefile.orig > ${x}/Makefile
 	done
+	
 	emake || die
 }
 
diff --git a/sys-apps/xfsprogs/ChangeLog b/sys-apps/xfsprogs/ChangeLog
index d5b75431f647..a894d093759f 100644
--- a/sys-apps/xfsprogs/ChangeLog
+++ b/sys-apps/xfsprogs/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/xfsprogs
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsprogs/ChangeLog,v 1.5 2002/09/27 20:01:06 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsprogs/ChangeLog,v 1.6 2002/10/05 08:25:36 bcowan Exp $
 
 *xfsprogs-2.2.2 (27 Sep 2002)
 
@@ -9,6 +9,10 @@
   
   version bump thanks to Hanno Boeck <hanno@gentoo.org>
 
+  05 Oct 2002; Brad Cowan <bcowan@gentoo.org> xfsprogs-2.2.2.ebuild :
+  
+  Fixed symlinks and "modernized" ebuild.
+
 *xfsprogs-20020330-r1.ebuild (26 July 2002)
 
   26 Jul 2002; phoen][x <phoenix@gentoo.org>:
diff --git a/sys-apps/xfsprogs/xfsprogs-2.2.2.ebuild b/sys-apps/xfsprogs/xfsprogs-2.2.2.ebuild
index 449282fec6db..1af36a614af0 100644
--- a/sys-apps/xfsprogs/xfsprogs-2.2.2.ebuild
+++ b/sys-apps/xfsprogs/xfsprogs-2.2.2.ebuild
@@ -1,66 +1,48 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsprogs/xfsprogs-2.2.2.ebuild,v 1.2 2002/10/04 06:32:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsprogs/xfsprogs-2.2.2.ebuild,v 1.3 2002/10/05 08:25:36 bcowan Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="xfs filesystem utilities"
+
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
+
 KEYWORDS="x86 ppc"
 SLOT="0"
 LICENSE="LGPL-2.1"
-oldCFLAGS="${CFLAGS}"
-oldCXXFLAGS="${CXXFLAGS}"
 
-DEPEND="virtual/glibc sys-devel/autoconf sys-devel/make sys-apps/e2fsprogs"
-RDEPEND="virtual/glibc"
-
-ebuild_die() {
-	export CFLAGS="${oldCFLAGS}"
-	export CXXFLAGS="${oldCXXFLAGS}"
-	if([ -n "$LINE" ]) then 
-		die "Line ${2}: ${1}"
-	else
-		die "${1}"
-	fi
-}
+S=${WORKDIR}/${P}
 
+DEPEND="sys-apps/e2fsprogs"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-	cd ${S}
-	export CFLAGS="`echo ${CFLAGS} | sed "s/ -O[2-9]/ -O1/g"`"
-	export CXXFLAGS="`echo ${CXXFLAGS} | sed "s/ -O[2-9]/ -O1/g"`"
-	export OPTIMIZER="${CFLAGS}"
-	export DEBUG=-DNDEBUG
+	CFLAGS="`echo ${CFLAGS} | sed "s/ -O[2-9]/ -O1/g"`"
+	CXXFLAGS="`echo ${CXXFLAGS} | sed "s/ -O[2-9]/ -O1/g"`"
+	
+	OPTIMIZER="${CFLAGS}"
+	DEBUG=-DNDEBUG
+	
 	autoconf || die
-	./configure --prefix=/usr || die
-	# 1) add a ${DESTDIR} prefix to all install paths so we can relocate during the "install" phase
-	# 2) we also set the /usr/share/doc/ directory to the correct value.
-	# 3) we remove a hard-coded "-O1"
-	# 4) we fix some Makefile-created library symlinks that contains absolute paths
+	
+	./configure --prefix=/usr \
+		    --libexecdir=/lib || die "config failed"
+	
 	cp include/builddefs include/builddefs.orig
 	sed -e "s:/usr/share/doc/${PN}:/usr/share/doc/${PF}:" \
 	-e 's:-O1::' \
 	-e '/-S $(PKG/d' \
 	-e 's:^PKG_\(.*\)_DIR = \(.*\)$:PKG_\1_DIR = ${DESTDIR}\2:' \
-	include/builddefs.orig > include/builddefs || ebuild_die "sed failed" 49
-	emake || ebuild_die "emake failed" 50
-	export ${oldCFLAGS}
-	export ${oldCXXFLAGS}
+	include/builddefs.orig > include/builddefs || die "sed failed"
+	
+	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} DK_INC_DIR=${D}/usr/include/disk install install-dev || ebuild_die "make install failed" 54
+	make DESTDIR=${D} DK_INC_DIR=${D}/usr/include/disk install install-dev || die "make install failed"
+	
 	cat ${S}/libhandle/.libs/libhandle.la | sed -e 's:installed=no:installed=yes:g' > ${D}/usr/lib/libhandle.la
-	dodir /usr/lib /lib
-	insinto /usr/lib
-	doins libhandle.a
-	exeinto /lib
-	doins libhandle.so.1.0.0
-	cd ${D}/lib
-	ln -sf ../usr/lib/libhandle.a libhandle.a
-	ln -sf libhandle.so.1.0.0 libhandle.so.1
-	ln -sf libhandle.so.1 libhandle.so
-	cd ${D}/usr/lib
-	ln -sf ../../lib/libhandle.so libhandle.so
+	dosym /lib/libhandle.la /usr/lib/libhandle.la
+	dosym /lib/libhandle.a /usr/lib/libhandle.a
+	dosym /usr/lib/libhandle.so /lib/libhandle.so
 }