Fixed to respect user's CFLAGS. A bit of cleaning, install basic docs.

Package-Manager: portage-2.1.4_rc14

3 files changed, 31 insertions, 27 deletions

diff --git a/sci-libs/shapelib/ChangeLog b/sci-libs/shapelib/ChangeLog
index f5e6152ed4ec..ced1d9baec0f 100644
--- a/sci-libs/shapelib/ChangeLog
+++ b/sci-libs/shapelib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/shapelib
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/ChangeLog,v 1.8 2007/02/22 01:24:54 jokey Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/ChangeLog,v 1.9 2008/01/04 17:47:08 bicatali Exp $
+
+  04 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  shapelib-1.2.10-r1.ebuild:
+  Fixed to respect user's CFLAGS. A bit of cleaning, install basic docs.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest
index fb3dc7772ec4..a4e6009bcc2e 100644
--- a/sci-libs/shapelib/Manifest
+++ b/sci-libs/shapelib/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST shapelib-1.2.10.tar.gz 167219 RMD160 9dcd90d5197aa7d6063a703a369a530f6aa1f1c3 SHA1 436b09b6a90f403e4568460d67560d5730725651 SHA256 afa54d60369e49a3d2ebcd1ffca75104bdc85d7f539b81aec8a6e2d311ca6b78
-EBUILD shapelib-1.2.10-r1.ebuild 978 RMD160 af909dd2151e6bb05a2aa1e946c943b9a6333c2d SHA1 d30b02d6276c5f034be13c7063170926b3be180c SHA256 c489481b9869324709baac0136019f225648330d508ec5cdca0865ed747977af
-MD5 07c8a0a3f11c8e29f781d6b35d8148c7 shapelib-1.2.10-r1.ebuild 978
-RMD160 af909dd2151e6bb05a2aa1e946c943b9a6333c2d shapelib-1.2.10-r1.ebuild 978
-SHA256 c489481b9869324709baac0136019f225648330d508ec5cdca0865ed747977af shapelib-1.2.10-r1.ebuild 978
-MISC ChangeLog 1430 RMD160 c97ca620cc64228557fc2ae315ba3ad65377add5 SHA1 bfe48a16d5bebe030a2da584140582b0aefb8022 SHA256 21f9afeade75fd64ff4db28d6fbbf3ecba707e447f464f8a268b4e4fb4e15b37
-MD5 88fcdb13f7796395c81a49608c80a327 ChangeLog 1430
-RMD160 c97ca620cc64228557fc2ae315ba3ad65377add5 ChangeLog 1430
-SHA256 21f9afeade75fd64ff4db28d6fbbf3ecba707e447f464f8a268b4e4fb4e15b37 ChangeLog 1430
+EBUILD shapelib-1.2.10-r1.ebuild 1014 RMD160 90fb4d5bd3afed7ece675eaf067456f6a8d8abb9 SHA1 0c259c8723189f4b7f84e8b3733b363da9b84e8e SHA256 d83b0ab58b708fbc005db517a5b08c26108057c93ed52269f5f99051e35233c0
+MD5 8dc3c9dfd72dcb3ab1df5492f4d7824d shapelib-1.2.10-r1.ebuild 1014
+RMD160 90fb4d5bd3afed7ece675eaf067456f6a8d8abb9 shapelib-1.2.10-r1.ebuild 1014
+SHA256 d83b0ab58b708fbc005db517a5b08c26108057c93ed52269f5f99051e35233c0 shapelib-1.2.10-r1.ebuild 1014
+MISC ChangeLog 1591 RMD160 e33b6e62f4f515561de1e8da1a3628ef64cc52d7 SHA1 5179dad4c373cd0d8c39ffeff7ea39d277d7ecf7 SHA256 ed18781086b77a10cb5b3738167b1a996210f2a4a643a664facdac9ee096dd15
+MD5 12ae6fe429d3f2654ecfe20b28f024f9 ChangeLog 1591
+RMD160 e33b6e62f4f515561de1e8da1a3628ef64cc52d7 ChangeLog 1591
+SHA256 ed18781086b77a10cb5b3738167b1a996210f2a4a643a664facdac9ee096dd15 ChangeLog 1591
 MISC metadata.xml 441 RMD160 c987199410f870735080ba1b5f8a8286fbce17b4 SHA1 f7bc2b8c7bebdfdc301b0672a76a67d6e26521fc SHA256 aa5df660dea112b2e216bef74e49bc4c648933135f6772038ed5aa5e0de5e0ac
 MD5 ecb4f2988c930154c102d1a9ecdb9457 metadata.xml 441
 RMD160 c987199410f870735080ba1b5f8a8286fbce17b4 metadata.xml 441
@@ -18,9 +18,9 @@ MD5 6a667a0d0bd28f9e9a1477990a73a867 files/digest-shapelib-1.2.10-r1 247
 RMD160 a365ea534da770039ba042da146cfbbe813b1edc files/digest-shapelib-1.2.10-r1 247
 SHA256 846a82ff71a40bc05be32d4200da7198d6b36f08e6e548e5b469bfe251eb2ca1 files/digest-shapelib-1.2.10-r1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFF3PB9z974XjDVpbkRAr/aAKDWvSHvNOHXUjS/vzszojrgtFjRVwCgoIac
-7dcylUudpqAX0aT8DHUollY=
-=7aJc
+iD8DBQFHfnEl1ycZbhPLE2ARAuXJAJ9DbSelvN6QDQXm9Zy5TaHeqEga/ACeO2sh
+/vAbWZhHmSsGMTQSmSVU2Qs=
+=CsfM
 -----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 87f40e51eeeb..dd4af6d8e417 100644
--- a/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild
+++ b/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 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.1 2006/02/20 00:41:08 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild,v 1.2 2008/01/04 17:47:08 bicatali Exp $
 
 inherit eutils toolchain-funcs
 
@@ -15,25 +15,25 @@ IUSE=""
 
 DEPEND=""
 
-export MY_LIBDIR=$(get_libdir)
-
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	sed \
-	    -e 's:/usr/local/:${DESTDIR}/usr/:g' \
-	    -e 's:/usr/lib:/usr/${MY_LIBDIR}:g' \
-	    -e 's:SHPLIB_VERSION=1.2.9:SHPLIB_VERSION=1.2.10:g' \
-	    -i Makefile || die
+	sed -i \
+		-e 's:/usr/local/:${DESTDIR}/usr/:g' \
+		-e "s:/usr/lib:/usr/$(get_libdir):g" \
+		-e 's:SHPLIB_VERSION=1.2.9:SHPLIB_VERSION=1.2.10:g' \
+		-e "s:-g:${CFLAGS}:g" \
+		"${S}"/Makefile || die
 }
 
 src_compile() {
 	emake || die "emake failed"
-	make lib || die "make lib failed"
+	emake lib || die "emake lib failed"
 }
 
 src_install() {
 	dobin shp{create,dump,test,add} dbf{create,dump,add} \
-	    || die "dobin failed"
-	make DESTDIR=${D} lib_install || die "lib_install failed"
+		|| die "dobin failed"
+	emake DESTDIR="${D}" lib_install || die "emake lib_install failed"
+	dodoc ChangeLog || die
+	dohtml *.html || die
 }