Stable on alpha, fix license syntax.

5 files changed, 21 insertions, 17 deletions

diff --git a/media-libs/giblib/ChangeLog b/media-libs/giblib/ChangeLog
index a7b47608e8a7..c71f7ac393a6 100644
--- a/media-libs/giblib/ChangeLog
+++ b/media-libs/giblib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/giblib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giblib/ChangeLog,v 1.15 2004/09/14 23:28:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giblib/ChangeLog,v 1.16 2004/11/08 23:01:27 kloeri Exp $
+
+  09 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> giblib-1.2.2.ebuild,
+  giblib-1.2.3.ebuild, giblib-1.2.4.ebuild:
+  Stable on alpha, fix license syntax.
 
 *giblib-1.2.4 (14 Sep 2004)
 
diff --git a/media-libs/giblib/Manifest b/media-libs/giblib/Manifest
index b61fe6bd1611..937ca662bd44 100644
--- a/media-libs/giblib/Manifest
+++ b/media-libs/giblib/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9b33c43bbcc8f77133d92c62e1f9cfad ChangeLog 1874
-MD5 c16866abc713361065f25555424031a9 giblib-1.2.2.ebuild 670
-MD5 bad457073bc1a52d77754f0f3e4c834a giblib-1.2.3.ebuild 793
+MD5 bd17a7b494d1be586fa02402df35ff41 giblib-1.2.2.ebuild 673
+MD5 cab6efc72140e48af2e7bf3d603c6780 ChangeLog 2032
+MD5 f46a663aa056c4a037ca38666855eb66 giblib-1.2.3.ebuild 800
 MD5 6b36114042766b590a929750635602fe metadata.xml 640
-MD5 0af32a6a1c882016ef69d11db4c73615 giblib-1.2.4.ebuild 820
-MD5 bd2c6f3969e5aa806ef43f96c23f4ace files/imlib-x-test.c 84
+MD5 aca78315ab919c9ee1949a6517701fef giblib-1.2.4.ebuild 824
 MD5 6f31ce14c952e21333c69c2c4d7d173d files/digest-giblib-1.2.2 64
 MD5 09fd67c47411427f2ed5fee63ef9b6d6 files/digest-giblib-1.2.3 64
 MD5 6ddf4a6071a44007ba8be97ab21ebfd4 files/digest-giblib-1.2.4 64
+MD5 bd2c6f3969e5aa806ef43f96c23f4ace files/imlib-x-test.c 84
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBUKYUHTu7gpaalycRAulGAJ9FaOH9UQJTX3tdA7rFKiTixdON5ACg6X5T
-9u3b6c/+GdcikKY6VIWfQJw=
-=yKfF
+iD8DBQFBj/rQugEuf3OQ0akRAg3CAJ9waFLVe+CPce7Dw8CeIyu6rWzAIgCgoRJa
+UuV9tjWPGVbr4H/9lCYblC8=
+=JryK
 -----END PGP SIGNATURE-----
diff --git a/media-libs/giblib/giblib-1.2.2.ebuild b/media-libs/giblib/giblib-1.2.2.ebuild
index e7d488e4abbf..dd5393526a08 100644
--- a/media-libs/giblib/giblib-1.2.2.ebuild
+++ b/media-libs/giblib/giblib-1.2.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giblib/giblib-1.2.2.ebuild,v 1.14 2004/07/14 19:36:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giblib/giblib-1.2.2.ebuild,v 1.15 2004/11/08 23:01:27 kloeri Exp $
 
 DESCRIPTION="Giblib, graphics library"
 HOMEPAGE="http://www.linuxbrit.co.uk/"
 SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="as-is | BSD"
+LICENSE="|| ( as-is BSD )"
 KEYWORDS="x86 ppc sparc ~alpha"
 IUSE=""
 
diff --git a/media-libs/giblib/giblib-1.2.3.ebuild b/media-libs/giblib/giblib-1.2.3.ebuild
index 030f2650ead2..0da8beb9727b 100644
--- a/media-libs/giblib/giblib-1.2.3.ebuild
+++ b/media-libs/giblib/giblib-1.2.3.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/giblib/giblib-1.2.3.ebuild,v 1.9 2004/07/31 01:35:55 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giblib/giblib-1.2.3.ebuild,v 1.10 2004/11/08 23:01:27 kloeri Exp $
 
 inherit gcc
 
@@ -8,7 +8,7 @@ DESCRIPTION="Giblib, graphics library"
 HOMEPAGE="http://www.linuxbrit.co.uk/"
 SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
-LICENSE="as-is | BSD"
+LICENSE="|| ( as-is BSD )"
 SLOT="0"
 KEYWORDS="x86 ppc sparc ~alpha amd64 ppc64"
 IUSE=""
diff --git a/media-libs/giblib/giblib-1.2.4.ebuild b/media-libs/giblib/giblib-1.2.4.ebuild
index 168f9aba38d7..c5ff53515c32 100644
--- a/media-libs/giblib/giblib-1.2.4.ebuild
+++ b/media-libs/giblib/giblib-1.2.4.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/giblib/giblib-1.2.4.ebuild,v 1.2 2004/09/21 22:06:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giblib/giblib-1.2.4.ebuild,v 1.3 2004/11/08 23:01:27 kloeri Exp $
 
 inherit gcc
 
@@ -8,9 +8,9 @@ DESCRIPTION="Giblib, graphics library"
 HOMEPAGE="http://www.linuxbrit.co.uk/"
 SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
-LICENSE="as-is | BSD"
+LICENSE="|| ( as-is BSD )"
 SLOT="0"
-KEYWORDS="x86 ppc sparc ~alpha amd64 ppc64"
+KEYWORDS="x86 ppc sparc alpha amd64 ppc64"
 IUSE=""
 
 DEPEND=">=media-libs/imlib2-1.0.3