Move Creative Commons licenses to shorter names.

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

11 files changed, 80 insertions, 52 deletions

diff --git a/dev-libs/dmalloc/ChangeLog b/dev-libs/dmalloc/ChangeLog
index be06cf03e206..5540534891d7 100644
--- a/dev-libs/dmalloc/ChangeLog
+++ b/dev-libs/dmalloc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/dmalloc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/ChangeLog,v 1.66 2012/07/08 16:07:24 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/ChangeLog,v 1.67 2013/02/07 21:50:56 ulm Exp $
+
+  07 Feb 2013; Ulrich Müller <ulm@gentoo.org> dmalloc-5.5.2-r3.ebuild,
+  dmalloc-5.5.2-r4.ebuild:
+  Move Creative Commons licenses to shorter names.
 
   08 Jul 2012; Raúl Porcel <armin76@gentoo.org> dmalloc-5.5.2-r4.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #418741
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index 5ac69992bae1..69c0819d737e 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -1,18 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX dmalloc-5.5.2-Makefile.in.patch 14022 SHA256 b4eb76731fd732da31945e9b04efe7c30e1f3bef15f19ddc9d88375fb8619b99 SHA512 fdb5fe6a618ceef3ab3cd8b57099aacb5f3ac38922b1a06f17e1225f9b6844935d26c0f7253f08ecf7513a106f9ca7c132f2be43fa11b4595acd595bd13f2dd2 WHIRLPOOL f9ffee8dd0414514ad8047adfd50381c3f4a1a6000cd8cff4ef06b14e35ad90fb250b6edc46f639758384077600a144ac995f9dcc33ec9e4babd7983e91a6e51
 AUX dmalloc-5.5.2-cxx.patch 715 SHA256 c488baec7cb90a57b0256459c7e38fd6e0cddef0682a60ae98bfedca9292897d SHA512 0898d41915c891b7b1bd3674ed47b1c887b4ac0eb1efef5474783ac4547bea8ad03b2071fd63770c1bd227debaed69a713dc8a5f353eaf47a1760cf94d297b13 WHIRLPOOL ee2dbae9212969164686d2188ade0c366508d36b444f69fd02d66ccf66bee7e68dbaf97c3ea447257628bd6674ede6d65589df491569b7f19218e7db15da1f49
 AUX dmalloc-5.5.2-threads.patch 270 SHA256 f80e3cf1293f5ebeee8d8f83e0bf5ecad606c27ddc9a2fd8908d5af649720433 SHA512 ab6ab0c6dbce43b5ad5494ceeb7633f0bf65eff8bdd9d9ce28399bffa5a72a506769b3a91156e25a68915ad12458ec8a55a1764fcc3689d7032955d8e7ee94e8 WHIRLPOOL 9c72710cd18620d789bf8f01e6641cc9cc94526ce9f2b057d0a2812371904fd514b4a3643cc469b57f025ab934917637a92bba5a1aba9ee4a2168f317f72bbe7
 DIST dmalloc-5.5.2.tgz 666608 SHA256 d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93 WHIRLPOOL 4427dfb595b82bf4b7a3edd6a0a61da54fd7b7abf84a238dee3cef6ab3e0b9a27a34c7219ae938155da9908762c217cca52e9ac6710543bb37ca8dcf72749a73
