Added "doc" flag support/"pg-hire" flag support etc

4 files changed, 243 insertions, 8 deletions

diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 44c65273b9af..765d1da4cf83 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,14 +1,12 @@
 MD5 8209316daf7e08531d3fe495d9a9a8f3 postgresql-7.3.ebuild 5550
 MD5 d14e09bbf946bcb9084a6dfa89a3bf07 postgresql-7.3.3.ebuild 5967
 MD5 e2f91a5762f1e303c2a28a75792f2763 postgresql-7.3.2.ebuild 5959
-MD5 c90e6ab7622dd216338044dd8ef1dfb3 ChangeLog 11108
-MD5 211adb54815892907e833bd6a29514c3 postgresql-7.4.ebuild 7767
+MD5 754f565ae90c42ddf95114dd0f6aa209 ChangeLog 11392
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 MD5 cd19ab56b3c8e79135cb5dd43689d470 postgresql-7.3.4-r1.ebuild 7605
 MD5 001672389391266544b0972fd0a7553c postgresql-7.3.4.ebuild 7262
-MD5 211adb54815892907e833bd6a29514c3 postgresql-7.4-r1.ebuild 7767
-MD5 0deb57eaa9e16d7417a512377107a6cd postgresql-7.4.ebuild.~1.4.~ 7221
-MD5 3c104928f6dadb8fa6086b5ae8060835 postgresql-test-7.4.tar.bz2 944191
+MD5 4bd54cd63c2390a22a3825357c965134 postgresql-7.4-r1.ebuild 7797
+MD5 0deb57eaa9e16d7417a512377107a6cd postgresql-7.4.ebuild 7221
 MD5 bc6938c5fbc47a864dddb0c885f0a6dd files/pgsql 613
 MD5 b0b26f2f466f14fcab3085e2ce726413 files/postgresql.init-7.3.4 1138
 MD5 26e2c8e4978d59f58bf13e94bbdc446b files/postgres 851
@@ -21,11 +19,10 @@ MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
 MD5 4e148f930c09bddec23d157f9c446020 files/postgresql.init 937
 MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql 375
 MD5 de93df43e2bc632828c53eac67680692 files/digest-postgresql-7.3.4-r1 135
-MD5 596e1f84497ad704dc893af524c97ce6 files/digest-postgresql-7.4 282
+MD5 973b357ee4548f1e275f02e2515c3577 files/digest-postgresql-7.4 68
 MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4 390
 MD5 b325603c1adc7c6734e48976c2b604c0 files/postgresql.init-7.4 1137
 MD5 fb171f76854a5249b2be2773b4336a4a files/postgresql-7.4-gentoo.patch 623
 MD5 596e1f84497ad704dc893af524c97ce6 files/digest-postgresql-7.4-r1 282
