add inherit eutils

2 files changed, 40 insertions, 45 deletions

diff --git a/dev-lisp/clisp/clisp-2.31-r1.ebuild b/dev-lisp/clisp/clisp-2.31-r1.ebuild
index aa145bca67b9..f5cd686430b4 100644
--- a/dev-lisp/clisp/clisp-2.31-r1.ebuild
+++ b/dev-lisp/clisp/clisp-2.31-r1.ebuild
@@ -1,41 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.31-r1.ebuild,v 1.3 2004/03/30 20:58:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.31-r1.ebuild,v 1.4 2004/04/25 20:37:25 vapier Exp $
 
-inherit flag-o-matic
-
-IUSE="X threads fastcgi postgres ldap nls"
-
-# Handle the case where the user has some other -falign-functions
-# option set.  Bug 34630.
-
-if ! is-flag '-falign-functions=4' \
-	&& expr "$CFLAGS" : '.*\(-falign-functions=[[:digit:]]\+\)' >/dev/null; then
-	CFLAGS=${CFLAGS/\
-$(expr "$CFLAGS" : '.*\(-falign-functions=[[:digit:]]\+\)')/\
--falign-functions=4}
-fi
-
-# Fails to compile without -falign-functions=4 when -march=pentium4
-# (or -march=pentium3, sometimes??) is defined.  Bugs 33425 and 34630.
-
-if (is-flag '-march=pentium4' || is-flag '-march=pentium3') \
-	&& ! is-flag '-falign-functions=4'; then
-	append-flags '-falign-functions=4'
-fi
-
-# Athlon XP users report problems with -O3 optimization.  In this
-# block, we remove any optimization flag.  Depending on bug 34497. we
-# may be able to reduce optimization to -O2.
-
-if is-flag '-march=athlon-xp'; then
-	filter-flags '-O*'
-fi
+inherit flag-o-matic eutils
 
 DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
 HOMEPAGE="http://clisp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
-S=${WORKDIR}/${P}
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="x86"
+IUSE="X threads fastcgi postgres ldap nls"
+
 DEPEND="dev-libs/libsigsegv
 	dev-lisp/common-lisp-controller
 	fastcgi? ( dev-libs/fcgi )
@@ -45,10 +22,6 @@ DEPEND="dev-libs/libsigsegv
 	readline? ( sys-libs/readline )
 	nls? ( sys-devel/gettext )"
 
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="x86"
-
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${PV}/bindings-glibc-linux.lisp-gentoo.patch
@@ -57,6 +30,28 @@ src_unpack() {
 }
 
 src_compile() {
+	# Handle the case where the user has some other -falign-functions
+	# option set.  Bug 34630.
+
+	if ! is-flag '-falign-functions=4' \
+		&& expr "$CFLAGS" : '.*\(-falign-functions=[[:digit:]]\+\)' >/dev/null; then
+		CFLAGS=${CFLAGS/\
+	$(expr "$CFLAGS" : '.*\(-falign-functions=[[:digit:]]\+\)')/\
+	-falign-functions=4}
+	fi
+
+	# Fails to compile without -falign-functions=4 when -march=pentium4
+	# (or -march=pentium3, sometimes??) is defined.  Bugs 33425 and 34630.
+	if (is-flag '-march=pentium4' || is-flag '-march=pentium3') \
+		&& ! is-flag '-falign-functions=4'; then
+		append-flags '-falign-functions=4'
+	fi
+
+	# Athlon XP users report problems with -O3 optimization.  In this
+	# block, we remove any optimization flag.  Depending on bug 34497. we
+	# may be able to reduce optimization to -O2.
+	is-flag -march=athlon-xp && filter-flags -O?
+
 	einfo "Using CFLAGS: ${CFLAGS}"
 	export CC="${CC} ${CFLAGS}"
 	unset CFLAGS CXXFLAGS
@@ -114,11 +109,11 @@ pkg_preinst() {
 
 pkg_postinst() {
 	chown cl-builder:cl-builder /usr/lib/common-lisp/clisp
-	rm -rf /usr/lib/common-lisp/clisp/* || true
+	rm -rf ${ROOT}/usr/lib/common-lisp/clisp/* || true
 	/usr/bin/clc-autobuild-impl clisp yes
 	/usr/sbin/register-common-lisp-implementation clisp
 }
 
 pkg_prerm() {
-	rm -rf /usr/lib/common-lisp/clisp/* || true
+	rm -rf ${ROOT}/usr/lib/common-lisp/clisp/* || true
 }
diff --git a/dev-lisp/clisp/clisp-2.31.ebuild b/dev-lisp/clisp/clisp-2.31.ebuild
index b129419e06d4..5e779d0de986 100644
--- a/dev-lisp/clisp/clisp-2.31.ebuild
+++ b/dev-lisp/clisp/clisp-2.31.ebuild
@@ -1,13 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.31.ebuild,v 1.5 2004/03/30 20:58:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.31.ebuild,v 1.6 2004/04/25 20:39:21 vapier Exp $
 
-IUSE="X threads fastcgi postgres ldap nls"
+inherit eutils
 
 DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
 HOMEPAGE="http://clisp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
-S=${WORKDIR}/${P}
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="x86"
+IUSE="X threads fastcgi postgres ldap nls"
+
 DEPEND="dev-libs/libsigsegv
 	dev-lisp/common-lisp-controller
 	fastcgi? ( dev-libs/fcgi )
@@ -17,10 +22,6 @@ DEPEND="dev-libs/libsigsegv
 	readline? ( sys-libs/readline )
 	nls? ( sys-devel/gettext )"
 
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="x86"
-
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${PV}/bindings-glibc-linux.lisp-gentoo.patch
@@ -93,4 +94,3 @@ pkg_postinst() {
 pkg_prerm() {
 	rm -rf /usr/lib/common-lisp/clisp/*
 }
-