patrick 15/04/07 02:08:19 Modified: postgresql-9999.ebuild ChangeLog Log: Fix -9999 ebuild to not build docs and manpages as this doesn't work, upstream is aware of the issue (Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.9 dev-db/postgresql/postgresql-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgresql/postgresql-9999.ebuild?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgresql/postgresql-9999.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgresql/postgresql-9999.ebuild?r1=1.8&r2=1.9 Index: postgresql-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9999.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- postgresql-9999.ebuild 31 Mar 2015 19:06:54 -0000 1.8 +++ postgresql-9999.ebuild 7 Apr 2015 02:07:32 -0000 1.9 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9999.ebuild,v 1.8 2015/03/31 19:06:54 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9999.ebuild,v 1.9 2015/04/07 02:07:32 patrick Exp $ EAPI="5" @@ -22,7 +22,7 @@ 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="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python +IUSE="kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib" for lingua in ${LINGUAS}; do @@ -152,7 +152,7 @@ # If use doc, generate all documentation, otherwise just the # man pages - use doc && emake -C doc || emake -C doc man + #use doc && emake -C doc || emake -C doc man } src_install() { @@ -162,15 +162,15 @@ dodoc README HISTORY doc/{TODO,bug.template} # We use ${SLOT} instead of doman for postgresql.eselect - insinto /usr/share/postgresql-${SLOT}/man/ - doins -r doc/src/sgml/man{1,3,7} - if ! use server; then - # Remove man pages for non-existent binaries - for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do - rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1" - done - fi - docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7} + #insinto /usr/share/postgresql-${SLOT}/man/ + #doins -r doc/src/sgml/man{1,3,7} + #if ! use server; then + # # Remove man pages for non-existent binaries + # for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do + # rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1" + # done + #fi + #docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7} insinto /etc/postgresql-${SLOT} newins src/bin/psql/psqlrc.sample psqlrc @@ -181,13 +181,13 @@ use static-libs || find "${ED}" -name '*.a' -delete - if use doc ; then - docinto html - dodoc doc/src/sgml/html/* - - docinto sgml - dodoc doc/src/sgml/*.{sgml,dsl} - fi + #if use doc ; then + # docinto html + # dodoc doc/src/sgml/html/* + + # docinto sgml + # dodoc doc/src/sgml/*.{sgml,dsl} + #fi if use server; then sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \ 1.422 dev-db/postgresql/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgresql/ChangeLog?rev=1.422&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgresql/ChangeLog?rev=1.422&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgresql/ChangeLog?r1=1.421&r2=1.422 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v retrieving revision 1.421 retrieving revision 1.422 diff -u -r1.421 -r1.422 --- ChangeLog 31 Mar 2015 19:06:54 -0000 1.421 +++ ChangeLog 7 Apr 2015 02:08:19 -0000 1.422 @@ -1,6 +1,10 @@ # ChangeLog for dev-db/postgresql # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.421 2015/03/31 19:06:54 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.422 2015/04/07 02:08:19 patrick Exp $ + + 07 Apr 2015; Patrick Lauer <patr...@gentoo.org> postgresql-9999.ebuild: + Fix -9999 ebuild to not build docs and manpages as this doesn't work, upstream + is aware of the issue 31 Mar 2015; Ulrich Müller <u...@gentoo.org> postgresql-9.0.19.ebuild, postgresql-9.1.15.ebuild, postgresql-9.2.10.ebuild, postgresql-9.3.6.ebuild,