Added static-libs. Switch to EAPI4

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

diff --git a/sci-libs/shapelib/ChangeLog b/sci-libs/shapelib/ChangeLog
index 82ccffaae42c21585be17b07381660f2169079b5..ec3fe9511bb7d8e49d3af8889d41d122d4b658ca 100644 (file)
--- 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/Manifest b/sci-libs/shapelib/Manifest
index 3a1a21c1302a418e580f05def0af8444ffefb8f8..02d5ae96eaede7931d5180af22640806eaeed584 100644 (file)
--- a/sci-libs/shapelib/Manifest
+++ b/sci-libs/shapelib/Manifest
@@ -5,13 +5,13 @@ AUX fix-shapelib-test.diff 1033 RMD160 fbcd5f30862573a707101c6f92a689b4fa989026
 AUX makefile-fix.patch 213 RMD160 8394dc5dac487f231b2352654db7eb1e15a2f69e SHA1 0a32bf8790c4200fb3abf5b2f1d941d060d11a52 SHA256 225e989102341d75054e151f7d27dd203204648e2a8902f9c7ada4b976003581
 AUX stdlib_include_fix.patch 838 RMD160 e28e8e35017fa61f6bba305c0f4b0014fc3ced8d SHA1 0ec87da346fd94404260261a885fa367506ae60e SHA256 a6fa734cfb0642de3e2e95455194ccf56ab4cd7053914575197a026f5dd74d0b
 DIST shapelib-1.2.10.tar.gz 167219 RMD160 9dcd90d5197aa7d6063a703a369a530f6aa1f1c3 SHA1 436b09b6a90f403e4568460d67560d5730725651 SHA256 afa54d60369e49a3d2ebcd1ffca75104bdc85d7f539b81aec8a6e2d311ca6b78
-EBUILD shapelib-1.2.10-r1.ebuild 1217 RMD160 d1516a26d4e07d7bb654a20a8e4ac581542d16b8 SHA1 2c66f58625b0648f9be18868e429ce6712459c01 SHA256 278723354bbcb495eea79094113f021bd45ffd14afaf3aa47f32e89fb3f55eb2
-MISC ChangeLog 2100 RMD160 5378c9ae52cf8c40e4fe11dd53e0bdeb1a969967 SHA1 a3a5a1657c0fa7d91682b20f9b445233bf6b9d4d SHA256 a0357e6411b0bf9ebf03e772e86052c89467e6e0d38d7c8ee1ce92a36558eb5a
+EBUILD shapelib-1.2.10-r1.ebuild 1183 RMD160 d0a7b010f89ae2b2747346d110b273f5af764c62 SHA1 b54e16dbb590c36e1b9bdee923bf9a4065cdce2d SHA256 4ee01a3c9ada3b136e91387787a5037a3ce9221740c9deabd08bbad4ec7a4f11
+MISC ChangeLog 2225 RMD160 551bfc60610f69242d2ff3cba191feb1e4efc68a SHA1 164c313ea45799019776b2c49192ec655b30a464 SHA256 97b3bd51f9f32e97bc6fd4a52421d9eda1681a2d303b17a159f933a7c58d979a
 MISC metadata.xml 441 RMD160 c987199410f870735080ba1b5f8a8286fbce17b4 SHA1 f7bc2b8c7bebdfdc301b0672a76a67d6e26521fc SHA256 aa5df660dea112b2e216bef74e49bc4c648933135f6772038ed5aa5e0de5e0ac
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkv29UwACgkQCaWpQKGI+9TMrwCfRRUXWzodANkSV/bi256KCyqN
-shwAnRgVW82aGad0PzUP13KYzf2zlK0P
-=p/tx
+iEYEARECAAYFAk8EubEACgkQ1ycZbhPLE2DssACcCzcgO2ZIrfQ2/5q1zSYGzIRw
+hwMAmgLezzn4bV5CW3Tp8ZOs1P+nh4R/
+=3NLr
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild b/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild
index 879b290d7803be88179837f0838c5d2b7ca81327..a532d1cf3ba61f7901c156e76e3a9ca469ab01bd 100644 (file)
--- 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
 }