summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Shepherd <masterdriverz@gentoo.org>2007-01-19 15:31:46 +0000
committerCharlie Shepherd <masterdriverz@gentoo.org>2007-01-19 15:31:46 +0000
commit492adb21b662b81f729436d2ea76852cee1dd4b8 (patch)
treefcf699d810f5c6f076f12f8884348fcfd4104b9a
parentQA: remove invalid RESTRICT="mirror" (diff)
downloadgentoo-2-492adb21b662b81f729436d2ea76852cee1dd4b8.tar.gz
gentoo-2-492adb21b662b81f729436d2ea76852cee1dd4b8.tar.bz2
gentoo-2-492adb21b662b81f729436d2ea76852cee1dd4b8.zip
Fix licenses (GPL/BSD is not compatible w/ Googles)
(Portage version: 2.1.2_rc4-r3)
-rw-r--r--media-gfx/picasa/ChangeLog8
-rw-r--r--media-gfx/picasa/picasa-2.2.2820.5.ebuild6
2 files changed, 9 insertions, 5 deletions
diff --git a/media-gfx/picasa/ChangeLog b/media-gfx/picasa/ChangeLog
index e759a41720ca..20fb2d101a66 100644
--- 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 b0d06bc1e2ab..67e63b5d37c9 100644
--- 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"