diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2012-01-04 20:42:16 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2012-01-04 20:42:16 +0000 |
| commit | 2869f742109bf812efaee621618c05d304300ee1 (patch) | |
| tree | c15b0c400dfd30afeee5028c0576ee26e3a570f4 /sci-libs | |
| parent | Fix static libs, fix ldflags for plugins (bug 397681), and fix ptlib dep for ... (diff) | |
| download | gentoo-2-2869f742109bf812efaee621618c05d304300ee1.tar.gz gentoo-2-2869f742109bf812efaee621618c05d304300ee1.tar.bz2 gentoo-2-2869f742109bf812efaee621618c05d304300ee1.zip | |
Added static-libs. Switch to EAPI4
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/shapelib/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-libs/shapelib/shapelib-1.2.10-r1.ebuild | 32 |
2 files changed, 23 insertions, 17 deletions
diff --git a/sci-libs/shapelib/ChangeLog b/sci-libs/shapelib/ChangeLog index 82ccffaae42c..ec3fe9511bb7 100644 --- a/sci-libs/shapelib/ChangeLog +++ b/sci-libs/shapelib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/shapelib -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/ChangeLog,v 1.12 2010/05/21 21:04:06 pacho Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/ChangeLog,v 1.13 2012/01/04 20:42:16 bicatali Exp $ + + 04 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> + shapelib-1.2.10-r1.ebuild: + Added static-libs. Switch to EAPI4 21 May 2010; Pacho Ramos <pacho@gentoo.org> shapelib-1.2.10-r1.ebuild: stable amd64, bug 300734 diff --git a/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild b/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild index 879b290d7803..a532d1cf3ba6 100644 --- a/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild +++ b/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild @@ -1,20 +1,22 @@ -# Copyright 1999-2010 Gentoo Foundation + +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild,v 1.5 2010/05/21 21:04:06 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild,v 1.6 2012/01/04 20:42:16 bicatali Exp $ -EAPI="2" -inherit eutils toolchain-funcs +EAPI=4 +inherit eutils -DESCRIPTION="library for manipulating ESRI Shapefiles" +DESCRIPTION="Library for manipulating ESRI Shapefiles" HOMEPAGE="http://shapelib.maptools.org/" SRC_URI="http://dl.maptools.org/dl/shapelib//${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2 LGPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="" +IUSE="static-libs" DEPEND="" +RDEPEND="" src_prepare() { epatch "${FILESDIR}"/makefile-fix.patch @@ -22,7 +24,7 @@ src_prepare() { epatch "${FILESDIR}"/stdlib_include_fix.patch sed -i \ -e 's:/usr/local/:${DESTDIR}/usr/:g' \ - -e "s:/usr/lib:/usr/$(get_libdir):g" \ + -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ -e 's:SHPLIB_VERSION=1.2.9:SHPLIB_VERSION=1.2.10:g' \ -e "s:-g:${CFLAGS}:" \ -e "s:-g -O2:${CFLAGS}:g" \ @@ -31,14 +33,14 @@ src_prepare() { } src_compile() { - emake || die "emake failed" - emake lib || die "emake lib failed" + emake all + emake lib } src_install() { - dobin shp{create,dump,test,add} dbf{create,dump,add} \ - || die "dobin failed" - emake DESTDIR="${D}" lib_install || die "emake lib_install failed" - dodoc ChangeLog || die - dohtml *.html || die + dobin shp{create,dump,test,add} dbf{create,dump,add} + emake DESTDIR="${D}" lib_install + dodoc ChangeLog + dohtml *.html + use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib*.a } |