sci-libs/shapelib: Respect AR, #444548

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 42 insertions, 21 deletions

diff --git a/sci-libs/shapelib/ChangeLog b/sci-libs/shapelib/ChangeLog
index bcdc5d88517e..b90cb8b7bcb0 100644
--- a/sci-libs/shapelib/ChangeLog
+++ b/sci-libs/shapelib/ChangeLog
@@ -1,6 +1,10 @@
 # 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.22 2012/11/29 16:58:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/ChangeLog,v 1.23 2012/11/29 21:00:14 jlec Exp $
+
+  29 Nov 2012; Justin Lecher <jlec@gentoo.org> shapelib-1.3.0-r1.ebuild,
+  files/shapelib-1.3.0-respect-user.patch, metadata.xml:
+  Respect AR, #444548
 
   29 Nov 2012; <ago@gentoo.org> shapelib-1.3.0-r1.ebuild:
   Stable for ppc, wrt bug #444664
diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest
index 518757c17587..e2a4d6978e06 100644
--- a/sci-libs/shapelib/Manifest
+++ b/sci-libs/shapelib/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX fix-shapelib-test.diff 1033 SHA256 839075511961b514171e5a1b84f6151724e04fbbde1f3b3c6a48baf817219ad2 SHA512 a86bcbeb72900a698e110565fe7806a8d21a735420f24522450df8548f4ee8e1f8f762077764db6c24a7669717eb5ad2cf251719b8c66f55a1f9a437729eb768 WHIRLPOOL 8a7c6f41ba92b1f1c43b18d01691caefd110fa021effbf6a6cc8daf924468729ce6d50ce40b131c0c7c65a15c611bcaa43f5fb4e54413b4c93991d5539d37015
 AUX makefile-fix.patch 213 SHA256 225e989102341d75054e151f7d27dd203204648e2a8902f9c7ada4b976003581 SHA512 c249856458899529b052d87d71fba71fb8ad93fcdba985b18ecbbabbecf524c9fac4b3cd3ea0d2953c295793ec571c0879c5930f09830237d161f82de96fce0f WHIRLPOOL df65efda5035c9bb3c64dd3454191e888b9c8a12e864f6c28fdcf8184a5f2560a2576f0060bc343eec9539dcf2b345e4319cd93f6a2f2a0e6c88b63fd58658f6
-AUX shapelib-1.3.0-respect-user.patch 3370 SHA256 df171304938bae3ed35f1d9b15ef224d31060f959227fc840fcf5b3cfe6d8d7e SHA512 e0a7127d40a1272b40ee8f6a8ee7d599120054b914e0f5c9f6b07af718696c596277fc15c5db1c80110af89e1dfe4daf8c3f20f328d0e5926250dca8bd69271e WHIRLPOOL b33e302860564966c14f7198baf9fbcacdff3b0c3443f6fe3ef134ffae060a6a627cf2036b2e25476bd4038a5f63ea84780e40583d4ed499ce86d0c9d22a8ebe
+AUX shapelib-1.3.0-respect-user.patch 3787 SHA256 8203f4832ffd0d19974b49e5b677e223c959081b29ae183c6a936ee6eccda535 SHA512 aa7f99ee628366d4f5ee3a975c81dd56c7c1aff7a9cc9f1491d5639d00472b6e698653b41debb12fd9f896265a8f1fc5520fa6a8e6a04909bed7048d659d743c WHIRLPOOL 3ba0e643d91d698a59f79e5f243fe2d17f50eaaed719aa73502d4208e037850d7c0e4293b26a84364c441f14d4de5de32e39f91523c36be37c89d23803dbfdb4
 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-r1.ebuild 1893 SHA256 e5e5092862398738f6bd88a3ce09a88db94a5d27dae1e92142a9c7d9fb3c319f SHA512 91be2ed3c6a0962d8a0fd6868b9729cc72857ce81daa93e38dd09eeca8ba9f8717527f5645beab8aa22f05d2510a933c209097d3263d9217bac47f5756dd0702 WHIRLPOOL 48ede8aeb0982b8d9e79600327db1ae839ac352e27b7cca3d851bfe91134b7bc49368da59c028d6b6ea37798ba977d889ddd7c3cf0cd2ffd8964ad720f2231d8
