switched emake to make. Fixes #5834

8 files changed, 8 insertions, 353 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 76f4afd37ca1..f1f0daf7d09a 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.23 2002/08/13 19:43:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.24 2002/08/19 00:14:22 rphillips Exp $
 
 * postgresql-7.2.1-r2 (31 Jul 2002)                                      
 
+  18 Aug 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.1-r2.ebuild :
+
+  Postgresql doesn't like emake due to multiple processor support.
+  Using make instead
+
   13 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> postgresql-7.2.1-r2.ebuild:
 
   Added ppc keyword
diff --git a/dev-db/postgresql/files/digest-postgresql-7.0.3-r3 b/dev-db/postgresql/files/digest-postgresql-7.0.3-r3
deleted file mode 100644
index 3905e102622b..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.0.3-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b416c04e6c91967160dfde866293ee6f postgresql-7.0.3.tar.gz 7222232
diff --git a/dev-db/postgresql/files/digest-postgresql-7.1-r1 b/dev-db/postgresql/files/digest-postgresql-7.1-r1
deleted file mode 100644
index 7a1057a966f2..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5499444696d919f9fbf2efcaf8e54022 postgresql-7.1.tar.gz 8088678
-MD5 9ffc80a0c387d97437bdea2b7acf09c2 rl42-pg.patch 3335
diff --git a/dev-db/postgresql/files/digest-postgresql-7.1.3-r4 b/dev-db/postgresql/files/digest-postgresql-7.1.3-r4
deleted file mode 100644
index e8dbf2b65914..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.1.3-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a92c77092034fb35c7b3bb82beebd54b postgresql-7.1.3.tar.gz 8124455
diff --git a/dev-db/postgresql/postgresql-7.0.3-r3.ebuild b/dev-db/postgresql/postgresql-7.0.3-r3.ebuild
deleted file mode 100644
index ba6f67f7d70c..000000000000
--- a/dev-db/postgresql/postgresql-7.0.3-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.0.3-r3.ebuild,v 1.6 2002/08/13 19:49:30 pvdabeel Exp $
-
-S=${WORKDIR}/${P}/src
-DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
-SRC_URI="ftp://ftp.postgresql.org/pub/v7.0.3/${P}.tar.gz"
-HOMEPAGE="http://postgresql.readysetnet.com/"
-LICENSE="POSTGRESQL"
-SLOT="0"
-DEPEND=">=dev-lang/tk-8"
-RDEPEND=""
-KEYWORDS="x86"
-
-src_unpack() {
-  unpack ${A}
-  cd ${S}/backend/catalog
-  cp genbki.sh.in genbki.sh.orig
-  sed -e 's:\\name:name:' genbki.sh.orig > genbki.sh.in
-}
-
-src_compile() {
-
-    cd ${S}
-    ./configure --prefix=/usr --host=${CHOST} \
-	--enable-locale --with-tcl --enable-syslog || die
-    cp Makefile.global Makefile.orig
-    sed -e "s:^TEMPLATEDIR=.*:TEMPLATEDIR=\$(POSTGRESDIR)/lib/pgsql:" \
-	-e "s:^HEADERDIR=.*:HEADERDIR=\$(POSTGRESDIR)/include/pgsql:" \
-	-e "s:-O2:${CFLAGS}:" \
-	Makefile.orig > Makefile.global
-    make || die
-
-}
-
-src_install () {
-
-    cd ${S}
-    dodir /usr/include/pgsql
-    make POSTGRESDIR=${D}/usr install || die
-    dosed "s:/usr/pgaccess:/usr/lib/pgaccess:" /usr/bin/pgaccess
-    cd ${D}/usr
-    mv pgaccess lib
-    cd lib/postgres
-    cd ${S}/../doc
-    dodoc FAQ* KNOWN_BUGS MISSING_FEATURES README*
-    dodoc TODO* internals.ps bug.template
-    dodoc *.tar.gz
-	 exeinto /usr/bin
-    doexe ${FILESDIR}/postmaster-wrapper
-    exeinto /etc/rc.d/init.d/
-    doexe ${FILESDIR}/pgsql
-}
-
-
-pkg_config() {
-   mkdir -p /var/db/pgsql/data
-   chown -R postgres /var/db/pgsql/data
-   su - postgres -c "/usr/bin/initdb -D /var/db/pgsql/data"
-}
diff --git a/dev-db/postgresql/postgresql-7.1-r1.ebuild b/dev-db/postgresql/postgresql-7.1-r1.ebuild
deleted file mode 100644
index fc4c10c23c88..000000000000
--- a/dev-db/postgresql/postgresql-7.1-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.1-r1.ebuild,v 1.8 2002/08/13 19:49:30 pvdabeel Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
-SRC_URI="ftp://ftp.postgresql.org/pub/v7.1/${P}.tar.gz
-	 http://www.postgresql.org/~petere/rl42-pg.patch"
-HOMEPAGE="http://postgresql.readysetnet.com/"
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="virtual/glibc sys-devel/autoconf
-        >=sys-libs/readline-4.1
-        >=sys-libs/ncurses-5.2
-        >=sys-libs/zlib-1.1.3
-        tcltk? ( >=dev-lang/tk-8 )
-        perl? ( sys-devel/perl )
-        python? ( dev-lang/python )
-        java? ( virtual/jdk >=dev-java/ant-1.3 )
-        ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-        nls? ( sys-devel/gettext )"
-
-RDEPEND="virtual/glibc
-        >=sys-libs/zlib-1.1.3
-        tcltk? ( >=dev-lang/tk-8 )
-        perl? ( sys-devel/perl )
-        python? ( dev-lang/python )
-        java? ( virtual/jdk >=dev-java/ant-1.3 )
-        ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-src_unpack() {
-
-  unpack ${P}.tar.gz
-
-  cd ${S}
-
-  # This is a patch from Peter Eisentraut
-  patch -p0 < ${DISTDIR}/rl42-pg.patch
-  # This patch is based on Lamar Owens, Thomas Lockhards and 
-  # Thron Eivind Glomsrod work. Thanks you all.
-  patch -p1 < ${FILESDIR}/${P}-perl5-GNUmakefile-gentoo.diff
-  
-
-}
-if [ "`use java`" ]
-then
-	export CLASSPATH=`java-config --full-classpath=ant,jaxp`
-fi
-
-src_compile() {
-
-    local myconf
-    if [ "`use tcltk`" ]
-    then
-        myconf="--with-tcl"
-    fi
-    if [ "`use perl`" ]
-    then
-        myconf="$myconf --with-perl"
-    fi
-    if [ "`use python`" ]
-    then
-        myconf="$myconf --with-python"
-    fi
-    if [ "`use java`" ]
-    then
-        myconf="$myconf --with-java"
-    fi
-    if [ "`use ssl`" ]
-    then
-        myconf="$myconf --with-openssl=/usr"
-    fi
-    if [ "`use nls`" ]
-    then
-        myconf="$myconf --enable-locale"
-    fi
-    autoconf || die
-    unset ROOT
-    ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} \
-	--enable-syslog $myconf || die 
-    make || die
-
-}
-
-src_install () {
-
-    make DESTDIR=${D} install || die
-    dodoc COPYRIGHT HISTORY README register.txt
-    cd ${S}/doc
-    dodoc FAQ* KNOWN_BUGS MISSING_FEATURES README*
-    dodoc TODO internals.ps bug.template
-    dodoc *.tar.gz
-    docinto sgml
-    dodoc src/sgml/*.{sgml,dsl}
-    docinto sgml/ref
-    dodoc src/sgml/ref/*.sgml
-    docinto sgml/graphics
-    dodoc src/graphics/*
-    mv ${D}/usr/doc/postgresql/html ${D}/usr/share/doc/${PF}
-    rm -rf ${D}/usr/doc ${D}/mnt
-    exeinto /usr/bin
-    doexe ${FILESDIR}/postmaster-wrapper
-    exeinto /etc/rc.d/init.d/
-    doexe ${FILESDIR}/pgsql
-}
-
-
-pkg_config() {
-	mkdir -p /var/db/pgsql/data
-	chown -R postgres /var/db/pgsql/data
-	su - postgres -c "/usr/bin/initdb -D /var/db/pgsql/data"
-}
diff --git a/dev-db/postgresql/postgresql-7.1.3-r4.ebuild b/dev-db/postgresql/postgresql-7.1.3-r4.ebuild
deleted file mode 100644
index f0d1ac59131d..000000000000
--- a/dev-db/postgresql/postgresql-7.1.3-r4.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.1.3-r4.ebuild,v 1.6 2002/07/23 02:57:16 rphillips Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
-SRC_URI="ftp://ftp.easynet.be/postgresql/v${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.postgresql.org"
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="virtual/glibc
-		sys-devel/autoconf
-		>=sys-libs/readline-4.1
-		>=sys-libs/ncurses-5.2
-		>=sys-libs/zlib-1.1.3
-		tcltk? ( >=dev-lang/tcl-8 )
-		perl? ( >=sys-devel/perl-5.6.1-r2 )
-		python? ( =dev-lang/python-2.1* )
-		java? ( >=virtual/jdk-1.3 >=dev-java/ant-1.3 )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		nls? ( sys-devel/gettext )"
-
-RDEPEND="virtual/glibc
-		>=sys-libs/zlib-1.1.3
-		tcltk? ( >=dev-lang/tcl-8 )
-		perl? ( >=sys-devel/perl-5.6.1-r2 )
-		python? ( =dev-lang/python-2.1* )
-		java? ( >=virtual/jdk-1.3 )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-SLOT="0"
-
-src_unpack() {
-
-	unpack postgresql-${PV}.tar.gz
-
-	cd ${S}
-
-	# we know that a shared libperl is present, the default perl
-	# config is however set to the static libperl.a
-	# just remove the check
-	patch -p1 < ${FILESDIR}/${P}-dyn-libperl-gentoo.diff || die
-
-	# patch configure to use python 2.1 for sure
-	patch -p1 < ${FILESDIR}/${P}-python21-configure-gentoo.diff || die
-
-	# This patch is based on Lamar Owens, Thomas Lockhards and 
-	# Thron Eivind Glomsrod work. Thanks you all.
-	patch -p1 < ${FILESDIR}/${P}-perl5-GNUmakefile-gentoo.diff || die
-}
-
-src_compile() {
-
-	local myconf
-	if [ "`use tcltk`" ]
-	then
-		myconf="--with-tcl"
-	fi
-	if [ "`use python`" ]
-	then
-		myconf="$myconf --with-python"
-	fi
-	if [ "`use perl`" ]
-	then
-		myconf="$myconf --with-perl"
-	fi
-	if [ "`use java`" ]
-	then
-		myconf="$myconf --with-java"
-	fi
-	if [ "`use ssl`" ]
-	then
-		myconf="$myconf --with-openssl=/usr"
-	fi
-	if [ "`use nls`" ]
-	then
-		myconf="$myconf --enable-locale"
-	fi
-	if [ "`use libg++`" ]
-	then
-	myconf="$myconf --with-CXX"
-	fi
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--docdir=/usr/share/doc/${P} \
-		--libdir=/usr/lib \
-		--enable-syslog \
-		$myconf || die
-
-	if [ "`use python`" ]
-	then
-		# generate python makefiles
-		cd ${S}/src/interfaces/python
-		make Makefile.pre.in
-
-		cd ${S}
-		# patch makefiles to use python 2.1 for sure
-		patch -p1 < ${FILESDIR}/${P}-python21-makefiles-gentoo.diff || die
-	fi
-
-	emake || die
-
-}
-
-src_install () {
-
-	if [ "`use perl`" ]
-	then
-		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
-		sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/lib:" \
-			${S}/src/pl/plperl/Makefile_orig > ${S}/src/pl/plperl/Makefile
-		mv ${S}/src/pl/plperl/GNUmakefile ${S}/src/pl/plperl/GNUmakefile_orig
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			${S}/src/pl/plperl/GNUmakefile_orig > ${S}/src/pl/plperl/GNUmakefile
-	fi
-
-	if [ "`use python`" ]
-	then
-		mkdir -p ${D}/usr/lib/python2.1/site-packages
-		mv ${S}/src/Makefile.global ${S}/src/Makefile.global_orig
-		sed -e "s:python_moduledir = /usr/lib/python2.1:python_moduledir = ${D}/usr/lib/python2.1:" \
-			${S}/src/Makefile.global_orig > ${S}/src/Makefile.global
-	fi
-
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	make DESTDIR=${D} install-all-headers || die
-	dodoc COPYRIGHT HISTORY INSTALL README register.txt
-	cd ${S}/doc
-	dodoc FAQ* KNOWN_BUGS MISSING_FEATURES README*
-	dodoc TODO internals.ps bug.template
-	dodoc *.tar.gz
-	docinto sgml
-	dodoc src/sgml/*.{sgml,dsl}
-	docinto sgml/ref
-	dodoc src/sgml/ref/*.sgml
-	docinto sgml/graphics
-	dodoc src/graphics/*
-	rm -rf ${D}/usr/doc ${D}/mnt
-	exeinto /usr/bin
-	
-	dojar ${D}/usr/share/postgresql/java/postgresql.jar
-	rm ${D}/usr/share/postgresql/java/postgresql.jar
-
-	exeinto /etc/init.d/
-	doexe ${FILESDIR}/${PV}/${PN}
-
-	einfo ">>> Execute the following command"
-	einfo ">>> ebuild  /var/db/pkg/dev-db/${P}/${P}.ebuild config"
-	einfo ">>> to setup the initial database environment."
-}
-
-
-pkg_config() {
-
-	einfo ">>> Creating data directory ..."
-	mkdir -p /var/lib/postgresql/data
-	chown -Rf postgres.postgres /var/lib/postgresql
-	chmod 700 /var/lib/postgresql/data
-
-	einfo ">>> Initializing the database ..."
-	if [ -f /var/lib/postgresql/data/PG_VERSION ] ; then
-		echo -n "A postgres data directory already exists from version "; cat /var/lib/postgresql/data/PG_VERSION
-		echo "Read the documentation to check how to upgrade to version ${PV}."
-	else
-		su - postgres -c "/usr/bin/initdb --pgdata /var/lib/postgresql/data"
-	fi
-
-}
diff --git a/dev-db/postgresql/postgresql-7.2.1-r2.ebuild b/dev-db/postgresql/postgresql-7.2.1-r2.ebuild
index bf631335ee25..ac9226f5c55b 100644
--- a/dev-db/postgresql/postgresql-7.2.1-r2.ebuild
+++ b/dev-db/postgresql/postgresql-7.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2.1-r2.ebuild,v 1.3 2002/08/13 19:35:57 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2.1-r2.ebuild,v 1.4 2002/08/19 00:14:22 rphillips Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
@@ -80,7 +80,7 @@ src_compile() {
 		--with-maxbackends=1024 \
 		$myconf || die
 
-	emake || die
+	make || die
 
 }