Fix licenses (GPL/BSD is not compatible w/ Googles)

Package-Manager: portage-2.1.2_rc4-r3

diff --git a/media-gfx/picasa/ChangeLog b/media-gfx/picasa/ChangeLog
index e759a41720ca675d2ecf6c90c65b8fc4f896908d..20fb2d101a66e6b0a9a0705de1e9a9c73557b043 100644 (file)
--- a/media-gfx/picasa/ChangeLog
+++ b/media-gfx/picasa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/picasa
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/picasa/ChangeLog,v 1.6 2006/09/13 00:16:40 genstef Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/picasa/ChangeLog,v 1.7 2007/01/19 15:31:46 masterdriverz Exp $
+
+  19 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  picasa-2.2.2820.5.ebuild:
+  Fix licenses (GPL/BSD is not compatible w/ Googles)
 
   13 Sep 2006; Stefan Schweizer <genstef@gentoo.org>
   +files/picasa-unicode.patch, picasa-2.2.2820.5.ebuild:

diff --git a/media-gfx/picasa/picasa-2.2.2820.5.ebuild b/media-gfx/picasa/picasa-2.2.2820.5.ebuild
index b0d06bc1e2ab3a32a11fbf86ad67f74f52427bd8..67e63b5d37c906bfe4754bcef77d1033e621d693 100644 (file)
--- a/media-gfx/picasa/picasa-2.2.2820.5.ebuild
+++ b/media-gfx/picasa/picasa-2.2.2820.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/picasa/picasa-2.2.2820.5.ebuild,v 1.6 2006/09/13 00:16:40 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/picasa/picasa-2.2.2820.5.ebuild,v 1.7 2007/01/19 15:31:46 masterdriverz Exp $
 
 inherit eutils versionator
 
@@ -8,7 +8,7 @@ MY_P="picasa-$(replace_version_separator 3 '-')"
 DESCRIPTION="Google's photo organizer"
 HOMEPAGE="http://picasa.google.com"
 SRC_URI="http://dl.google.com/linux/standalone/${MY_P}.i386.bin"
-LICENSE="google-picasa LGPL-2 GPL-2 MPL-1.1 BSD"
+LICENSE="google-picasa"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="mirror strip"