Fix LICENSE, "||" would mean dual licensing which is not the case here.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 21 insertions, 18 deletions

diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index 2d3d873d69e7..a8b8a34216dd 100644
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/gd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.80 2012/02/27 20:17:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.81 2012/03/02 06:59:29 ulm Exp $
+
+  02 Mar 2012; Ulrich Müller <ulm@gentoo.org> gd-2.0.35-r3.ebuild:
+  Fix LICENSE, "||" would mean dual licensing which is not the case here.
 
   27 Feb 2012; Mike Frysinger <vapier@gentoo.org> gd-2.0.35-r3.ebuild:
   DEPEND on pkg-config #406057 by cyberbat.
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index c65e2a31ca38..47ed54204bf4 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -6,23 +6,23 @@ AUX gd-2.0.35-libpng-pkg-config.patch 4240 RMD160 46c596c53cf4c1892c85dad591e349
 AUX gd-2.0.35-libpng14.patch 347 RMD160 2d845e72cfe88a0b32d61efc8377b0d5aa438709 SHA1 cba6b3a13c9d35bbe3446dcf7130250e1b3958fa SHA256 b9f5e121ae652e211c866e1982bc6c37303d43b2a3df420be7069ca5fbb04bc4
 AUX gd-2.0.35-maxcolors.patch 348 RMD160 14ef5425229c5406c90beb4a8fade801cd1013bb SHA1 1da2b14b84f2f44aeac04d16cd5fd07e6272966e SHA256 c5dbbc7c1acd9e602fea8bf893333ca6258e7801761b6c899c7da62cd88cbc3b
 DIST gd-2.0.35.tar.bz2 1212730 RMD160 f452a2c333b2ba9b7b4c143983ec2af18a335516 SHA1 ccf34a610abff2dbf133a20c4d2a4aa94939018a SHA256 bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9
