Only in mine/dev-db/postgresql-base: autoconf.patch Only in mine/dev-db/postgresql-base: base.patch Only in mine/dev-db/postgresql-base: bool.patch diff -u -r orig/dev-db/postgresql-base/postgresql-base-9.3_beta1.ebuild mine/dev-db/postgresql-base/postgresql-base-9.3_beta1.ebuild --- orig/dev-db/postgresql-base/postgresql-base-9.3_beta1.ebuild 2013-06-26 10:36:24.977800559 +0200 +++ mine/dev-db/postgresql-base/postgresql-base-9.3_beta1.ebuild 2013-06-26 10:36:51.233686769 +0200 @@ -32,7 +32,7 @@ RESTRICT="test" LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW" -IUSE="kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib" +IUSE="kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib perl python tcl xml uuid" for lingua in ${LINGUAS} ; do IUSE+=" linguas_${lingua}" @@ -67,6 +67,8 @@ nls? ( sys-devel/gettext ) " + + #PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )" src_prepare() { @@ -78,7 +80,6 @@ # to avoid collision - it only should be installed by server rm "${S}/src/backend/nls.mk" - # because psql/help.c includes the file ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die @@ -98,9 +99,6 @@ ;; esac - export LDFLAGS_SL="${LDFLAGS}" - export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" econf \ @@ -110,9 +108,9 @@ --sysconfdir="${PO}/etc/postgresql-${SLOT}" \ --includedir="${PO}/usr/include/postgresql-${SLOT}" \ --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \ - --without-tcl \ - --without-perl \ - --without-python \ + --with-system-tzdata="${PO}/usr/share/zoneinfo" \ + --with-includes="${PO}/usr/include/postgresql-${SLOT}/" \ + --with-libraries="${PO}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \ $(use_with readline) \ $(use_with kerberos krb5) \ $(use_with kerberos gssapi) \ @@ -150,8 +148,6 @@ insinto /usr/share/doc/postgresql-${SLOT} doins README HISTORY doc/{TODO,bug.template} - cd "${S}/contrib" - emake DESTDIR="${D}" install cd "${S}" dodir /etc/eselect/postgresql/slots/${SLOT} Only in mine/dev-db/postgresql-base: postgresql-patches-9.3.tbz2 Only in mine/dev-db/postgresql-base: regress.patch Only in mine/dev-db/postgresql-base: server.patch diff -u -r orig/dev-db/postgresql-server/postgresql-server-9.3_beta1-r1.ebuild mine/dev-db/postgresql-server/postgresql-server-9.3_beta1-r1.ebuild --- orig/dev-db/postgresql-server/postgresql-server-9.3_beta1-r1.ebuild 2013-06-26 10:37:00.649646074 +0200 +++ mine/dev-db/postgresql-server/postgresql-server-9.3_beta1-r1.ebuild 2013-06-26 10:36:55.633667813 +0200 @@ -79,19 +79,13 @@ -i src/backend/libpq/auth.c \ || die 'PGSQL_PAM_SERVICE rename failed.' fi + if use perl ; then sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \ -i "${S}/src/pl/plperl/GNUmakefile" || die 'sed plperl failed' fi - if use test ; then - epatch "${WORKDIR}/regress.patch" - sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c - else - echo "all install:" > "${S}/src/test/regress/GNUmakefile" - fi - sed -e "s|@SLOT@|${SLOT}|g" \ -i "${WORKDIR}"/postgresql.{init,confd,service} || \ die "SLOT sed failed" @@ -109,22 +103,12 @@ local PO="${EPREFIX%/}" # eval is needed to get along with pg_config quotation of space-rich entities. - eval econf "$(${PO}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \ - $(use_with perl) \ - $(use_with python) \ - $(use_with tcl) \ - $(use_with xml libxml) \ - $(use_with xml libxslt) \ - $(use_with uuid ossp-uuid) \ - --with-system-tzdata="${PO}/usr/share/zoneinfo" \ - --with-includes="${PO}/usr/include/postgresql-${SLOT}/" \ - --with-libraries="${PO}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \ - "$(use_enable nls nls "$(wanted_languages)")" + eval econf "$(${PO}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" } src_compile() { local bd - for bd in . contrib $(use xml && echo contrib/xml2); do + for bd in . contrib; do PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \ emake -C $bd || die "emake in $bd failed" done @@ -132,7 +116,7 @@ src_install() { local bd - for bd in . contrib $(use xml && echo contrib/xml2) ; do + for bd in . contrib src/test/regress; do PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \ emake install -C $bd DESTDIR="${D}" || die "emake install in $bd failed" done