-MD5 b0b26f2f466f14fcab3085e2ce726413 files/postgresql.init-7.4.~1.1.~ 1138
 MD5 c6a4bb3c0ed81f48ad1d6b675c32842e files/7.3/postgresql 678
 MD5 c6a4bb3c0ed81f48ad1d6b675c32842e files/7.3.2/postgresql 678
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4-r1 b/dev-db/postgresql/files/digest-postgresql-7.4-r1
new file mode 100644
index 000000000000..181019903064
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-7.4-r1
@@ -0,0 +1,4 @@
+MD5 a1af58384f506ed63c1d960ab43a2b3b postgresql-base-7.4.tar.bz2 6386681
+MD5 df425a08172b1e6ca41e7720b65a6b15 postgresql-opt-7.4.tar.bz2 326740
+MD5 b8f1d43dc64b6813b3239f36425c8cb8 postgresql-docs-7.4.tar.bz2 2361172
+MD5 a9d68b8e15764ce75734b805407c1a66 hier-Pg7.4-0.3.tar.gz 28382
diff --git a/dev-db/postgresql/files/postgresql.init-7.4 b/dev-db/postgresql/files/postgresql.init-7.4
index 9ea516e3e0bb..53ed6a88b3d7 100644
--- a/dev-db/postgresql/files/postgresql.init-7.4
+++ b/dev-db/postgresql/files/postgresql.init-7.4
@@ -4,7 +4,7 @@
 # /space/gentoo/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.rc6,v 1.1 2002/01/06 00:53:24 woodchip Exp
 
 depend() {
-	need net
+	use net
 }
 
 checkconfig() {
diff --git a/dev-db/postgresql/postgresql-7.4-r1.ebuild b/dev-db/postgresql/postgresql-7.4-r1.ebuild
new file mode 100644
index 000000000000..1b16c116af42
--- /dev/null
+++ b/dev-db/postgresql/postgresql-7.4-r1.ebuild
@@ -0,0 +1,234 @@
+# 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.4-r1.ebuild,v 1.1 2003/11/25 20:55:45 nakano Exp $
+
+DESCRIPTION="sophisticated Object-Relational DBMS."
+
+RESTRICT="nomirror"
+P_HIERPG="hier-Pg7.4-0.3"
+SRC_URI="mirror://postgresql/v${PV}/${PN}-base-${PV}.tar.bz2
+	mirror://postgresql/v${PV}/${PN}-opt-${PV}.tar.bz2
+	doc? ( mirror://postgresql/v${PV}/${PN}-docs-${PV}.tar.bz2 )
+	pg-hier? ( http://gppl.terminal.ru/${P_HIERPG}.tar.gz )"
+
+HOMEPAGE="http://www.postgresql.org/"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier"
+
+DEPEND="virtual/glibc
+	sys-devel/autoconf
+	app-admin/sudo
+	>=sys-libs/ncurses-5.2
+	>=sys-devel/bison-1.875
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	readline? ( >=sys-libs/readline-4.1 )
+	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
+	perl? ( >=dev-lang/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
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	tcltk? ( >=dev-lang/tcl-8 )
+	perl? ( >=dev-lang/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"
+
+pkg_setup() {
+	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
+		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
+		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
+		if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -lt 4 ] ; then
+			eerror "Postgres ${PV} cannot upgrade your existing databases, you must"
+			eerror "use pg_dump to export your existing databases to a file, and then"
+			eerror "pg_restore to import them when you have upgraded completely."
+			eerror "You must remove your entire database directory to continue."
+			eerror "(database directory = ${PG_DIR})."
+			exit 1
+		fi
+	fi
+}
+
+check_java_config() {
+	JDKHOME="`java-config --jdk-home`"
+	if [ -z "${JDKHOME}" ] || [ ! -d "${JDKHOME}" ]; then
+		NOJDKERROR="You need to use java-config to set your JVM to a JDK!"
+		eerror "${NOJDKERROR}"
+		die "${NOJDKERROR}"
+	fi
+}
+
+src_unpack() {
+	unpack ${A} || die
+	epatch ${FILESDIR}/${P}-gentoo.patch
+	if [ "`use pg-hier`" ]; then
+		cd ${WORKDIR} || die
+		mv readme.html README-${P_HIERPG}.html || die
+		cd ${S} || die
+		epatch ${WORKDIR}/${P_HIERPG}.diff
+	fi
+}
+
+src_compile() {
+	filter-flags -ffast-math
+
+	use java && check_java_config
+
+	local myconf
+	use tcltk && myconf="--with-tcl"
+	use python && myconf="$myconf --with-python"
+	use perl && myconf="$myconf --with-perl"
+	use java && myconf="$myconf --with-java"
+	use ssl && myconf="$myconf --with-openssl"
+	use nls && myconf="$myconf --enable-nls"
+	use libg++ && myconf="$myconf --with-CXX"
+	use pam && myconf="$myconf --with-pam"
+	use readline || myconf="$myconf --without-readline"
+	use zlib || myconf="$myconf --without-zlib"
+
+	# these are the only working CFLAGS I could get on ppc, so locking them
+	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
+	# Gerk - Nov 26, 2002
+	use ppc && CFLAGS="-pipe -fsigned-char"
+
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--host=${CHOST} \
+		--docdir=/usr/share/doc/${PF} \
+		--libdir=/usr/lib \
+		--enable-depend \
+		--with-gnu-ld \
+		--with-maxbackends=1024 \
+		$myconf || die
+
+	make || die
+	cd contrib
+	make || 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
+
+	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
+	make DESTDIR=${D} install-all-headers || die
+	cd ${S}/contrib
+	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
+	cd ${S}
+	if [ "`use pg-hier`" ]; then
+		dodoc ${WORKDIR}/README-${P_HIERPG}.html || die
+	fi
+	dodoc README HISTORY
+	dodoc contrib/adddepend/*
+
+	exeinto /usr/bin
+
+	if [ `use java` ]; then
+		dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
+		rm ${D}/usr/share/postgresql/java/postgresql.jar
+	fi
+
+
+	dodir /usr/include/postgresql/pgsql
+	cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql
+
+	cd ${S}/doc
+	dodoc FAQ* README.* TODO bug.template
+	if [ "`use doc`" ]; then
+		cd ${S}/doc
+		docinto FAQ_html || die
+		dodoc src/FAQ/* || die
+		docinto sgml || die
+		dodoc src/sgml/*.{sgml,dsl} || die
+		docinto sgml/ref || die
+		dodoc src/sgml/ref/*.sgml || die
+		docinto TODO.detail || die
+		dodoc TODO.detail/* || die
+	fi
+
+	cd ${S}
+	exeinto /etc/init.d/
+	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
+
+	insinto /etc/conf.d/
+	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
+}
+
+pkg_postinst() {
+	einfo "Execute the following command"
+	einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+	einfo "to setup the initial database environment."
+	einfo ""
+	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell, or /bin/true"
+}
+
+pkg_config() {
+	einfo "Creating the data directory ..."
+	mkdir -p ${PG_DIR}/data
+	chown -Rf postgres:postgres ${PG_DIR}
+	chmod 700 ${PG_DIR}/data
+
+	einfo "Initializing the database ..."
+	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
+		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
+		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
+		if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -lt 3 ] ; then
+			eerror "Postgres ${PV} cannot upgrade your existing databases."
+			eerror "You must remove your entire database directory to continue."
+			eerror "(database directory = ${PG_DIR})."
+			exit 1
+		else
+			einfon "A postgres data directory already exists from version "; cat ${PG_DIR}/data/PG_VERSION
+			einfo "Read the documentation to check how to upgrade to version ${PV}."
+		fi
+	else
+		# On hppa, postgresql need way more than the default sem index and shmmax
+		if [ "${ARCH}" = "hppa" ]; then
+			SEM_IDX_MIN=1024
+			SHMMAX_MIN=100000000
+			SEM_IDX=`sysctl kernel.sem | awk '{ print $6 }'`
+			if [ $SEM_IDX -lt ${SEM_IDX_MIN} ]; then
+				eerror "The last value of /proc/sys/kernel/sem is too low for postgresql to run"
+				eerror "Temporary setting this value to ${SEM_IDX_MIN} while creating the initial database."
+				cat /proc/sys/kernel/sem | sed -e "s/\t${SEM_IDX}/\t${SEM_IDX_MIN}/" > /proc/sys/kernel/sem
+			fi
+		fi
+		sudo -u postgres /usr/bin/initdb --pgdata ${PG_DIR}/data
+
+		if [ "${ARCH}" = "hppa" ]; then
+			if [ ! `sysctl kernel.sem | awk '{ print $6 }'` -eq ${SEM_IDX} ] ; then
+				cat /proc/sys/kernel/sem | sed -e "s/\t${SEM_IDX_MIN}/\t${SEM_IDX}/" > /proc/sys/kernel/sem
+				ewarn "Restoring the sem idx value to the previous value"
+				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
+				ewarn "and set it to at least ${SEM_IDX_MIN}"
+			fi
+
+			if [ `sysctl kernel.shmmax | awk '{ print $3 }'` -lt ${SHMMAX_MIN} ]; then
+				eerror "The current value of /proc/sys/kernel/shmmax is too low"
+				eerror "for postgresql to run. Please edit /etc/sysctl.conf and set"
+				eerror "this value to at least ${SHMMAX_MIN}."
+
+			fi
+		fi
+
+		einfo "If you are upgrading from a pre-7.3 version of PostgreSQL, please read"
+		einfo "the README.adddepend file for information on how to properly migrate"
+		einfo "all serial columns, unique keys and foreign keys to this version."
+	fi
+}