Version bump. Keyword amd64-linux x86-linux

(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)

3 files changed, 56 insertions, 8 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/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
+}