Version bump. Keyword amd64-linux x86-linux

Package-Manager: portage-2.2.01.20796-prefix/cvs/Linux x86_64

4 files changed, 70 insertions, 30 deletions

diff --git a/sci-libs/shapelib/ChangeLog b/sci-libs/shapelib/ChangeLog
index 1424d8f81f96..11da23b0b161 100644
--- a/sci-libs/shapelib/ChangeLog
+++ b/sci-libs/shapelib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/shapelib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/ChangeLog,v 1.14 2012/02/14 21:37:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/ChangeLog,v 1.15 2012/08/02 19:01:46 bicatali Exp $
+
+*shapelib-1.3.0 (02 Aug 2012)
+
+  02 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> +shapelib-1.3.0.ebuild,
+  shapelib-1.2.10-r1.ebuild:
+  Version bump. Keyword amd64-linux x86-linux
 
   14 Feb 2012; Ulrich Müller <ulm@gentoo.org> shapelib-1.2.10-r1.ebuild:
   QA: Fix ebuild header, bug 398773.
diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest
index 878a92b07d4d..fefe473831ef 100644
--- a/sci-libs/shapelib/Manifest
+++ b/sci-libs/shapelib/Manifest
@@ -1,27 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX fix-shapelib-test.diff 1033 RMD160 fbcd5f30862573a707101c6f92a689b4fa989026 SHA1 bd1103be20f38ac60c2d0eec9d903149143ae3ea SHA256 839075511961b514171e5a1b84f6151724e04fbbde1f3b3c6a48baf817219ad2
-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 1177 RMD160 3ea4f4bf76bc9ec7f9adee51ac06056926ddd301 SHA1 d68f8fd1721665dfcbef0b924870c789533818bc SHA256 edc38e24ee4abd94e673659752d7cb6f90ee4bc8394b5fd965982e5be08b572e
-MISC ChangeLog 2332 RMD160 d9998734d8e276620934a59f419c2262f09b79b6 SHA1 69e45c3785471d38b99d6ae74987004cb06cbe4a SHA256 9a078c46e4399cedfb50be42268bf714708fdf210929ce61c8310e90bd00e16b
-MISC metadata.xml 441 RMD160 c987199410f870735080ba1b5f8a8286fbce17b4 SHA1 f7bc2b8c7bebdfdc301b0672a76a67d6e26521fc SHA256 aa5df660dea112b2e216bef74e49bc4c648933135f6772038ed5aa5e0de5e0ac
+AUX fix-shapelib-test.diff 1033 SHA256 839075511961b514171e5a1b84f6151724e04fbbde1f3b3c6a48baf817219ad2 SHA512 a86bcbeb72900a698e110565fe7806a8d21a735420f24522450df8548f4ee8e1f8f762077764db6c24a7669717eb5ad2cf251719b8c66f55a1f9a437729eb768 WHIRLPOOL 8a7c6f41ba92b1f1c43b18d01691caefd110fa021effbf6a6cc8daf924468729ce6d50ce40b131c0c7c65a15c611bcaa43f5fb4e54413b4c93991d5539d37015
+AUX makefile-fix.patch 213 SHA256 225e989102341d75054e151f7d27dd203204648e2a8902f9c7ada4b976003581 SHA512 c249856458899529b052d87d71fba71fb8ad93fcdba985b18ecbbabbecf524c9fac4b3cd3ea0d2953c295793ec571c0879c5930f09830237d161f82de96fce0f WHIRLPOOL df65efda5035c9bb3c64dd3454191e888b9c8a12e864f6c28fdcf8184a5f2560a2576f0060bc343eec9539dcf2b345e4319cd93f6a2f2a0e6c88b63fd58658f6
+AUX stdlib_include_fix.patch 838 SHA256 a6fa734cfb0642de3e2e95455194ccf56ab4cd7053914575197a026f5dd74d0b SHA512 0dedb8d94ce7d27a643fe301ea71ddb6eeb08f7b29eef8decb049f5e7cd3d9d76d3fa5de63c40f29f4cb21601c27c95599cd509d5ef73dbda9b948b0c920a5b0 WHIRLPOOL c548ec3c9d93b6b77b88a12d5825c6a09a0449db4bdc82744a6efbfecfa836a9c058184642e515b5abe162269c40f5495a7005c10c871d8eb884310ef721a3db
+DIST shapelib-1.2.10.tar.gz 167219 SHA256 afa54d60369e49a3d2ebcd1ffca75104bdc85d7f539b81aec8a6e2d311ca6b78 SHA512 c72cb637aaa2e09037f334edb9638b7af673fa965435b8e0d9beaa3391e9db958d0b16f59d98a5d6933136562556fb8c607fb89f3dd6d3c1696774bb11554cf6 WHIRLPOOL 37f12628fde626b3cc5a0279ac76854d739a2f8ac0d62fd4ca19fdfdc31cffd0e7695164ec4b7ee740776b22b075b68191d5a1c29f1390b39cde5043434dc543
+DIST shapelib-1.3.0.tar.gz 156301 SHA256 23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f SHA512 286a9faf7d7a6d88db3cceffb4e0fe335e5d754244b4e83110862ba0f88904aa10dd2814aa0c93d7531781cb318052d3f683160c9644f83f93e7d20108ac3b60 WHIRLPOOL 79b44dac05f8ca5e10809f7af1e9d0d1f1f5a2c7009698aa5dd33260a362c75b7e7f09cf535d58b6510f355ff5dfb193f2a0c7d14ef913caa4a0d5b099ef3a5b
+EBUILD shapelib-1.2.10-r1.ebuild 1240 SHA256 9f82d21afe139d148a420eccd40a7e064d668f99b5ff10b403600ac8aa4b41ab SHA512 8697989e771f6263bc4d4deb804effb7b99e3bf9eeea4ce5fba61c485ac3ad5dcb9e130c4272e0470de811ae0aa15e4fb0a0e9a2298b667bf92bf5bd3161de60 WHIRLPOOL 5cd8acbb5bbcd7c0b6947e5037b70e815be3ec7a4a6db07cb8eae28c50adf5bf6b6efa74f086f523b3412ed34aa114df95371dc5c68b76f1d7dafc0887adf2a8
+EBUILD shapelib-1.3.0.ebuild 1126 SHA256 718a2fda86d56c150f711170729a8698bb9b9ba202c3ddc21dffc89f19639207 SHA512 baa973db0afbbf2efaa8739baf1ff4a829dfc53b03b0c6c9fe2d37f2fde4c9730fd2e00677ef69a9707e8a055c94ec365dc112437e37aa612f7f56048f3b3709 WHIRLPOOL 2183ee6980c78acb3f5e7bf66c12c57e848b9eb5b51690881b7d8c9fc3b462e5b915a152d9b0ff912672555b30046ddd0d41cd550021fb1d68da43d7a7fcfbe6
+MISC ChangeLog 2523 SHA256 707ed1492d909ae097c8f8213f47b5fbb50c7c179752e4bcfb3fad8990203751 SHA512 b81b41b4d59e352bfc47b468a9de7bee6585f7eb0c132b023d17b39e51438e6f2d60bb8a2b336b1362f0ad959bb1e3ea5b2c3d33d2d315d5a5671a36d14a67d1 WHIRLPOOL 2c9b4ef7a518f235d58a076ebc0c0aa622a481c8a9a5d3545a8b56db142e700e6e62ed1ed3cc59ea1a142a7fae6a48e2ea9298618ca65b1d9355de74f85a6e82
+MISC metadata.xml 441 SHA256 aa5df660dea112b2e216bef74e49bc4c648933135f6772038ed5aa5e0de5e0ac SHA512 9dd268a745a4e1d20966c8fd419a7d7554f23bf308bc112b123f736cbc5a3e8b3141447aa654c76bd0b70ece7989177e1a1c21da2369f195fb2de42b13dad9bf WHIRLPOOL 60b22eb5595b4efc829af6c199e62fd4df80323ae9caf801c74cf9f46c56038aeb244bf5fa22f5adac8f9fc8f7a60e3580eb9666e5c2f32a65a6f1671eac9b01
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPOtSJAAoJEDxpGckxwJCBZmgP/3qiyhcBAOKlc6dSb1McXCiz
-Ay7ie96MXb9B4uA5RzDWvWUTFprp9LsilYfZlyhqOvDFN8Xhz+AJZ4/hhOM27RxA
-AI1OU457jbKtTrJGGFlW2fDkEEkoXO9k0DJxd5OseMiJ8UnY5+hE8C/e7Gp2lxL5
-T/6vtMJS4ZFdLc7RrLbRHiyzXxOGrr/IIkynza+FLTBeqIDGmIFWyVJV90WSKbnc
-ZNM5Xu0VJjjNhV+by5UvhHiDyiyeJ2STkVbFYwi0RZRMIWYm4Ff/TT1Q6bJRPCDi
-yHGrQZF+iiei4yMtL3zrPnuYG+AMftM7m4gK8Oz6CEbed2jbN02+fuQHi4afx7Np
-ozhOEFxFhcheeVGgIdindxrh35fO63qbkdL4WUa7i5xGUye8eX1U0Mbgo/U4OhVG
-6m+0fSJtPdY+YKmIxhN/2GuTrHEH9UpAbeWdSDAJxrrTsDhzQ1791hrtM941jtP9
-P1BO0WOdSQv0vQJXnshZVAeKtoXGes5O3IsGG5ZxKa0Hw7CHHpUL63u6tTqzNnRR
-PzrVIXUD/2VTqhNA/7TqZIEghZAKi1UIod1oWo2FwbeN9drd1iOQIasaFMjHR1Px
-a8BGFHhfjAkDYbeKFt+Q1qev2Q/Yyt8/ZvVAYGFz2uYyP2IPhlwuSf0Q7vedhfwj
-kOhauQNUkAK/Oj5/C6Ty
-=o1Bs
+iEYEAREIAAYFAlAazqQACgkQ1ycZbhPLE2BcdACffTwQDC4Ovrj0bVFi96I2aeoK
+3Q0Ani4tIIOSBZK7inGEvKLEtQMYR+qc
+=UpOy
 -----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 6256936fd5ca..459209a8c0ba 100644
