removed old version

Package-Manager: portage-2.0.51.22-r3

7 files changed, 7 insertions, 379 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 5711e1c601d6..533eac8e5af6 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.244 2005/11/08 13:53:10 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.245 2005/11/08 14:01:52 nakano Exp $
+
+  08 Nov 2005; Masatomo Nakano <nakano@gentoo.org>
+  -files/postgresql.conf-8.1_beta3, -files/postgresql.init-8.1_beta3,
+  -files/postgresql-8.1_beta3-gentoo.patch,
+  -files/postgresql-8.1_beta3-sh.patch, -postgresql-8.1_beta3.ebuild:
+  removed beta version.
 
 *postgresql-8.1.0 (08 Nov 2005)
 
diff --git a/dev-db/postgresql/files/digest-postgresql-8.1_beta3 b/dev-db/postgresql/files/digest-postgresql-8.1_beta3
deleted file mode 100644
index 5fe2697383b5..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-8.1_beta3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 113e0c694aaf14571e4a3cff38b3dbce postgresql-base-8.1beta3.tar.bz2 8011390
-MD5 f67888882a3c2ba6280a4f30a4b8d94e postgresql-docs-8.1beta3.tar.bz2 2428642
-MD5 d1f1283089441b775bcc7c89497f60b9 postgresql-opt-8.1beta3.tar.bz2 141138
diff --git a/dev-db/postgresql/files/postgresql-8.1_beta3-gentoo.patch b/dev-db/postgresql/files/postgresql-8.1_beta3-gentoo.patch
deleted file mode 100644
index b93f376d4d1c..000000000000
--- a/dev-db/postgresql/files/postgresql-8.1_beta3-gentoo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naru postgresql-8.1beta1.org/src/interfaces/Makefile postgresql-8.1beta1/src/interfaces/Makefile
---- postgresql-8.1beta1.org/src/interfaces/Makefile	2004-04-20 01:33:51.000000000 +0100
-+++ postgresql-8.1beta1/src/interfaces/Makefile	2005-05-09 21:59:15.000000000 +0100
-@@ -12,7 +12,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS := libpq ecpg 
-+DIRS := ecpg 
- 
- ALLDIRS := $(DIRS) 
- 
-diff -Naru postgresql-8.1beta1.org/src/Makefile postgresql-8.1beta1/src/Makefile
---- postgresql-8.1beta1.org/src/Makefile	2005-01-13 18:23:21.000000000 +0000
-+++ postgresql-8.1beta1/src/Makefile	2005-05-09 21:59:54.000000000 +0100
-@@ -18,7 +18,6 @@
- 	$(MAKE) -C timezone $@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -47,7 +46,6 @@
- 	$(MAKE) -C port $@
- 	$(MAKE) -C timezone $@
- 	$(MAKE) -C backend $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -61,7 +59,6 @@
- 	-$(MAKE) -C port $@
- 	-$(MAKE) -C timezone $@
- 	-$(MAKE) -C backend $@
--	-$(MAKE) -C include $@
- 	-$(MAKE) -C interfaces $@
- 	-$(MAKE) -C bin $@
- 	-$(MAKE) -C pl $@
diff --git a/dev-db/postgresql/files/postgresql-8.1_beta3-sh.patch b/dev-db/postgresql/files/postgresql-8.1_beta3-sh.patch
deleted file mode 100644
index fc59d52af0e8..000000000000
--- a/dev-db/postgresql/files/postgresql-8.1_beta3-sh.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/include/storage/s_lock.h~	2005-01-01 07:03:42.000000000 +0900
-+++ src/include/storage/s_lock.h	2005-08-17 23:09:19.000000000 +0900
-@@ -239,6 +239,31 @@
- #endif	 /* __s390__ || __s390x__ */
- 
- 
-+#if defined(__sh__)
-+#define HAS_TEST_AND_SET
-+
-+typedef unsigned char slock_t;
-+
-+#define TAS(lock) tas(lock)
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+	register int _res = 1;
-+
-+	__asm__ __volatile__(
-+		"tas.b	@%1\n\t"
-+		"movt	%0\n\t"
-+		"xor	#1,%0"
-+:		"=z"(_res)
-+:		"r"(lock)
-+:		"t","memory");
-+	return _res;
-+}
-+
-+#endif	 /* __sh__ */
-+
-+
- #if defined(__sparc__)
- #define HAS_TEST_AND_SET
- 
diff --git a/dev-db/postgresql/files/postgresql.conf-8.1_beta3 b/dev-db/postgresql/files/postgresql.conf-8.1_beta3
deleted file mode 100644
index e8dab3e4c827..000000000000
--- a/dev-db/postgresql/files/postgresql.conf-8.1_beta3
+++ /dev/null
@@ -1,14 +0,0 @@
-# PostgreSQL's Database Directory
-PGDATA=/var/lib/postgresql/data
-
-# Logfile path: (NOTE: This must be uid/gid owned by the value of $PGUSER!)
-PGLOG=/var/lib/postgresql/data/postgresql.log
-
-# Run the PostgreSQL user as:
-PGUSER=postgres
-
-# Extra options to run postmaster with.
-# If you want to enable TCP/IP for PostgreSQL, add -i to the following:
-# PGOPTS="-N 1024 -B 2048 -i"
-PGOPTS=""
-
diff --git a/dev-db/postgresql/files/postgresql.init-8.1_beta3 b/dev-db/postgresql/files/postgresql.init-8.1_beta3
deleted file mode 100644
index ec13d1e5d0b5..000000000000
--- a/dev-db/postgresql/files/postgresql.init-8.1_beta3
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.1_beta3,v 1.1 2005/10/15 19:49:20 nakano Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use net
-}
-
-checkconfig() {
-	if [ ! -d $PGDATA ]; then
-		eerror "directory not found: $PGDATA"
-		eerror "You should create PGDATA directory first."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting PostgreSQL"
-	if [ -f $PGDATA/postmaster.pid ]; then
-		rm $PGDATA/postmaster.pid
-	fi
-	su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'"
-
-	while :
-	do
-		cnt=$(($cnt + 1))
-		if [ -f "$PGDATA/postmaster.pid" ]; then
-			ret=0
-			break
-		fi
-
-		if [ $cnt -eq 30 ]; then
-			eerror "Please see log file: $PGLOG"
-			ret=1
-			break
-		fi
-		sleep 1
-	done
-	eend $ret
-}
-
-stop() {
-	ebegin "Stopping PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast"
-	eend $?
-}
-
-svc_restart() {
-	ebegin "Restarting PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-	su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s"
-	eend $?
-}
diff --git a/dev-db/postgresql/postgresql-8.1_beta3.ebuild b/dev-db/postgresql/postgresql-8.1_beta3.ebuild
deleted file mode 100644
index da04a9bbe9f0..000000000000
--- a/dev-db/postgresql/postgresql-8.1_beta3.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1_beta3.ebuild,v 1.2 2005/10/22 06:48:56 nakano Exp $
-
-inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="sophisticated Object-Relational DBMS."
-HOMEPAGE="http://www.postgresql.org/"
-P_HIERPG="hier-Pg8.0.1-0.5.4"
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-SRC_URI="mirror://postgresql/source/v8.1beta/${PN}-base-${MY_PV}.tar.bz2
-	mirror://postgresql/source/v8.1beta/${PN}-opt-${MY_PV}.tar.bz2
-	doc? ( mirror://postgresql/source/v8.1beta/${PN}-docs-${MY_PV}.tar.bz2 )"
-#	pg-hier? ( http://gppl.moonbone.ru/${P_HIERPG}.diff.gz )"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-#IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime"
-
-S=${WORKDIR}/${MY_P}
-DEPEND="virtual/libc
-	=dev-db/libpq-8.1*
-	sys-devel/autoconf
-	>=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 )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )
-	kerberos? ( virtual/krb5 )"
-RDEPEND="virtual/libc
-	=dev-db/libpq-8.1*
-	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 )
-	selinux? ( sec-policy/selinux-postgresql )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
-	kerberos? ( virtual/krb5 )"
-
-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 8 ] || [ ${PG_MAJOR} -eq 8 -a ${PG_MINOR} -lt 0 ] ; then
-			eerror "Postgres ${MY_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
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-#	use pg-hier && epatch ${WORKDIR}/${P_HIERPG}.diff
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	epatch ${FILESDIR}/${P}-sh.patch
-}
-
-src_compile() {
-	filter-flags -ffast-math -feliminate-dwarf2-dups
-
-	local myconf
-	use tcltk && myconf="--with-tcl"
-	use python && myconf="$myconf --with-python"
-	use perl && myconf="$myconf --with-perl"
-	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"
-	use kerberos && myconf="$myconf --with-krb5"
-	use pg-intdatetime && myconf="$myconf --enable-integer-datetimes"
-
-	# 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"
-
-	# Detect mips systems properly
-	gnuconfig_update
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--with-docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-depend \
-		--with-gnu-ld \
-		$myconf || die
-
-	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	cd contrib
-	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
-		cd xml2
-		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	fi
-}
-
-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
-	if use xml2; then
-		cd ${S}/contrib/xml2
-		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	fi
-	cd ${S}
-	dodoc README HISTORY COPYRIGHT INSTALL
-	dodoc contrib/adddepend/*
-
-	exeinto /usr/bin
-
-	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
-
-	rm ${D}/usr/include/postgres_ext.h
-}
-
-pkg_postinst() {
-	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell"
-
-	einfo ""
-	einfo "Execute the following command when you want to setup the initial database environment."
-	einfo "emerge --config =${PF}"
-	einfo ""
-	einfo "autovacuum function, which  was in contrib, has moved to main PostgreSQL function from 8.1."
-	einfo "You can enable it in postgresql.conf."
-	einfo ""
-}
-
-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
-		eerror "Postgres ${MY_PV} cannot upgrade your existing databases."
-		eerror "You must remove your entire database directory to continue."
-		eerror "(database directory = ${PG_DIR})."
-		exit 1
-	else
-		local SEM=`sysctl -n kernel.sem | cut -f-3`
-		local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-		local SEMMNI_MIN=`expr \( ${MAX_CONNECTIONS} + 15 \) / 16`
-		local SHMMAX=`sysctl -n kernel.shmmax`
-		local SHMMAX_MIN=`expr 250000 + 8200 \* 1000 + 14200 \* 100`
-
-		if [ ${SEMMNI} -lt ${SEMMNI_MIN} ]; then
-			eerror "The current value of SEMMNI is too low"
-			eerror "for postgresql to run ${MAX_CONNECTIONS} connections"
-			eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
-			echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
-		fi
-		su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-
-		if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
-			echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
-			ewarn "Restoring the SEMMNI 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 ${SEMMNI_MIN}"
-			ewarn ""
-			ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-			ewarn ""
-		fi
-
-		if [ ${SHMMAX} -lt ${SHMMAX_MIN} ]; then
-			eerror "The current value of SHMMAX is too low for postgresql to run."
-			eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}."
-			eerror ""
-			eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-			eerror ""
-
-		fi
-		einfo ""
-		einfo "You can use /etc/init.d/postgresql script to run PostgreSQL instead of pg_ctl."
-		einfo ""
-	fi
-}