Use libtiff as LICENSE instead of as-is wrt #445934 by Ulrich Müller

Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

6 files changed, 25 insertions, 17 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index 18c8f4eca735..cdbe972627b7 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/tiff
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.219 2012/11/14 14:24:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.220 2012/12/11 08:44:51 ssuominen Exp $
+
+  11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> tiff-3.9.5-r3.ebuild,
+  tiff-4.0.2-r1.ebuild, tiff-4.0.3.ebuild, tiff-4.0.3-r1.ebuild:
+  Use libtiff as LICENSE instead of as-is wrt #445934 by Ulrich Müller
 
   14 Nov 2012; Justin Lecher <jlec@gentoo.org> tiff-3.9.5-r3.ebuild:
   Prefix fix for temporary installation directory
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 18dfabcdeadd..9ad746c2bb3c 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -8,16 +8,20 @@ AUX tiff-4.0.3-tiff2pdf-colors.patch 529 SHA256 18c1446e15383bdb94884bc140002719
 DIST tiff-3.9.5.tar.gz 1455502 SHA256 ecf2e30582698dbc61d269203bbd1e701a1a50fb26c87d709e10d89669badb33 SHA512 814d5b2b488c8332ab1e17095004d42d44717a530ab2675740ef4256050971fb5feb35f804001e1bc5081f4a02c38922555fdc4c947b041876c96a32385da094 WHIRLPOOL 24e348c6d7c754f70706faab72956dc85b48225c4e31a10f4a16536f434fd269a20aa3beed9bddff6a0af2fb67fc73fd946c9e0397f4a6d8599d20b79c2215aa
 DIST tiff-4.0.2.tar.gz 2022814 SHA256 aa29f1f5bfe3f443c3eb4dac472ebde15adc8ff0464b83376f35e3b2fef935da SHA512 bfc82b2780f2a7d89b1cd6d73ba45091fc74de996b2dad616cfdba59770b192449d6a9effba305f478a8e527d7246443a4e2bc1c5e2e6673a0037972f4a13413 WHIRLPOOL 1c89f2760413035f37dfde47d7c8884fa899e86b7911fd6b52b2920c830898b8f26f8d9a287ed6dc3820feb7fa21c50fb1dba278c57fb548806e8700c23e1ec9
 DIST tiff-4.0.3.tar.gz 2051630 SHA256 ea1aebe282319537fb2d4d7805f478dd4e0e05c33d0928baba76a7c963684872 SHA512 d80e18b00e9e696a30b954c0d92e5f2f773fd9a7a0a944cf6cabb69c1798e671506580daa1cd2ebf493ae922000170c2491dfc6d4c0a9cd0b865684070595a73 WHIRLPOOL 762ace7c66dec7a6f350bc8c000a9e1f4b775e7b148b1d923eb3f7c015f47bda65a54bc0b5974ce665c7d836ec0b275c9307d1f18f3b6bee8b0949a6cceb319e
