revision bump with fix for bug #123330

(Portage version: 2.1_pre4-r1)

6 files changed, 60 insertions, 42 deletions

diff --git a/sci-libs/shapelib/ChangeLog b/sci-libs/shapelib/ChangeLog
index 604880a8f7c9..5409e37ad8af 100644
--- a/sci-libs/shapelib/ChangeLog
+++ b/sci-libs/shapelib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/shapelib
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/ChangeLog,v 1.5 2005/10/07 10:19:18 carlo Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/ChangeLog,v 1.6 2006/02/20 00:41:08 nerdboy Exp $
+
+*shapelib-1.2.10-r1 (20 Feb 2006)
+
+  20 Feb 2006; Steve Arnold <nerdboy@gentoo.org> -shapelib-1.2.10.ebuild,
+  +shapelib-1.2.10-r1.ebuild:
+  revision bump with fix for bug #123330, along with rework of src_install
 
   07 Oct 2005; Carsten Lohrke <carlo@gentoo.org> shapelib-1.2.10.ebuild:
   fixed typo
diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest
index c0e5a046e7f2..13085464920d 100644
--- a/sci-libs/shapelib/Manifest
+++ b/sci-libs/shapelib/Manifest
@@ -1,14 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5a86cb3f6fb9a8d9df4cb34131f9ef1e ChangeLog 1036
-MD5 8e119a24844842e421d7b400ff138974 files/digest-shapelib-1.2.10 67
+RMD160 e2e4a0cf0855e36fc1b336fc4528857c1848d9bd ChangeLog 1036
+SHA256 ab90ae01e0563d80a39cd6a0eeeb8d17b417e8590108f5968c1c3dee13ef971d ChangeLog 1036
+MD5 6a667a0d0bd28f9e9a1477990a73a867 files/digest-shapelib-1.2.10-r1 247
+RMD160 a365ea534da770039ba042da146cfbbe813b1edc files/digest-shapelib-1.2.10-r1 247
+SHA256 5f2c2a44177d3b04c34f1218f3226c710685d6e855efec1519effcd92f68821c files/digest-shapelib-1.2.10-r1 247
 MD5 8cfef0e9a4540e9d7cc628e70e95c49a metadata.xml 429
-MD5 f1779c3e07dbb995e19cf1f14e8ae6d0 shapelib-1.2.10.ebuild 699
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDeB1rgIKl8Uu19MoRAuazAJ0X1qDrehORQxH/Lm1bqL2ytoxsmACfdgOB
-IfuDG5VlXUkdzK2Cc2aJ1ac=
-=4lMo
------END PGP SIGNATURE-----
+RMD160 e52181c8b5001f79e53ac3651df87691696fdc30 metadata.xml 429
+SHA256 f62b7f3057d77bda9827de92e739bb341b654b3f02cfcf74df941ea3f13e215f metadata.xml 429
+MD5 91b38192480ee1d79dfa090cb892f2a8 shapelib-1.2.10-r1.ebuild 974
+RMD160 c8df24acfe6c738337166c4b8826b87a64972303 shapelib-1.2.10-r1.ebuild 974
+SHA256 7330f33c622ebc3c16009fcabf07064974bc640aacf64977c392f9cead84b0dd shapelib-1.2.10-r1.ebuild 974
diff --git a/sci-libs/shapelib/files/digest-shapelib-1.2.10 b/sci-libs/shapelib/files/digest-shapelib-1.2.10
deleted file mode 100644
index e5b5a1c93a16..000000000000
--- a/sci-libs/shapelib/files/digest-shapelib-1.2.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4d96bd926167193d27bf14d56e2d484e shapelib-1.2.10.tar.gz 167219
diff --git a/sci-libs/shapelib/files/digest-shapelib-1.2.10-r1 b/sci-libs/shapelib/files/digest-shapelib-1.2.10-r1
new file mode 100644
index 000000000000..b1a66fdc743b
--- /dev/null
+++ b/sci-libs/shapelib/files/digest-shapelib-1.2.10-r1
@@ -0,0 +1,3 @@
+MD5 4d96bd926167193d27bf14d56e2d484e shapelib-1.2.10.tar.gz 167219
+RMD160 9dcd90d5197aa7d6063a703a369a530f6aa1f1c3 shapelib-1.2.10.tar.gz 167219
+SHA256 afa54d60369e49a3d2ebcd1ffca75104bdc85d7f539b81aec8a6e2d311ca6b78 shapelib-1.2.10.tar.gz 167219
diff --git a/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild b/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild
new file mode 100644
index 000000000000..87f40e51eeeb
--- /dev/null
+++ b/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 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 $
+
+inherit eutils toolchain-funcs
+
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+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
+}
+
+src_compile() {
+	emake || die "emake failed"
+	make lib || die "make 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"
+}
diff --git a/sci-libs/shapelib/shapelib-1.2.10.ebuild b/sci-libs/shapelib/shapelib-1.2.10.ebuild
deleted file mode 100644
index 48c66daf03f1..000000000000
--- a/sci-libs/shapelib/shapelib-1.2.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 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.ebuild,v 1.5 2005/11/14 05:14:04 vapier Exp $
-
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-	emake || die
-	make lib || die
-}
-
-src_install() {
-	dobin shp{create,dump,test,add} dbf{create,dump,add} || die
-	dolib.so .libs/libshp.so.1.0.1
-	dosym libshp.so.1.0.1 usr/lib/libshp.so
-	insinto /usr/include/libshp
-	doins shapefil.h
-}