Move Creative Commons licenses to shorter names.

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

10 files changed, 84 insertions, 57 deletions

diff --git a/gnome-extra/avant-window-navigator-extras/ChangeLog b/gnome-extra/avant-window-navigator-extras/ChangeLog
index 45d5caad3794..762535aff9dd 100644
--- a/gnome-extra/avant-window-navigator-extras/ChangeLog
+++ b/gnome-extra/avant-window-navigator-extras/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/avant-window-navigator-extras
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/ChangeLog,v 1.33 2012/05/08 00:55:00 hasufell Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/ChangeLog,v 1.34 2013/02/07 22:21:06 ulm Exp $
+
+  07 Feb 2013; Ulrich Müller <ulm@gentoo.org>
+  avant-window-navigator-extras-0.4.0.ebuild:
+  Move Creative Commons licenses to shorter names.
 
   08 May 2012; Julian Ospald <hasufell@gentoo.org> metadata.xml:
   webkit is now global wrt #285743
diff --git a/gnome-extra/avant-window-navigator-extras/Manifest b/gnome-extra/avant-window-navigator-extras/Manifest
index 9a7adc01fb25..11135e097886 100644
--- a/gnome-extra/avant-window-navigator-extras/Manifest
+++ b/gnome-extra/avant-window-navigator-extras/Manifest
@@ -1,21 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX avant-window-navigator-extras-0.4.0-glib-2.31.patch 4035 RMD160 d46d7be9275ff5f0f241f3ac27c704f9a3aa935f SHA1 6da17d28c1e06f52ff40ce0ce699e34b30a79380 SHA256 a3f615194cd940344e48c1491733d6b3de1f8021e332b777fe8bb69fb5ee5c2b
-AUX avant-window-navigator-extras-0.4.0-libnotify-0.7.patch 488 RMD160 b63ac4297480d12cf2bc2e24fe89fb56fa7ed541 SHA1 f9d4c61fd692a642cffd4702b4ad10185e0bbb45 SHA256 ab05f12b89ec6b1f12de698faa660243863e9280e7c0bd0f555b0ac590d271af
-AUX avant-window-navigator-extras-0.4.0-to-do.py.patch 745 RMD160 53d4a8b038cc1fa22c1b781f374b9213ca31d98f SHA1 de12eb59cee041430b971d2032731b57717cf3c8 SHA256 39757338ab8aae7c86e5bbc0ba2edaf72f0b161d74b317a87519be6f2867d088
-DIST awn-extras-0.4.0.tar.gz 3233697 RMD160 0591c59a93f111d54a027e9184ea0f4c526fcc71 SHA1 6adca898d11369da841d5eecd79fa693989118a6 SHA256 4ccb2bcfb944ed4dd0bf0d1f85c2c635de9549f141dcd923f5f8391e98d1efa5
-EBUILD avant-window-navigator-extras-0.4.0.ebuild 2362 RMD160 b42e60d80f15767d0b86ea6e9dfb7c3e0c21eb8d SHA1 e6c0f6c86da07f43ca263c80d3e23c1b470c48fc SHA256 e8da5c036567fc9d0b6aa150f900cfcd5c32a5494ac460ecfa5d672938a9e883
-MISC ChangeLog 7014 RMD160 a9b308e573ebef8448e25c976ef4c6494bfcd3f0 SHA1 075d5ec337959dcae42b01f6c6f2000857cb94b6 SHA256 dc71c2f4515cdede730bc126ac573f84bae13e7d7e3015f67659a87ef4233b76
-MISC metadata.xml 252 RMD160 01ec5f03dd8e9179030295caba4b9d40957261c2 SHA1 0e101b1471e837fedbe2537dd1411abef0f697d3 SHA256 7acdf4552b3f6b32d05fe473526bf31528fc40780a39746857aa8d01792e32cc
+AUX avant-window-navigator-extras-0.4.0-glib-2.31.patch 4035 SHA256 a3f615194cd940344e48c1491733d6b3de1f8021e332b777fe8bb69fb5ee5c2b SHA512 1ce6c03ed808c25f72a5f706c912276ed090c073cc450e504cf2fb98ffc28cd781778cd55e36eceb0b20d3cf7d6f64e073e9e82b10105340f9588eb443c88675 WHIRLPOOL b561e743c7cad21a37c233c43349f9caa5847f6854e349c4d397e3d4613b384878dc7983cd5fbbb90aa26a4c0b20a72399907bccffde5e104341732dd65ed92e
+AUX avant-window-navigator-extras-0.4.0-libnotify-0.7.patch 488 SHA256 ab05f12b89ec6b1f12de698faa660243863e9280e7c0bd0f555b0ac590d271af SHA512 078db130c372bcd28de8301a2a1fc7bd3857b004847eb30d9e9b25fdeae2811905a49f59921a1341d25e8a486dd39a2f5d178e06c8fd3fa2e098edff09707da9 WHIRLPOOL 2c0af191d9e37e11b32383b3cdc83b6cf49e8730fa465bf294934335016db87a0f5c9d4e9184116c1dfb21ef271bbcfec7e00c9b43cecc57d49961787b7976bf
+AUX avant-window-navigator-extras-0.4.0-to-do.py.patch 745 SHA256 39757338ab8aae7c86e5bbc0ba2edaf72f0b161d74b317a87519be6f2867d088 SHA512 48c7099cdd6f441cf19d38ed950b664c3e76d777fa52d5a31aa1f66abce3296e78639cfdcbc59b0b6f42bf9700d1a40b1d4f215ddcd0885db21a91ad9bf93211 WHIRLPOOL 3c849ef83e6f2fb85f8bc829f4061333196c950d2a36ad94efa8f791721b52fd24da3d7f2d6916781b563e67ba68699a8dde6bdeb75d15d85a08d2bfa2bdbeb5
+DIST awn-extras-0.4.0.tar.gz 3233697 SHA256 4ccb2bcfb944ed4dd0bf0d1f85c2c635de9549f141dcd923f5f8391e98d1efa5
+EBUILD avant-window-navigator-extras-0.4.0.ebuild 2340 SHA256 d5f2b81b59e6c361aeb0c82c03ce7c27f7f0a71dc8f41d80b6443b94111630a9 SHA512 1ca15b8e7b1a52b3073697b561862ccb8561b4537784edb0b51d6f7b5493288248523ef2755746db06e6aec5f0a382e3837883e56d4ed926715683849750787a WHIRLPOOL 6aaa8e01838ea4524fce09ef1883781e981b76ab79b387ecc8ab43a57918332e7ad59ef8cae283fac8663d1b43f9fb1b2736adab6d8b82d3fdd6c96a899a0bd4
+MISC ChangeLog 7154 SHA256 2d0da167174968528edb423e1dae721f48e5f7148f05297d702f35640d75168f SHA512 50db3d82bee1dded62778cc0aec82f00517542b1702853c825bd3010e5e5beae62f7c1683adbaf34e490d84585489d65300d3cce661c413fc81fa9c0450b45df WHIRLPOOL 287e50a2cbbc8621db12174abdbbe8d88fb33c30e9325c1e0aa573edc5afb1f63531fc042eaaf3c11519923e7cc597e81210193b20a7b1d63c987bda6672d84c
+MISC metadata.xml 252 SHA256 7acdf4552b3f6b32d05fe473526bf31528fc40780a39746857aa8d01792e32cc SHA512 d540c43ccd514ab0a665295b95f01207e06db73cc0eab0f8b07ec16630582dc0f0cebe94f228590550cd11071eecf9556dd536c7e61e224c3f6b20f5559b05bc WHIRLPOOL d7f2876054ae190db304ab9d3cde2d5baee8b9b5ce5ae3569ae01091619928c2bfab28ac0037a5ed9684cd7537ae65d7fc85fce946f843d8a1b64eccacf47409
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPqG7cAAoJEFpvPKfnPDWzlCMIAIAdeNzg8SGUkn/W4N5tzYpm
-QlBLegKF671mAhQQB7paM/j0Y907iNmFf3l6SV7ASJnYYCj2af9qSqrJjeS7wuFk
-yLrYN2lpp34NxNCt25pOSLa3B573vv1GGiSSBa22+tsoT6CW5Cg5LeuPH7AWmJp4
-wnkT1Iq2ZtpbyoW9iT8DG1eWOcP3OUiH6p82+1NhAykQ95jurrhvXmUI2MAFMwDI
-35NrKA0aUrIzB+qzbtkzPqwgUptjvDgGWaLcjX47jURqUb7Xf242M3No1hc4hR7g
-gxvTDbL4Ho5LxQFcye7/kb3G7nlX22Jw6oAXYgdrxK4Lr4LU9tbyWYoAwHh9D0M=
-=R4nB
+iQIcBAEBCAAGBQJRFCm/AAoJEDxpGckxwJCBxiUQAMYJsD6tXLrAACUElPm1GgX/
+CCPVja7MW4htbNYefoYmuczBin/75rTamFuMeWy1I/D8VJiqHfHJAYCUsOppx6Wn
+S+cJxYH84eOjXBSykHubzD3jgvOnSMqYNu230+fsuwNLsBI34IvsGwtCvnZOs1E4
+cPRov5scXqSKBcVUd/7x9bMQrI+rKDAEVA83uWA2uOv5u8CX1yZvvaNLF/IirIa6
+zGotfIiOY7gY8UFP0RMiZyyJrO/4ecwBbs/pVf8kNMlv7gqpgc3rarbaL/470tye
+kas5YEZJM3Rr0FMmtJpgWik/yGTAVlI8tp7SraM3EHCvndncujeGELe66t3EnoBO
+58LtDT8WVTu2Ni1WX+hsbbF9B/BQu1QlbCHNEWlBEKx1nqFsHSP9GhXbLnz2LFxQ
+VlIAYg/m7JUeIISdYvTjBCDoi4RM26cYM3j8V2oJnPL2TIoCUO8TPkWbOWrudR3I
+WKZWVW6weBLBfjc9D5YjrFPg+iKFBMv6VXTY4s/1AnQQsGTDzmAX+uQ9kFpylW1h
+SQI+vqd141TRTxxqSdLmb7VixTTWjsx290ncVCqxrYFHQiCaxJ8g6cFnwjY5WiW9
+YtsaYssGNNaHD/RHGMaPqg+p0zC03o5Av0IOPKXaVGcWItgBZQ8CAywGfb06aNt+
+OMP7vXhH7rZ9qxK76gyp
+=pD/6
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.4.0.ebuild b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.4.0.ebuild
index f29be8930b5c..2f9932edfcda 100644
--- a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.4.0.ebuild
+++ b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.4.0.ebuild,v 1.7 2012/05/05 06:25:22 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.4.0.ebuild,v 1.8 2013/02/07 22:21:06 ulm Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ DESCRIPTION="Applets for the Avant Window Navigator"
 HOMEPAGE="http://launchpad.net/awn-extras"
 SRC_URI="http://launchpad.net/awn-extras/0.4/${PV}/+download/awn-extras-${PV}.tar.gz"
 