-EBUILD tiff-3.9.5-r3.ebuild 1792 SHA256 e8dd7180c8d02314d1bb6e076441edf0823298d62f395ae290c0606f748e29d2 SHA512 246e8adb4fcfcab819a9273edc1eb6ca2f4c9551ceb93c92f0682d9ec9a620da50e04eb7d5f5aa76407b00229ebfa15ec78dcf48b545935f5e03483dcad17470 WHIRLPOOL b2adaa0daa8b59e3e2657664eec5791ae422904d827add4a3d87cf0d4b092d5ec8a75b462236e921677cbb3d53f0994f8fcd25e6ce1d4f94fd465fff4511ad52
-EBUILD tiff-4.0.2-r1.ebuild 1442 SHA256 cf2883fb4d37c9470d1f17a6cffd5b45032a7a51960fdc7fdfabc529bbec3ddd SHA512 6bc49921fc17a23548653662e9c1b9a77aec413f70e18642c87e878a4652b74b1b6b66e97df532f2153cdf38877b61b901d2c5a2165871f09f6b2dd5e1287480 WHIRLPOOL 793d872882ff941010be75e04a73f62e17dfb8ea3084be63f2c35bce3764b1f3efe2ee3ab75527e60652b9e3cf72d78289c5a53e6b04e097c2448977914dc65f
-EBUILD tiff-4.0.3-r1.ebuild 1418 SHA256 e961e7ed72b577a2ef45dd669983954a31b151873ab3f4f5428291f6338e8021 SHA512 79eb20bea9759c95c109da789a65ff5f6c81885bc1faf015925291d3c068c7eaea295af62597ccdda7bfba890b036cd6cf5f251af6c335e4514af4b163a2d06e WHIRLPOOL e02ed25bd3eead64b5d92467939811088f0fcd5a4b3876d9b30647cd43f6c43f2768d4a4487d1e4baa1f5a9e163aeb79442c3e6a02cfdd206fbca0d8cbfecb42
-EBUILD tiff-4.0.3.ebuild 1351 SHA256 66d7e6f091be9a625a239686cf22dfc6a04046a710e4e0a859634d1b10ff4ad7 SHA512 785be96d725b41a00b04c8759558b67d67ec44ce269e6aa4ff6483a1d37c6493f1f330d26e692a8097c9b40c0e57d5350fc4658d6d72fb293e223dfd65e34aad WHIRLPOOL 51d1d4cd8a3c35663f829bc72f9645abca5e7f1308e8c091ae946916a4c29bae13792b8ccff98264ef0000108f6ebce3a73eb23d4e80adf0b7c2843f12a228f0
-MISC ChangeLog 30332 SHA256 2fba163ca07a7c8fd670b16ab5c103f7c794db34872bedde4ee31a4e521f6d1d SHA512 4241d278e7279e7176123c7ad4afe254b8ae431332526124e8bc90216baf2c1a2fda4d003495d1c445b792988c38e8d22cbfb5cfc56a98331d91a04d7f7aebcc WHIRLPOOL 0bf92ff8834b7bc2fe9bd53f150959d9887c2506928411f8f9edc6ef2b8de2746598e5c11c3b4ed74bfae8daafaf9a12ea3649405ea144a7d5d77a83a95a7cc6
+EBUILD tiff-3.9.5-r3.ebuild 1799 SHA256 10fc18a8ada9f8763ff295b6f42326b0f6866e235aeac1261f42dd1ad62a12fd SHA512 9434a31ccb4603d0278cfa0b51df4d902a627466f8243045585064db73627418ea871ea4a6f749acbe9f4792bddb6b7f2d28bc3a035da5daea8067338ae8d157 WHIRLPOOL 1cbc9bd3e518d48c8b42420c7db495bd95810ed571dc13ee4be5378c816383f75ae19e2d02f711c61a95642777458840340b15e8e438bc48cd2d72309955ce15
+EBUILD tiff-4.0.2-r1.ebuild 1446 SHA256 4301e356a342b75d9425d94ca7fc0f29eb956265136d23219851cbd7532c9c86 SHA512 f3f5ccd83c300a3acd445e9fe420c9c3150ad3933a80db1a315ff55afd73ca0829f6848bca49e0dab44246c506c12d8595eeb6d442cf414f28d20397da8034ea WHIRLPOOL ebe9c1d649335cdedf6630fb943cd916f2a64898a18015c0a389e3299b850b9a2c50ccc54a93519c7f2e72988bfa492969db52afe1068429cbca7b3cab049941
+EBUILD tiff-4.0.3-r1.ebuild 1420 SHA256 99cc3e2b0c631a5dc9406436b3c48c026d55c5d185ef171952ea2dabd89123c6 SHA512 50a2456cb7ae91249c35c01821073f6fdd8a5f6d53a8bbc8babb50d6095bf64f3040d3f9e6a01942bc84bbecf2fa003777ba1c97993cf2e1cf6f788495c5c876 WHIRLPOOL 96681181151de4d2cfd2fe52127234e97c089617a35d21215952a4a9845dcc52a2efe2ca5856e8377790905abeae207fdedacb8d59cdd27781f7fbf5be9ce242
+EBUILD tiff-4.0.3.ebuild 1353 SHA256 ae60d4451163f8fde953b0ba1120f3a10d01601a23d457ecf05f2ea0007c477f SHA512 a5aabfa782dc9c97e9a93e7f1a224152d7a561d0c8131042ca24e5ab40744125be8fc1e1a892a4f6f808003bd2d8c881ccaafd1165522f829adf15956d9d3689 WHIRLPOOL 4841ce497247a05952c1b83f718983422b819642a133acea9ab5daa6daeccc2ceb6f6faa2b26957fa9f965751d99ed533575c550e93205386d0c427965745eb2
+MISC ChangeLog 30551 SHA256 760017adeb310bec1fed4534830f00fbbb2890e27461ab3d3bb70cbda2a3c0e6 SHA512 0b542359c4aef3e5584bf3bed542d1607580c74c789349d4d7830b8077e98d12585e0b52b7b06b28a2188160393d7e634ebddc88b41dbd309d914980029fee20 WHIRLPOOL fc7bccbe9233e3c3dfd5dc23e1366ffe4c515d372616c40a3bb68b23ebc027131e5bbc9915ab1473799051e5154a5c56cab6485319ab126db3c621baeaba7e02
 MISC metadata.xml 309 SHA256 c1893fd7aaa763da14257353ceca7356500d8c8112f635f587c4ef407bd6ca51 SHA512 435eddb4a4280b37dd5948f305f88c5b3c8d193d50776a4c608132addcff03016fb00b218ad8be93a59dfdde28b57fc9d1327b18dc772344057147a5d3826f4b WHIRLPOOL b3323fa861535082bd475896c3cd5490c584cfe0262ffa25288bcda76e36ee58c42c825811ccc34078ed624e48467842012750cd650cf91398313cf4c6b60892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCjqacACgkQgAnW8HDreRYeOwCeJOVL2RF2E2FWqVh+BHwCj/O+
