Version bump. Remove older.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 34 insertions, 62 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/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
 }