Modernized ebuilds and fixed symlinks

2 files changed, 29 insertions, 43 deletions

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
 }