-vSMAoLHZrA3B9ASD/0rDDUKnWBkb9qFc
-=bojA
+iQEcBAEBCAAGBQJQxvKEAAoJEEdUh39IaPFN+fQH/i7fSywKiNU44nqeQU3X/gE/
+S68b6shKDkH9KGP1wSlpFgv2RczGeCD2gCJHyPQviKQbIuBRBtV/xKmFcd879DJ/
+jOK82JbaaUElHcFIUCOtQfTjuvgrgOy9ktH/+50a+R2SuceJptTYNfJJMgDZ2f0q
+46/EQMJsMphDbYzd5Pjp0Rgum0pRbLtbA2HHvXrpwE1Br3cuTLSlKrDO+Yu9Ff3m
+uWh1k3NT8YIxBNCahFjdyMERZgU3kLQhhCD20sCiggF5H72+sWeRAwJVFH1GKhvc
+kn9mCu9rJ0o0fw90aB9uN/i6cSnKiNRrTZ4LAng7LNve0K3PF5dn8aGDk18Kmr8=
+=9e2U
 -----END PGP SIGNATURE-----
diff --git a/media-libs/tiff/tiff-3.9.5-r3.ebuild b/media-libs/tiff/tiff-3.9.5-r3.ebuild
index ff2f9e23df33..255c99a37698 100644
--- a/media-libs/tiff/tiff-3.9.5-r3.ebuild
+++ b/media-libs/tiff/tiff-3.9.5-r3.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/media-libs/tiff/tiff-3.9.5-r3.ebuild,v 1.4 2012/11/14 14:24:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.9.5-r3.ebuild,v 1.5 2012/12/11 08:44:51 ssuominen Exp $
 
 # this ebuild is only for the libtiff.so.3 (+ 4) and libtiffxx.so.3 (+ 4) SONAME for ABI compat
 
@@ -11,7 +11,7 @@ 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/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="libtiff"
 SLOT="3"
 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="+cxx jbig jpeg zlib"
diff --git a/media-libs/tiff/tiff-4.0.2-r1.ebuild b/media-libs/tiff/tiff-4.0.2-r1.ebuild
index ce713e8a4ca6..09be9dc27074 100644
--- a/media-libs/tiff/tiff-4.0.2-r1.ebuild
+++ b/media-libs/tiff/tiff-4.0.2-r1.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/media-libs/tiff/tiff-4.0.2-r1.ebuild,v 1.6 2012/09/23 17:27:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.2-r1.ebuild,v 1.7 2012/12/11 08:44:51 ssuominen Exp $
 
 EAPI=4
 inherit eutils libtool
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.remotesensing.org/libtiff/"
 SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 	ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="libtiff"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs zlib"
diff --git a/media-libs/tiff/tiff-4.0.3-r1.ebuild b/media-libs/tiff/tiff-4.0.3-r1.ebuild
index 2d4c844a17c3..d148d7d66718 100644
--- a/media-libs/tiff/tiff-4.0.3-r1.ebuild
+++ b/media-libs/tiff/tiff-4.0.3-r1.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/media-libs/tiff/tiff-4.0.3-r1.ebuild,v 1.1 2012/11/03 04:41:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.3-r1.ebuild,v 1.2 2012/12/11 08:44:51 ssuominen Exp $
 
 EAPI=4
 inherit eutils libtool
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.remotesensing.org/libtiff/"
 SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 	ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="libtiff"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs zlib"
diff --git a/media-libs/tiff/tiff-4.0.3.ebuild b/media-libs/tiff/tiff-4.0.3.ebuild
index d5f66656fd93..6f050e1dac93 100644
--- a/media-libs/tiff/tiff-4.0.3.ebuild
+++ b/media-libs/tiff/tiff-4.0.3.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/media-libs/tiff/tiff-4.0.3.ebuild,v 1.1 2012/10/03 05:28:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.3.ebuild,v 1.2 2012/12/11 08:44:51 ssuominen Exp $
 
 EAPI=4
 inherit eutils libtool
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.remotesensing.org/libtiff/"
 SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 	ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="libtiff"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs zlib"