Version bump. Remove older.

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

4 files changed, 47 insertions, 66 deletions

diff --git a/sci-libs/libgeotiff/ChangeLog b/sci-libs/libgeotiff/ChangeLog
index 099ffa5c17a7..30a236a44e51 100644
--- 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.29 2010/04/17 17:14:03 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/ChangeLog,v 1.30 2010/04/26 22:29:26 scarabeus Exp $
+
+*libgeotiff-1.3.0_rc2 (26 Apr 2010)
+
+  26 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libgeotiff-1.2.1.ebuild, -libgeotiff-1.3.0_beta1.ebuild,
+  +libgeotiff-1.3.0_rc2.ebuild:
+  Version bump. Remove older.
 
 *libgeotiff-1.2.5 (17 Apr 2010)
 
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 19d5436d84de..bf784f78db3e 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -5,11 +8,17 @@ AUX libgeotiff-1.2.5-make.patch 368 RMD160 a3d3a06cf834fa9285589ead84eec18aa6b98
 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
+DIST libgeotiff-1.3.0RC2.tar.gz 1287837 RMD160 845a2bba9b8b6204d86895f7580e3ae9f3b8ed67 SHA1 b8cde5014cf82fe4683fa35fc81a5ea8d64b940f SHA256 0fa2e9130281c5867ada551ef757fd81f54c760d9f3039d33e349f992f440d27
 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 5322 RMD160 bacbe86c7b4e7b4f739dfe18b32efb8d16899303 SHA1 102500fe2050e884da08c94a07ac5e292ea09545 SHA256 8a77fd698fe23cba63484af4d0f0ea1733e2a7f3646f2aaaffb600472c1d24e7
+EBUILD libgeotiff-1.3.0_rc2.ebuild 1558 RMD160 47f4728e8cb9ba8cec7df5b6d2f21494c9dffa0e SHA1 897f0e199a19572d4131ab08761f4e9a4c6a7628 SHA256 905decd00a0724dcb4c1a2e8bf385d15be238e4eef1f931c2a2bebb49523550f
+MISC ChangeLog 5539 RMD160 ce5d6b880d209a848b0735b7b4224eb5b0e08ece SHA1 cf85ff7de1a9e0ceec43fa3b1ceb3b001f6ded11 SHA256 f5687d4f34dc8d5038c0746226ce4016b8a7bdb22bd8ab2ef9013f640bfc9802
 MISC metadata.xml 231 RMD160 449dd5a1a2bcddbfa9037704447bf95b708ee7c9 SHA1 1b8b972d346fe0e712300bb28a22c3f56575f3fc SHA256 307488f16994a0736abcb26d9c1ce9b77f9b07f981513493d46ac3eb6f8ece14
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvWE6kACgkQHB6c3gNBRYfEuQCgvT6mOM3gXFvfaCCdAROrvZ+p
+HjkAnj73LK/J7u4pu6ZZ/pLPSyjomXP8
+=Hjgm
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/libgeotiff/libgeotiff-1.2.1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.2.1.ebuild
deleted file mode 100644
index f7848281db81..000000000000
--- a/sci-libs/libgeotiff/libgeotiff-1.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 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.ebuild,v 1.7 2009/09/23 20:08:23 patrick Exp $
-
-inherit eutils
-
-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() {
-	econf || die "econf failed"
-	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.3.0_beta1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.3.0_rc2.ebuild
index 591e2984b2a6..1938cc399b71 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.3.0_beta1.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.3.0_rc2.ebuild
@@ -1,44 +1,42 @@
 # 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.3.0_beta1.ebuild,v 1.3 2010/01/02 18:09:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/libgeotiff-1.3.0_rc2.ebuild,v 1.1 2010/04/26 22:29:26 scarabeus Exp $
 
-EAPI="2"
-inherit eutils flag-o-matic
+EAPI="3"
+inherit base
 
-MY_P=${P/_beta/b}
-MY_S=${P/_beta1/}
+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="ftp://ftp.remotesensing.org/pub/geotiff/${PN}/${MY_P}.tar.gz"
+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 ~x86-macos"
-IUSE="debug doc"
+IUSE="debug doc static-libs"
 
-RDEPEND=">=media-libs/tiff-3.9.1
+RDEPEND="
 	media-libs/jpeg
-	sci-libs/proj"
+	>=media-libs/tiff-3.9.1
+	sci-libs/proj
+	sys-libs/zlib"
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-S=${WORKDIR}/${MY_S}
+S=${WORKDIR}/${MY_P/RC*/}
 
 src_configure() {
-	local my_conf=""
+	econf \
+		$(use_enable static_libs static) \
+		--enable-debug=$(use debug && echo yes || echo no) \
+		--with-jpeg=/usr/ \
+		--with-zip=/usr/
 
-	if use debug; then
-		my_conf="--enable-debug=yes"
-	else
-		my_conf="--enable-debug=no"
-	fi
-
-	econf || die "econf failed"
 }
 src_compile() {
-	emake || die "emake failed"
+	base_src_compile
 
 	if use doc; then
 		mkdir -p docs/api
@@ -49,15 +47,17 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	base_src_install
 
-	dodoc README
-	use doc && dohtml docs/api/*
+	dodoc README ChangeLog || die
+	use doc && { dohtml docs/api/* || die ; }
 }
 
 pkg_postinst() {
-	elog
-	ewarn "You should rebuild any packages built against ${PN}"
-	ewarn "by running: revdep-rebuild --library='libgeotiff.so.*'"
-	elog
+	echo
+	ewarn "You should rebuild any packages built against ${PN} by running:"
+	ewarn "# revdep-rebuild --library='libgeotiff.so.*'"
+	ewarn "or using preserved-rebuild features of portage-2.2:"
+	ewarn "# emerge @preserved-rebuild"
+	echo
 }