-LICENSE="BSD CCPL-Attribution-ShareAlike-3.0 GPL-3 LGPL-2.1"
+LICENSE="BSD CC-BY-SA-3.0 GPL-3 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+gconf gstreamer webkit"
diff --git a/gnome-extra/gnome-audio/ChangeLog b/gnome-extra/gnome-audio/ChangeLog
index 7a1781a98116..3ba68f33f826 100644
--- a/gnome-extra/gnome-audio/ChangeLog
+++ b/gnome-extra/gnome-audio/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/gnome-audio
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-audio/ChangeLog,v 1.38 2010/09/22 01:23:46 abcd Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-audio/ChangeLog,v 1.39 2013/02/07 22:22:06 ulm Exp $
+
+  07 Feb 2013; Ulrich Müller <ulm@gentoo.org> gnome-audio-2.22.2.ebuild:
+  Move Creative Commons licenses to shorter names.
 
   22 Sep 2010; Jonathan Callen <abcd@gentoo.org> gnome-audio-2.22.2.ebuild:
   Use EAPI=3, add ~amd64-linux/~x86-linux keywords and prefix support
diff --git a/gnome-extra/gnome-audio/Manifest b/gnome-extra/gnome-audio/Manifest
index 6529a8a25f30..9e40203f5e20 100644
--- a/gnome-extra/gnome-audio/Manifest
+++ b/gnome-extra/gnome-audio/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gnome-audio-2.22.2.tar.bz2 1743759 RMD160 927cf787ff7a6a69ccc7d323f82dddfd1dd5a253 SHA1 88bc38387a7b556eb32232f4148fd09abd59ab6d SHA256 2f870f822360d22d857548e549b600ca74511e060754e1dca8e3f8ec40210c8c
-EBUILD gnome-audio-2.22.2.ebuild 698 RMD160 0e4ccf3a1b9c628f158ef0eadbf46a5457fb77af SHA1 918c843967c31b46b3ef3987f8b580624341f594 SHA256 ff936c39016a4b783537de069c409341bfc7cb660fd5db110bc61e6b9b8484d2
-MISC ChangeLog 4703 RMD160 d6ccb57aca06717496b273332d0b3f0e8582ae7c SHA1 d202f666673d2e711942ebdce25fa3c40bc92648 SHA256 728af4eaf46d34a633ed11bd7545ab2b1dd2b034ae39da5cc58c6d953db860fb
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+DIST gnome-audio-2.22.2.tar.bz2 1743759 SHA256 2f870f822360d22d857548e549b600ca74511e060754e1dca8e3f8ec40210c8c SHA512 99aae5d549068ef699e25b69847b5e1e1c12f69db07e3f8c64c34ab64c7dda08fa0cf2043ba45c0674fb9b121207401d242c25d592eb164307aa6003a2ebbd40 WHIRLPOOL 5b151c6d2bfe2d8d12c309b7c3dd27b7b2d6abe67caab1f6f9f96b777261e07b4b766dfe37ef42f114c61352678fae49420ac81bed08dc11798cb36c3b2d6f4e
+EBUILD gnome-audio-2.22.2.ebuild 667 SHA256 a9c2ccd33911607e655453887375f6bc2702ad42b97638665d243a16faadf373 SHA512 0795e222a974de891e58efcf926b42e162f9facaa37a9ab03ee531001e3919196ff850fb9f774184f7493ffba8e2420389c6fadfbb0b3800d5902548c4828f44 WHIRLPOOL 4eccb1163a9cdc67a435001d077db371cdf6160d47303c8fcca3c4b40cf9f3bafe5a1c4ee0fd3ba034cf4912a6933ca03062b661174a6ed0d3bfeb04d364da80
+MISC ChangeLog 4828 SHA256 5e1d4aad4d2afad4e02cd2527b666cafef02c176cb30130262f6a65453b43c34 SHA512 c34a69fb763df9e4049e0fb31a423a23cc9d46bcae62ce7a7a667cbfdb1cc392ac20190a672c29d20091bc9adb187ee000c0a80087aaf555a7d7130b247bbb07 WHIRLPOOL efc46e777e5256f7e94510b67d7316fc74078413c32668e234f21c9a9871830e3f40a25655001d4ac81e1cc15da00088dbca8b5a487dd32f933257e8deda17d5
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJMmVqqAAoJELHSF2kinlg4iocP/1eF4UNQ+ciGnAgR6N37Xyf+
-i7+mrZAZcQ8OTFebpgkJNpl+IacV1rm/34T+9tWfz9pH843aZkd2MLB33CZa3fPE
-bcS6/BpkqPi1LjWmxmX8BKBxPMMgSVtY5rCK4ke/bb74Xg6Zg4GaQxO4pKon4tSp
-35UJkfVKJhVcN1VD+64AImYbZf2YdIhH1njeDY2V3qc+4vbZYqf5HUrmC+oOM6Wf
-gl7o+LXz9Eja8UyeiTzXtOboya72eNKlE0a+RO1TrphGKY6Wbypsh3fY2HFSPQ6D
-CWl+VnFlSNbsGM8L17ShtnCCb+1ubmqs/JYvPhnKAN0OOGQzJG1rNLtUMk4A1S7A
-c5FyUuDYZd1sxrKqpeIP+9gR5PQf5wG5AVROpmxNPhvTguVMo5WP8q3SdbokmKLA
-lPP+C67pdaZhAOAQs+thnNwx0SEpLPPVJZROzFdYtBB5rCgpu8GAPghyYTdutiRD
-uFZUschz5ZWRlHp6fRz1wTnqTWs9V5aFv/eXI5Kh8iCjp9SJC2kP+bjY9tjsyedk
-So8zQ92LZo6E4JCQ20cgKircANbGGkBk3/3EtFlbCjvdFrkw5RM95SYQrvjC+MMb
-rzccYdxXp7WRoRSJWOVE/eqfhFpEj/QeKOsoVem7GSoj/ShQYbVRCq4juR9Z28Eh
-jwYXywHc16Hp5rOiIpjF
-=JYrP
+iQIcBAEBCAAGBQJRFCn7AAoJEDxpGckxwJCBR5cP/RO4dB+zR7gi7rLpeQ5jHMln
+C34qB2ZcY8Ma1nWZf459P/VqQCu9x3wunWxgGHXIHLqLFSybmAVDfTVIgKSMRYkv
+gMEfV9oehbUh0fNVDvupWtR0j+1LKdajIl/1cErgGuaupog4xoX6mm6L/fhJxfh+
+QHuL0j8UfoKAg1OrfN8/PV/k4OkLu6tIftJNnUnhHMvzs18fp4hJM42V2T9ZROFP
+0QO+X+V5HrtVVzcyO11aQCJ+1VYvvlNQTpGMlC7zgZkTgF+aXPwJHWeVZ6q+wdOP
+BRcFsBdnP6gw4i/Uqodp+VVIghLwsYA7FRNfhJETHdIJtG4DqAwfvFIVKJFtfxjL
+cEipuBg7veuxwA4kGQFY8gY/TtwNhMmeexaXHVTmfW7G7fXm5uedW65i8R1+gxew
+SQ45VKrT9W9jB3//tpmhL3FguXtrZ1l7MYjMi6fQznSd7HYBAF7t5SjaFwswPnXw
+fwE5P+5KiXT6Z0Rg2S4zvoJZS+8IA2M1oMD+PqWdshdkFxtJKx+xY6HWYhdbjIR0
+yYc8ActegVlZm+P6u9vbMNsyJI56a+wOYmtHHEY0oh78u9cPUk1Q2mndW3VS4ddV
+R0ozYpe0cCkoTBCtc4sv+4KlUv8y6s+Vu7WjYAYs7gCs0+lDO7h10Z3Sm0gVNuwq
+P2soqRY+DQbSlgcY6Q8q
+=U0RA
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-audio/gnome-audio-2.22.2.ebuild b/gnome-extra/gnome-audio/gnome-audio-2.22.2.ebuild
index cda6c309f7bd..c1905f7f15b9 100644
--- a/gnome-extra/gnome-audio/gnome-audio-2.22.2.ebuild
+++ b/gnome-extra/gnome-audio/gnome-audio-2.22.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-audio/gnome-audio-2.22.2.ebuild,v 1.11 2010/09/22 01:23:46 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-audio/gnome-audio-2.22.2.ebuild,v 1.12 2013/02/07 22:22:06 ulm Exp $
 
 EAPI=3
 
