diff options
author | Tiziano Müller <dev-zero@gentoo.org> | 2007-06-24 22:50:25 +0000 |
---|---|---|
committer | Tiziano Müller <dev-zero@gentoo.org> | 2007-06-24 22:50:25 +0000 |
commit | 91941a07403ec9299958bb32b5990d5781638fd5 (patch) | |
tree | 252aac74e3b77ba80fda136ceb6a208ebe04d9d6 /dev-db | |
parent | fix failure when USE="hal -zlib" (diff) | |
download | gentoo-2-91941a07403ec9299958bb32b5990d5781638fd5.tar.gz gentoo-2-91941a07403ec9299958bb32b5990d5781638fd5.tar.bz2 gentoo-2-91941a07403ec9299958bb32b5990d5781638fd5.zip |
Dropped old versions.
(Portage version: 2.1.3_rc5)
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/postgresql/ChangeLog | 7 | ||||
-rw-r--r-- | dev-db/postgresql/files/digest-postgresql-8.0.12 | 12 | ||||
-rw-r--r-- | dev-db/postgresql/files/postgresql-8.0.12-gentoo.patch | 51 | ||||
-rw-r--r-- | dev-db/postgresql/files/postgresql-8.0.12-sh.patch | 34 | ||||
-rw-r--r-- | dev-db/postgresql/postgresql-8.0.12.ebuild | 267 |
5 files changed, 6 insertions, 365 deletions
diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog index e72770fe6c72..00d3f7252b85 100644 --- a/dev-db/postgresql/ChangeLog +++ b/dev-db/postgresql/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-db/postgresql # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.349 2007/06/24 11:57:12 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.350 2007/06/24 22:50:25 dev-zero Exp $ + + 24 Jun 2007; Tiziano Müller <dev-zero@gentoo.org> + -files/postgresql-8.0.12-gentoo.patch, -files/postgresql-8.0.12-sh.patch, + -postgresql-8.0.12.ebuild: + Dropped old versions. 24 Jun 2007; Tiziano Müller <dev-zero@gentoo.org> -files/postgresql-8.0-gentoo.patch, -files/postgresql-8.0-sh.patch, diff --git a/dev-db/postgresql/files/digest-postgresql-8.0.12 b/dev-db/postgresql/files/digest-postgresql-8.0.12 deleted file mode 100644 index 5e4e7f871a5d..000000000000 --- a/dev-db/postgresql/files/digest-postgresql-8.0.12 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 4905afe1beb0e58b348be9558579a24a postgresql-base-8.0.12.tar.bz2 7846737 -RMD160 e359f574020ef73a1f8f03ebffdc157114b1a454 postgresql-base-8.0.12.tar.bz2 7846737 -SHA256 2aec1d7129794fb29546e76bb0594f0c8ee6e37e8a155b201c15504af0740628 postgresql-base-8.0.12.tar.bz2 7846737 -MD5 01e8cd276e1c51fb45921b7926700527 postgresql-docs-8.0.12.tar.bz2 2266536 -RMD160 7716e772348a21b98dcf78d670464b4a0e7fe832 postgresql-docs-8.0.12.tar.bz2 2266536 -SHA256 04d233b68be2f4549a8a470166e7f6f175c5165722763c515e7230de0efa63d3 postgresql-docs-8.0.12.tar.bz2 2266536 -MD5 31722557a313a3690c894d9a6e42244d postgresql-opt-8.0.12.tar.bz2 134790 -RMD160 be0d57de5000296bfd5b64685f4d4ef81edea347 postgresql-opt-8.0.12.tar.bz2 134790 -SHA256 ceaf90195860694487918032c19e0a11f991d74c77838cac2ea827d6c85f54da postgresql-opt-8.0.12.tar.bz2 134790 -MD5 b48ee828885011892d4ce66548459c08 postgresql-test-8.0.12.tar.bz2 931028 -RMD160 e8527c571f727c14eedc8551cce75f6565d516af postgresql-test-8.0.12.tar.bz2 931028 -SHA256 54da2084d7ac970155836b5cf1d278b357df8a67d2a5af101f3390f866de18ac postgresql-test-8.0.12.tar.bz2 931028 diff --git a/dev-db/postgresql/files/postgresql-8.0.12-gentoo.patch b/dev-db/postgresql/files/postgresql-8.0.12-gentoo.patch deleted file mode 100644 index f1308ee0e898..000000000000 --- a/dev-db/postgresql/files/postgresql-8.0.12-gentoo.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Nru postgresql-8.0.9.orig/src/bin/Makefile postgresql-8.0.9/src/bin/Makefile ---- postgresql-8.0.9.orig/src/bin/Makefile 2006-11-05 13:20:26.000000000 +0100 -+++ postgresql-8.0.9/src/bin/Makefile 2006-11-05 15:50:05.000000000 +0100 -@@ -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 -diff -Nru postgresql-8.0.9.orig/src/interfaces/Makefile postgresql-8.0.9/src/interfaces/Makefile ---- postgresql-8.0.9.orig/src/interfaces/Makefile 2006-11-05 13:20:26.000000000 +0100 -+++ postgresql-8.0.9/src/interfaces/Makefile 2006-11-05 15:50:05.000000000 +0100 -@@ -12,7 +12,7 @@ - top_builddir = ../.. - include $(top_builddir)/src/Makefile.global - --DIRS := libpq ecpg -+DIRS := ecpg - - ALLDIRS := $(DIRS) - -diff -Nru postgresql-8.0.9.orig/src/Makefile postgresql-8.0.9/src/Makefile ---- postgresql-8.0.9.orig/src/Makefile 2006-11-05 13:20:26.000000000 +0100 -+++ postgresql-8.0.9/src/Makefile 2006-11-05 15:50:05.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.0.12-sh.patch b/dev-db/postgresql/files/postgresql-8.0.12-sh.patch deleted file mode 100644 index fc1dafe83d15..000000000000 --- a/dev-db/postgresql/files/postgresql-8.0.12-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/postgresql-8.0.12.ebuild b/dev-db/postgresql/postgresql-8.0.12.ebuild deleted file mode 100644 index f4e35c8e75dd..000000000000 --- a/dev-db/postgresql/postgresql-8.0.12.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.12.ebuild,v 1.9 2007/03/04 11:14:50 blubb Exp $ - -inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" - -DESCRIPTION="Sophisticated and powerful Object-Relational DBMS." -HOMEPAGE="http://www.postgresql.org/" -SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2 - mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2 - doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 ) - test? ( mirror://postgresql/source/v${PV}/${PN}-test-${PV}.tar.bz2 )" -LICENSE="POSTGRESQL" -SLOT="0" -IUSE="doc kerberos nls pam perl pg-intdatetime python readline selinux ssl tcl test xml zlib" - -RDEPEND="~dev-db/libpq-${PV} - >=sys-libs/ncurses-5.2 - kerberos? ( virtual/krb5 ) - pam? ( virtual/pam ) - perl? ( >=dev-lang/perl-5.6.1-r2 ) - python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base ) - readline? ( >=sys-libs/readline-4.1 ) - selinux? ( sec-policy/selinux-postgresql ) - ssl? ( >=dev-libs/openssl-0.9.6-r1 ) - tcl? ( >=dev-lang/tcl-8 ) - xml? ( dev-libs/libxml2 dev-libs/libxslt ) - zlib? ( >=sys-libs/zlib-1.1.3 )" -DEPEND="${RDEPEND} - sys-devel/autoconf - >=sys-devel/bison-1.875 - nls? ( sys-devel/gettext ) - xml? ( dev-util/pkgconfig )" - -PG_DIR="/var/lib/postgresql" -[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512" - -cluster_exists() { - [[ -f "${PG_DIR}/data/PG_VERSION" ]] && return 0 - return 1 -} - -pkg_setup() { - if hasq pg-hier ${USE} ; then - ewarn "Warning: pg-hier USE-flag detected:" - ewarn "The hier-patch has been dropped for this version and the pg-hier USE-flag is therefore deprecated." - ewarn "If you really used the 'hier' patch in your database with the 'CONNECT BY' statement," - ewarn "you should stop now and reconsider. You will be able to reuse your data, but not" - ewarn "any VIEWS or QUERIES based on that statement." - ewarn "Please disable the pg-hier USE-flag!" - ebeep 3 - if cluster_exists ; then - eerror "There is already a database in '${PG_DIR}/data' and you have the pg-hier USE-flag set." - eerror "Please read the message above first. If you decide that the warnings there don't" - eerror "apply to your situation, dump the database using pg_dump and move the '${PG_DIR}/data'" - eerror "away. Then restart the merge. After that create a new database cluster and use pg_restore to" - eerror "re-import the previously dumped data." - eerror "Moving '${PG_DIR}/data' temporarely away or just disable the 'pg-hier' USE-flag won't work." - die "Can't update this database." - fi - fi - if cluster_exists ; then - local cluster_version=$(cat "${PG_DIR}/data/PG_VERSION") - if [[ ${cluster_version} != $(get_version_component_range 1-2) ]] ; then - eerror "There is a database in '${PG_DIR}/data' from PostgreSQL version ${cluster_version}." - eerror "PostgreSQL doesn't support upgrades between major versions, you have to use pg_dump" - eerror "to dump your existing database. Then move your '${PG_DIR}/data' directory away and" - eerror "restart the merge. After that create a new database cluster and use pg_restore to" - eerror "re-import the previously dumped data." - die "Can't update this database." - fi - fi - - enewgroup postgres 70 - enewuser postgres 70 /bin/bash /var/lib postgres -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${PN}-${PV}-gentoo.patch" - epatch "${FILESDIR}/${PN}-${PV}-sh.patch" - - # Prepare package for future tests - if use test ; then - # Fix sandbox violation - sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source - - # We need to run the tests as a non-root user, portage seems the most fitting here, - # so if userpriv is enabled, we use it directly. If userpriv is disabled, well, we - # don't support that in this version of PostgreSQL ... :) - mkdir -p "${S}/src/test/regress/tmp_check" - chown portage "${S}/src/test/regress/tmp_check" - einfo "Tests will be run as user portage." - fi -} - -src_compile() { - filter-flags -ffast-math -feliminate-dwarf2-dups - - # Detect mips systems properly - gnuconfig_update - - cd "${S}" - - ./configure --prefix=/usr \ - --includedir=/usr/include/postgresql/pgsql \ - --sysconfdir=/etc/postgresql \ - --mandir=/usr/share/man \ - --host=${CHOST} \ - --with-docdir=/usr/share/doc/${PF} \ - --libdir=/usr/$(get_libdir) \ - --enable-depend \ - $(use_with kerberos krb5) \ - $(use_enable nls ) \ - $(use_with pam) \ - $(use_with perl) \ - $(use_enable pg-intdatetime integer-datetimes ) \ - $(use_with python) \ - $(use_with readline) \ - $(use_with ssl openssl) \ - $(use_with tcl) \ - $(use_with zlib) \ - || die "configure failed" - - emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "main emake failed" - - cd "${S}/contrib" - emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib emake failed" - - if use xml ; then - cd "${S}/contrib/xml2" - emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib/xml2 emake failed" - fi -} - -src_install() { - if use perl ; then - mv -f "${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 - - cd "${S}" - emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "main emake install failed" - - cd "${S}/contrib" - emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib emake install failed" - - if use xml ; then - cd "${S}/contrib/xml2" - emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib/xml2 emake install failed" - fi - - cd "${S}" - dodoc README HISTORY - dodoc contrib/adddepend/* - - cd "${S}/doc" - dodoc FAQ* README.* TODO bug.template - - if use doc ; then - cd "${S}/doc" - docinto FAQ_html - dodoc src/FAQ/* - docinto sgml - dodoc src/sgml/*.{sgml,dsl} - docinto sgml/ref - dodoc src/sgml/ref/*.sgml - docinto TODO.detail - dodoc TODO.detail/* - fi - - newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die "Inserting init.d-file failed" - newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die "Inserting conf.d-file failed" - - newinitd "${FILESDIR}/pg_autovacuum.init-${PV%.*}" pg_autovacuum || die "Inserting pg_autovacuum init.d-file failed" - newconfd "${FILESDIR}/pg_autovacuum.conf-${PV%.*}" pg_autovacuum || die "Inserting pg_autovacuum conf.d-file failed" - dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum -} - -pkg_postinst() { - elog "Execute the following command to setup the initial database environment:" - elog - elog "emerge --config =${PF}" - elog - elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql/'." -} - -pkg_config() { - einfo "Creating the data directory ..." - mkdir -p "${PG_DIR}/data" - chown -Rf postgres:postgres "${PG_DIR}" - chmod 0700 "${PG_DIR}/data" - - einfo "Initializing the database ..." - if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then - eerror "PostgreSQL ${PV} cannot upgrade your existing databases." - eerror "You must remove your entire database directory to continue." - eerror "(database directory = ${PG_DIR})." - die "Remove your database directory to continue" - else - if use kernel_linux ; then - local SEM=`sysctl -n kernel.sem | cut -f-3` - local SEMMNI=`sysctl -n kernel.sem | cut -f4` - local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16` - local SHMMAX=`sysctl -n kernel.shmmax` - local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}` - - if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then - eerror "The current value of SEMMNI is too low" - eerror "for PostgreSQL to run ${PG_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 - else - su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data" - fi - - einfo - einfo "You can use the '${ROOT}/etc/init.d/postgresql' script to run PostgreSQL instead of 'pg_ctl'." - einfo - fi -} - -src_test() { - cd "${S}" - - einfo ">>> Test phase [check]: ${CATEGORY}/${PF}" - if hasq userpriv ${FEATURES} ; then - if ! emake -j1 check ; then - hasq test ${FEATURES} && die "Make check failed. See above for details." - hasq test ${FEATURES} || eerror "Make check failed. See above for details." - fi - else - eerror "Tests won't be run if FEATURES=userpriv is disabled!" - fi - - einfo "Yes, there are other tests which could be run." - einfo "... and no, we don't plan to add/support them." - einfo "For now, the main regressions tests will suffice." - einfo "If you think other tests are necessary, please submit a" - einfo "bug including a patch for this ebuild to enable them." -} |