diff options
-rw-r--r-- | dev-db/libpq/ChangeLog | 20 | ||||
-rw-r--r-- | dev-db/libpq/files/digest-libpq-7.3.11 | 2 | ||||
-rw-r--r-- | dev-db/libpq/files/libpq-7.3.15-gentoo.patch | 53 | ||||
-rw-r--r-- | dev-db/libpq/files/libpq-7.4.13-gentoo.patch | 60 | ||||
-rw-r--r-- | dev-db/libpq/files/libpq-8.0.8-gentoo.patch | 43 | ||||
-rw-r--r-- | dev-db/libpq/files/libpq-8.1.4-gentoo.patch | 47 | ||||
-rw-r--r-- | dev-db/libpq/libpq-7.3.11.ebuild | 7 | ||||
-rw-r--r-- | dev-db/libpq/libpq-7.3.15.ebuild | 8 | ||||
-rw-r--r-- | dev-db/libpq/libpq-7.4.13.ebuild | 8 | ||||
-rw-r--r-- | dev-db/libpq/libpq-8.0.8.ebuild | 10 | ||||
-rw-r--r-- | dev-db/libpq/libpq-8.1.4.ebuild | 8 | ||||
-rw-r--r-- | dev-db/libpq/metadata.xml | 2 |
12 files changed, 241 insertions, 27 deletions
diff --git a/dev-db/libpq/ChangeLog b/dev-db/libpq/ChangeLog index 2336d043d277..36be25de9a38 100644 --- a/dev-db/libpq/ChangeLog +++ b/dev-db/libpq/ChangeLog @@ -1,6 +1,24 @@ # ChangeLog for dev-db/libpq # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.66 2006/07/16 12:09:36 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.67 2006/07/30 22:32:28 chtekk Exp $ + + 30 Jul 2006; Luca Longinotti <chtekk@gentoo.org> + -files/libpq-7.3.13-gentoo.patch, -files/libpq-7.3.14-gentoo.patch, + +files/libpq-7.3.15-gentoo.patch, -files/libpq-7.4.8-gentoo.patch, + -files/libpq-7.4.9-gentoo.patch, -files/libpq-7.4.11-gentoo.patch, + -files/libpq-7.4.12-gentoo.patch, +files/libpq-7.4.13-gentoo.patch, + -files/libpq-8.0.3-gentoo.patch, -files/libpq-8.0.4-gentoo.patch, + -files/libpq-8.0.6-gentoo.patch, -files/libpq-8.0.7-gentoo.patch, + +files/libpq-8.0.8-gentoo.patch, -files/libpq-8.1.2-gentoo.patch, + -files/libpq-8.1.3-gentoo.patch, +files/libpq-8.1.4-gentoo.patch, + metadata.xml, libpq-7.3.11.ebuild, -libpq-7.3.13.ebuild, + -libpq-7.3.14.ebuild, libpq-7.3.15.ebuild, -libpq-7.4.8.ebuild, + -libpq-7.4.8-r1.ebuild, -libpq-7.4.9.ebuild, -libpq-7.4.11.ebuild, + -libpq-7.4.12.ebuild, libpq-7.4.13.ebuild, -libpq-8.0.3.ebuild, + -libpq-8.0.3-r1.ebuild, -libpq-8.0.4.ebuild, -libpq-8.0.6.ebuild, + -libpq-8.0.7.ebuild, libpq-8.0.8.ebuild, -libpq-8.1.2.ebuild, + -libpq-8.1.3.ebuild, -libpq-8.1.3-r1.ebuild, libpq-8.1.4.ebuild: + Cleanup. 16 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> libpq-7.3.15.ebuild: ppc stable, bug #135187 diff --git a/dev-db/libpq/files/digest-libpq-7.3.11 b/dev-db/libpq/files/digest-libpq-7.3.11 index 0ded0381804b..51f9c4e9cb26 100644 --- a/dev-db/libpq/files/digest-libpq-7.3.11 +++ b/dev-db/libpq/files/digest-libpq-7.3.11 @@ -1 +1,3 @@ MD5 b72b5a505e87e994c27a85b1efb9744c postgresql-base-7.3.11.tar.bz2 5666278 +RMD160 41d7cd6498127f6806d5e82d630de96f9e33b1a8 postgresql-base-7.3.11.tar.bz2 5666278 +SHA256 4af458a34030a409a177f1a0b726a3f604f669ed5018f6a8f11a55ba4c509e0b postgresql-base-7.3.11.tar.bz2 5666278 diff --git a/dev-db/libpq/files/libpq-7.3.15-gentoo.patch b/dev-db/libpq/files/libpq-7.3.15-gentoo.patch new file mode 100644 index 000000000000..017dc522a1c5 --- /dev/null +++ b/dev-db/libpq/files/libpq-7.3.15-gentoo.patch @@ -0,0 +1,53 @@ +diff -Naru postgresql-7.3.14.org/src/interfaces/libpq/Makefile postgresql-7.3.14/src/interfaces/libpq/Makefile +--- postgresql-7.3.14.org/src/interfaces/libpq/Makefile 2002-12-13 22:18:22.000000000 +0000 ++++ postgresql-7.3.14/src/interfaces/libpq/Makefile 2005-05-16 04:12:52.000000000 +0100 +@@ -17,6 +17,7 @@ + NAME= pq + SO_MAJOR_VERSION= 3 + SO_MINOR_VERSION= 0 ++NAME_STATIC_LIB= pq-$(SO_MAJOR_VERSION) + + override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"' + +diff -Naru postgresql-7.3.14.org/src/interfaces/libpq/nls.mk postgresql-7.3.14/src/interfaces/libpq/nls.mk +--- postgresql-7.3.14.org/src/interfaces/libpq/nls.mk 2002-09-22 21:57:21.000000000 +0100 ++++ postgresql-7.3.14/src/interfaces/libpq/nls.mk 2005-05-16 04:13:08.000000000 +0100 +@@ -1,5 +1,5 @@ + # $Header: /cvsroot/pgsql/src/interfaces/libpq/nls.mk,v 1.8 2002/09/22 20:57:21 petere Exp $ +-CATALOG_NAME := libpq ++CATALOG_NAME := libpq-3 + AVAIL_LANGUAGES := cs de es fr pt_BR ru sv zh_CN zh_TW + GETTEXT_FILES := fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-secure.c + GETTEXT_TRIGGERS:= libpq_gettext +diff -Naru postgresql-7.3.14.org/src/Makefile.shlib postgresql-7.3.14/src/Makefile.shlib +--- postgresql-7.3.14.org/src/Makefile.shlib 2003-01-11 17:22:34.000000000 +0000 ++++ postgresql-7.3.14/src/Makefile.shlib 2005-05-16 04:25:54.000000000 +0100 +@@ -221,7 +221,7 @@ + + all-lib: all-static-lib all-shared-lib + +-all-static-lib: lib$(NAME).a ++all-static-lib: lib$(NAME_STATIC_LIB).a + + all-shared-lib: $(shlib) + +@@ -231,7 +231,7 @@ + MK_NO_LORDER := true + endif + +-lib$(NAME).a: $(OBJS) ++lib$(NAME_STATIC_LIB).a: $(OBJS) + ifdef MK_NO_LORDER + $(LINK.static) $@ $^ + else +@@ -302,8 +302,8 @@ + .PHONY: install-lib install-lib-static install-lib-shared + install-lib: install-lib-static install-lib-shared + +-install-lib-static: lib$(NAME).a +- $(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a ++install-lib-static: lib$(NAME_STATIC_LIB).a ++ $(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME_STATIC_LIB).a + + ifeq ($(enable_shared), yes) + install-lib-shared: $(shlib) diff --git a/dev-db/libpq/files/libpq-7.4.13-gentoo.patch b/dev-db/libpq/files/libpq-7.4.13-gentoo.patch new file mode 100644 index 000000000000..1af40d7077c7 --- /dev/null +++ b/dev-db/libpq/files/libpq-7.4.13-gentoo.patch @@ -0,0 +1,60 @@ +diff -Naru postgresql-7.4.12.org/src/interfaces/libpq/Makefile postgresql-7.4.12/src/interfaces/libpq/Makefile +--- postgresql-7.4.12.org/src/interfaces/libpq/Makefile 2003-09-27 16:32:48.000000000 +0100 ++++ postgresql-7.4.12/src/interfaces/libpq/Makefile 2005-05-16 04:37:16.000000000 +0100 +@@ -17,6 +17,7 @@ + NAME= pq + SO_MAJOR_VERSION= 3 + SO_MINOR_VERSION= 1 ++NAME_STATIC_LIB= pq-$(SO_MAJOR_VERSION) + + override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) $(THREAD_CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"' + +@@ -66,7 +67,7 @@ + $(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) $(srcdir)/libpq-int.h $(DESTDIR)$(includedir_internal) + $(INSTALL_DATA) $(srcdir)/pqexpbuffer.h $(DESTDIR)$(includedir_internal) +- $(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service.conf.sample ++ $(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service-${SO_MAJOR_VERSION}.conf.sample + + installdirs: + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir_internal) +diff -Naru postgresql-7.4.12.org/src/interfaces/libpq/nls.mk postgresql-7.4.12/src/interfaces/libpq/nls.mk +--- postgresql-7.4.12.org/src/interfaces/libpq/nls.mk 2004-10-30 09:22:16.000000000 +0100 ++++ postgresql-7.4.12/src/interfaces/libpq/nls.mk 2005-05-16 04:37:23.000000000 +0100 +@@ -1,5 +1,5 @@ + # $Header: /cvsroot/pgsql/src/interfaces/libpq/nls.mk,v 1.13.2.1 2004/10/30 08:22:16 petere Exp $ +-CATALOG_NAME := libpq ++CATALOG_NAME := libpq-3 + AVAIL_LANGUAGES := cs de es fr hr it nb pt_BR ru sl sv tr zh_CN zh_TW + GETTEXT_FILES := fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-secure.c + GETTEXT_TRIGGERS:= libpq_gettext pqInternalNotice:2 +diff -Naru postgresql-7.4.12.org/src/Makefile.shlib postgresql-7.4.12/src/Makefile.shlib +--- postgresql-7.4.12.org/src/Makefile.shlib 2003-10-20 02:34:33.000000000 +0100 ++++ postgresql-7.4.12/src/Makefile.shlib 2005-05-16 04:36:25.000000000 +0100 +@@ -224,7 +224,7 @@ + + all-lib: all-static-lib all-shared-lib + +-all-static-lib: lib$(NAME).a ++all-static-lib: lib$(NAME_STATIC_LIB).a + + all-shared-lib: $(shlib) + +@@ -234,7 +234,7 @@ + MK_NO_LORDER := true + endif + +-lib$(NAME).a: $(OBJS) ++lib$(NAME_STATIC_LIB).a: $(OBJS) + ifdef MK_NO_LORDER + $(LINK.static) $@ $^ + else +@@ -305,7 +305,7 @@ + .PHONY: install-lib install-lib-static install-lib-shared + install-lib: install-lib-static install-lib-shared + +-install-lib-static: lib$(NAME).a ++install-lib-static: lib$(NAME_STATIC_LIB).a + $(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a + ifeq ($(PORTNAME), darwin) + cd $(DESTDIR)$(libdir) && \ diff --git a/dev-db/libpq/files/libpq-8.0.8-gentoo.patch b/dev-db/libpq/files/libpq-8.0.8-gentoo.patch new file mode 100644 index 000000000000..3304772ae629 --- /dev/null +++ b/dev-db/libpq/files/libpq-8.0.8-gentoo.patch @@ -0,0 +1,43 @@ +diff -Naur postgresql-8.0.7.orig/src/Makefile.shlib postgresql-8.0.7/src/Makefile.shlib +--- postgresql-8.0.7.orig/src/Makefile.shlib 2004-11-21 06:13:04.000000000 +0900 ++++ postgresql-8.0.7/src/Makefile.shlib 2005-05-15 13:30:59.000000000 +0900 +@@ -355,7 +355,7 @@ + install-lib: install-lib-static install-lib-shared + + install-lib-static: lib$(NAME).a +- $(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a ++ $(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME_STATIC_LIB).a + ifeq ($(PORTNAME), darwin) + cd $(DESTDIR)$(libdir) && \ + ranlib lib$(NAME).a +diff -Naur postgresql-8.0.7.orig/src/interfaces/libpq/Makefile postgresql-8.0.7/src/interfaces/libpq/Makefile +--- postgresql-8.0.7.orig/src/interfaces/libpq/Makefile 2005-04-29 23:07:34.000000000 +0900 ++++ postgresql-8.0.7/src/interfaces/libpq/Makefile 2005-05-15 13:33:14.000000000 +0900 +@@ -20,6 +20,8 @@ + SO_MINOR_VERSION= 0 + DLTYPE= library + ++NAME_STATIC_LIB= pq-$(SO_MAJOR_VERSION) ++ + override CPPFLAGS := -DFRONTEND -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port + override CFLAGS += $(PTHREAD_CFLAGS) + +@@ -136,7 +138,7 @@ + $(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) $(srcdir)/libpq-int.h $(DESTDIR)$(includedir_internal) + $(INSTALL_DATA) $(srcdir)/pqexpbuffer.h $(DESTDIR)$(includedir_internal) +- $(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service.conf.sample ++ $(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service-${SO_MAJOR_VERSION}.conf.sample + + installdirs: + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir_internal) +diff -Naur postgresql-8.0.7.orig/src/interfaces/libpq/nls.mk postgresql-8.0.7/src/interfaces/libpq/nls.mk +--- postgresql-8.0.7.orig/src/interfaces/libpq/nls.mk 2005-01-14 17:57:06.000000000 +0900 ++++ postgresql-8.0.7/src/interfaces/libpq/nls.mk 2005-05-15 13:30:32.000000000 +0900 +@@ -1,5 +1,5 @@ + # $PostgreSQL: pgsql/src/interfaces/libpq/nls.mk,v 1.20 2005/01/14 08:57:06 petere Exp $ +-CATALOG_NAME := libpq ++CATALOG_NAME := libpq-4 + AVAIL_LANGUAGES := af cs de es fr hr it ko nb pl pt_BR ru sk sl sv tr zh_CN zh_TW + GETTEXT_FILES := fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-protocol2.c fe-protocol3.c fe-secure.c + GETTEXT_TRIGGERS:= libpq_gettext pqInternalNotice:2 diff --git a/dev-db/libpq/files/libpq-8.1.4-gentoo.patch b/dev-db/libpq/files/libpq-8.1.4-gentoo.patch new file mode 100644 index 000000000000..2eff3bb4a535 --- /dev/null +++ b/dev-db/libpq/files/libpq-8.1.4-gentoo.patch @@ -0,0 +1,47 @@ +diff -Naru postgresql-8.1.3.org/src/Makefile.shlib postgresql-8.1.3/src/Makefile.shlib +--- postgresql-8.1.3.org/src/Makefile.shlib 2005-11-12 20:26:09.000000000 +0000 ++++ postgresql-8.1.3/src/Makefile.shlib 2005-11-12 20:28:28.000000000 +0000 +@@ -363,10 +363,10 @@ + install-lib: install-lib-static install-lib-shared + + install-lib-static: lib$(NAME).a +- $(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a ++ $(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME_STATIC_LIB).a + ifeq ($(PORTNAME), darwin) + cd $(DESTDIR)$(libdir) && \ +- ranlib lib$(NAME).a ++ ranlib lib$(NAME_STATIC_LIB).a + endif + + ifeq ($(enable_shared), yes) +diff -Naru postgresql-8.1.3.org/src/interfaces/libpq/Makefile postgresql-8.1.3/src/interfaces/libpq/Makefile +--- postgresql-8.1.3.org/src/interfaces/libpq/Makefile 2005-11-12 20:26:09.000000000 +0000 ++++ postgresql-8.1.3/src/interfaces/libpq/Makefile 2005-11-12 20:28:02.000000000 +0000 +@@ -20,6 +20,8 @@ + SO_MINOR_VERSION= 1 + DLTYPE= library + ++NAME_STATIC_LIB= pq-$(SO_MAJOR_VERSION) ++ + override CPPFLAGS := -DFRONTEND -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port + ifneq ($(PORTNAME), win32) + override CFLAGS += $(PTHREAD_CFLAGS) +@@ -135,7 +137,7 @@ + $(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) $(srcdir)/libpq-int.h $(DESTDIR)$(includedir_internal) + $(INSTALL_DATA) $(srcdir)/pqexpbuffer.h $(DESTDIR)$(includedir_internal) +- $(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service.conf.sample ++ $(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service-${SO_MAJOR_VERSION}.conf.sample + + installdirs: + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir_internal) +diff -Naru postgresql-8.1.3.org/src/interfaces/libpq/nls.mk postgresql-8.1.3/src/interfaces/libpq/nls.mk +--- postgresql-8.1.3.org/src/interfaces/libpq/nls.mk 2005-11-12 20:26:09.000000000 +0000 ++++ postgresql-8.1.3/src/interfaces/libpq/nls.mk 2005-11-12 20:28:02.000000000 +0000 +@@ -1,5 +1,5 @@ + # $PostgreSQL: pgsql/src/interfaces/libpq/nls.mk,v 1.20 2005/01/14 08:57:06 petere Exp $ +-CATALOG_NAME := libpq ++CATALOG_NAME := libpq-4 + AVAIL_LANGUAGES := af cs de es fr hr it ko nb pl pt_BR ru sk sl sv tr zh_CN zh_TW + GETTEXT_FILES := fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-protocol2.c fe-protocol3.c fe-secure.c + GETTEXT_TRIGGERS:= libpq_gettext pqInternalNotice:2 diff --git a/dev-db/libpq/libpq-7.3.11.ebuild b/dev-db/libpq/libpq-7.3.11.ebuild index ea3f6ccb3ce0..e2d7a83ae7cb 100644 --- a/dev-db/libpq/libpq-7.3.11.ebuild +++ b/dev-db/libpq/libpq-7.3.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.3.11.ebuild,v 1.7 2006/02/19 20:54:24 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.3.11.ebuild,v 1.8 2006/07/30 22:32:28 chtekk Exp $ inherit eutils gnuconfig flag-o-matic toolchain-funcs @@ -11,7 +11,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2" LICENSE="POSTGRESQL" SLOT="3" -KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86" IUSE="ssl nls pam readline zlib kerberos" #pg-hier" @@ -41,7 +41,8 @@ pkg_preinst() { src_unpack() { unpack ${A} - epatch ${FILESDIR}/${P}-gentoo.patch + cd "${S}" + epatch "${FILESDIR}/${P}-gentoo.patch" } src_compile() { diff --git a/dev-db/libpq/libpq-7.3.15.ebuild b/dev-db/libpq/libpq-7.3.15.ebuild index 25bbf130ecc7..9fb22a3473b6 100644 --- a/dev-db/libpq/libpq-7.3.15.ebuild +++ b/dev-db/libpq/libpq-7.3.15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.3.15.ebuild,v 1.2 2006/07/16 12:09:36 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.3.15.ebuild,v 1.3 2006/07/30 22:32:28 chtekk Exp $ inherit eutils gnuconfig flag-o-matic toolchain-funcs @@ -41,10 +41,8 @@ pkg_preinst() { src_unpack() { unpack ${A} - cd ${S} - - # patch from 7.3.14 is ok - epatch ${FILESDIR}/${P/5/4}-gentoo.patch + cd "${S}" + epatch "${FILESDIR}/${P}-gentoo.patch" } src_compile() { diff --git a/dev-db/libpq/libpq-7.4.13.ebuild b/dev-db/libpq/libpq-7.4.13.ebuild index 62cf36a38676..4acfe2dbf053 100644 --- a/dev-db/libpq/libpq-7.4.13.ebuild +++ b/dev-db/libpq/libpq-7.4.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.4.13.ebuild,v 1.9 2006/06/28 03:02:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.4.13.ebuild,v 1.10 2006/07/30 22:32:28 chtekk Exp $ inherit eutils gnuconfig flag-o-matic toolchain-funcs @@ -41,10 +41,8 @@ pkg_preinst() { src_unpack() { unpack ${A} - cd ${S} - - # patch from 7.4.12 is ok - epatch ${FILESDIR}/${P/3/2}-gentoo.patch + cd "${S}" + epatch "${FILESDIR}/${P}-gentoo.patch" } src_compile() { diff --git a/dev-db/libpq/libpq-8.0.8.ebuild b/dev-db/libpq/libpq-8.0.8.ebuild index 484b2456cdcf..2252d676e681 100644 --- a/dev-db/libpq/libpq-8.0.8.ebuild +++ b/dev-db/libpq/libpq-8.0.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.0.8.ebuild,v 1.11 2006/07/03 20:46:57 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.0.8.ebuild,v 1.12 2006/07/30 22:32:28 chtekk Exp $ inherit eutils gnuconfig flag-o-matic toolchain-funcs @@ -33,9 +33,6 @@ RDEPEND="virtual/libc MAKEOPTS="${MAKEOPTS} -j1" -# misc files -FILES_VER="8.0.7" - pkg_preinst() { # removing wrong symlink which is created by previous ebuild. if [ -L /usr/include/libpq ]; then @@ -45,9 +42,8 @@ pkg_preinst() { src_unpack() { unpack ${A} - cd ${S} - - epatch ${FILESDIR}/${PN}-${FILES_VER}-gentoo.patch + cd "${S}" + epatch "${FILESDIR}/${P}-gentoo.patch" } src_compile() { diff --git a/dev-db/libpq/libpq-8.1.4.ebuild b/dev-db/libpq/libpq-8.1.4.ebuild index 3315270b787a..2f08e3a2ed5d 100644 --- a/dev-db/libpq/libpq-8.1.4.ebuild +++ b/dev-db/libpq/libpq-8.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.1.4.ebuild,v 1.3 2006/07/03 20:46:57 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.1.4.ebuild,v 1.4 2006/07/30 22:32:28 chtekk Exp $ inherit eutils gnuconfig flag-o-matic toolchain-funcs @@ -42,10 +42,8 @@ pkg_preinst() { src_unpack() { unpack ${A} - cd ${S} - - # patch from 8.1.3 is ok - epatch ${FILESDIR}/${P/4/3}-gentoo.patch + cd "${S}" + epatch "${FILESDIR}/${P}-gentoo.patch" } src_compile() { diff --git a/dev-db/libpq/metadata.xml b/dev-db/libpq/metadata.xml index 309b51e9a965..d06e452b35af 100644 --- a/dev-db/libpq/metadata.xml +++ b/dev-db/libpq/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>postgresql</herd> + <herd>postgresql</herd> </pkgmetadata> |