From: Michael Hanselmann <hansmi@gentoo.org>
Date: Sun, 31 Oct 2004 11:07:35 +0000 (+0000)
Subject: Stable on ppc, update to the new LICENSE-syntax.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=407131b408c5e9e0271c152c1653ca30ae1523c3;p=gentoo.git

Stable on ppc, update to the new LICENSE-syntax.
---

diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index 1c768a48cfe4..df0c1784c166 100644
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/gd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.8 2004/10/30 22:00:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.9 2004/10/31 11:07:35 hansmi Exp $
+
+  31 Oct 2004; Michael Hanselmann <hansmi@gentoo.org> gd-1.8.4-r2.ebuild,
+  gd-2.0.28.ebuild, gd-2.0.30.ebuild:
+  Stable on ppc, updated to the new LICENSE-syntax.
 
 *gd-2.0.30 (30 Oct 2004)
 
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 6b6483b7524c..a94ec1fe7214 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 795e8835d446aa3f1514fedc8c082b22 ChangeLog 7057
-MD5 45c3e4f26e85dd60cb7d8fde1f7200a4 gd-2.0.30.ebuild 959
-MD5 e1e99ec5ea5356a9a95a8a32cca42525 gd-2.0.28.ebuild 953
+MD5 9e92e7c3df3fe40664e0b476c70ed2ae gd-2.0.30.ebuild 963
+MD5 fb45f43372ca8e8c5a8ee203d52cb1dc gd-1.8.4-r2.ebuild 2225
 MD5 312563b7288a2111976b24b0865d9df8 metadata.xml 1227
-MD5 92245c1143479ca38c07f068460a7bb4 gd-1.8.4-r2.ebuild 2220
+MD5 73053c80326e09068f105b55b4b0ccca ChangeLog 7222
+MD5 ecf98c50570a620b6e064d83abed4303 gd-2.0.28.ebuild 958
 MD5 09cc9995071652c954638c7ed2590dee files/1.8.4-jpeg-inc.patch 419
-MD5 e9f2abd6a0ef05426a70dd19610678c9 files/digest-gd-2.0.30 61
-MD5 7f1d011b6f09a5125c3c5151abbb2f56 files/digest-gd-2.0.28 133
 MD5 1b0c2bb216ba3a29f024514a934ca995 files/digest-gd-1.8.4-r2 60
 MD5 c700ef06f9532087e4f27487633179a9 files/1.8.4-dec-alpha-compiler.diff 725
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBhA8/HTu7gpaalycRAiQ2AKCyaTi8XCiFksq5Oz0gIsk+KiC5CgCg8LYi
-H9ObItzQXTVsUzoTTXv7m+4=
-=Q9/2
------END PGP SIGNATURE-----
+MD5 7f1d011b6f09a5125c3c5151abbb2f56 files/digest-gd-2.0.28 133
+MD5 e9f2abd6a0ef05426a70dd19610678c9 files/digest-gd-2.0.30 61
diff --git a/media-libs/gd/gd-1.8.4-r2.ebuild b/media-libs/gd/gd-1.8.4-r2.ebuild
index 5462f575680d..61f2628b9928 100644
--- a/media-libs/gd/gd-1.8.4-r2.ebuild
+++ b/media-libs/gd/gd-1.8.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-1.8.4-r2.ebuild,v 1.2 2004/10/26 14:02:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-1.8.4-r2.ebuild,v 1.3 2004/10/31 11:07:35 hansmi Exp $
 
 inherit eutils toolchain-funcs
 
@@ -8,7 +8,7 @@ DESCRIPTION="A graphics library for fast image creation"
 HOMEPAGE="http://www.boutell.com/gd/"
 SRC_URI="http://www.boutell.com/gd/http/${P}.tar.gz"
 
-LICENSE="as-is | BSD"
+LICENSE="|| ( as-is BSD )"
 SLOT="0"
 KEYWORDS="x86 ppc sparc hppa amd64 alpha ia64"
 IUSE="X truetype freetype-version-1 jpeg"
diff --git a/media-libs/gd/gd-2.0.28.ebuild b/media-libs/gd/gd-2.0.28.ebuild
index 24c457aca497..41a8851e75f5 100644
--- a/media-libs/gd/gd-2.0.28.ebuild
+++ b/media-libs/gd/gd-2.0.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.28.ebuild,v 1.3 2004/10/19 14:35:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.28.ebuild,v 1.4 2004/10/31 11:07:35 hansmi Exp $
 
 inherit gnuconfig
 
@@ -8,7 +8,7 @@ DESCRIPTION="A graphics library for fast image creation"
 HOMEPAGE="http://www.boutell.com/gd/"
 SRC_URI="http://www.boutell.com/gd/http/${P}.tar.gz"
 
-LICENSE="as-is | BSD"
+LICENSE="|| ( as-is BSD )"
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="jpeg png X truetype"
diff --git a/media-libs/gd/gd-2.0.30.ebuild b/media-libs/gd/gd-2.0.30.ebuild
index d0cebebd77cb..2fa59f8c94a8 100644
--- a/media-libs/gd/gd-2.0.30.ebuild
+++ b/media-libs/gd/gd-2.0.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.30.ebuild,v 1.1 2004/10/30 22:00:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.30.ebuild,v 1.2 2004/10/31 11:07:35 hansmi Exp $
 
 inherit gnuconfig
 
@@ -8,9 +8,9 @@ DESCRIPTION="A graphics library for fast image creation"
 HOMEPAGE="http://www.boutell.com/gd/"
 SRC_URI="http://www.boutell.com/gd/http/${P}.tar.gz"
 
-LICENSE="as-is | BSD"
+LICENSE="|| ( as-is BSD )"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 ~sparc x86"
 IUSE="jpeg png X truetype"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b )