tomwij 14/05/14 17:07:31 Modified: postgis-1.3.6-r2.ebuild ChangeLog Log: [QA] EAPI 1 -> 5. (Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path 1.2 dev-db/postgis/postgis-1.3.6-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/postgis-1.3.6-r2.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/postgis-1.3.6-r2.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/postgis-1.3.6-r2.ebuild?r1=1.1&r2=1.2 Index: postgis-1.3.6-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.3.6-r2.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- postgis-1.3.6-r2.ebuild 30 Jan 2013 14:46:58 -0000 1.1 +++ postgis-1.3.6-r2.ebuild 14 May 2014 17:07:30 -0000 1.2 @@ -1,8 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.3.6-r2.ebuild,v 1.1 2013/01/30 14:46:58 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.3.6-r2.ebuild,v 1.2 2014/05/14 17:07:30 tomwij Exp $ -EAPI="1" +EAPI="5" inherit eutils multilib versionator @@ -55,7 +55,7 @@ fi } -src_compile(){ +src_configure(){ local myconf if use geos; then myconf="--with-geos" @@ -71,25 +71,26 @@ --libdir=/usr/$(get_libdir)/postgresql/ \ --with-docdir=/usr/share/doc/${PF}/html/ \ ${myconf} \ - $(use_with proj) ||\ - die "Error: econf failed" + $(use_with proj) +} - emake || die "Error: emake failed" +src_compile(){ + emake cd topology/ - emake || die "Unable to build topology sql file" + emake if use doc ; then cd "${S}" - emake docs || die "Unable to build documentation" + emake docs fi } src_install(){ dodir /usr/$(get_libdir)/postgresql /usr/share/postgresql/contrib/ - emake DESTDIR="${D}" install || die "emake install failed" + default cd "${S}/topology/" - emake DESTDIR="${D}" install || die "emake install topology failed" + default cd "${S}" dodoc CREDITS TODO loader/README.* doc/*txt 1.89 dev-db/postgis/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/ChangeLog?rev=1.89&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/ChangeLog?rev=1.89&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/ChangeLog?r1=1.88&r2=1.89 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- ChangeLog 26 Apr 2014 16:08:54 -0000 1.88 +++ ChangeLog 14 May 2014 17:07:30 -0000 1.89 @@ -1,6 +1,9 @@ # ChangeLog for dev-db/postgis # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.88 2014/04/26 16:08:54 nimiux Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.89 2014/05/14 17:07:30 tomwij Exp $ + + 14 May 2014; Tom Wijsman <tom...@gentoo.org> postgis-1.3.6-r2.ebuild: + [QA] EAPI 1 -> 5. 26 Apr 2014; Chema Alonso <nim...@gentoo.org> postgis-2.1.1.ebuild: Stable for amd64 wrt bug #498156