summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-02-07 22:32:21 +0000
committerUlrich Müller <ulm@gentoo.org>2013-02-07 22:32:21 +0000
commit568eeb314a432b0bcc45db2635268d8165647506 (patch)
tree6f3f742bf8b3b188974aed7c3f69ce056bb99fb9 /net-im
parentFix cross-compiling. (diff)
downloadgentoo-2-568eeb314a432b0bcc45db2635268d8165647506.tar.gz
gentoo-2-568eeb314a432b0bcc45db2635268d8165647506.tar.bz2
gentoo-2-568eeb314a432b0bcc45db2635268d8165647506.zip
Move Creative Commons licenses to shorter names.
(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)
Diffstat (limited to 'net-im')
-rw-r--r--net-im/empathy/ChangeLog6
-rw-r--r--net-im/empathy/empathy-3.6.2-r2.ebuild4
-rw-r--r--net-im/empathy/empathy-3.6.3.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index d52b6312e57d..d2981828d7d4 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/empathy
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.123 2013/02/02 23:00:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.124 2013/02/07 22:32:21 ulm Exp $
+
+ 07 Feb 2013; Ulrich Müller <ulm@gentoo.org> empathy-3.6.2-r2.ebuild,
+ empathy-3.6.3.ebuild:
+ Move Creative Commons licenses to shorter names.
02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> empathy-3.6.2-r2.ebuild:
Add ~arm, wrt bug #449220
diff --git a/net-im/empathy/empathy-3.6.2-r2.ebuild b/net-im/empathy/empathy-3.6.2-r2.ebuild
index 49d9ba645168..bf2c79239e18 100644
--- a/net-im/empathy/empathy-3.6.2-r2.ebuild
+++ b/net-im/empathy/empathy-3.6.2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.6.2-r2.ebuild,v 1.7 2013/02/02 23:00:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.6.2-r2.ebuild,v 1.8 2013/02/07 22:32:21 ulm Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit gnome2 python-any-r1 virtualx
DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
HOMEPAGE="http://live.gnome.org/Empathy"
-LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0 FDL-1.3 LGPL-2.1"
+LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
SLOT="0"
IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
diff --git a/net-im/empathy/empathy-3.6.3.ebuild b/net-im/empathy/empathy-3.6.3.ebuild
index 5cfdf9480f1b..b41a0c9d77c4 100644
--- a/net-im/empathy/empathy-3.6.3.ebuild
+++ b/net-im/empathy/empathy-3.6.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.6.3.ebuild,v 1.1 2013/01/25 23:14:04 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.6.3.ebuild,v 1.2 2013/02/07 22:32:21 ulm Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit gnome2 python virtualx
DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
HOMEPAGE="http://live.gnome.org/Empathy"
-LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0 FDL-1.3 LGPL-2.1"
+LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
SLOT="0"
IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"