-EBUILD dmalloc-5.5.2-r3.ebuild 1770 SHA256 a1ee5c6ab58cd253673c24aa058a748064761c5f71d078de9f4c3f2210d5f329 SHA512 8aef554bc031fa8f5b7791a63f33bde4a01248748c69c688d3e1cb729326a700455050eaa416d7f919d6dda1e13196351f9e579b3bbd05be9bb4babe2f2fcb28 WHIRLPOOL be314c93892dd28e1727fc6d33e0d96423b509ec845b4b36330919647e45496c36f379e2ece40bd85ed32514a1f507ff4ca4a1d9cf4fabd86b8cc5ab05ac3709
-EBUILD dmalloc-5.5.2-r4.ebuild 1908 SHA256 3405d947a8405bde888b312b8b0bee3f691487df8e2b5b8f4db0fefc0ef60098 SHA512 01a7d018046ad67b787c5e8c58c53e71880548500b0a9c21ca22a1f15f0c72d69631f8cfe3b0e512ae2b35704cf2cf0a3f3dcd2a57264f929a4bcd50a1292181 WHIRLPOOL 21c4fa56cb77bbcfc042821f7768787ad395bea4169289c045acf57bc5355ab43eb56cb1883901aa3f1eb9f7cc9c3ffe9538861fea7cc7df099ad8d6a2aac471
-MISC ChangeLog 8936 SHA256 ffcb20548482a55f3159b83288a0642015b258fe66b51fc7eadb5d2f81fa0c36 SHA512 d416dea1ef4a3a8cb0e09a4dc0fac79e2d1d95d4346964797cec30ee7ac417451116d3040b52c1622f4b49414fd9f37a3a64e252b7d4a8e43703ad1442fcfcea WHIRLPOOL e925ac22143c607d20f6321e9c67544b99f5583977755e774a24607052a155ff6e05de8e467d5bbcc169fb7d86ec3fb1ce81ee567d7ee3febd87e03d39f2bf4f
+EBUILD dmalloc-5.5.2-r3.ebuild 1749 SHA256 afcfbf1d2c3d7ebb3233ba19006aa0e06384f794a106f3cbfe059d7b2ee8212c SHA512 88fb87b6871bb0a7057fc2bf3393185cdd5772ae242c2aa21b4f7fff6e0b6763519c4c328f4911625abe38e1e2eaae4153fb051958dda34f57b3f88e8f34d12c WHIRLPOOL f79757481e00ac7c6b5696e4bd583bb5ec67b8d8cc0bdb77d79c3bc134a1329c1eb92abfdee44d16a73ba328e849fddd3520520f02b8941db0258699d09c973f
+EBUILD dmalloc-5.5.2-r4.ebuild 1885 SHA256 3737a93d4d719ede9aa23ee723e57691add9ad8d535b24b01046444a5c01e125 SHA512 291e1a340c1612e142a9316d0d2630876f0fd14d3f791858c6d55192e2dd6439be66b05d95848863281952ee5a5f27a58942e60f9eb36684741a9d8208134f33 WHIRLPOOL 3a2e7070b58c2f87eaf10e1b888ebe06f5bdf1b5866bc61dc061fdaf6b7ef3a7629f3bd234af25f85f6dc07dea1ca3faa213d044b6d8355c247a9523de50872f
+MISC ChangeLog 9083 SHA256 2fa3d6e12065e0ffebe19f7e1745788c8057f738e4e5e2ad21d20f6b683dd4c7 SHA512 123e3bbe67dd315f040ccecd7ca3b634cb3d6cb594f968e80e8dd83e4c83eccd7209452ef1d0242ff32c418e8e7203a2592929643a2583116196240589470f14 WHIRLPOOL 7d1b4bf1b09d2358c7c7b2fb6baa53c6011be194521833332d23a0707ac35685678328c59bf0fd4a639377da6c40b2acf4ffc407cdf867a45f2856c838df81d4
 MISC metadata.xml 230 SHA256 529c3320b250d179bb9e9ae651a88ba3f2a1bca78cd1ab07d5aef28d571960ce SHA512 a7a1138a00026b873623549a80248ee704c039921fd65203098c1f81c9c4532f142de26a2743720e6a108273f4ac547a8707909f3e6001dd5844b0e7e275dba7 WHIRLPOOL dc42bdbbe8863903771b14c2511223d0a3c2c94d543cc2e211269312e522bc6cb352af4568a4a307ad1163c6feb8852d61652694ae00616f6abbdcecf840d5d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/5sEQACgkQuQc30/atMkClPACfYRJ8buY2iyzNpaXGPHpm4t4U
