add inherit eutils

3 files changed, 25 insertions, 15 deletions

diff --git a/dev-cpp/libpqpp/libpqpp-4.0-r1.ebuild b/dev-cpp/libpqpp/libpqpp-4.0-r1.ebuild
index 2ab105e0af2a..92f509251169 100644
--- a/dev-cpp/libpqpp/libpqpp-4.0-r1.ebuild
+++ b/dev-cpp/libpqpp/libpqpp-4.0-r1.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/libpqpp-4.0-r1.ebuild,v 1.2 2004/03/10 16:32:01 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/libpqpp-4.0-r1.ebuild,v 1.3 2004/04/08 23:04:10 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="C++ wrapper for the libpq Postgresql library"
 HOMEPAGE="http://gborg.postgresql.org/"
 SRC_URI="ftp://gborg.postgresql.org/pub/libpqpp/stable/${P}.tar.gz"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86"
@@ -12,8 +15,6 @@ KEYWORDS="x86"
 DEPEND="virtual/glibc"
 RDEPEND=">=dev-db/postgresql-7.3"
 
-S=${WORKDIR}/${P}
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -21,14 +22,15 @@ src_unpack() {
 }
 
 src_compile() {
-	sed "s|^POSTGRES_HOME=/usr/local/pgsql$|POSTGRES_HOME=/usr|g" Makefile > Makefile.new &&
-	mv Makefile.new Makefile
-	emake
-	sed "s|^POSTGRES_HOME=/usr$|POSTGRES_HOME=\${D}usr|g" Makefile > Makefile.new &&
-	mv Makefile.new Makefile
-	sed "s|^\tln -s .*$|\tln -s \$(soname) \$(POSTGRES_HOME)/lib/\$(TARGET).so|g" Makefile > Makefile.new &&
-	mv Makefile.new Makefile
-	emake
+	sed -i \
+		-e "s|^POSTGRES_HOME=/usr/local/pgsql$|POSTGRES_HOME=/usr|g" \
+		Makefile
+	emake || die "first"
+	sed -i \
+		-e "s|^POSTGRES_HOME=/usr$|POSTGRES_HOME=\${D}usr|g" \
+		-e "s|^\tln -s .*$|\tln -s \$(soname) \$(POSTGRES_HOME)/lib/\$(TARGET).so|g" \
+		Makefile
+	emake || die "second"
 }
 
 src_install() {
diff --git a/dev-cpp/libpqpp/libpqpp-4.0-r2.ebuild b/dev-cpp/libpqpp/libpqpp-4.0-r2.ebuild
index a3d141f115a6..f6982a5cc174 100644
--- a/dev-cpp/libpqpp/libpqpp-4.0-r2.ebuild
+++ b/dev-cpp/libpqpp/libpqpp-4.0-r2.ebuild
@@ -1,16 +1,20 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/libpqpp-4.0-r2.ebuild,v 1.2 2004/03/10 16:32:01 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/libpqpp-4.0-r2.ebuild,v 1.3 2004/04/08 23:04:59 vapier Exp $
+
+inherit eutils
 
 MY_P=${P/pp/++}
 DESCRIPTION="C++ wrapper for the libpq Postgresql library"
 HOMEPAGE="http://gborg.postgresql.org/"
 SRC_URI="ftp://gborg.postgresql.org/pub/libpqpp/stable/${MY_P}.tar.gz"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86"
 
-DEPEND="virtual/glibc >=dev-db/postgresql-7.3"
+DEPEND="virtual/glibc
+	>=dev-db/postgresql-7.3"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-cpp/libpqpp/libpqpp-4.0-r3.ebuild b/dev-cpp/libpqpp/libpqpp-4.0-r3.ebuild
index 69737f8689ff..31bf751128e4 100644
--- a/dev-cpp/libpqpp/libpqpp-4.0-r3.ebuild
+++ b/dev-cpp/libpqpp/libpqpp-4.0-r3.ebuild
@@ -1,16 +1,20 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/libpqpp-4.0-r3.ebuild,v 1.2 2004/03/10 16:32:01 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/libpqpp-4.0-r3.ebuild,v 1.3 2004/04/08 23:05:03 vapier Exp $
+
+inherit eutils
 
 MY_P=${P/pp/++}
 DESCRIPTION="C++ wrapper for the libpq Postgresql library"
 HOMEPAGE="http://gborg.postgresql.org/"
 SRC_URI="ftp://gborg.postgresql.org/pub/libpqpp/stable/${MY_P}.tar.gz"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86"
 
-DEPEND="virtual/glibc >=dev-db/postgresql-7.3"
+DEPEND="virtual/glibc
+	>=dev-db/postgresql-7.3"
 
 S=${WORKDIR}/${MY_P}