Update for latest stable 1.2.x release; closes bug 307639.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-libs/libgeotiff/ChangeLog b/sci-libs/libgeotiff/ChangeLog
index 5ff362c21a54f6a675db2e5881702c911f3a92be..099ffa5c17a78eb666f02c475ebc2cd3f3901ac2 100644 (file)
--- a/sci-libs/libgeotiff/ChangeLog
+++ b/sci-libs/libgeotiff/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/libgeotiff
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/ChangeLog,v 1.28 2010/01/02 18:09:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/ChangeLog,v 1.29 2010/04/17 17:14:03 nerdboy Exp $
+
+*libgeotiff-1.2.5 (17 Apr 2010)
+
+  17 Apr 2010; Steve Arnold <nerdboy@gentoo.org> +libgeotiff-1.2.5.ebuild,
+  +files/libgeotiff-1.2.5-listgeo-link-hack.patch,
+  +files/libgeotiff-1.2.5-make.patch:
+  Update for latest stable 1.2.x release; closes bug #307639.
 
   02 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   libgeotiff-1.3.0_beta1.ebuild:

diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 34fc39109de8ddf7864d49e3347a2a7deb4fc50d..19d5436d84de0eafb3fba4edaaf5554615391fbd 100644 (file)
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,21 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Doxyfile 9282 RMD160 ee70ea07c5da4d79241bcb571e5868fd2f1bcf44 SHA1 d8a07fa43047bce0bdbd381bf4687477ad97ed51 SHA256 9cd2e6d4fb9662ee08c153b8c9b0b35dc81802cb32886c3afc5ee7b2924afbc2
 AUX libgeotiff-1.2.4-soname.patch 667 RMD160 b15af801e7fc55c3ae5ca76a081eb2db1056434c SHA1 901002861666ec14ddef1d7d370122e332a851ec SHA256 c83a235585217a0a4e4f8907966b21e23cb9ac38d9835ca25250251ee4d894ab
+AUX libgeotiff-1.2.5-listgeo-link-hack.patch 677 RMD160 3f8da2fef0e23880f1721d445120df1ceeee0e72 SHA1 c5015794244f7ad82fb4a5f7e67d6f6ef52c4ff7 SHA256 ee7c2bdd75d7336f90133e2c9453f84733db05c514f2f7c3b517d75d69ceca0f
+AUX libgeotiff-1.2.5-make.patch 368 RMD160 a3d3a06cf834fa9285589ead84eec18aa6b988c0 SHA1 4daa572cfe339cde0391ffadcda8660d151f516d SHA256 2949e0f87d6dd107d3caff5842f5e3badb7453c305838a2b335b82dd4b3f83ff
 DIST libgeotiff-1.2.1.tar.gz 714274 RMD160 d2991116ac95acb9f46167da74298b202498654c SHA1 763f82858e2d513478d7c3ae623f38e530661d55 SHA256 4f66d65353f6504b840cab402aa265b5145067b8eb1298bdc245f5e73e3b19cb
 DIST libgeotiff-1.2.4.tar.gz 1033973 RMD160 e1b434848db2c3cb66f8bb7f24aa2a80989b8c9b SHA1 044060c38a1eba53e9955b2b9cf541cf461d7e7e SHA256 cd9ec9a9fc91a59d44361164a998cd424dd22828ba9052e8fc688653e8060780
+DIST libgeotiff-1.2.5.tar.gz 1057705 RMD160 d82d8c705979feb51c367259e1659ff3325320f2 SHA1 38b10070374636fedfdde328ff1c9f3c6e8e581f SHA256 f27b1758d6899805107e4c5bea17eb19e8d2dae7942cc06040fa837acfe95e7c
 DIST libgeotiff-1.3.0b1.tar.gz 1271705 RMD160 551ccf2365451b06d8253020decf3449918dd6cf SHA1 cafdd63594be37169018064540a7c7f86a986924 SHA256 ab5668f65e10416ddf6a658428e84138b656cc6ab6503cc1c5826424abb9c239
 EBUILD libgeotiff-1.2.1-r1.ebuild 1045 RMD160 fb5269e2a753fe9ab98caa123d13d569dd77c0ae SHA1 d20577d1c8e97d3b72090cc86bf2fa42c2eb1f37 SHA256 3857a2c515177247d2bcf5356f49cb23f4a77f2618a870eb16caaf04bbfb14db
 EBUILD libgeotiff-1.2.1.ebuild 1013 RMD160 38f0368dd2f5ed20bc14dc667f872abfeb1e9d76 SHA1 df8425ce1bf6c36a1d227a41efb9f85b3dfdabfe SHA256 3ca492cb2992dea605354518d2bc70dde145a9554c306f741072dcba271bf3cc
 EBUILD libgeotiff-1.2.4.ebuild 1245 RMD160 e0f37e03d4dd9be54fe271261ecd6ffe5c08a153 SHA1 7a5e39fd9abd0ebd8ec4f0c13a13ea63c897dbe1 SHA256 e20d929f0cbd3399213b322653c74f7bc1e3433c79ccc028496297a3dced4d68
+EBUILD libgeotiff-1.2.5.ebuild 1290 RMD160 2c701da77066aef5ba62c7f0bf543da7da5f4709 SHA1 304c61091f68e0eac49bb4a6434280f8c69e0ebc SHA256 ac1015bc11b345e9c4ff6032c89299927d461c4cbc3c253289286963873226e5
 EBUILD libgeotiff-1.3.0_beta1.ebuild 1482 RMD160 64b4ba8211b172b8659c6a9c0c720d92d0cfbb97 SHA1 1f32150d1892979adfe6f3116e1449f392bc8eea SHA256 1dcff891bdd33554008c8bd424de31c1f6218820dcb8177de6379fb68fb2c2c2