-TnsAn0bm+H5Ulz/iAoFqFny6tNJ8Y7KV
-=j5Cd
+iQIcBAEBCAAGBQJRFCKrAAoJEDxpGckxwJCBkRMP/A+G7rPkLWmEQecKBy5WBxgf
+MGHjIzGLWfR4Oc+K28INxq8ZWF9hqXJErLaQCerDByiqqYNaMKee3tBDtBRiJrjU
+ZG/GZGoP6bTRSlOxxxn5fChuuhbt3stH0lD9oe/5DIqCZnFTElx9w8kghfk2ZcAE
+13sFN1PN3x/3MYggjwcy6C1cgjcZnC1NXIh3vOK1KekAXMUPTfW56aXuMxCJr6x4
+2doyickguze1aSOTI/N/eQElB4O+8Dgh0x8h1sWv8T/YSoBaecKqrfSinPUZDkLh
+hrELhF+P9YFlL7qDuTvGSD9Afp6FS7EHrGJK43PfPoSjUcNCjLCh102An5v7wzlX
+VJdlsB5JpYJG0bVz/FRkmro0///kiQ6XuTRz4I0sP0p00DdJ0wf+lX3NAAMYGsC9
+Jid3HMTzu7J+O6PDs9DJd8KQfh1vu/APhXLowVBAPZ/jXLxK6P8TIDQj5WEL3aZT
+xL9bZkMkg0XnrS2ZCZwgL8CmIa+nlTPN1dmSVKZSbjv263+BcoBGHxECKe0AEd6e
+awXUJeZPjG348PB0U33b2R4Bkb9HYFbuTtBsGiQwgUeReFJcpKsZMLFC5Pic34ug
+KNP987nqq2mmqbG1vpB8Wpw3kzlGAd2BagTHxI0/XjXpU+e4QK2ZV/bXjxbgcdF8
+vWBfl6O6cunUUCsrqIxF
+=e6x3
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r3.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r3.ebuild
index 6edf4fb83172..d679c1c779cc 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r3.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.5.2-r3.ebuild,v 1.8 2011/07/27 13:00:23 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.5.2-r3.ebuild,v 1.9 2013/02/07 21:50:56 ulm Exp $
 
 EAPI="3"
 
@@ -10,7 +10,7 @@ DESCRIPTION="A Debug Malloc Library"
 HOMEPAGE="http://dmalloc.com"
 SRC_URI="http://dmalloc.com/releases/${P}.tgz"
 
-LICENSE="CCPL-Attribution-ShareAlike-3.0"
+LICENSE="CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="threads"
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild
index f032f151077a..280eefdbadf4 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r4.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/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild,v 1.10 2012/07/08 16:07:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild,v 1.11 2013/02/07 21:50:56 ulm Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ DESCRIPTION="A Debug Malloc Library"
 HOMEPAGE="http://dmalloc.com"
 SRC_URI="http://dmalloc.com/releases/${P}.tgz"
 
-LICENSE="CCPL-Attribution-ShareAlike-3.0"
+LICENSE="CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs threads"
diff --git a/dev-libs/shared-desktop-ontologies/ChangeLog b/dev-libs/shared-desktop-ontologies/ChangeLog
index e2c568c76f43..f25908e0c1e4 100644
--- a/dev-libs/shared-desktop-ontologies/ChangeLog
+++ b/dev-libs/shared-desktop-ontologies/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/shared-desktop-ontologies
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/shared-desktop-ontologies/ChangeLog,v 1.39 2012/08/04 13:33:13 johu Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/shared-desktop-ontologies/ChangeLog,v 1.40 2013/02/07 21:51:50 ulm Exp $
+
+  07 Feb 2013; Ulrich Müller <ulm@gentoo.org>
+  shared-desktop-ontologies-0.10.0.ebuild:
+  Move Creative Commons licenses to shorter names.
 
   04 Aug 2012; Johannes Huber <johu@gentoo.org>
   -shared-desktop-ontologies-0.9.0.ebuild:
diff --git a/dev-libs/shared-desktop-ontologies/Manifest b/dev-libs/shared-desktop-ontologies/Manifest
index 159efd68fbf5..676b04ca23f8 100644
--- a/dev-libs/shared-desktop-ontologies/Manifest
+++ b/dev-libs/shared-desktop-ontologies/Manifest
@@ -2,17 +2,23 @@
 Hash: SHA256
 
 DIST shared-desktop-ontologies-0.10.0.tar.bz2 3966792 SHA256 b11901f016b54c8d00917cd167cf8585245ad266125880118f91e75ee52ac503 SHA512 b1d3e9724c96f04cc443ae77f1c7031131fd9ae378fc93a9500424b6dee495167eeeec7351b371f0889567b145c56a7fa36488f241d66bf8155358cfca1e388c WHIRLPOOL 3d5269e02e731dd83ff10ad380c0398ca0541089878e1a762c376b146e8d146057b9f6c35a70633a2c8b293446ccfe41a6a17d902d77f7566e068534fa3c078d