-MISC ChangeLog 3461 SHA256 9c3e337c25a09333e7b9ec0931a0e9c63e627a187e0dc026befba69a1f964791 SHA512 8c8e527223615c2d0193be55bee5e2ebfbd05b1cf0c53d59cdcc5a8159038da3bf6cfb09af0d37ea8be651ac7e929fe4de0aba08af58c536648ccd736af68164 WHIRLPOOL 7a112afd9f6596977946b4b1fb358ee316ea3e13c194f7d7c7c5cb9b4010d140ae8af79f411d1dcf6f752a81edd79c6563ebb0ca87964622bef41c04ee543ba8
-MISC metadata.xml 303 SHA256 4b14291f8b67dbee9122e8a867cd2463015cdfa712cec2d44f63e6b6b5fd9e56 SHA512 ba7928de0c4a0f06f0783d24e17bbe41c9c76a56b1278d5aa6370a9158823cfe9b85e38c3025542b691383d810cfc80b73d67c26024184d6070e62bfcfb56c28 WHIRLPOOL a96168dad56d1a81e79a57efb2217e59ca74f95509cc35a206b12cafc307cb9dd26872276d693840bc3026045201b3900d5e4e4a8f07a004feef84346908c431
+EBUILD shapelib-1.3.0-r1.ebuild 1880 SHA256 f4f7a67e5185f9238bbe930376def349c3dbfd4f5b0ce18ba8aa2161e057a708 SHA512 e67722ee600158766d9f9a47a84f462e3f371a685014dc8d0568cc5b32a4dc9b5e926cdf4b3fb39086adaaf932287b86188e56a8391ea9c68335169fae724ee9 WHIRLPOOL 2e86cbd5e70f4b980542f7465f20853d15378151441f08bc3ce8df13cb2f646b2167842b2e01396ffb57e1c28a8af33a2a4e567d830ec51fc14a44797b3ffdc7
+MISC ChangeLog 3615 SHA256 33949adeccc01760419b9612127de7d5d6d17d93a1ad39052036685319c3a9dc SHA512 34b6450da49dcc11c6e3bf03273f7b9be8facd77f826b96140de953e080a8950fd5a14b99bfa7bf9b813feac0777c71efa6076a82a33673a29857112221661e4 WHIRLPOOL db8c956be57dd7c1ee735837752623252c477cda89e2c871484c89eb00951472abcb7530be8d52b38cf8a3052e9321034add1a7fae89fc5ec1c95c1e984b2370
+MISC metadata.xml 305 SHA256 15541823fffa098405145cec05005f09bcc561c34153cd1938c005d099af0c6d SHA512 382f3ea2e5f14fc9a9d759cc0186d3ac3615d25a13aade9dda9f66bce70dd19496acdb24123a8d5d737841deaf5fe2d4b93cae4c1553104c199131b6c1b08745 WHIRLPOOL 5c3b5e113a410bdf4d6e7f08a90b3c98f7ea577460cea25af2294106409c7ca5467115baf7e16bbac572dffca97530eacce49b9a6c9d35bfab1f82b01ccf69e8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAlC3zOAACgkQgAnW8HDreRZtzQCdHmqEIWFIk0Q5wI7zS2ZTNTcL
+ZRkAn0zpyJBuCyn1BclyO//m205svTr/
+=3Ss5
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/shapelib/files/shapelib-1.3.0-respect-user.patch b/sci-libs/shapelib/files/shapelib-1.3.0-respect-user.patch
index 0b0c5bcef7cc..04963108ec42 100644
--- a/sci-libs/shapelib/files/shapelib-1.3.0-respect-user.patch
+++ b/sci-libs/shapelib/files/shapelib-1.3.0-respect-user.patch
@@ -1,6 +1,11 @@
---- Makefile.orig	2012-08-02 23:51:00.000000000 +0100
-+++ Makefile	2012-08-03 00:19:37.000000000 +0100
-@@ -1,6 +1,6 @@
+ Makefile | 41 ++++++++++++++++++++---------------------
+ 1 file changed, 20 insertions(+), 21 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0c41d8a..4149412 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,9 @@
  
 -PREFIX	=	/usr/local
 -CFLAGS	=	-g -Wall -fPIC
