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

4 files changed, 12 insertions, 8 deletions

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/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 )