-EBUILD shared-desktop-ontologies-0.10.0.ebuild 828 SHA256 3bf101a74d07a350f1c7ad44e5343f6da8286e7f682a76cbf92e9e02cffb5cce SHA512 0abe66451443f862e209f295a62226f0521c8e7053fbe53b986d6f8a6ac5a2825dfc35dcf2d63af937dd28e1745f519a9c9864acb172eaacf25ea4e7503aa326 WHIRLPOOL ee25f05f431798da383c5ddac8cb626ff1cf023258c7313e068093d36a44893e3d7615cc748cf06e1e12962744780ae595ad3ec0d36e9765434d0ebf10bc92c9
-MISC ChangeLog 5722 SHA256 b9ba2bd2df7f3c37160b0ec9615fdad67db421953e263f37bb38a377ef5b080f SHA512 26bdec7d50a1641098b72cd6738f7b79259f072ab0ac9d365e99fd4121eddc51d78173fd7476144975742d005429de53a06a9befd241c2d86d48b12cc44a401c WHIRLPOOL e2b30c474b05b7a396912f293906ce919918e6494bcd44a3eae6f53250fd6f929cd4e601def1cd6713c76a82db8e7672eefe0eb1c1298593237e7a0e5704c5af
+EBUILD shared-desktop-ontologies-0.10.0.ebuild 808 SHA256 1e790b9e9cce6fa56e32962550745668d3307a3712f59935d3a72c6ebd2723b6 SHA512 e9e54c5d6c138583c80fbd5c797502efc849cb85fcad2edaf9a37d64faecee6d8827bb73ee4fb7b15dff0d02aaaf0a99ef7955ec0f142024ef8b209a6a994ea7 WHIRLPOOL cfb75ced5d1316d2836682cf22e7ed9169f8bd2863f7e182d5a68aa8c70a0db488b0687083f288f37a1084ea2311ca13be7b6ee9653bdfc25ee1e845c0b014ea
+MISC ChangeLog 5863 SHA256 9d82d1ac7e4cb89d2931644d51bdaef0361296559022e568ac13d128c7507e96 SHA512 03100e7b3cb89b211b974bf47bdf90c08a03e81ad6bd1888bb030a1c1df8fdd6b6b4615e3e8fd0d2104c399fb6d7d28896a7d2fd437ad2a49569dcc00eb626bd WHIRLPOOL 975ca83a77490573f0d86c032fea9ca2eff673b810ebb60b27d8b32a6408c98643ec76e679123662c21450cc68d53222cf4163b1d9252c3c6be06c27eb2ceb4e
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQHSSJAAoJEO+t9ga+3I3aCkgH/0mRNqCollWofB3I/l0zlw0n
-A7MZWRDTmDB37U+mvhGfp0v1J/KCiemJx1KA5HlBQTUlqTrwfAk7ey1ZHdjzd7yo
-rr2HMSfJy06JsM3CZAjJ8uZn6ykMUxdQqbZHfQH8F9z2xsfTrK1ueTIxdDBrN57m
-M6jcMEXhZlQ/qr8FqA0IH/u5mSjHnGjccvJQhfMRMrNa4B8RRVxO1bK+obY1uzBl
-GMypU3T9XyM9R8lWvyMHPc941qfc4sTJ8eL7cSu89TyqY0KQhFL9FxrtjSy9wkTS
-ik7z6vVaGo03LTfNJnhYqqfiOEuqRVU7XPdf0/d6KgAi49Cd2UR9KHvmnffHHXE=
-=5Yy9
+iQIcBAEBCAAGBQJRFCLjAAoJEDxpGckxwJCB9lAP/iI59ivKJVSLT6OuZT3rD5nf
+A41k8r/oJpPtH6D3S3ovhfnh7vyvpRmUZW+YaHN85WBrf0m0FvntGtykLyMEmeZY
+nHCK7Sojms7Tj0PEi/jOo622V412whmvQGD7jjk56JVSgnupVyA/hD5mU/yky2TX
+E8FtAnPFkCqr3b8OnBPVw9iWrJi3ZEid7xY4vaYmLdHydeRXyOXyFVscuSybXAoi
+EqaLh4thYGkr7tfZoK5lwpjCP9MVRgRERQ8kVNypcjgsOiOymIOnka2+fhldsmIj
+/ITWSovUUDsAt3eDi4hTfobXXxPftopK/RAZzjS5X6tOHeYqZKEMYcRWBZ02jrwE
+KkdYak5yafuhUn84AqyFDYaMGcItLililGfpWRHtkMYWyEmWghSmKbnIeLLGoGut
+aoa1Yt4a9RAVQdUYlyRMDzkiD5hCCtsBhl7PLkY5sRoqMuZ4nNH6zBPT+OXgZqad
+Qv0NwOZK0c2KnO69S4XfJs60g/uTKBVNQjBrxTXohII3K0O0dBwVRidmixwvjbL6
+ZY7NsnG61pvrp/q3Nz+QMxzhqGi3nlseYA6DjTILlx9HlmB6GNQCScJ86xk+igSl
+mj4s/qtJe6GenKte7EidhNj2ZmtQBU5B7O27QilOa7NDSorZKrZFAdlMsGzf0pHn
+L2hZ33iPjtBDD3WXrqqs
+=+Dun
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-0.10.0.ebuild b/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-0.10.0.ebuild
index 39967463a02b..d70f88f45d97 100644
--- a/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-0.10.0.ebuild
+++ b/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-0.10.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/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-0.10.0.ebuild,v 1.4 2012/08/04 13:30:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-0.10.0.ebuild,v 1.5 2013/02/07 21:51:50 ulm Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ if [[ ${PV} != *9999 ]]; then
 	KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