@@ -10,7 +10,7 @@ DESCRIPTION="Gnome Desktop Sound Effects Package"
 HOMEPAGE="http://www.gnome.org/"
 
 SLOT="0"
-LICENSE="public-domain CCPL-Attribution-ShareAlike-2.0 CCPL-Attribution-3.0"
+LICENSE="public-domain CC-BY-SA-2.0 CC-BY-3.0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
diff --git a/gnome-extra/gnome-user-docs/ChangeLog b/gnome-extra/gnome-user-docs/ChangeLog
index 02990eb768c8..aa0175fa0548 100644
--- a/gnome-extra/gnome-user-docs/ChangeLog
+++ b/gnome-extra/gnome-user-docs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-user-docs
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.61 2012/12/23 23:47:55 eva Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.62 2013/02/07 22:23:14 ulm Exp $
+
+  07 Feb 2013; Ulrich Müller <ulm@gentoo.org> gnome-user-docs-3.4.2.ebuild,
+  gnome-user-docs-3.6.2.ebuild:
+  Move Creative Commons licenses to shorter names.
 
 *gnome-user-docs-3.6.2 (23 Dec 2012)
 
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 5abd519ae8d8..4328791e4333 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -5,14 +5,24 @@ DIST gnome-user-docs-2.32.0.tar.bz2 17858824 SHA256 d42c4435590e5b79c8fcf1d917ae
 DIST gnome-user-docs-3.4.2.tar.xz 7692224 SHA256 65ca3921f3afa275b4d64eff2ec29f65d8b118c5e3778b1cd715bd6bdced39cf SHA512 a04197fbefd28cae613c0aca869765768f8928ec754637c985edaee999ef4775e8d33191e544769594367137b09f3bf2817ce2da3af752dea3245ea9ec4ff1f3 WHIRLPOOL 042456226d7d286a2e60ac134d9ce38546312fd0b696cd9682f0498f9d6f7b08d489f5e5e9359088dd73ff54b85a3db35c0d85e6c6e3877bd8074b402dfb53e4
 DIST gnome-user-docs-3.6.2.tar.xz 8142108 SHA256 9c13bda8d2690760699456d5d91d241455af51e21a732689d68f15cbf3664152 SHA512 39d302098b90e1c15c7887727b99c9940757df9964d0844191d1914959bb1d2b70a9a194421a5b75edb50c4dd755d3799c0e557231c6e385e72a21e91c1f2da7 WHIRLPOOL 2f114b9ffdc42b9d38aa61ea94698a48db425d18f43c1e5863005d1cca37d8bff787b3b2c61bea214cc1c3979797ebfeea5608e77f1d65af36f2a94567ed02b5
 EBUILD gnome-user-docs-2.32.0.ebuild 732 SHA256 763a4214431a94929cc44f3a375383271757a83c824df364fc1f2a4c95dcffa4 SHA512 2f3172b2f0da14ea564c82da93e2274f35eee2e18f5ebee540d7fe6e1c2863b5da51e277e09c36f15c8e4a792e7a97e80153defcf123b0739e2f55bf9b0509c0 WHIRLPOOL 18e59d5dfc00462fcd544672656ce995e301de11c3ba28dd2c86cb6a08bd63e3c44af427faf75dd84d4035ad232f194d241325ed3e8a0c28d2a9e6c936c44137
