Version bump to latest development version and include USE="static-libs" by Markus Meier.

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

4 files changed, 21 insertions, 19 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index a6a47d388fc0..aebd7fbe6d3e 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/tiff
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.153 2010/06/20 22:28:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.154 2010/06/21 22:04:09 ssuominen Exp $
+
+*tiff-4.0.0_beta6 (21 Jun 2010)
+
+  21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> tiff-3.9.4.ebuild,
+  +tiff-4.0.0_beta6.ebuild:
+  Version bump to latest development version and include USE="static-libs"
+  by Markus Meier.
 
 *tiff-3.9.4 (20 Jun 2010)
 
diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml
index 8316a4b0fa05..afea603b688a 100644
--- a/media-libs/tiff/metadata.xml
+++ b/media-libs/tiff/metadata.xml
@@ -9,8 +9,4 @@
 </maintainer>
 <longdescription>TIFF image library and tools, mostly for scanner and fax
  support, but also used by GIS and other imaging tools.</longdescription>
-<use>
-  <flag name="bigtiff">Provide support for very large tiff files.</flag>
-  <flag name="mdi">Provide support for MDI format graphics.</flag>
-</use>
 </pkgmetadata>
diff --git a/media-libs/tiff/tiff-3.9.4.ebuild b/media-libs/tiff/tiff-3.9.4.ebuild
index 79777923b4f5..397ece9d9b4f 100644
--- a/media-libs/tiff/tiff-3.9.4.ebuild
+++ b/media-libs/tiff/tiff-3.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.9.4.ebuild,v 1.1 2010/06/20 22:28:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.9.4.ebuild,v 1.2 2010/06/21 22:04:09 ssuominen Exp $
 
 EAPI=3
 inherit libtool
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="jpeg jbig +cxx zlib"
+IUSE="+cxx jbig jpeg static-libs zlib"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b:0 )
 	jbig? ( media-libs/jbigkit )
@@ -25,6 +25,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
+		$(use_enable static.libs static) \
 		$(use_enable cxx) \
 		$(use_enable zlib) \
 		$(use_enable jpeg) \
diff --git a/media-libs/tiff/tiff-4.0.0_beta5.ebuild b/media-libs/tiff/tiff-4.0.0_beta6.ebuild
index da23868dc00b..ff2d54787a8d 100644
--- a/media-libs/tiff/tiff-4.0.0_beta5.ebuild
+++ b/media-libs/tiff/tiff-4.0.0_beta6.ebuild
@@ -1,42 +1,40 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.0_beta5.ebuild,v 1.1 2010/05/12 03:38:15 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.0_beta6.ebuild,v 1.1 2010/06/21 22:04:09 ssuominen Exp $
 
-EAPI=2
+EAPI=3
 inherit eutils libtool
 
-MY_PV="${PV/_beta/beta}"
-S=${WORKDIR}/${PN}-${MY_PV}
+MY_P=${P/_}
 
-DESCRIPTION="Beta release of TIFF4 (Tag Image File Format) image library."
+DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images"
 HOMEPAGE="http://www.remotesensing.org/libtiff/"
-SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${PN}-${MY_PV}.tar.gz"
+SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+bigtiff +cxx jpeg jbig -mdi zlib"
+IUSE="+cxx jbig jpeg static-libs zlib"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b:0 )
 	jbig? ( media-libs/jbigkit )
 	zlib? ( sys-libs/zlib )"
 
+S=${WORKDIR}/${MY_P}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.9.2-CVE-2009-2347.patch
 	elibtoolize
 }
 
 src_configure() {
-	use prefix || EPREFIX=
 	econf \
 		--disable-dependency-tracking \
-		--disable-silent-rules \
-		$(use_enable bigtiff largefile) \
+		$(use_enable static.libs static) \
 		$(use_enable cxx) \
 		$(use_enable zlib) \
 		$(use_enable jpeg) \
 		$(use_enable jbig) \
-		$(use_enable mdi) \
 		--without-x \
 		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
 }
@@ -52,7 +50,7 @@ pkg_postinst() {
 		elog "JBIG support is intended for Hylafax fax compression, so we"
 		elog "really need more feedback in other areas (most testing has"
 		elog "been done with fax).  Be sure to recompile anything linked"
-		elog "against tiff."
+		elog "against tiff if you rebuild it with jbig support."
 		echo
 	fi
 }