-LICENSE="|| ( BSD CCPL-Attribution-ShareAlike-3.0 )"
+LICENSE="|| ( BSD CC-BY-SA-3.0 )"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-libs/wayland/ChangeLog b/dev-libs/wayland/ChangeLog
index 7cdc94609e23..1bc65803767b 100644
--- a/dev-libs/wayland/ChangeLog
+++ b/dev-libs/wayland/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/wayland
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/wayland/ChangeLog,v 1.12 2013/02/05 07:01:56 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wayland/ChangeLog,v 1.13 2013/02/07 21:52:59 ulm Exp $
+
+  07 Feb 2013; Ulrich Müller <ulm@gentoo.org> wayland-0.95.0.ebuild,
+  wayland-1.0.4.ebuild:
+  Move Creative Commons licenses to shorter names.
 
 *wayland-1.0.4 (05 Feb 2013)
 
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index f7b40814ed1b..f258961e14ad 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -3,24 +3,24 @@ Hash: SHA256
 
 DIST wayland-0.95.0.tar.xz 359928 SHA256 a38b915ce294efb3f45d3c66ea21f8424aea676656eca93af0edcc5d55a1efcb SHA512 fe0b93528ad1c515231c8763ff6ea6506d0c6fa97412e873d16a0549aaf45831e6c98bb5eb43de7fcf4b28ceb7abde58cbb98a068e9ecbe56e61c7636cabab54 WHIRLPOOL 80b8de926dec7a805bb32e3721301d6c0478eabe8973e659c235e62e8e431b6a79763095736e20e4c82256c9251648df124e7b79a91a1328c68dfcff6ef69352
 DIST wayland-1.0.4.tar.xz 389076 SHA256 8de803a686b29b3891dea826182c7964a78cb2da5f579e1c8c1baf741a49961c SHA512 77a08a2caec642a164411e20ce4bbdacc2fe0b312ff91a71e76606b21987577073fc74b603017299538b99eb7d886c26dd887dffffb103080f46a4914cf9f91b WHIRLPOOL 9d234e00a1bb2a53cc992d9af267a26758ee2ad230645841b1caa57420cb7c1df55a3458c8e567624b7b5d305e0779b6cb7d7767351dccc2b65bd6dfa85ec76d
