Move Creative Commons licenses to shorter names.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0xE7BE08CA7DC6EA25

4 files changed, 32 insertions, 8 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/Manifest b/net-im/empathy/Manifest
index 3e8ddc6bce96..7035980d0c12 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX empathy-2.32.2-libnotify-0.7.patch 1644 SHA256 8f7280c95fb67a2f91dc38984523f8ae4be95643e7404ea672d88d6541987ca8 SHA512 9462bc0584041460f9347eeb3e727296dc5f6ec2ea2f65867860029208096c4d795544c02426587d19a2bd4aef562b0b2bf51c3fefe439e69c65c5c6c79669a9 WHIRLPOOL 31e4192b3212d2a8f7625410df55400c36465d643a24631e486b998b6040542672b4f253189aae6a76aeb97ccc11ab3abf68483c667e08e87806ef97bad943b2
 AUX empathy-2.34.0-CVE-2011-3635.patch 2451 SHA256 7b82ba0d9e002ba78975caff45ec08eb7b176feb513ba72c0c312f0a2a8ccd54 SHA512 c15bfa0814e4d588d43b834fc6bf62109d0a121aed8735415f27b743cf8424dec4b27ab118583afc66bb7fe6980209762ebbaf6df11586c40294f936b8178d5a WHIRLPOOL b657bef90495501ab270747a5724dc8be1daa37fbbfc23aaea549e4f57016fb6d6d3d82b92939ebee79f1ed86d0b6dc7a9af0ef9156be0b5dab9b4b7211cb1fc
 AUX empathy-2.34.0-auth-dialog-crash-fix.patch 976 SHA256 cad7bc8885b94cfe777223bd167006f5fd5e57dcff87ba861260d08e961c22f3 SHA512 25b70069d60c6039ef224aeafbdbffa65a32f021231e8e33fe12b9bcaa3865051ead6adaa1f271d4b8121a60842bb51ace87b2c9204d95554e5b9d2529d5a489 WHIRLPOOL 38e879736b54b9455f26f6a7db90f02b6154c3ec483f01788036d63eea8ceb46e6879ed05abafbbebdf72757cebd291745d87756c55d4ce05fb646cd2839f390
@@ -6,7 +9,24 @@ DIST empathy-2.34.0.tar.bz2 3361496 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e
 DIST empathy-3.6.2.tar.xz 3443720 SHA256 707bf283f37e8b91816c78742d9ebf9e3effc4206a3ecc3e4c0cfbbf8ce0fd26 SHA512 8cd1eaaa9b42f415a175ce2eb57f85f716523e4bcdfe32661af0bc557ed7b7f22ceee884e2474e8b68448b8ae4b3c12225b77501b876cce530d76e14bb7da112 WHIRLPOOL c00e10cbab33a12ddf31b70a654ec53bbb3b50313fd6bbd7503e2e58d82af4ed188bd3763d6dfc3d3e7c10ee7839c2ddd3fe041885ce0d894f9960adf950af26
 DIST empathy-3.6.3.tar.xz 3448720 SHA256 eaae20e8e9b8660979ed7a9a65deba61d6d795c6f698e684f21c3821f042704d SHA512 888389b76ac84651ffcc31230a2d77069741acccd231bf1f86bce5c4e9e7be42e4794d65b0bb44e8dff519c52aceaea7e37bc71fa4f4b67b6a2df24818be2e26 WHIRLPOOL 9f71224384d76c9a6684ac44548973cb4ae61053ce1ad53ddb39d493f28a81c29a96c2a4b528d3dd7248972ade08a79dd07886ec2a1f645df5b0f8b6d9a09b4d
 EBUILD empathy-2.34.0-r2.ebuild 3263 SHA256 4a37586f24b19bede46e2983de0a0647c9b9fc42da6e52a0c193b1af41448805 SHA512 a90faa742b02b8de4125f7bc0998e76d90394aea73f99b0b61e261a13d19efc18405f2a6518e43e60b29c24cb3c5721fed44db279a53c2007695d7e94a1f82c6 WHIRLPOOL 9d96b2f8e51d4bcd8e27230d038d3ed2849d7bc305e943e22d6582b5b17b24e6026621eba7a69b69ffc4fac85d714898811037b747c9f67cc7574fcfbb3d23ef