--- a/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild
+++ b/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild
@@ -1,9 +1,9 @@
 # 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.7 2012/02/14 21:37:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild,v 1.8 2012/08/02 19:01:46 bicatali Exp $
 
 EAPI=4
-inherit eutils
+inherit eutils toolchain-funcs multilib
 
 DESCRIPTION="Library for manipulating ESRI Shapefiles"
 HOMEPAGE="http://shapelib.maptools.org/"
@@ -11,7 +11,7 @@ SRC_URI="http://dl.maptools.org/dl/shapelib//${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=""
@@ -22,12 +22,12 @@ src_prepare() {
 	epatch "${FILESDIR}"/fix-shapelib-test.diff
 	epatch "${FILESDIR}"/stdlib_include_fix.patch
 	sed -i \
-		-e 's:/usr/local/:${DESTDIR}/usr/: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:/usr/local/:\$(DESTDIR)/${EPREFIX}/usr/:g" \
+		-e "s:/usr/lib:/usr/$(get_libdir):g" \
+		-e "s:SHPLIB_VERSION=1.2.9:SHPLIB_VERSION=${PV}:g" \
 		-e "s:-g:${CFLAGS}:" \
 		-e "s:-g -O2:${CFLAGS}:g" \
-		-e "s:link gcc :link gcc ${LDFLAGS}:" \
+		-e "s:link gcc :link $(tc-getCC) ${LDFLAGS}:" \
 		Makefile || die "sed failed"
 }
 