-EBUILD wayland-0.95.0.ebuild 1056 SHA256 e39edb86d0f19a0437424f242742664673b53b660f6aa733d05d12f893aea6be SHA512 04624af49a257e440c3092c692c1f351e016f320216e1c06d6c8a3e0a24ffe924290bc4437c2dea08eafd2418d88962b75b7cbac1b62beaaf6f79d7126fb719c WHIRLPOOL bd3966a409496a24fe125bb9c7e71d38300a79b005325cc64effce559945076b1687d8310729d93488d555a1a202056f1dadf3b9955ab9390576b5df84e4d291
-EBUILD wayland-1.0.4.ebuild 1094 SHA256 a94862a1a85349b16fe5949445a3be24845a2195a1ae495bc19e52bd0c215371 SHA512 082bd7ce7185cacae6a89ef799a1e2e3a819c607a97575bfee2a6b2aa7424a808cd869ae696ca3f93a69e932dc52b13c3590c8010588865b6da1ae9b58ae0337 WHIRLPOOL 4c14a5c49903b42000f33ec51164e8e5d095d52d8b15f5e514b4b98b3a6f4c0c36f5a98d8fe37b1308c6c884e106fd3dcea8f63009403bdebff09dc02754621b
-MISC ChangeLog 1629 SHA256 5deab9c564ab83d617253ea10b0281b209fb8630537be373e16ae96001153c2e SHA512 6826db9adc014d13ef5ecffac605a2289aca543219723d4bd64f4f4c0caa32d5f10c3f9732974c150daa3d73d752468d2fb027004ab4ad6c831a20bc31c49a26 WHIRLPOOL 6413e74ad389d96dbc302b4146c6d4d0604c11f8640f1478faa39101a713a3a707b66bd920b2f8cf66f598796de7258a4cb55ef7bc480fdb7622b17b39c3eb21
+EBUILD wayland-0.95.0.ebuild 1037 SHA256 0d9ac17ede2946b584d736a47194085d940cbe6c4c1d934c971cf177cb7f1ee6 SHA512 88947ac270da521beefc945c6c5cb17b6bfff031b66c516655466c78a362e0a2ec21fee732b3a6aac813c63a7887b0bf63179112e6d1904150b1eae580d6b715 WHIRLPOOL 63a48a814932d75373974b805d93e56b96f67d9768316174289505508c34217b716546008ec57b24e300d4705d9f085e6f2147d8708b1224a1e19e9749db9a07
+EBUILD wayland-1.0.4.ebuild 1070 SHA256 64f43e1b5681dba19a62ba6b3dca1a2ad0661ffba6664e93aadd5cd2c941ed33 SHA512 56098e89e48c180326e49b72554c5551a64e8a68397caa8e6b66f66a108a7a33b2f16bdf314cda3c8866d91fd8824ac8fb457a1041679fe117859308d2379f4c WHIRLPOOL 289dda0a684191d90d1be717a45e9184a84cdbc04eee34908b77e4fd98e881fd37863576c37625d80c97cfa9c9f6b618d3efde19f9aad3d14c033e02984a9c6f
+MISC ChangeLog 1770 SHA256 9a67ccbfac84cf29acbc6f891e36089efffe4baac1518c6753427f8ca3831f13 SHA512 cacdfeef3b4fca2591386f7bc16254837950ed6821fd13121f71ad3ec53dd849118f76abbf74a6c3211066f107566a1fbbc232b050694545111ee4f10b6ae60e WHIRLPOOL c52348e5f942b0653cbe95a312552cba15fd39341960037f7449d36423576a2bafb2b429e46d952e57a51d7cbaa57c99749f0aefdce3a0748076fd9964f6531d
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJREK5pAAoJEA/daC2XTKcqSW8P/jqCKXg4+8U1U7MBQtc50EEA
-r0rGy3+AGk+mSh0DdJaWC8fKEAQC70ftAbX9s4WmXolXi49d2VIwNOfAvXwL+iXb
-iqWA6KWxtM3XwjFEmVEw7ACrwPrW/MhWwkKpP0nDMZZjI0pbQRQZbU8NHdkmOwyQ
-Ps3sADzwlV2msafDA2zh15CvEwZwyvjReLnKh7zkD9NNaxQbBptRqQJRyclouFu7
-dD63Kjx1gpkHP04xAQca8n/zlzgdvXQlCQBaYqOvT83whXvvU8rz/Fy8UQVWsYCu
-ezJUyRXzUGbKb19mdRikORcY7PCPObstoP/NayeEykimnVziBXwBHkO8XzAGZmOY
-+66k2BQFlBNW9Hi//vIKtB+6cBho8GPIqfghIOZeqjL5Ndns+wDJiEbPUpGG4wiY
-g5n47Nsfiho3DzDxGpre1CS6TptB407QKbdmvCvYNfNd26gXYVXh0vtfVE7XVm6C
-LGDOscQjDiKxjQMQtusUkTQCr+yygsOhZ9BsOREBoOPlzNLh33Q8Tb87mWFTQWZl
-UPMd702ZzEZihSpXVmrm+jg2Jwk4fCPSPLijeQtCUtEm+RDGgfnWeuEKDUPLNMR7
-x15I5wX0pLVtE74Hofenw5iylJ6Kvk3k+RjtKc8MeZZnqAq+xqE8o1uyGYoark85
-eavKPCp9q9NELmnyIFeb
-=ZWA3
+iQIcBAEBCAAGBQJRFCMpAAoJEDxpGckxwJCBLNwP/22POnfPYd0s/mBI7GT6Bjy3
+ifaxD+M2reghqWwZ3Nn70IcqhNbhBk3sKkS+2TYF3rhjpHvatoVbhsHLK237T2Qi
+Pnu7krtn3CE57vvZF/VFY4ZGf02ldSw0qay1KDPSjZZNwvbIzTwKOEy6BnvVs/zA
+AJrYV/sjEpa1CAfYGmMiahWX1SQAX566AD0sJUq8LedB1UtdGb9vjWjiEkLMgALG
+xmn4lshW74pl/+fFgd9gjsfszRT2absI67hrU9d++l4j7Gc3tP1uiouxhyaywrLg
+anJVIlnwakgCQNi9StilvZ3WaA7TwTGgHWyXtNJvde6YtrspfvtH6CO+e8oa5kXR
+D0BHszGcwt5DJMD6GhnMGKP3TRufYRqaJ+ByzruUXIZmiltd5CGT04AYaka4ln37
+fMiecDtRnwyXHyvf4DMqtNXUhvsd7B8qcpwHAHISNAjOKTv8Q0oNS6q6jb4UY/yD
+YIXqeuPre73FbSLQ7WK2nSZmoFWlS9hNggED4MEalHg7R0TyptjKiaVVoVKSCbkp
+V56oCgUqjn0qSBLv+LJpE39/U3SYbE61fA9tuVR28hqrFYl+k13bl2sUnFuwbUFT
+vKBqXFI8/ClgWj3K4DK5gQtQlmIn4OlO90DAUYQJxX68FxE2ePTlIkZp3a/Ugz/g
+b7QNFs9KzICth8xjXhPW
+=hKCo
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/wayland/wayland-0.95.0.ebuild b/dev-libs/wayland/wayland-0.95.0.ebuild
index b57e65f49aae..4a54dae1e0ec 100644
--- a/dev-libs/wayland/wayland-0.95.0.ebuild
+++ b/dev-libs/wayland/wayland-0.95.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/dev-libs/wayland/wayland-0.95.0.ebuild,v 1.3 2012/12/19 15:50:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wayland/wayland-0.95.0.ebuild,v 1.4 2013/02/07 21:52:59 ulm Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ else
 	SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz"
 fi
 
-LICENSE="CCPL-Attribution-ShareAlike-3.0 MIT"
+LICENSE="CC-BY-SA-3.0 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="static-libs"
diff --git a/dev-libs/wayland/wayland-1.0.4.ebuild b/dev-libs/wayland/wayland-1.0.4.ebuild
index 847c73603a5f..365fa131fbf9 100644
--- a/dev-libs/wayland/wayland-1.0.4.ebuild
+++ b/dev-libs/wayland/wayland-1.0.4.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/dev-libs/wayland/wayland-1.0.4.ebuild,v 1.1 2013/02/05 07:01:56 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wayland/wayland-1.0.4.ebuild,v 1.2 2013/02/07 21:52:59 ulm Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ else
 	SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz"
 fi
 
-LICENSE="CCPL-Attribution-ShareAlike-3.0 MIT"
+LICENSE="CC-BY-SA-3.0 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="doc static-libs"