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

(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

5 files changed, 13 insertions, 9 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/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"