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

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

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index a6a47d388fc0d4729eccc071b6eb1714f496756f..aebd7fbe6d3ef2d48cb7c2af8a2c6c04a662df24 100644 (file)
--- 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/Manifest b/media-libs/tiff/Manifest
index 1b55e3cc88fed77430a338008181f3752cee11ab..fc4ae238e810e9a70336c3494c9ea18e872281ff 100644 (file)
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -2,9 +2,9 @@ AUX tiff-3.8.2-CVE-2009-2285.patch 717 RMD160 6fca42b138383626becf1221ec85509356
 AUX tiff-3.9.2-CVE-2009-2347.patch 2571 RMD160 142c305b3a1cd9c0f27b482ced15104e82f43a19 SHA1 04c0bb3f6bcfa27e89f00f97c843b2f9d5220ce8 SHA256 27839133f0ddd51b7c5f53e85b7985f68284ab0da4ba589e629fe085be62074b
 DIST tiff-3.9.2.tar.gz 1419742 RMD160 22716e0bcee93a654a704900f3e19f41600f3d18 SHA1 5c054d31e350e53102221b7760c3700cf70b4327 SHA256 3cd566c19291ea3379115dd0d2ebcdefb6a7cf0511cc33e733ec3a500e10da69
 DIST tiff-3.9.4.tar.gz 1436968 RMD160 3e0a74b6294297c16fb983ad68056a1dfbbdb1de SHA1 a4e32d55afbbcabd0391a9c89995e8e8a19961de SHA256 67b76d075fb74f7cb32e7e4b217701674755fe6cee0f463b259a753fce691da6
-DIST tiff-4.0.0beta5.tar.gz 1928857 RMD160 45f7223a1b0f825e29f6ff1d45189e835212ba64 SHA1 ac314013e91e6b74806ae50c79fa2c9407f1cec7 SHA256 64b61567782643a841e33a8d031d0d6a9b3e436108829e2e947183f8dcdc6ec7
+DIST tiff-4.0.0beta6.tar.gz 1968829 RMD160 deab0908742a309f1b2954f1d1b5e2aaaa3180d0 SHA1 20aabb4d92bd5980a382e8ca53a2e010c7580976 SHA256 de016175742bcdd0cd6f326dd2e7bbc7154437d7bb09976ad4789016065061e6
 EBUILD tiff-3.9.2-r1.ebuild 1604 RMD160 f97539a32f5163afbe916106dadc3f7a98deb0fe SHA1 e0b8bef40db8f5106d17c29897e4c75f086b40af SHA256 3b270c8e8717267ef155ff81aaabeab58c2f2c839c956ad0485862215a37fa28
-EBUILD tiff-3.9.4.ebuild 1488 RMD160 6736476223feff86ba911d52f2874380df99b1f1 SHA1 11db2d54a7daffacfafb0311a8773aa414a3b2b5 SHA256 5b0a0374130d95486c06be0a918d73dcc1b2a75a4ab016394f7d38ebdfe7e77f
-EBUILD tiff-4.0.0_beta5.ebuild 1701 RMD160 d6a5a31a0610c1fb4a6dbfa01a2548b50f902233 SHA1 dd7618679dafb75988288b838698dc0d1ac201ec SHA256 6503b5408f7a81d782463178160ff4640805a3eadf9d749739c854788a161569
-MISC ChangeLog 20985 RMD160 4fa102f369aaa309e2e02375ac181ec076e329d7 SHA1 27f468e70b347f3d241e1b7a02a3084de72eb622 SHA256 4828d2d6fbe3ac3c3649628898de736d14dda81bf7b67aefe834610b0eb155cb
-MISC metadata.xml 601 RMD160 602afed92ceb5bb6604ab6aaac0f3d0636934246 SHA1 2f44b068cdecda0830d1d7d280713a8f3be14ff4 SHA256 f0088305b6654c9a6039f05e99adb65f256150e1e810cf74d87a63d9831c2fd8
+EBUILD tiff-3.9.4.ebuild 1537 RMD160 fa1afc24dba6dff75b848fb8515670f45c206d93 SHA1 32d3951a49086c6f956d347cb7426ee06f233a66 SHA256 d3eb1dfe24cb775a96f8dc9d547411da9bf9109c4d3b1a8145917e2ccf3c6afd
+EBUILD tiff-4.0.0_beta6.ebuild 1642 RMD160 56ea8eaf6b6fa6845256f2f8e06b49ee3aab6123 SHA1 b179bc1f4c46f3d1d6301578556b73c76465be9d SHA256 dc49f195b9ab3fd594280dcb51a129fcae12360606265563b29634ffd98c1b3d
+MISC ChangeLog 21214 RMD160 13b85766f0d817903664125e2e9443475dbac24d SHA1 b6c6064ec7d9b4b40e3bff412c568c4a2e502adc SHA256 477e625648d9ad43e9df90f6e91801240f8a3904172706f6f1296704b39beca5
+MISC metadata.xml 448 RMD160 0419f91f1f20efdc94d3894f6a4fc6471f22d0a1 SHA1 d743d16f4afb124bbe57a45b217b92f71b515f20 SHA256 61b04082cf0ccec1f58146fab271f88e56009277edee28b3f297eafb0562f4c9

diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml
index 8316a4b0fa05e4c0ce6ce52a3ecac10b828b224c..afea603b688a1af2cd0ebc26101c2563d1ece6d6 100644 (file)
--- 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 79777923b4f5cbcd286c011c5aff33b899614627..397ece9d9b4f11d6e7d685fd73a162e2e0aac0d6 100644 (file)
--- 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
similarity index 74%
rename from media-libs/tiff/tiff-4.0.0_beta5.ebuild
rename to media-libs/tiff/tiff-4.0.0_beta6.ebuild
index da23868dc00b4be4bf4227038b35830060017b64..ff2d54787a8d11378c7d6cb8143b36407909bb7f 100644 (file)
--- 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
 }