Version bump to 1.4.0. Stable 1.2.4 on ppc. Punt older.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

5 files changed, 93 insertions, 48 deletions

diff --git a/sci-libs/libgeotiff/ChangeLog b/sci-libs/libgeotiff/ChangeLog
index bfe1682d9ae3..32f8c03305bf 100644
--- a/sci-libs/libgeotiff/ChangeLog
+++ b/sci-libs/libgeotiff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/libgeotiff
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/ChangeLog,v 1.36 2012/04/25 17:10:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/ChangeLog,v 1.37 2012/05/24 19:38:04 scarabeus Exp $
+
+*libgeotiff-1.4.0 (24 May 2012)
+
+  24 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> +libgeotiff-1.4.0.ebuild,
+  -libgeotiff-1.2.1-r1.ebuild, libgeotiff-1.2.4.ebuild:
+  Version bump to 1.4.0. Stable 1.2.4 on ppc. Punt older.
 
   25 Apr 2012; Justin Lecher <jlec@gentoo.org> libgeotiff-1.2.1-r1.ebuild,
   libgeotiff-1.2.4.ebuild, metadata.xml:
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 659da51e4998..5af461b4a64d 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,20 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
-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.3.0.tar.gz 1287837 RMD160 845a2bba9b8b6204d86895f7580e3ae9f3b8ed67 SHA1 b8cde5014cf82fe4683fa35fc81a5ea8d64b940f SHA256 0fa2e9130281c5867ada551ef757fd81f54c760d9f3039d33e349f992f440d27
-EBUILD libgeotiff-1.2.1-r1.ebuild 1021 RMD160 f4aad24d1daf8422e3a03c93e50443df335678ba SHA1 5e2c823cd35ff22789dc163d3155a4ec91a8b33f SHA256 17d8aa6da038a6302adb4692f4f3bb59905f703d0daf7dbc7a1bb1546b6ab250
-EBUILD libgeotiff-1.2.4.ebuild 1218 RMD160 a6bbab440cfe0b6c4ab5907f89d5d77a733a3e18 SHA1 4c669670eedbeb0a06825e20d013ba0109018e3c SHA256 52cb62e8dd99286d4c77a90289fb821a286290ce104d62a1458a2f8a3d02d102
+DIST libgeotiff-1.4.0.tar.gz 1517881 RMD160 e665d077303961454cb0663af564942b5b808a49 SHA1 4c6f405869826bb7d9f35f1d69167e3b44a57ef0 SHA256 d0acb8d341fd6a8f2c673456e09fdb8f50f91e3166ac934719fe05b30d328329
+EBUILD libgeotiff-1.2.4.ebuild 1222 RMD160 c58b1694e7a338dc2cf90bc6563acefc2da090ed SHA1 01f87bc28a69b77e6b5c9a451da1c704043dda43 SHA256 840fcc3f774e722bae6c388d0eea11b8a281954e1833a0e4f9f80ec9aad0dd35
 EBUILD libgeotiff-1.3.0.ebuild 1563 RMD160 9b7a5e4b5cdab35e743ddef0ab9c154f3b8d5a5f SHA1 b9ed76ed91e984cfe472ed52a61e93185ff79f81 SHA256 e873dd23ce9a2d106b1203d8d0bee5f9cf500670d1c34e83ae75af761eefb221
-MISC ChangeLog 6613 RMD160 03c82497788ba7722ea0d48459c6f9b004228a8f SHA1 c8b0770d841cb6b42b24439bc26342c443ae074b SHA256 c6eb3ef1d79fa7bef6ff6bb130512448f1cbd430a6110e9b69e12f0d1264634f
+EBUILD libgeotiff-1.4.0.ebuild 1565 RMD160 c2eabe154481ae78b86c063a5c4e15625cc50deb SHA1 4eb36bb511ff53ce5952789c2f8958ff6d5a232f SHA256 34b0ad78f3f56a2deeac1ff6c41f993fd8d10f0ddc0f19e4947bc4cfee5b6947
+MISC ChangeLog 6847 RMD160 548c0e0919a25d973aaf990ab3ae8f783412e5f2 SHA1 d0d71d24c6714f8c99b91f86e882e220465a2727 SHA256 b193ff536d7879cb16e4d849857f9ef52bba5365d6190e56ff69e14da41a0027
 MISC metadata.xml 234 RMD160 063c547d5c03bfb98b8b17fb76cc96bde00b50f0 SHA1 5681ce660fdaee626510641454915606ca930334 SHA256 7cf60f37d61aa1f9fb02236d0ac227bc7e0a0596a7a706bde7b2c99a1180ad4c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk+YMAIACgkQgAnW8HDreRZYJQCfbB9jhSMtSFW8Hm57tm0440MC