-EBUILD gnome-user-docs-3.4.2.ebuild 1313 SHA256 24be6119c4d5779e09a911c4ac7482379eaff5335d006df9111c9e2e6b226d6c SHA512 2526fd4fc9ea8fe06a05daea7e402fa5ffc1306da2ee3ffd9995c0440045c6efe0830897d66d2d5fd9ba3507bb194e3706bc48f0c4444599188ad7e161d22844 WHIRLPOOL 6ee95f15f50a0917dd66131af2a810fde7abd9021f7e8cb831db010d03f0962787510bde28178f6d5571217122b4f56207347b31979662d25c83de1c6006c5a5
-EBUILD gnome-user-docs-3.6.2.ebuild 1333 SHA256 c34577f77b3b867c2f062987092da5aa1249f6242a261f8e3fbccedf915e4d99 SHA512 a7c02296eecf0cc6a331a0ac6e6e4d9a2ba4fc5abe2347b60ec4f0a9de0ba090cc1525aea9b49c0401c780881cec9ef34674a73b4ef100e561a13556dec0addd WHIRLPOOL 07e049968c59422dd17f73d99882f1430b99fb8945717a0749d96872e00b8eccc402b874bb5ccad5f1c053726ef8e84b8937369a64e77e641d4b5c8687a9e560
-MISC ChangeLog 21762 SHA256 15174eef52817b180bf4588dae413a8029a88b37635470fc08e39dd9dc5ac560 SHA512 efa3ebb8bccdb6d493d9cb14cbd433f2a745b3eb8868f9956f91a907adf19d96e7c9a044898024e5c903c3ae79c7c890916740fea2510f940eaf9ddf35ae14e8 WHIRLPOOL ed7ac052f93bd1e5abcbe3a41659a205aa152dadd7b890c7b3554787c032b0e62a7ad8c90e04f52e475315bab926b153c40bf51d3fa443b168e62592af35e11b
+EBUILD gnome-user-docs-3.4.2.ebuild 1296 SHA256 66f3fe5ed29b22e9fd37a762d3ec8db803d1ddffc3ac29480b0e28384ca73948 SHA512 0ac994edaa87926c6e3519632d71cc4c77c0828b93747ea02ea2685dbdb6866e483d18e7e0df850e8497c093a58f985037a2017f440119e08964fd948fdd9dc7 WHIRLPOOL 43e7129930d5e5d6e39e7585254f45a2cdbea48c28263e63dfa89a5fdd566e15c51694384d9a4785919b5990a388ec56fdf668916ccf523d80e367c8cf95c995
+EBUILD gnome-user-docs-3.6.2.ebuild 1322 SHA256 4cff0003ae3d49d51449856031e0cba6b04662fa3d82e91547205fbe1afb4791 SHA512 c2734dca06dc666055d5c12fd128d4cdc6f92c201f329fce068970e7d291c1909577c4377ade1293797fca6eeaafeb4b806b09edb0ba002c79f9b8ed767383b5 WHIRLPOOL 12830d7fa3b0b3d1c1ba2c733b31e53d33c9488454ce65b56eb2558e4fe0a0203466a048d1810da2d1c3e3e5d848111274cb6b31cc3969084975f9b076c3a3ec
+MISC ChangeLog 21923 SHA256 e9671283ab7e39548946d29cb93f388213e1213cd13f8ea355c3dabf5cf08f9a SHA512 b5fbaafd10b4a47c9b2b75367d14423a3534c0bcc955c374f66350532b2ed9b9eefa9e9fe197c151f9f347b9d8fa4683c47490a29799e6184275ad3810d4c0a2 WHIRLPOOL 621cf4ecafa4914ea1cc5408af6e598d9083d93d75b5a6b73506cea7e994bad33f04465b520a9a86144b3a368b0d4c0d0b6028435be068314049dfc98dd6ad9e
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDXmCwACgkQ1fmVwcYIWAaPLwCfS7I2zlc8hvtK7V8vcfCKnQad
-f3gAn1ygwm2AJV8vvSs44mGUz1Ou4tji
-=CRxQ
+iQIcBAEBCAAGBQJRFCpAAAoJEDxpGckxwJCBpdoQAJiLLKwP0QoRzgiwIuoZ74hw
+YG+DdtvlnWJOueZqYpARdrqJJ2HppcQPU4VxcNrPaRWxmzsQvHvWjKT0Ns0RmAEm
+BmeVqD3s/xIJF97nXSmlJIXOvAixNgyTf9ajckaFQJ7VMn6pzWEWvmzV0WdDFr7+
+kKs78zueE3JnHScYsMOJhikFAda9YABL0x0E5C9Ydm1Z4qjzsEV+FUsu4xW+7A2B
+veEohuJYz5saaKzzHyuh+s77HZ0tAW5EdOfWud1zwIr9l/k6wTB0KbzHJ8SK9DvY
+I6b/EBr+XyLULzfLj+EXTWXq9/JBK96w4psIZYLDd5Pt/IaeJR3d1ap2twoA54Wj
+iTTav1FVFpeRTrl/mZ6clVfskXJMRlCrVmySMnHbVacwGwzaos5Ots/W7MVlf8X1
+c0t8cgGovfBF6BAehUZxm1xUCKd1cCz7zFxubonozfhW/3VB93fpMWgM9qGiev/U
+9mdukQfjSOys+F5ywInkySA1jYdtl0tq2MzKgkLXi5xnYoWaPV42aJAqmE1ph0Rq
+PLYViksltk6ctt1+n2Qlfw8ll+I42G9QtYLsGrd4k3KXA0R9o3RlBodk1Ro9c9lg
+ffdJ9C8TerpAVVRT8Cz/uLqoV/AB3yFUVnf2eQVvNp6cmJJtckEIDj5vMVzBnXK/
+OXHW8cMZAPBzhkJEc54C
+=gwBy
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.4.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.4.2.ebuild
index 6f3ccec804ec..cbe675600118 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.4.2.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-3.4.2.ebuild,v 1.1 2012/08/09 09:21:27 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-3.4.2.ebuild,v 1.2 2013/02/07 22:23:14 ulm Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -10,7 +10,7 @@ inherit gnome2
 DESCRIPTION="GNOME end user documentation"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="CCPL-Attribution-3.0"
+LICENSE="CC-BY-3.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="test"
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.6.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.6.2.ebuild
index 1706769537b1..49c186acf9f4 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.6.2.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-3.6.2.ebuild,v 1.1 2012/12/23 23:47:55 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-3.6.2.ebuild,v 1.2 2013/02/07 22:23:14 ulm Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -10,7 +10,7 @@ inherit gnome2
 DESCRIPTION="GNOME end user documentation"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="CCPL-Attribution-3.0"
+LICENSE="CC-BY-3.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="test"