Update LICENSE: DB and OracleDB are identical, except for the different copyright holder. They have been unified in the "Sleepycat" license template, which is the name used by both OSI and SPDX. Bug 300426.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)

4 files changed, 14 insertions, 7 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index eaa72beff5bf..98de95ef884e 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.345 2012/10/17 09:54:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.346 2012/11/25 19:33:56 ulm Exp $
+
+  25 Nov 2012; Ulrich Müller <ulm@gentoo.org>
+  evolution-data-server-2.32.3-r2.ebuild,
+  evolution-data-server-3.2.3-r2.ebuild, evolution-data-server-3.4.4.ebuild:
+  Update LICENSE: DB and OracleDB are identical, except for the different
+  copyright holder. They have been unified in the "Sleepycat" license
+  template, which is the name used by both OSI and SPDX. Bug 300426.
 
   17 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   -evolution-data-server-2.32.3-r1.ebuild,
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
index 387e7d4d610d..feca4be6d2bd 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.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/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild,v 1.12 2012/10/17 09:54:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild,v 1.13 2012/11/25 19:33:56 ulm Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ HOMEPAGE="http://projects.gnome.org/evolution/"
 SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
 
 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD DB"
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild
index 316930128eae..aa4548937ecf 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.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/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild,v 1.4 2012/10/17 09:54:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild,v 1.5 2012/11/25 19:33:56 ulm Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ DESCRIPTION="Evolution groupware backend"
 HOMEPAGE="http://projects.gnome.org/evolution/"
 
 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD DB"
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 IUSE="+gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.4.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.4.4.ebuild
index 45cea5eec4fa..4dc6b14466f3 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.4.4.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.4.4.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/gnome-extra/evolution-data-server/evolution-data-server-3.4.4.ebuild,v 1.5 2012/10/17 09:54:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.4.4.ebuild,v 1.6 2012/11/25 19:33:56 ulm Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ DESCRIPTION="Evolution groupware backend"
 HOMEPAGE="http://projects.gnome.org/evolution/"
 
 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD DB"
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 IUSE="+gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"