@@ -8,8 +13,11 @@
 +CFLAGS	?=	-g -Wall -fPIC
  #CFLAGS  =       -g -DUSE_CPL
  #CC = g++
++AR ?= ar
  
-@@ -10,7 +10,7 @@
+ LIBOBJ	=	shpopen.o dbfopen.o safileio.o shptree.o 
+ SHPBIN	=	shpcreate shpadd shpdump shprewind dbfcreate dbfadd dbfdump \
+@@ -10,7 +11,7 @@ SHPBIN	=	shpcreate shpadd shpdump shprewind dbfcreate dbfadd dbfdump \
  
  default:	all
  
@@ -18,7 +26,7 @@
  
  shpopen.o:	shpopen.c shapefil.h
  	$(CC) $(CFLAGS) -c shpopen.c
-@@ -25,46 +25,46 @@
+@@ -25,46 +26,46 @@ safileio.o:	safileio.c shapefil.h
  	$(CC) $(CFLAGS) -c safileio.c
  
  shpcreate:	shpcreate.c shpopen.o safileio.o 
@@ -77,7 +85,7 @@
  	@./stream1.sh > s1.out
  	@if test "`diff s1.out stream1.out`" = '' ; then \
  	    echo "******* Stream 1 Succeeded *********"; \
-@@ -74,7 +74,7 @@
+@@ -74,7 +75,7 @@ test1:
  	    diff s1.out stream1.out; \
  	fi
  
@@ -86,7 +94,7 @@
  	@./stream2.sh > s2.out
  	@if test "`diff s2.out stream2.out`" = '' ; then \
  	    echo "******* Stream 2 Succeeded *********"; \
-@@ -85,7 +85,7 @@
+@@ -85,7 +86,7 @@ test2:
  	    diff s2.out stream2.out; \
  	fi
  
@@ -95,14 +103,16 @@
  	@./makeshape.sh > s3.out
  	@if test "`diff s3.out stream3.out`" = '' ; then \
  	    echo "******* Stream 3 Succeeded *********"; \
-@@ -97,9 +97,7 @@
+@@ -97,10 +98,8 @@ test3:
  	fi
  
  
 -lib:	libshp.a
 -
 -libshp.a:	$(LIBOBJ)
+-	ar r libshp.a $(LIBOBJ)
 +lib:	$(LIBOBJ)
- 	ar r libshp.a $(LIBOBJ)
++	$(AR) r libshp.a $(LIBOBJ)
  
  lib_install:	libshp.a
+ 	cp libshp.a $(PREFIX)/lib
diff --git a/sci-libs/shapelib/metadata.xml b/sci-libs/shapelib/metadata.xml
index 4cb9f367606d..6ecd4996da1e 100644
--- a/sci-libs/shapelib/metadata.xml
+++ b/sci-libs/shapelib/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
-<longdescription>Shapelib is for working with ESRI shape files, a format used by the commercial ArcInfo GIS package.</longdescription>
+	<herd>sci-geosciences</herd>
+	<longdescription>Shapelib is for working with ESRI shape files, a format used by the commercial ArcInfo GIS package.</longdescription>
 </pkgmetadata>
diff --git a/sci-libs/shapelib/shapelib-1.3.0-r1.ebuild b/sci-libs/shapelib/shapelib-1.3.0-r1.ebuild
index f88b5fcbbeaa..3d9620fa38f7 100644
--- a/sci-libs/shapelib/shapelib-1.3.0-r1.ebuild
+++ b/sci-libs/shapelib/shapelib-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.6 2012/11/29 16:58:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/shapelib-1.3.0-r1.ebuild,v 1.7 2012/11/29 21:00:14 jlec Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs multilib versionator
@@ -40,12 +40,9 @@ static_to_shared() {
 	fi
 }
 
-pkg_setup() {
-	tc-export CC
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-respect-user.patch
+	tc-export CC AR
 }
 
 src_compile() {