-BacAoK9XOZ521bFubbGKRNgh9eyWTblL
-=8RIq
+iQIcBAEBAgAGBQJPvo4iAAoJEOSiRoyO7jvoFqwP/jvwCkXQjG6y7a1nQn7I7Jzu
+AUSlW2Xwu6Hn2E8i+t8EXQm1Cg8QDNqNQfHdyj0nLHwKKmJr0k1wk2Rw9GhKN0fc
+FoSyqfulLIfgvASoyUVq5Bh/r47PGhj1ynRJ79mpaGkvssZHyOsehw06Wl2JOlXi
+fqFM2uSdJzpXBGk1xsrTA4KTyUrpDsj2rrHPuwO2CfXmRLBkDyvN1REazcPQmh8d
+vqsAk2IoDvhjxXvgctHqYQHkmxuEvroTuhY9WiBvTGx3ikhtmZS+U/shtxP22uwL
+O74W37RXn4zu6wVBCKHLIpepve36K+cpX/Jkhva1L7pKSvZ/21+XLCKrgAg6qOUR
+DA8jdkeQ3ww0SVuyHnTTmHQsMPtYKp7SIGyom05Fz+3PvEcNFv1INDuv4AzZzaD5
+Qd/oupgyFBwjLk3L3SsW5mzSHYkoa83yxaqZ9tD+YyhJ6M4PvV+3VeBlepsVz6a/
+iMG2jjlmoqRmeXkfCA8mt8TgFesti/lww0wRKdDqIr3+XLjTS2LERfhe9acscaa1
+zuHkurdANFnwx9vxYh1uwAOZLaL7nGo9g93h+3HU+d+4+m2UQwW4f3DW7f0LCowC
+iCmgYMEO2BYsXXDRyIHBwdGSDgnypwnOVS49RS2wGBhHSLT92C7Y4/kksyD/Mecv
+CR7ahpBLDxVZIIUbXIui
+=g6UO
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/libgeotiff/libgeotiff-1.2.1-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.2.1-r1.ebuild
deleted file mode 100644
index 9e9d07e635ed..000000000000
--- a/sci-libs/libgeotiff/libgeotiff-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/libgeotiff-1.2.1-r1.ebuild,v 1.10 2012/04/25 17:10:20 jlec Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Library for reading TIFF files with embedded tags for geographic (cartographic) information"
-HOMEPAGE="http://remotesensing.org/geotiff/geotiff.html"
-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=""
-
-DEPEND=">=media-libs/tiff-3.7.0
-	sci-libs/proj"
-
-src_compile() {
-	append-flags -fPIC
-	econf
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	dobin bin/{listgeo,geotifcp,makegeo} || die "dobin failed"
-	dolib.a libgeotiff.a
-	dolib.so libgeotiff.so.${PV}
-	dosym libgeotiff.so.${PV} usr/$(get_libdir)/libgeotiff.so || die "dosym failed"
-	insinto usr/include
-	doins libxtiff/*.h
-	doins *.h
-	doins *.inc
-	insinto usr/share/epsg_csv
-	doins csv/*.csv
-}
diff --git a/sci-libs/libgeotiff/libgeotiff-1.2.4.ebuild b/sci-libs/libgeotiff/libgeotiff-1.2.4.ebuild
index 82dd789267db..1cbfaf90b111 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.2.4.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.2.4.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/libgeotiff/libgeotiff-1.2.4.ebuild,v 1.11 2012/04/25 17:10:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/libgeotiff-1.2.4.ebuild,v 1.12 2012/05/24 19:38:04 scarabeus Exp $
 
 inherit autotools eutils flag-o-matic
 
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="alpha amd64 ~mips ppc ppc64 sparc x86"
 IUSE="doc python"
 
 RDEPEND=">=media-libs/tiff-3.7
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild b/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild
new file mode 100644
index 000000000000..78ffa96e3872
--- /dev/null
+++ b/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild,v 1.1 2012/05/24 19:38:04 scarabeus Exp $
+
+EAPI=4
+inherit base
+
+MY_P=${P/_rc/RC}
+
+DESCRIPTION="Library for reading TIFF files with embedded tags for geographic (cartographic) information"
+HOMEPAGE="http://geotiff.osgeo.org/"
+SRC_URI="http://download.osgeo.org/geotiff/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc static-libs"
+
+RDEPEND="
+	virtual/jpeg
+	>=media-libs/tiff-3.9.1
+	sci-libs/proj
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_P/RC*/}
+
+DOCS=( README ChangeLog )
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--enable-debug=$(use debug && echo yes || echo no) \
+		--with-jpeg="${EPREFIX}"/usr/ \
+		--with-zip="${EPREFIX}"/usr/
+
+}
+src_compile() {
+	default
+
+	if use doc; then
+		mkdir -p docs/api
+		cp "${FILESDIR}"/Doxyfile Doxyfile
+		doxygen -u Doxyfile || die "updating doxygen config failed"
+		doxygen Doxyfile || die "docs generation failed"
+	fi
+}
+
+src_install() {
+	default
+
+	use doc && dohtml docs/api/*
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_postinst() {
+	echo
+	ewarn "You should rebuild any packages built against ${PN} by running:"
+	ewarn "# revdep-rebuild"
+	ewarn "or using preserved-rebuild features of portage-2.2:"
+	ewarn "# emerge @preserved-rebuild"
+	echo
+}