Remove patches for removed versions

(Portage version: 2.1.4)

9 files changed, 11 insertions, 351 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index f3beb87033b6..b93762d7a6cb 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.368 2008/01/16 05:52:04 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.369 2008/01/16 05:55:03 mjolnir Exp $
+
+  16 Jan 2008; Martin Jackson <mjolnir@gentoo.org>
+  -files/postgresql-8.1.9-regress_su.patch,
+  -files/postgresql-8.1.9-sh.patch, -files/postgresql-8.2.4-gentoo.patch,
+  -files/postgresql-8.2.4-no-test.patch,
+  -files/postgresql-8.2.4-python-threads.patch,
+  -files/postgresql-8.2.4-regress_fix.patch,
+  -files/postgresql-8.2.4-regress_su.patch,
+  -files/postgresql-8.2.4-sh.patch:
+  Remove patches for removed versions
 
   16 Jan 2008; Martin Jackson <mjolnir@gentoo.org> -postgresql-8.1.9.ebuild,
   -postgresql-8.2.4-r1.ebuild:
diff --git a/dev-db/postgresql/files/postgresql-8.1.9-regress_su.patch b/dev-db/postgresql/files/postgresql-8.1.9-regress_su.patch
deleted file mode 100644
index 28e29253dacb..000000000000
--- a/dev-db/postgresql/files/postgresql-8.1.9-regress_su.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- src/test/regress/pg_regress.sh	2006-08-01 10:57:17.000000000 +0200
-+++ src/test/regress/pg_regress.sh	2006-08-04 00:14:39.000000000 +0200
-@@ -81,8 +81,8 @@
- # Initialize default settings
- # ----------
- 
--: ${inputdir=.}
--: ${outputdir=.}
-+: ${inputdir=PORTAGETEMPDIRPG}
-+: ${outputdir=PORTAGETEMPDIRPG}
- 
- libdir='@libdir@'
- bindir='@bindir@'
-@@ -410,7 +410,8 @@
-     message "initializing database system"
-     [ "$debug" = yes ] && initdb_options="--debug"
-     [ "$nolocale" = yes ] && initdb_options="$initdb_options --no-locale"
--    "$bindir/initdb" -D "$PGDATA" -L "$datadir" --noclean $initdb_options >"$LOGDIR/initdb.log" 2>&1
-+    chown portage "${datadir}" "${temp_install}" "${inputdir}/testtablespace"
-+    su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='ISO, MDY' $bindir/initdb -D '$PGDATA' -L '$datadir' --noclean $initdb_options" >"$LOGDIR/initdb.log" 2>&1
- 
-     if [ $? -ne 0 ]
-     then
-@@ -433,7 +434,7 @@
-     else
-         postmaster_options="$postmaster_options -c listen_addresses="
-     fi
--    "$bindir/postmaster" -D "$PGDATA" -F $postmaster_options >"$LOGDIR/postmaster.log" 2>&1 &
-+    su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='ISO, MDY' $bindir/postmaster -D '$PGDATA' -F $postmaster_options" >"$LOGDIR/postmaster.log" 2>&1 &
-     postmaster_pid=$!
- 
-     # Wait till postmaster is able to accept connections (normally only
-@@ -441,7 +442,7 @@
-     # wait forever, however.
-     i=0
-     max=60
--    until "$bindir/psql" -X $psql_options postgres </dev/null 2>/dev/null
-+    until su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='ISO, MDY' $bindir/psql -X $psql_options postgres </dev/null 2>/dev/null"
-     do
-         i=`expr $i + 1`
-         if [ $i -ge $max ]
-@@ -498,7 +499,7 @@
-     fi
- 
-     message "dropping database \"$dbname\""
--    "$bindir/dropdb" $psql_options "$dbname"
-+    su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='ISO, MDY' $bindir/dropdb $psql_options '$dbname'"
-     # errors can be ignored
- fi
- 
-@@ -538,17 +539,17 @@
- # ----------
- 
- message "creating database \"$dbname\""
--"$bindir/createdb" $encoding_opt $psql_options --template template0 "$dbname"
-+su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' $bindir/createdb $encoding_opt $psql_options --template template0 '$dbname'"
- if [ $? -ne 0 ]; then
-     echo "$me: createdb failed"
-     (exit 2); exit
- fi
- 
--"$bindir/psql" -q -X $psql_options -c "\
-+su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' $bindir/psql -q -X $psql_options -c \"\
- alter database \"$dbname\" set lc_messages to 'C';
- alter database \"$dbname\" set lc_monetary to 'C';
- alter database \"$dbname\" set lc_numeric to 'C';
--alter database \"$dbname\" set lc_time to 'C';" "$dbname"
-+alter database \"$dbname\" set lc_time to 'C';\" '$dbname'"
- if [ $? -ne 0 ]; then
-     echo "$me: could not set database default locales"
-     (exit 2); exit
-@@ -560,7 +561,7 @@
- # ----------
- 
- message "dropping regression test user accounts"
--"$bindir/psql" -q -X $psql_options -c 'DROP GROUP regressgroup1; DROP GROUP regressgroup2; DROP USER regressuser1, regressuser2, regressuser3, regressuser4;' $dbname 2>/dev/null
-+su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' $bindir/psql -q -X $psql_options -c 'DROP GROUP regressgroup1; DROP GROUP regressgroup2; DROP USER regressuser1, regressuser2, regressuser3, regressuser4;' '$dbname' 2>/dev/null"
- if [ $? -eq 2 ]; then
-     echo "$me: could not drop user accounts"
-     (exit 2); exit
-@@ -575,7 +576,7 @@
-     for lang in xyzzy $load_langs ; do    
-         if [ "$lang" != "xyzzy" ]; then
-             message "installing $lang"
--            "$bindir/createlang" $psql_options $lang $dbname
-+            su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' $bindir/createlang $psql_options $lang '$dbname'"
-             if [ $? -ne 0 ] && [ $? -ne 2 ]; then
-                 echo "$me: createlang $lang failed"
-                 (exit 2); exit
-@@ -635,7 +636,7 @@
-         # Run a single test
-         formatted=`echo $1 | awk '{printf "%-20.20s", $1;}'`
-         $ECHO_N "test $formatted ... $ECHO_C"
--        ( $PSQL -d "$dbname" <"$inputdir/sql/$1.sql" >"$outputdir/results/$1.out" 2>&1 )&
-+        ( su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' ${PSQL} -d '${dbname}' < '${inputdir}/sql/${1}.sql' > '${outputdir}/results/${1}.out' 2>&1" )&
-         wait
-     else
-         # Start a parallel group
-@@ -646,7 +647,7 @@
-         fi
-         for name do
-             ( 
--              $PSQL -d "$dbname" <"$inputdir/sql/$name.sql" >"$outputdir/results/$name.out" 2>&1
-+              su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' ${PSQL} -d '${dbname}' < '${inputdir}/sql/${name}.sql' > '${outputdir}/results/${name}.out' 2>&1"
-               $ECHO_N " $name$ECHO_C"
-             ) &
-             if [ $maxconnections -gt 0 ] ; then
-@@ -740,7 +741,7 @@
- 
- if [ -n "$postmaster_pid" ]; then
-     message "shutting down postmaster"
--    "$bindir/pg_ctl" -s -D "$PGDATA" stop
-+    su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' $bindir/pg_ctl -s -D '$PGDATA' stop"
-     wait "$postmaster_pid"
-     unset postmaster_pid
- fi
diff --git a/dev-db/postgresql/files/postgresql-8.1.9-sh.patch b/dev-db/postgresql/files/postgresql-8.1.9-sh.patch
deleted file mode 100644
index 6350771080e8..000000000000
--- a/dev-db/postgresql/files/postgresql-8.1.9-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
-@@ -300,6 +300,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-8.2.4-gentoo.patch b/dev-db/postgresql/files/postgresql-8.2.4-gentoo.patch
deleted file mode 100644
index 6d47d2535980..000000000000
--- a/dev-db/postgresql/files/postgresql-8.2.4-gentoo.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- postgresql-8.2.3.orig/src/bin/Makefile	2006-03-05 16:58:50.000000000 +0100
-+++ postgresql-8.2.3/src/bin/Makefile	2007-03-29 12:12:26.000000000 +0200
-@@ -14,7 +14,7 @@
- include $(top_builddir)/src/Makefile.global
- 
- DIRS := initdb ipcclean pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog
-+	psql scripts pg_controldata pg_resetxlog
- ifeq ($(PORTNAME), win32)
- DIRS+=pgevent
- endif
---- postgresql-8.2.3.orig/src/interfaces/Makefile	2004-04-20 02:33:51.000000000 +0200
-+++ postgresql-8.2.3/src/interfaces/Makefile	2007-03-29 12:14:01.000000000 +0200
-@@ -12,7 +12,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS := libpq ecpg 
-+DIRS := ecpg 
- 
- ALLDIRS := $(DIRS) 
-
---- postgresql-8.2.3.orig/src/Makefile	2006-06-23 01:50:35.000000000 +0200
-+++ postgresql-8.2.3/src/Makefile	2007-03-29 12:54:59.000000000 +0200
-@@ -18,12 +18,10 @@
- 	$(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 $@
- 	$(MAKE) -C makefiles $@
--	$(MAKE) -C test/regress $@
- 
- install: install-local
- 
-@@ -47,7 +45,6 @@
- 	$(MAKE) -C port $@
- 	$(MAKE) -C timezone $@
- 	$(MAKE) -C backend $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -60,12 +57,10 @@
- 	-$(MAKE) -C port $@
- 	-$(MAKE) -C timezone $@
- 	-$(MAKE) -C backend $@
--	-$(MAKE) -C include $@
- 	-$(MAKE) -C interfaces $@
- 	-$(MAKE) -C bin $@
- 	-$(MAKE) -C pl $@
- 	-$(MAKE) -C makefiles $@
--	-$(MAKE) -C test $@
- 	-$(MAKE) -C tutorial NO_PGXS=1 $@
- 	-$(MAKE) -C test/thread $@
- 	rm -f Makefile.port Makefile.global
diff --git a/dev-db/postgresql/files/postgresql-8.2.4-no-test.patch b/dev-db/postgresql/files/postgresql-8.2.4-no-test.patch
deleted file mode 100644
index 0f887e28d22c..000000000000
--- a/dev-db/postgresql/files/postgresql-8.2.4-no-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 5eb7c4a..0f9fff0 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -22,7 +22,6 @@ all install installdirs uninstall dep de
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
- 	$(MAKE) -C makefiles $@
--	$(MAKE) -C test/regress $@
- 
- install: install-local
- 
diff --git a/dev-db/postgresql/files/postgresql-8.2.4-python-threads.patch b/dev-db/postgresql/files/postgresql-8.2.4-python-threads.patch
deleted file mode 100644
index 520ba13a6473..000000000000
--- a/dev-db/postgresql/files/postgresql-8.2.4-python-threads.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur a/config/python.m4 b/config/python.m4
---- a/config/python.m4	2006-10-16 18:24:54 +0100
-+++ b/config/python.m4	2007-08-17 15:37:00 +0100
-@@ -78,18 +78,4 @@
- AC_SUBST(python_libspec)[]dnl
- AC_SUBST(python_additional_libs)[]dnl
- 
--# threaded python is not supported on bsd's
--AC_MSG_CHECKING(whether Python is compiled with thread support)
--pythreads=`${PYTHON} -c "import sys; print int('thread' in sys.builtin_module_names)"`
--if test "$pythreads" = "1"; then
--  AC_MSG_RESULT(yes)
--  case $host_os in
--  openbsd*|freebsd*)
--    AC_MSG_ERROR([threaded Python not supported on this platform])
--    ;;
--  esac
--else
--  AC_MSG_RESULT(no)
--fi
--
- ])# PGAC_CHECK_PYTHON_EMBED_SETUP
-diff -ur a/configure b/configure
---- a/configure	2007-04-20 04:20:41 +0100
-+++ b/configure	2007-08-17 15:37:20 +0100
-@@ -5002,24 +5002,6 @@
- echo "${ECHO_T}${python_libspec} ${python_additional_libs}" >&6
- 
- 
--# threaded python is not supported on bsd's
--echo "$as_me:$LINENO: checking whether Python is compiled with thread support" >&5
--echo $ECHO_N "checking whether Python is compiled with thread support... $ECHO_C" >&6
--pythreads=`${PYTHON} -c "import sys; print int('thread' in sys.builtin_module_names)"`
--if test "$pythreads" = "1"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--  case $host_os in
--  openbsd*|freebsd*)
--    { { echo "$as_me:$LINENO: error: threaded Python not supported on this platform" >&5
--echo "$as_me: error: threaded Python not supported on this platform" >&2;}
--   { (exit 1); exit 1; }; }
--    ;;
--  esac
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
- 
- 
- fi
diff --git a/dev-db/postgresql/files/postgresql-8.2.4-regress_fix.patch b/dev-db/postgresql/files/postgresql-8.2.4-regress_fix.patch
deleted file mode 100644
index 0af8c3fbfd80..000000000000
--- a/dev-db/postgresql/files/postgresql-8.2.4-regress_fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/test/regress/expected/interval.out b/src/test/regress/expected/interval.out
-index f7c35de..183a963 100644
---- a/src/test/regress/expected/interval.out
-+++ b/src/test/regress/expected/interval.out
-@@ -293,12 +293,6 @@ (10 rows)
- -- test avg(interval), which is somewhat fragile since people have been
- -- known to change the allowed input syntax for type interval without
- -- updating pg_aggregate.agginitval
--select avg(f1) from interval_tbl;
--                       avg                       
---------------------------------------------------
-- @ 4 years 1 mon 10 days 4 hours 18 mins 23 secs
--(1 row)
--
- -- test long interval input
- select '4 millenniums 5 centuries 4 decades 1 year 4 months 4 days 17 minutes 31 seconds'::interval;
-                   interval                  
-diff --git a/src/test/regress/sql/interval.sql b/src/test/regress/sql/interval.sql
-index 9b2e625..cb44d12 100644
---- a/src/test/regress/sql/interval.sql
-+++ b/src/test/regress/sql/interval.sql
-@@ -101,9 +101,6 @@ SELECT '' AS ten, * FROM INTERVAL_TBL;
- -- test avg(interval), which is somewhat fragile since people have been
- -- known to change the allowed input syntax for type interval without
- -- updating pg_aggregate.agginitval
--
--select avg(f1) from interval_tbl;
--
- -- test long interval input
- select '4 millenniums 5 centuries 4 decades 1 year 4 months 4 days 17 minutes 31 seconds'::interval;
- 
diff --git a/dev-db/postgresql/files/postgresql-8.2.4-regress_su.patch b/dev-db/postgresql/files/postgresql-8.2.4-regress_su.patch
deleted file mode 100644
index 83c56d7ab100..000000000000
--- a/dev-db/postgresql/files/postgresql-8.2.4-regress_su.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
-index f2319d2..b14a6f0 100644
---- a/src/test/regress/GNUmakefile
-+++ b/src/test/regress/GNUmakefile
-@@ -148,7 +148,8 @@ ##
- check: all
- 	-rm -rf ./testtablespace
- 	mkdir ./testtablespace
--	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
-+	chown portage testtablespace .
-+	su -s /bin/sh portage -c "./pg_regress --psqldir=`pwd`/../../bin/psql --temp-install=./tmp_check --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)"
- 
- installcheck: all
- 	-rm -rf ./testtablespace
-diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
diff --git a/dev-db/postgresql/files/postgresql-8.2.4-sh.patch b/dev-db/postgresql/files/postgresql-8.2.4-sh.patch
deleted file mode 100644
index 295bb6cfb600..000000000000
--- a/dev-db/postgresql/files/postgresql-8.2.4-sh.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- postgresql-8.2.3.orig/src/include/storage/s_lock.h	2006-06-08 00:24:45.000000000 +0200
-+++ postgresql-8.2.3/src/include/storage/s_lock.h	2007-03-29 12:25:56.000000000 +0200
-@@ -299,6 +299,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__)		/* Sparc */
- #define HAS_TEST_AND_SET
-