diff --git a/sci-libs/shapelib/shapelib-1.3.0.ebuild b/sci-libs/shapelib/shapelib-1.3.0.ebuild
new file mode 100644
index 000000000000..2158bfae0669
--- /dev/null
+++ b/sci-libs/shapelib/shapelib-1.3.0.ebuild
@@ -0,0 +1,42 @@
+# 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.3.0.ebuild,v 1.1 2012/08/02 19:01:46 bicatali Exp $
+
+EAPI=4
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="Library for manipulating ESRI Shapefiles"
+HOMEPAGE="http://shapelib.maptools.org/"
+SRC_URI="http://download.osgeo.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	sed -i \
+		-e "s:/usr/local:\$(DESTDIR)/${EPREFIX}/usr:g" \
+		-e "s:/usr/lib:/usr/$(get_libdir):g" \
+		-e "s:SHPLIB_VERSION=1.2.9:SHPLIB_VERSION=${PV}:g" \
+		-e "s:-g:${CFLAGS}:" \
+		-e "s:-g -O2:${CFLAGS}:g" \
+		-e 's:$(LINKOPT):$(LDFLAGS):' \
+		-e "s:link gcc :link $(tc-getCC) ${LDFLAGS}:" \
+		Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake all
+	emake lib
+}
+
+src_install() {
+	dobin shp{create,dump,test,add} dbf{create,dump,add}
+	emake DESTDIR="${D}" lib_install
+	dodoc ChangeLog README*
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib*.a
+}