diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2014-05-14 17:07:30 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2014-05-14 17:07:30 +0000 |
| commit | 818c558872f03ad5e86fb6a476526a292dc547d4 (patch) | |
| tree | 8b01ea823e7619edba6a4d2a027e0232629288d4 /dev-db | |
| parent | Stabilize for everyone to gain 1 trivial bugfix for typing errors in 2 files ... (diff) | |
| download | gentoo-2-818c558872f03ad5e86fb6a476526a292dc547d4.tar.gz gentoo-2-818c558872f03ad5e86fb6a476526a292dc547d4.tar.bz2 gentoo-2-818c558872f03ad5e86fb6a476526a292dc547d4.zip | |
[QA] EAPI 1 -> 5.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/postgis/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-db/postgis/postgis-1.3.6-r2.ebuild | 23 |
2 files changed, 16 insertions, 12 deletions
diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog index 8f91eb9ec80e..ca889b29d986 100644 --- a/dev-db/postgis/ChangeLog +++ b/dev-db/postgis/ChangeLog @@ -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 <TomWij@gentoo.org> postgis-1.3.6-r2.ebuild: + [QA] EAPI 1 -> 5. 26 Apr 2014; Chema Alonso <nimiux@gentoo.org> postgis-2.1.1.ebuild: Stable for amd64 wrt bug #498156 diff --git a/dev-db/postgis/postgis-1.3.6-r2.ebuild b/dev-db/postgis/postgis-1.3.6-r2.ebuild index 673108a46a0b..079d294e431c 100644 --- a/dev-db/postgis/postgis-1.3.6-r2.ebuild +++ b/dev-db/postgis/postgis-1.3.6-r2.ebuild @@ -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 @@ pkg_setup(){ fi } -src_compile(){ +src_configure(){ local myconf if use geos; then myconf="--with-geos" @@ -71,25 +71,26 @@ src_compile(){ --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 |