touchups

12 files changed, 291 insertions, 375 deletions

diff --git a/dev-db/postgresql/postgresql-7.2-r2.ebuild b/dev-db/postgresql/postgresql-7.2-r2.ebuild
index 95fe0d959a6e..3d132f4600ed 100644
--- a/dev-db/postgresql/postgresql-7.2-r2.ebuild
+++ b/dev-db/postgresql/postgresql-7.2-r2.ebuild
@@ -1,38 +1,34 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2-r2.ebuild,v 1.10 2003/02/13 10:04:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2-r2.ebuild,v 1.11 2003/03/01 04:46:41 vapier Exp $
 
-IUSE="ssl nls java python tcltk perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
+DESCRIPTION="sophisticated Object-Relational DBMS"
 SRC_URI="ftp://ftp.easynet.be/postgresql/v${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.postgresql.org"
+HOMEPAGE="http://www.postgresql.org/"
+
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="x86 -ppc"
+IUSE="ssl nls java python tcltk perl"
 
 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.2 )
-		java? ( =virtual/jdk-1.3* >=dev-java/ant-1.3 )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		nls? ( sys-devel/gettext )"
-
+	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.2 )
+	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.2 )
-		java? ( =virtual/jdk-1.3* )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-SLOT="0"
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 )
+	java? ( =virtual/jdk-1.3* )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 pkg_setup() {
 	local foo
@@ -42,8 +38,8 @@ pkg_setup() {
 		exit 1
 	fi
 }
-src_unpack() {
 
+src_unpack() {
 	unpack postgresql-${PV}.tar.gz
 
 	cd ${S}
@@ -55,7 +51,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	local myconf
 	if [ "`use tcltk`" ]
 	then
@@ -95,11 +90,9 @@ src_compile() {
 		$myconf || die
 
 	emake || die
-
 }
 
-src_install () {
-
+src_install() {
 	if [ "`use perl`" ]
 	then
 		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
@@ -137,9 +130,7 @@ src_install () {
 	einfo ">>> to setup the initial database environment."
 }
 
-
-pkg_config() {
-
+config() {
 	einfo ">>> Creating data directory ..."
 	mkdir -p /var/lib/postgresql/data
 	chown -Rf postgres.postgres /var/lib/postgresql
@@ -152,5 +143,4 @@ pkg_config() {
 	else
 		su - postgres -c "/usr/bin/initdb --pgdata /var/lib/postgresql/data"
 	fi
-
 }
diff --git a/dev-db/postgresql/postgresql-7.2-r3.ebuild b/dev-db/postgresql/postgresql-7.2-r3.ebuild
index 020f9b70ba02..f606c1b21fee 100644
--- a/dev-db/postgresql/postgresql-7.2-r3.ebuild
+++ b/dev-db/postgresql/postgresql-7.2-r3.ebuild
@@ -1,38 +1,34 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2-r3.ebuild,v 1.13 2003/02/13 10:04:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2-r3.ebuild,v 1.14 2003/03/01 04:46:41 vapier Exp $
 
-IUSE="ssl nls java python tcltk perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
+DESCRIPTION="sophisticated Object-Relational DBMS"
 SRC_URI="ftp://ftp.easynet.be/postgresql/v${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.postgresql.org"
+HOMEPAGE="http://www.postgresql.org/"
+
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="x86 -ppc"
+IUSE="ssl nls java python tcltk perl"
 
 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.2 )
-		java? ( =virtual/jdk-1.3* >=dev-java/ant-1.3 )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		nls? ( sys-devel/gettext )"
-
+	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.2 )
+	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.2 )
-		java? ( =virtual/jdk-1.3* )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-SLOT="0"
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 )
+	java? ( =virtual/jdk-1.3* )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 pkg_setup() {
 	local foo
@@ -44,8 +40,8 @@ pkg_setup() {
 		fi
 	fi
 }
-src_unpack() {
 
+src_unpack() {
 	unpack postgresql-${PV}.tar.gz
 
 	cd ${S}
@@ -57,7 +53,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	local myconf
 	if [ "`use tcltk`" ]
 	then
@@ -97,7 +92,6 @@ src_compile() {
 		$myconf || die
 
 	emake || die
-
 }
 
 pkg_preinst() {
@@ -111,8 +105,7 @@ pkg_preinst() {
 	fi
 }
 
-src_install () {
-
+src_install() {
 	if [ "`use perl`" ]
 	then
 		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
@@ -150,8 +143,7 @@ src_install () {
 	einfo ">>> to setup the initial database environment."
 }
 
-pkg_config() {
-
+config() {
 	einfo ">>> Creating data directory ..."
 	mkdir -p /var/lib/postgresql/data
 	chown -Rf postgres.postgres /var/lib/postgresql
@@ -164,5 +156,4 @@ pkg_config() {
 	else
 		setuidgid postgres /usr/bin/initdb --pgdata /var/lib/postgresql/data
 	fi
-
 }
diff --git a/dev-db/postgresql/postgresql-7.2.1-r1.ebuild b/dev-db/postgresql/postgresql-7.2.1-r1.ebuild
index 8dd6e0843d98..0a4e56511c83 100644
--- a/dev-db/postgresql/postgresql-7.2.1-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.2.1-r1.ebuild
@@ -1,39 +1,35 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2.1-r1.ebuild,v 1.17 2003/02/13 10:04:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2.1-r1.ebuild,v 1.18 2003/03/01 04:46:41 vapier Exp $
 
-IUSE="ssl nls java python tcltk perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
+DESCRIPTION="sophisticated Object-Relational DBMS"
 SRC_URI="ftp://ftp.easynet.be/postgresql/v${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.postgresql.org"
+HOMEPAGE="http://www.postgresql.org/"
+
 LICENSE="POSTGRESQL"
-KEYWORDS="x86 -ppc"
 SLOT="0"
+KEYWORDS="x86 -ppc"
+IUSE="ssl nls java python tcltk perl"
 
 DEPEND="virtual/glibc
-		sys-devel/autoconf
-		app-admin/sudo
-		>=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.2 )
-		java? ( =virtual/jdk-1.3* >=dev-java/ant-1.3 )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		nls? ( sys-devel/gettext )"
-
+	sys-devel/autoconf
+	app-admin/sudo
+	>=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.2 )
+	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.2 )
-		java? ( =virtual/jdk-1.3* )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-SLOT="0"
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 )
+	java? ( =virtual/jdk-1.3* )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 pkg_setup() {
 	local foo
@@ -47,7 +43,6 @@ pkg_setup() {
 }
 
 src_unpack() {
-
 	unpack postgresql-${PV}.tar.gz
 
 	cd ${S}
@@ -60,7 +55,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	local myconf
 	if [ "`use tcltk`" ]
 	then
@@ -104,7 +98,6 @@ src_compile() {
 		$myconf || die
 
 	emake || die
-
 }
 
 pkg_preinst() {
@@ -118,8 +111,7 @@ pkg_preinst() {
 	fi
 }
 
-src_install () {
-
+src_install() {
 	if [ "`use perl`" ]
 	then
 		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
@@ -160,9 +152,7 @@ src_install () {
 	einfo ">>> to setup the initial database environment."
 }
 
-
-pkg_config() {
-
+config() {
 	einfo ">>> Creating data directory ..."
 	mkdir -p /var/lib/postgresql/data
 	chown -Rf postgres.postgres /var/lib/postgresql
@@ -175,5 +165,4 @@ pkg_config() {
 	else
 		sudo -u postgres /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 dac8ea0d5ccd..b61cd9b61a90 100644
--- a/dev-db/postgresql/postgresql-7.2.1-r2.ebuild
+++ b/dev-db/postgresql/postgresql-7.2.1-r2.ebuild
@@ -1,39 +1,35 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2.1-r2.ebuild,v 1.8 2003/02/13 10:04:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2.1-r2.ebuild,v 1.9 2003/03/01 04:46:41 vapier Exp $
 
-IUSE="ssl nls java python tcltk perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
+DESCRIPTION="sophisticated Object-Relational DBMS"
 SRC_URI="ftp://ftp.easynet.be/postgresql/v${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.postgresql.org"
+HOMEPAGE="http://www.postgresql.org/"
+
 LICENSE="POSTGRESQL"
-KEYWORDS="x86 -ppc"
 SLOT="0"
+KEYWORDS="x86 -ppc"
+IUSE="ssl nls java python tcltk perl"
 
 DEPEND="virtual/glibc
-		sys-devel/autoconf
-		app-admin/sudo
-		>=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.2 )
-		java? ( =virtual/jdk-1.3* >=dev-java/ant-1.3 )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		nls? ( sys-devel/gettext )"
-
+	sys-devel/autoconf
+	app-admin/sudo
+	>=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.2 )
+	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.2 )
-		java? ( =virtual/jdk-1.3* )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-SLOT="0"
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 )
+	java? ( =virtual/jdk-1.3* )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 pkg_setup() {
 	local foo
@@ -47,7 +43,6 @@ pkg_setup() {
 }
 
 src_unpack() {
-
 	unpack postgresql-${PV}.tar.gz
 
 	cd ${S}
@@ -60,7 +55,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	local myconf
 	use tcltk && myconf="--with-tcl"
 	use python && myconf="$myconf --with-python"
@@ -83,7 +77,6 @@ src_compile() {
 		$myconf || die
 
 	make || die
-
 }
 
 pkg_preinst() {
@@ -97,8 +90,7 @@ pkg_preinst() {
 	fi
 }
 
-src_install () {
-
+src_install() {
 	if [ "`use perl`" ]
 	then
 		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
@@ -139,9 +131,7 @@ src_install () {
 	einfo ">>> to setup the initial database environment."
 }
 
-
-pkg_config() {
-
+config() {
 	einfo ">>> Creating data directory ..."
 	mkdir -p /var/lib/postgresql/data
 	chown -Rf postgres.postgres /var/lib/postgresql
@@ -154,5 +144,4 @@ pkg_config() {
 	else
 		sudo -u postgres /usr/bin/initdb --pgdata /var/lib/postgresql/data
 	fi
-
 }
diff --git a/dev-db/postgresql/postgresql-7.2.1.ebuild b/dev-db/postgresql/postgresql-7.2.1.ebuild
index efc3d6167b26..7d0120328aa9 100644
--- a/dev-db/postgresql/postgresql-7.2.1.ebuild
+++ b/dev-db/postgresql/postgresql-7.2.1.ebuild
@@ -1,38 +1,34 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2.1.ebuild,v 1.9 2003/02/13 10:04:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2.1.ebuild,v 1.10 2003/03/01 04:46:41 vapier Exp $
 
-IUSE="ssl nls java python tcltk perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
+DESCRIPTION="sophisticated Object-Relational DBMS"
 SRC_URI="ftp://ftp.easynet.be/postgresql/v${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.postgresql.org"
+HOMEPAGE="http://www.postgresql.org/"
+
 LICENSE="POSTGRESQL"
-KEYWORDS="x86 -ppc"
 SLOT="0"
+KEYWORDS="x86 -ppc"
+IUSE="ssl nls java python tcltk perl"
 
 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.2 )
-		java? ( =virtual/jdk-1.3* >=dev-java/ant-1.3 )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		nls? ( sys-devel/gettext )"
-
+	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.2 )
+	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.2 )
-		java? ( =virtual/jdk-1.3* )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-SLOT="0"
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 )
+	java? ( =virtual/jdk-1.3* )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 pkg_setup() {
 	local foo
@@ -44,8 +40,8 @@ pkg_setup() {
 		fi
 	fi
 }
-src_unpack() {
 
+src_unpack() {
 	unpack postgresql-${PV}.tar.gz
 
 	cd ${S}
@@ -57,7 +53,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	local myconf
 	if [ "`use tcltk`" ]
 	then
@@ -97,11 +92,9 @@ src_compile() {
 		$myconf || die
 
 	emake || die
-
 }
 
-src_install () {
-
+src_install() {
 	if [ "`use perl`" ]
 	then
 		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
@@ -139,9 +132,7 @@ src_install () {
 	einfo ">>> to setup the initial database environment."
 }
 
-
-pkg_config() {
-
+config() {
 	einfo ">>> Creating data directory ..."
 	mkdir -p /var/lib/postgresql/data
 	chown -Rf postgres.postgres /var/lib/postgresql
@@ -154,5 +145,4 @@ pkg_config() {
 	else
 		su - postgres -c "/usr/bin/initdb --pgdata /var/lib/postgresql/data"
 	fi
-
 }
diff --git a/dev-db/postgresql/postgresql-7.2.2.ebuild b/dev-db/postgresql/postgresql-7.2.2.ebuild
index 1354cd210ac0..bec9976dfb9b 100644
--- a/dev-db/postgresql/postgresql-7.2.2.ebuild
+++ b/dev-db/postgresql/postgresql-7.2.2.ebuild
@@ -1,41 +1,37 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2.2.ebuild,v 1.16 2003/02/13 10:04:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2.2.ebuild,v 1.17 2003/03/01 04:46:41 vapier Exp $
 
-IUSE="ssl nls java python tcltk perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
+DESCRIPTION="sophisticated Object-Relational DBMS"
 SRC_URI="ftp://ftp.easynet.be/postgresql/v${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.postgresql.org"
+HOMEPAGE="http://www.postgresql.org/"
+
 LICENSE="POSTGRESQL"
-KEYWORDS="x86 -ppc"
 SLOT="0"
+KEYWORDS="x86 -ppc"
+IUSE="ssl nls java python tcltk perl"
 
 DEPEND="virtual/glibc
-		sys-devel/autoconf
-		app-admin/sudo
-		>=sys-libs/readline-4.1
-		>=sys-libs/ncurses-5.2
-		>=sys-libs/zlib-1.1.3
-		tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
-		perl? ( >=sys-devel/perl-5.6.1-r2 )
-		python? ( >=dev-lang/python-2.2 )
-		java? ( =virtual/jdk-1.3* >=dev-java/ant-1.3 ) 
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		nls? ( sys-devel/gettext )"
+	sys-devel/autoconf
+	app-admin/sudo
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 )
+	java? ( =virtual/jdk-1.3* >=dev-java/ant-1.3 ) 
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	nls? ( sys-devel/gettext )"
 # java dep workaround for portage bug
 # x86? ( java? ( =virtual/jdk-1.3* >=dev-java/ant-1.3 ) )
-
 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.2 )
-		java? ( =virtual/jdk-1.3* )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-SLOT="0"
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 )
+	java? ( =virtual/jdk-1.3* )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 pkg_setup() {
 	local foo
@@ -98,8 +94,7 @@ pkg_preinst() {
 	fi
 }
 
-src_install () {
-
+src_install() {
 	if [ "`use perl`" ]
 	then
 		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
@@ -143,8 +138,7 @@ pkg_postinst() {
 	einfo ">>> to setup the initial database environment."
 }
 
-
-pkg_config() {
+config() {
 	einfo ">>> Creating data directory ..."
 	mkdir -p /var/lib/postgresql/data
 	chown -Rf postgres.postgres /var/lib/postgresql
diff --git a/dev-db/postgresql/postgresql-7.2.3-r1.ebuild b/dev-db/postgresql/postgresql-7.2.3-r1.ebuild
index ed928f7c348c..eb9ee9846bf7 100644
--- a/dev-db/postgresql/postgresql-7.2.3-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.2.3-r1.ebuild
@@ -1,41 +1,37 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2.3-r1.ebuild,v 1.7 2003/02/13 10:04:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2.3-r1.ebuild,v 1.8 2003/03/01 04:46:41 vapier Exp $
 
-IUSE="ssl nls java python tcltk perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
+DESCRIPTION="sophisticated Object-Relational DBMS"
 SRC_URI="ftp://ftp.easynet.be/postgresql/v${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.postgresql.org"
+HOMEPAGE="http://www.postgresql.org/"
+
 LICENSE="POSTGRESQL"
-KEYWORDS="x86 ppc"
 SLOT="0"
+KEYWORDS="x86 ppc"
+IUSE="ssl nls java python tcltk perl"
 
 DEPEND="virtual/glibc
-		sys-devel/autoconf
-		app-admin/sudo
-		>=sys-libs/readline-4.1
-		>=sys-libs/ncurses-5.2
-		>=sys-libs/zlib-1.1.3
-		tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
-		perl? ( >=sys-devel/perl-5.6.1-r2 )
-		python? ( >=dev-lang/python-2.2 )
-		java? ( =virtual/jdk-1.3* >=dev-java/ant-1.3 ) 
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		nls? ( sys-devel/gettext )"
+	sys-devel/autoconf
+	app-admin/sudo
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 )
+	java? ( =virtual/jdk-1.3* >=dev-java/ant-1.3 ) 
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	nls? ( sys-devel/gettext )"
 # java dep workaround for portage bug
 # x86? ( java? ( =virtual/jdk-1.3* >=dev-java/ant-1.3 ) )
-
 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.2 )
-		java? ( =virtual/jdk-1.3* )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-SLOT="0"
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 )
+	java? ( =virtual/jdk-1.3* )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 pkg_setup() {
 	local foo
@@ -92,8 +88,7 @@ src_compile() {
 	make || die
 }
 
-src_install () {
-
+src_install() {
 	if [ "`use perl`" ]
 	then
 		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
@@ -142,8 +137,7 @@ pkg_postinst() {
 	einfo ">>> Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell, or /bin/true"
 }
 
-
-pkg_config() {
+config() {
 	einfo ">>> Creating data directory ..."
 	mkdir -p /var/lib/postgresql/data
 	chown -Rf postgres.postgres /var/lib/postgresql
diff --git a/dev-db/postgresql/postgresql-7.2.3.ebuild b/dev-db/postgresql/postgresql-7.2.3.ebuild
index 663c00b0cd93..d735ea0fd06f 100644
--- a/dev-db/postgresql/postgresql-7.2.3.ebuild
+++ b/dev-db/postgresql/postgresql-7.2.3.ebuild
@@ -1,41 +1,37 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2.3.ebuild,v 1.5 2003/02/13 10:04:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2.3.ebuild,v 1.6 2003/03/01 04:46:41 vapier Exp $
 
-IUSE="ssl nls java python tcltk perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
+DESCRIPTION="sophisticated Object-Relational DBMS"
 SRC_URI="ftp://ftp.easynet.be/postgresql/v${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.postgresql.org"
+HOMEPAGE="http://www.postgresql.org/"
+
 LICENSE="POSTGRESQL"
-KEYWORDS="x86 -ppc"
 SLOT="0"
+KEYWORDS="x86 -ppc"
+IUSE="ssl nls java python tcltk perl"
 
 DEPEND="virtual/glibc
-		sys-devel/autoconf
-		app-admin/sudo
-		>=sys-libs/readline-4.1
-		>=sys-libs/ncurses-5.2
-		>=sys-libs/zlib-1.1.3
-		tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
-		perl? ( >=sys-devel/perl-5.6.1-r2 )
-		python? ( >=dev-lang/python-2.2 )
-		java? ( =virtual/jdk-1.3* >=dev-java/ant-1.3 ) 
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		nls? ( sys-devel/gettext )"
+	sys-devel/autoconf
+	app-admin/sudo
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 )
+	java? ( =virtual/jdk-1.3* >=dev-java/ant-1.3 ) 
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	nls? ( sys-devel/gettext )"
 # java dep workaround for portage bug
 # x86? ( java? ( =virtual/jdk-1.3* >=dev-java/ant-1.3 ) )
-
 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.2 )
-		java? ( =virtual/jdk-1.3* )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-SLOT="0"
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 )
+	java? ( =virtual/jdk-1.3* )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 pkg_setup() {
 	local foo
@@ -98,8 +94,7 @@ pkg_preinst() {
 	fi
 }
 
-src_install () {
-
+src_install() {
 	if [ "`use perl`" ]
 	then
 		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
@@ -146,8 +141,7 @@ pkg_postinst() {
 	einfo ">>> to setup the initial database environment."
 }
 
-
-pkg_config() {
+config() {
 	einfo ">>> Creating data directory ..."
 	mkdir -p /var/lib/postgresql/data
 	chown -Rf postgres.postgres /var/lib/postgresql
diff --git a/dev-db/postgresql/postgresql-7.3.1.ebuild b/dev-db/postgresql/postgresql-7.3.1.ebuild
index 4b4a3854acc5..c080f8710c21 100644
--- a/dev-db/postgresql/postgresql-7.3.1.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.1.ebuild
@@ -1,41 +1,37 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.1.ebuild,v 1.6 2003/02/13 10:05:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.1.ebuild,v 1.7 2003/03/01 04:46:41 vapier Exp $
 
-IUSE="ssl nls java python tcltk perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
+DESCRIPTION="sophisticated Object-Relational DBMS"
 SRC_URI="ftp://ftp.us.postgresql.org/source/v${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.postgresql.org"
+HOMEPAGE="http://www.postgresql.org/"
+
 LICENSE="POSTGRESQL"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE="ssl nls java python tcltk perl"
 
 DEPEND="virtual/glibc
-		sys-devel/autoconf
-		app-admin/sudo
-		>=sys-libs/readline-4.1
-		>=sys-libs/ncurses-5.2
-		>=sys-libs/zlib-1.1.3
-		tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
-		perl? ( >=sys-devel/perl-5.6.1-r2 )
-		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-		java? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3 ) 
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		nls? ( sys-devel/gettext )"
+	sys-devel/autoconf
+	app-admin/sudo
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
+	java? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3 ) 
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	nls? ( sys-devel/gettext )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
-
 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.2 )
-		java? ( >=virtual/jdk-1.3* )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-SLOT="0"
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 )
+	java? ( >=virtual/jdk-1.3* )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 PG_DIR="/var/lib/postgresql"
 
@@ -87,8 +83,7 @@ src_compile() {
 	make || die
 }
 
-src_install () {
-
+src_install() {
 	addwrite "/usr/share/man/man3/Pg.3pm"
 
 	if [ "`use perl`" ]
@@ -143,8 +138,7 @@ pkg_postinst() {
 	einfo ">>> Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell, or /bin/true"
 }
 
-
-pkg_config() {
+config() {
 	einfo ">>> Creating data directory ..."
 	mkdir -p ${PG_DIR}/data
 	chown -Rf postgres.postgres ${PG_DIR}
diff --git a/dev-db/postgresql/postgresql-7.3.2.ebuild b/dev-db/postgresql/postgresql-7.3.2.ebuild
index 5b62cc7fd740..c5f2653e5a9d 100644
--- a/dev-db/postgresql/postgresql-7.3.2.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.2.ebuild
@@ -1,39 +1,37 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.2.ebuild,v 1.1 2003/02/28 21:10:19 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.2.ebuild,v 1.2 2003/03/01 04:46:41 vapier Exp $
 
-IUSE="ssl nls java python tcltk perl libg++"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
+DESCRIPTION="sophisticated Object-Relational DBMS"
 SRC_URI="ftp://ftp.us.postgresql.org/source/v${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.postgresql.org"
+HOMEPAGE="http://www.postgresql.org/"
+
 LICENSE="POSTGRESQL"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE="ssl nls java python tcltk perl libg++"
 
 DEPEND="virtual/glibc
-		sys-devel/autoconf
-		app-admin/sudo
-		>=sys-libs/readline-4.1
-		>=sys-libs/ncurses-5.2
-		>=sys-libs/zlib-1.1.3
-		tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
-		perl? ( >=sys-devel/perl-5.6.1-r2 )
-		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-		java? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3 )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		nls? ( sys-devel/gettext )"
+	sys-devel/autoconf
+	app-admin/sudo
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
+	java? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	nls? ( sys-devel/gettext )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
-
 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.2 )
-		java? ( >=virtual/jdk-1.3* )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 )
+	java? ( >=virtual/jdk-1.3* )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 PG_DIR="/var/lib/postgresql"
 
@@ -84,8 +82,7 @@ src_compile() {
 	make || die
 }
 
-src_install () {
-
+src_install() {
 	addwrite "/usr/share/man/man3/Pg.3pm"
 
 	if [ "`use perl`" ]
@@ -140,8 +137,7 @@ pkg_postinst() {
 	einfo ">>> Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell, or /bin/true"
 }
 
-
-pkg_config() {
+config() {
 	einfo ">>> Creating data directory ..."
 	mkdir -p ${PG_DIR}/data
 	chown -Rf postgres.postgres ${PG_DIR}
diff --git a/dev-db/postgresql/postgresql-7.3.ebuild b/dev-db/postgresql/postgresql-7.3.ebuild
index 21d1da9e9cd8..d239151f76c4 100644
--- a/dev-db/postgresql/postgresql-7.3.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.ebuild
@@ -1,41 +1,37 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.ebuild,v 1.5 2003/02/13 10:05:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.ebuild,v 1.6 2003/03/01 04:46:41 vapier Exp $
 
-IUSE="ssl nls java python tcltk perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
+DESCRIPTION="sophisticated Object-Relational DBMS"
 SRC_URI="ftp://ftp.us.postgresql.org/source/v${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.postgresql.org"
+HOMEPAGE="http://www.postgresql.org/"
+
 LICENSE="POSTGRESQL"
-KEYWORDS="x86 ppc sparc"
 SLOT="0"
+KEYWORDS="x86 ppc sparc"
+IUSE="ssl nls java python tcltk perl"
 
 DEPEND="virtual/glibc
-		sys-devel/autoconf
-		app-admin/sudo
-		>=sys-libs/readline-4.1
-		>=sys-libs/ncurses-5.2
-		>=sys-libs/zlib-1.1.3
-		tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
-		perl? ( >=sys-devel/perl-5.6.1-r2 )
-		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-		java? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3 ) 
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		nls? ( sys-devel/gettext )"
+	sys-devel/autoconf
+	app-admin/sudo
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
+	java? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3 ) 
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	nls? ( sys-devel/gettext )"
 # java dep workaround for portage bug
 # x86? ( java? ( =virtual/jdk-1.3* >=dev-java/ant-1.3 ) )
-
 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.2 )
-		java? ( >=virtual/jdk-1.3* )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-SLOT="0"
+	>=sys-libs/zlib-1.1.3
+	tcltk? ( >=dev-lang/tcl-8 )
+	perl? ( >=sys-devel/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 )
+	java? ( >=virtual/jdk-1.3* )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 PG_DIR="/var/lib/postgresql"
 
@@ -87,8 +83,7 @@ src_compile() {
 	make || die
 }
 
-src_install () {
-
+src_install() {
 	addwrite "/usr/share/man/man3/Pg.3pm"
 
 	if [ "`use perl`" ]
@@ -143,8 +138,7 @@ pkg_postinst() {
 	einfo ">>> Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell, or /bin/true"
 }
 
-
-pkg_config() {
+config() {
 	einfo ">>> Creating data directory ..."
 	mkdir -p ${PG_DIR}/data
 	chown -Rf postgres.postgres ${PG_DIR}
diff --git a/dev-db/sqlguipart/sqlguipart-0.4.ebuild b/dev-db/sqlguipart/sqlguipart-0.4.ebuild
index a9f2ba6b2f3a..adefc6123583 100644
--- a/dev-db/sqlguipart/sqlguipart-0.4.ebuild
+++ b/dev-db/sqlguipart/sqlguipart-0.4.ebuild
@@ -1,33 +1,34 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlguipart/sqlguipart-0.4.ebuild,v 1.3 2003/02/13 10:05:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlguipart/sqlguipart-0.4.ebuild,v 1.4 2003/03/01 04:50:37 vapier Exp $
+
 inherit kde-base
 
 need-kde 3
 
-newdepend ">=dev-db/mysql-3.23.38 >=kde-base/kdebase-3"
+newdepend ">=dev-db/mysql-3.23.38
+	>=kde-base/kdebase-3"
 
 DESCRIPTION="kpart for administering a mysql db. dev-db/sqlgui is a gui for it."
 SRC_URI="http://www.sqlgui.de/download/sqlgui-0.4.0.tar.gz"
 HOMEPAGE="http://www.sqlgui.de/"
+
 LICENSE="GPL-2"
 KEYWORDS="x86"
-S=$WORKDIR/sqlgui-0.4.0/$P
-
-myconf="$myconf --with-extra-includes=/usr/include/mysql"
 
-src_unpack() {
+myconf="${myconf} --with-extra-includes=/usr/include/mysql"
 
-    cd $WORKDIR
-    unpack sqlgui-0.4.0.tar.gz
-    cd sqlgui-0.4.0
-    tar -xvzpf $P.tar.gz
-    cd $S
-    patch -p0 < $FILESDIR/$P-gcc3.diff
-    patch -p0 < $FILESDIR/$P-gentoo.diff
-    need-autoconf 2.1
-    make -f Makefile.dist
-    need-autoconf 2.5
+S=${WORKDIR}/sqlgui-0.4.0/${P}
 
+src_unpack() {
+	cd $WORKDIR
+	unpack sqlgui-0.4.0.tar.gz
+	cd sqlgui-0.4.0
+	tar -xvzpf $P.tar.gz
+	cd $S
+	patch -p0 < $FILESDIR/$P-gcc3.diff
+	patch -p0 < $FILESDIR/$P-gentoo.diff
+	need-autoconf 2.1
+	make -f Makefile.dist
+	need-autoconf 2.5
 }
-