-MISC ChangeLog 5060 RMD160 91df5078a7b62e4ce828719659039a0dd04447cf SHA1 ae7e43faed0ddd293d29fae578fe1a0fefc5b65d SHA256 a51a8e071fc3255b2f483a45cb4f4f02d0cc565c0bc04a36e525f0d1362c5e0d
+MISC ChangeLog 5322 RMD160 bacbe86c7b4e7b4f739dfe18b32efb8d16899303 SHA1 102500fe2050e884da08c94a07ac5e292ea09545 SHA256 8a77fd698fe23cba63484af4d0f0ea1733e2a7f3646f2aaaffb600472c1d24e7
 MISC metadata.xml 231 RMD160 449dd5a1a2bcddbfa9037704447bf95b708ee7c9 SHA1 1b8b972d346fe0e712300bb28a22c3f56575f3fc SHA256 307488f16994a0736abcb26d9c1ce9b77f9b07f981513493d46ac3eb6f8ece14
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks/i8cACgkQNQqtfCuFneOSlQCglkLux5zp7dVqkSid76O5Oe1q
-FG8An1KDsO4mrPYFr+HvCkBSPRhv5IJE
-=DyYj
------END PGP SIGNATURE-----

diff --git a/sci-libs/libgeotiff/files/libgeotiff-1.2.5-listgeo-link-hack.patch b/sci-libs/libgeotiff/files/libgeotiff-1.2.5-listgeo-link-hack.patch
new file mode 100644 (file)
index 0000000..eaa06da
--- /dev/null
+++ b/sci-libs/libgeotiff/files/libgeotiff-1.2.5-listgeo-link-hack.patch
@@ -0,0 +1,15 @@
+--- bin/Makefile.in.orig       2009-10-10 12:04:15.972291516 -0700
++++ bin/Makefile.in    2009-10-10 12:07:34.459886566 -0700
+@@ -49,10 +49,10 @@
+       ${CC} ${COPTS} makegeo.o -L${libdir} ${LIBS} -o $@
+   
+ geotifcp$(EXEEXT): geotifcp.o  ${GEOTIFFDIR}/libgeotiff.a
+-      ${CC} ${COPTS} geotifcp.o -L${libdir} ${LIBS} -o $@
++      ${CC} ${COPTS} geotifcp.o -L${libdir} ../libgeotiff.a ${LIBS} -o $@
+   
+ listgeo$(EXEEXT): listgeo.o  ${GEOTIFFDIR}/libgeotiff.a
+-      ${CC} ${COPTS} listgeo.o -L${libdir} ${LIBS} -o $@
++      ${CC} ${COPTS} listgeo.o -L${libdir} ../libgeotiff.a ${LIBS} -o $@
+   
+ csv2html$(EXEEXT): csv2html.o  ${GEOTIFFDIR}/libgeotiff.a
+       ${CC} ${COPTS} csv2html.o -L${libdir} ${LIBS} -o $@

diff --git a/sci-libs/libgeotiff/files/libgeotiff-1.2.5-make.patch b/sci-libs/libgeotiff/files/libgeotiff-1.2.5-make.patch
new file mode 100644 (file)
index 0000000..719a3e0
--- /dev/null
+++ b/sci-libs/libgeotiff/files/libgeotiff-1.2.5-make.patch
@@ -0,0 +1,10 @@
+--- Makefile.in.orig   2009-10-10 10:32:26.665288828 -0700
++++ Makefile.in                2009-10-10 10:35:36.098484182 -0700
+@@ -104,6 +104,7 @@
+       ${LD_SHARED} ${OBJS} ${LIBS} -o $(GEOTIFF_SO)
+       rm -f libgeotiff.$(SO_EXT)
+       ${LN} $(GEOTIFF_SO) libgeotiff.$(SO_EXT)
++      ${LN} $(GEOTIFF_SO) libgeotiff.$(SO_EXT).$(VERSION_MAJOR).$(VERSION_MINOR)
+ 
+ Progs:        $(GEOTIFF_SO)
+       ${CD} ${BIN};\

diff --git a/sci-libs/libgeotiff/libgeotiff-1.2.5.ebuild b/sci-libs/libgeotiff/libgeotiff-1.2.5.ebuild
new file mode 100644 (file)
index 0000000..307079b
--- /dev/null
+++ b/sci-libs/libgeotiff/libgeotiff-1.2.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/libgeotiff-1.2.5.ebuild,v 1.1 2010/04/17 17:14:03 nerdboy Exp $
+
+EAPI=2
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Library for reading TIFF files with embedded tags for geographic (cartographic) information"
+HOMEPAGE="http://geotiff.osgeo.org/"
+SRC_URI="ftp://ftp.remotesensing.org/pub/geotiff/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc python"
+
+RDEPEND=">=media-libs/tiff-3.9.1
+       media-libs/jpeg
+       sci-libs/proj"
+
+DEPEND="${RDEPEND}
+       doc? ( app-doc/doxygen )"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-1.2.4-soname.patch
+       epatch "${FILESDIR}"/${P}-make.patch
+       epatch "${FILESDIR}"/${P}-listgeo-link-hack.patch
+       filter-ldflags -Wl,-O1
+       eautoconf
+       eautomake
+}
+
+src_compile() {
+       emake -j1 || die "emake failed"
+
+       if use doc; then
+           emake dox || die "emake dox failed"
+       fi
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "emake install failed"
+
+       dobin bin/makegeo || die "dobin makegeo failed"
+
+       if use python; then
+               dobin csv/*.py || die "dobin python failed"
+       fi
+
+       dodoc README
+       newdoc csv/README README.csv
+       use doc && dohtml docs/api/*
+}