-EBUILD gd-2.0.35-r3.ebuild 1998 RMD160 d9bb09c5e04638da8500018f528c93f9e80775f0 SHA1 c34e999d00466d95c89122839ca8e3b588338ab8 SHA256 6177060e49361b20fa8403f953c2330dfa2f61054106fecbb1d211f786664ae0
-MISC ChangeLog 16095 RMD160 b1559b5a13c5df96b320b8c543de5ba26b83c105 SHA1 d05cfca38a1da1867fe71a87def43dedcdd4d47d SHA256 c6c1d9d642f308c1f3c5361c6b92a1a6b87f0f0cbd83fba14e7ee3744f654c60
+EBUILD gd-2.0.35-r3.ebuild 1988 RMD160 e256a43688cc8c037687fbcd2f22dcdf7afb2736 SHA1 9fbbdcc777df51dec02b5b84e3225d164175d364 SHA256 3f6d8f07eaec8d44ddb377214734e8d0b5728de919f4100554bdbcd3859ac5ad
+MISC ChangeLog 16235 RMD160 da4ae10abdf89114e454a0e8f39067507dc6cc66 SHA1 679d9e3ea0ab631fa2768f052424a64e9875853d SHA256 2c59b062b2f4dc43566a1562b0b8a81b34b503bb5cf1cc207824605d14bbf23d
 MISC metadata.xml 1199 RMD160 d34c8a08b02ececd35c66c0c3594f326639ef8a5 SHA1 e52d9e8500558488eee80333fe2e112a23a519a5 SHA256 a670f3b0950512e392f25f290fc70b953c941cecdc6919cb38048bef2d46c843
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPS+TRAAoJELEHsLL7fEFWtDsP/jkqn3A5XjUWYimPxum2ZPnp
-ZqMAppTnbVnhpF3YwS/z3VX7nOjzpmlIZH3rsMJ0+WzubdCw9Zx0/OSZ1E+8VpnX
-AhG5Jv/OjCTQDkaEh6oxnPiFjqcC+jHZuodJ+igOtQ7nw8xk1M92fuUpxRzZd+hK
-5gj3SQQdRdfcIOMruFCWhf7FG2p1+E04GL8H2aaq1QEJYZ/JSEYpZ+3F7a2XYEI3
-31hG4gsIbi+hYQazBOmbTk8S3bgOgZi5Mmw6e0RGvqy1O6rMS5rlOWvRmPMXqMv4
-cfDhN8iz/J1ETOVOAmHWfoCo77RzdQNJe17jUjduczPrxGxYqEZnz7iLiNPJXaPm
-6n66w2McdHXIKtzsx0AAOHeioW02TLDPmHaNqZCP6zK6F/1v5Skvob6pGKk6JOJF
-eoGY1EPS1aa+PSTJ2BwwgCfsINPCZOWVxuNour7NTP4TEHwxFQBEU0ITmWJyTqTk
-56/UlR3+Un65LP6zqNQBK4wjBpyqmh5Q+edw/r4puApmRmZPI0pDxtqIEJ0JXC4e
-xaUsf8Fa4X5Ym8xm3SzBM4Sw6YVGzUBc32+Dj7abIRYHjgBX7yp/9h8aC+XCYamn
-nN+UEcE4WmdIKU8bkRDpcqoyKUBLGSdM7gUPgzyTz6AYvXTKAMQ1nx5b/UvJ7r6E
-IYxdTKezbUcT/MH7suV9
-=SVOt
+iQIcBAEBAgAGBQJPUHBNAAoJEDxpGckxwJCBhccP/0dJYcMKKrp2dl+oIoo6IlPr
+gyjQ/FS0l1VebonEOf1QN9LVaPVwGB7pPhyT5J2wdDxY85vHbkoJ9lDBhPEFndom
+IxEpnAagEGzaoyl6ax3HPD+OdQXTpE+V+cWC5NFweSz4x72o7VnW7M1yAw3gI+HI
+9cpGIeJKohUdi9S3ZtHby1wYuVidiPbsW/DWawnVks23etU1DVJRh78v3+TloooO
+kL9js0DnGWxOn39tCGAQhEix+UDtykvlXt6xHT6PrLQkIWEMGODOBXEJ393CgLik
+t2FVi+3bzyoP9QF1NbeJWmJA3JkLIjNJGxlXSxar74v2B+So/Ys8QhrwUT9t/vQr
+2cM0/S1nr6/YIzt3Iqhkj7FjgVjmonf9KXmgX0+9xkPbSEc5sPLfPs2CO+mRiMuy
+5x2jktr0XPSq3Sgp6DywsObLzMpmQtoXKf+QIPleRnj5SmkMidMVM9BXuHYOItpk
++7nGtBnyXHK5LOxaJoCqIX/AGwUWPZuXwjHx/R1syyA1RiaVeNAj4NxBoE99mRJ8
+fnAv+shxHnaOY9unhGirbNvRSg9AjwHEUIiFhZfqccd9SX5fJ7894fvcDlBXbmSo
+pTlST7d9EeP3PmFgUFTlqAvhYH7qYeiPPpBSoSwwl/XPSWF4LcX/HZMnDkTTtI/z
++RrC0ExzhpSPC8oKzgto
+=r0sh
 -----END PGP SIGNATURE-----
diff --git a/media-libs/gd/gd-2.0.35-r3.ebuild b/media-libs/gd/gd-2.0.35-r3.ebuild
index 6a6ecadf99ed..6b34d74b6bc0 100644
--- a/media-libs/gd/gd-2.0.35-r3.ebuild
+++ b/media-libs/gd/gd-2.0.35-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/gd/gd-2.0.35-r3.ebuild,v 1.13 2012/02/27 20:17:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild,v 1.14 2012/03/02 06:59:29 ulm Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ DESCRIPTION="A graphics library for fast image creation"
 HOMEPAGE="http://libgd.org/ http://www.boutell.com/gd/"
 SRC_URI="http://libgd.org/releases/${P}.tar.bz2"
 
-LICENSE="|| ( as-is BSD )"
+LICENSE="as-is BSD"
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="fontconfig jpeg png static-libs truetype xpm zlib"