sci-libs/shapelib: Respect AR, #444548

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

4 files changed, 28 insertions, 17 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/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() {