-EBUILD empathy-3.6.2-r2.ebuild 3263 SHA256 6cfc4d6a7507a4583f352454f920fd895c9a3b30ef4f743f1b3853c4210c29bd SHA512 997d758634a7f7cda9f00e6ea9eabbb58041fb633ff788f8e78c10836ffb079eef13afe7ddb756e063d50ff9492c8e14459e43176244b70cda2919b180435911 WHIRLPOOL faec6b0b242d4083ae78126dbef6812170ec3b09979c52018d96e26b1d316861226afa555f6a8f9a74854f5d45d30c4ce651d531a6092bd6f77f41811299d39c
-EBUILD empathy-3.6.3.ebuild 3350 SHA256 73dd0389c3deaaa2421d5634c5b9aaa2efc275a7322f5bc14819e7d4981246cb SHA512 31dda672af938fe963b14e3b61c2b846197669b8769e0e9673a26f63c2d23e9bfa0323bdd93d18e7ac521c23807ddb95152836c65e770adb60d6714512f89d89 WHIRLPOOL 5f6e0517ac0c19b17148a99b4e0968da93906d6a0250a853e753b15a7a7c5899a7906ecdf4f30272eb7b790a268a81a9e8acb74c9d03e3b0de36a91b2db007e5
-MISC ChangeLog 21694 SHA256 c4a2e49789a9de15869ae8c342a267e4a092e16525c8ea5201a9d5f2835f9755 SHA512 06013f7a83f678a292827b4dc7f7986156663c5fe1738a7c4b632e15490b2c6c0b626d74a07910858129c40cd674d07696864b98892ababc2a564521fb15fed9 WHIRLPOOL 385cde125c6e633e085faaf6a722d982d4a97e3ac6442172900ae398dd9a4191866df014fde1b45d9910a4004c7603f6f240eeb2b5ed80e4fb76987a03e7b242
+EBUILD empathy-3.6.2-r2.ebuild 3244 SHA256 91c41eff9c0c647c2dea4e318ecdcbfd143e7bcd705976bc52415de86d353a53 SHA512 050a299b0638e33a28ab71b04d8d64cfd53d8db92bb00174c23e87d2195591b6a401bc3588860c09e8f913b065eeec81f305d4ce55baee6ecee0d60b1d362d40 WHIRLPOOL ef930cb3467c612458a28bc645f839e62face222dcd6a192789ff19753c49578c69d3eeb34637eccb20164b5843be1dc1dc657becaf9fa0b3088fb4a05b38dd2
+EBUILD empathy-3.6.3.ebuild 3331 SHA256 774a6a2e2657eae189f7e84c83a6f789cdd6e30e4235df4dfd34658f46e3f73a SHA512 75739d0d611a831ebbf587d5474ca8572834e01f213182ee736f7af6013da92dd8e567c19250ffa539e003e6fd4504667dcd582fd8bda37415ccf6277246505f WHIRLPOOL 1b9811061228ea8fae6b74345f3946c257a0da4fb9371d20665d0c0a4187b2e3e3de57bbdf824aa11a0ded351b59f2be80641179ed2a65efb25bfdfbdcb79e5e
+MISC ChangeLog 21842 SHA256 139967a5b8a15650222e68c262ccc31892e4a89b283cec2e2b9c6f2ace0add52 SHA512 57f7566a4e80a2b40d21d7366824aa5fe1baf9c4858e0192447aa8e1bba23aa5b8f47967ab9cc0ac855977afc39b62d2ae41d4099b6740df22c6600a89aee440 WHIRLPOOL b6942231e1bc3df3354e8bbbe9b15cc00ec8b7dc277bf1b88b60fd1264bebf25fc9c27ba4f2e1fb537ee8d3072b4b4dd582ff8a07730c78d1bab223b7c0c5496
 MISC metadata.xml 1467 SHA256 b1fbccf18385402e0ac0ac63595f9b7b3a27fb61086e5bf503d11a858099c8ae SHA512 2a20c65b50aeee8f660277ffc57f4a223edb9989814c031e8ac7158a5133421ad393d35858e47e639b97a55c2cd6b589e0645d74e791e19967a7cba86a17521e WHIRLPOOL 50c817df40f507c5380bf4d53ef23f494c70a48032d0584210ade162fecae68d178c86e86b12412209443a0dd878c9670c934d3b2267328c9e9a8a9899781d01
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRFCxhAAoJEDxpGckxwJCBhzUP/0N6RGDXc74JXVW8ajnlvBXJ
+z8D+GEjOE6vBYlViMWTCzqHK+/zaMwbBKWxDwhXYM4X+VhoeR40xiuftgYne9ta4
+vLSeK6bjPT5sRKaJUM9+4kSIAjKH8t1xFHC/B7puIpQiLABkR4gl+N0x04x6U7CL
+S81IG7ddwBXuveNwqVSqdHwD9blmJtYnKKXJxyiSWoRDJYUFxBJcKdaE04HApJ2k
+OYVSSEMce6jZScdlrR5gvmau3xZW3PZW4dPtoi0s0CWJ6F7NkBf6ELTdRfUrmuZf
+MVVq3JiXntxDnM1yfBpTfk7yIZvd6qTKrxE5/CMiHBHeW5avvme547UA1vYkBCYu
+a82JGbM7FK4l3LnCpuADZSuVYD/8RaEJ9M0zzO6qv0/5VwFqj5hD57gOkOMWk03m
+virWztqpWyjY007Bic1mxVTLuKbvIeSwMe+Lw7y/VnKEc0NDNrY7JUktno32FOKj
+cdmtTl9IqjIjbJaFKnGH+aRMXe8c4Lye9oFKbV64IFGiDm586fDvzNNeWTkcadPJ
+04YJVggkQLBV6bcVDZVrXp+zasGhVq9wSvffvNyJj3YAkmQSHzQClvUj0EiZ8sNw
+VoKWamejOGWpUGHMrUJ4nlrhfcjCN+Oyex4g2oAlzmssKW8rAofzASXcthCPd9dv
+0mNODBIdPYo7IFV8fWGV
+=K4o9
+-----END PGP SIGNATURE-----
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"