20 files changed, 146 insertions, 76 deletions
diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index 90bc71fdcb83..acb8c6c76090 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/darktable
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.36 2013/01/24 02:32:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.37 2013/02/07 22:25:40 ulm Exp $
+
+  07 Feb 2013; Ulrich Müller <ulm@gentoo.org> darktable-1.1.1.ebuild,
+  darktable-1.1.2.ebuild, darktable-1.1.2-r1.ebuild:
+  Move Creative Commons licenses to shorter names.
 
   24 Jan 2013; Tim Harder <radhermit@gentoo.org> darktable-9999.ebuild:
   Update kwallet related deps.
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 9fcb5baf83a2..a7bf2ada35ec 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -14,20 +14,26 @@ DIST darktable-1.1.2.tar.gz 3432009 SHA256 225ebf1bd2ca4cf06aa609f2eda55cb0894ae
 DIST darktable-usermanual-1.1.1.pdf 8399829 SHA256 037e27a41aa4d0e2c2db3ae13bee47a2b6ec6195d953341ae637ad8495874552 SHA512 bbf3748c0c678ea84bbe57000c3b894e76b2bdf111faf9296e31b6776364757a19ecacd32d1e4edc248b6a9a00d19862a4e443e88a63707b269afe52f157a08a WHIRLPOOL 2ccfa5bf497358bc241de6e37b22d56c7718b107b78a109691d58267b7e75f29a98214444e36ee9ebf1b885231e224ba74ca0a4cf27053a14470084e240bd5a5
 DIST darktable-usermanual-1.1.2.pdf 8513151 SHA256 a33d4e7bb87c8d7f748f99badb12bd923ba798d205bbddbac85a648d6c9d866f SHA512 1e2b22fc8fb4db7b99dfc8b228310951b04d52a42781f8f83f96ce2e86b24ddc1d3075b246a4d9e73f566a0b57999582daf40f04fd166ab979f8abebe6582275 WHIRLPOOL 5c9733bc155e93fc6c475f93af7246a7123a9257e4ffe1da057845a7d2d9bd4c29a5d61ea172acdb7739abb466c7325502d73b72cbe03d7f4553118bfee5c6f2
 EBUILD darktable-1.0.5.ebuild 2500 SHA256 f8db6938a8155063ec3bacd7adc14faa2d9dd3c87061ea6933b75b8944ab30c2 SHA512 7d42960cb7758e02e875306409d8f78977adcdc188134e6fc74bf3dde7e04fcf8b57a8e5c3e04c84ac98fb4dcf59a749b0fac2dc224aef344384e5e3256c9e10 WHIRLPOOL c0414f8022fcd3b6829cae6c4845f58fa53b90e3ca14fa314422e162fcc8e9fe0a00670636bb0aeaba63114e2d8593ebb1f5c4d161409c50440fd1a9cfa63f31
-EBUILD darktable-1.1.1.ebuild 2683 SHA256 d3639f558841ac62cca956670f8baeaf02f1d0ab2fa756c6a5a79d9a8b01ecf4 SHA512 3418f20080b935574837485f63a8047ccd9b5cec6abc9ae7bded2b99efc275e4713fdb4b52ce677db5a257ff4d03ab65124c28ece1a7d71f9abd90a7eed80578 WHIRLPOOL 1557a6fd95bde798d3e16ec323ced5156f358a570ef540bb1794d607e9b32630030adf700bafc74f44a5c8e7d5d16e87754532ac24086f3ed9dbf28f1aab430e
-EBUILD darktable-1.1.2-r1.ebuild 3006 SHA256 22eaf36323ec89f14561f04fff4e103cb624e85ebabfc99cb3fe092253fef4ba SHA512 3657ff34dbded5a3dde7b1f865d588dec76c73632b3777214531bab14362eb8879649fb6dd76aab61b2f1d98115a0967e1faf8264a04c230244f2da78293d731 WHIRLPOOL 4d7a05dc821054f6f838569a10c87cc3c1748c69d342c8a6aae7e6be33ab754cfac464c48a08533251206ebf70979ca59474a75f302126c0f10f4d82f5895825
-EBUILD darktable-1.1.2.ebuild 3003 SHA256 8f93907147c0b9dffaf00d6f52f6e4a0cd0ecb94000bb95cc1a0e4e529a8c00c SHA512 d15dd6f111fa1fe8ad78fd3737e160a105ba6e6125f0135ba2a1425f386d0bda41fc6035077e8c90306b627947c3839bdca0d972541d36e5c154282e26625d4d WHIRLPOOL 0f1e1c27c55ad5a87db27103e36b1eed527d23bd2c4aaeabf3e76fe2f75a095ed0f7d671b96cd7904614c23e66ec795b97f70af38242595332a13ebd07c5d832
+EBUILD darktable-1.1.1.ebuild 2666 SHA256 671d4a0767fcdd55c0029d5ea5a1b9fc873da72399a7a04c97f868de9959a187 SHA512 5422841372200a70b5c87aa712b903502599cf28f05ac57a01198cf3d45dad8057d56ddc0874c7ad011d5a1525af086179e5102902e072c79cf98c6d880eaf7e WHIRLPOOL 19e4a9ce1be533439f3094069c168741cbd214380a15db60f1bffaac521e14e8502c80007a0b9a495fadfae573c81229a1b7b739f0080ede0a9c10bb6a5ae05b
+EBUILD darktable-1.1.2-r1.ebuild 2989 SHA256 b31004dfe6caa3d0d5495722b30222406112c0dcf986e127fa59f049f7cba64e SHA512 e4ce54c4ca67448a7336f0f490c03beccc9674587664d141a06753be05d191390347b62eae5a55481de5dd59894f6c17160af8f5e106f557a51e18aa741a2cdb WHIRLPOOL 36493ae71d39af79d90525f6fb579b3b47edef01dec0c5169e8f3fd2651b07f038498351664cd124bb118299f4092e5ec4a3002534fd04fdd430855f627a3f21
+EBUILD darktable-1.1.2.ebuild 2986 SHA256 0c6b11e5a2856a9ecf62c310458ed1879ea6da152facb71219538ffd15f977c9 SHA512 fa61f6284ba81edf1f15a4b0f678977aa7a7b068f1d8e172393c5b4e235aefb1228fb67e089de0384d8d7c47d037b766801400bb2576e6d303603514dd1917cf WHIRLPOOL c1220932626af7649a364837fd72b3d578201cec642092fda1f4edb49ee20cb393db1b0020df88ae43e78f95c8f6d6302a50339d8e8ea2febedd482295754029
 EBUILD darktable-9999.ebuild 3020 SHA256 189f724adb239836fda3b2013bb0310de77a0fb88e04724412cadff8bded8916 SHA512 327ea1c0c873920e6b74db8d3e6bfdb8f86225c99f77be2bb8971ed39b59bd32d1963ef42b5306b88b881256628af77c864b9553ded6e5190e1984f0f22812d1 WHIRLPOOL ce9b83418582b5d29a32b2e09391880fd0fd7259ddc5d30bbe998b5ecafdfe855c45c6be548a1a21d09363c7f048a9e5f58f04448f42d1af35db99f2b55fc2f6
-MISC ChangeLog 6977 SHA256 887f81de4bf2207003a6319afc2e8609d39eb858f241582a3fbc65c9bf16e466 SHA512 e09c683c20c4abda6450111defaa80605094cd41f9789fcdd1cba263c243d994562526069b982e97c8d8045cb7a3b75b515339525abeb49713c17cd8e6b3d3da WHIRLPOOL d97b62255a22ac21a8aa9e6831d08881761eff2c5d0a7991b223d801b05a476cf2b51404c58f740a05eea7c3ab069297c1431b84a3bb469ca0ada5ee60381631
+MISC ChangeLog 7147 SHA256 dd54d519b05d6b77759dbe4238b58fdb67463accb8a183870ac9672cd359e1db SHA512 798776e0ef08c48ee29486a0a1fc14f273d7b4431d432cf2a39468031db2013ab115aa8e9344feecc9c08c2d4965626fb4da00993437082ebe0790771b329dbc WHIRLPOOL f1fc39d5d9130955cc1a027e7c3b2b5fff242e63877711fee7ee5c4eaadc66e9aa04e363aea3fa6a40aa546807b59714da964812c0aa9cf02004beccf525d544
 MISC metadata.xml 1048 SHA256 ec368b5aa921fe7a1d4cf9e2739475af497fe3b3014a7c25163be36b78aa6cc4 SHA512 a133b1c39b5f018cb9afddda6dbd80a628611419c385146e5e1e7339cb180991ccfdb7cf4a1b69e3d07f7727db26e0ebd484d304c3352291a99764b499703b8a WHIRLPOOL e89235504e82052b90ce857f05560c7080b3ad536f6c5c1423c823b425f314905de8a4808b0da639954297513b50ae43567a4018a6b372598682a223f2f3ba7a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRAJ1KAAoJEEqz6FtPBkyjFIcH/iCYAwFF/Cy6u7zShPdyGVkx
-/kcG0BT/hOQxTcTxGMCdAI8UiRLxs5O2A/VskF86WUpTo3BreZKyYXlJ44Pi1qlH
-3Xg8kYWzaxwf8s58dyffB+qV0jOdTQoy5ThgpMLJ/jwTbFEJJ7VM3aEi9K2DmjP+
-bBwl74Io9O5MV0jT8SZ2nN7OuV0A7EzFRs2l/mp51TtIXHF2Wx8nZVPFs65p35He
-w6UVRT2LWQkHnDQJ/8krBTRsevs/g55qNKYy20G32BXFezdv422K93Hs9FMtan91
-vI4/OVFV0/jss/eVBoeuA3f58HLUPQm1UZsj6b0c/21eZk8VAekVOF9G17Ta1po=
-=AYNM
+iQIcBAEBCAAGBQJRFCrRAAoJEDxpGckxwJCBPJUP+waSgTorg9Euqnm9olQ5rK7X
+tErkAjy7N5lEFuapUGEPlifhEohL9OI/T+Rx1RxjmEOer+vjwspUEtygNeaYz9sS
+p20X5FSMyx9Y/WHLiKw8kd2H4y2MjQwbxTS7S1h7TJh/syUBPU/YMehvkakHkcXN
+BuzrtUihVejkLd/nFS6KA0kvwOJNu4x+Bm7rf/UTNevH+sZmB/UHr2WRRpOk4xLY
+bRhy4l/qjRDu4BnFbTTDdlzkqSJ1hDwKNiOdJ+vw8cnqEvYsf+c75iy0aL2a3OIF
+Z5ykrO2tzPT+WEjUUkuf14DIRhllIKu2inzvU+L47MYh72c/YuKY47/119Eh5tHq
+lE6ddKmwsb5rrsdsF1461gUlfJqWTKOoHPTI0vvvcW7P+ikuW56RjQigVECEXfuf
+pvJwp4ubOy4kkPjNjfyE3/LuY0vgFu/5KyTrygTDezza0PxxFazd+ePjjXWtXSyp
+UeTNzza8VWtSS/PAelVQitcTL6EvwL69jZQhcqQFZPhnXoNIbroX1kRzi1y/9i4M
+kSup5nnqfdMxhdxPjeJUUEC0GXmniNnQhmWY5d31vDNm35mYXCaavF9dEYYZXvcs
+UGwNBajSddvT8UNW4FBRfN9CkeqaCWEKohOKFCkR3vQuhBCIKIrnJ7pqX26bzFAa
+CLTupYhaSh9/kE3vVyVJ
+=qJpE
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-1.1.1.ebuild b/media-gfx/darktable/darktable-1.1.1.ebuild
index 0b66d51256ba..a2fb8dd05e3c 100644
--- a/media-gfx/darktable/darktable-1.1.1.ebuild
+++ b/media-gfx/darktable/darktable-1.1.1.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/media-gfx/darktable/darktable-1.1.1.ebuild,v 1.4 2012/12/10 21:56:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.1.1.ebuild,v 1.5 2013/02/07 22:25:40 ulm Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.darktable.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	doc? ( mirror://sourceforge/${PN}/${PN}-usermanual-${PV}.pdf )"
 
-LICENSE="GPL-3 CCPL-Attribution-3.0"
+LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="colord debug doc facebook flickr geo gnome-keyring gphoto2 kde nls opencl openmp +rawspeed +slideshow"
diff --git a/media-gfx/darktable/darktable-1.1.2-r1.ebuild b/media-gfx/darktable/darktable-1.1.2-r1.ebuild
index a6260fb00a8e..5a05d26248fc 100644
--- a/media-gfx/darktable/darktable-1.1.2-r1.ebuild
+++ b/media-gfx/darktable/darktable-1.1.2-r1.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/media-gfx/darktable/darktable-1.1.2-r1.ebuild,v 1.1 2013/01/14 21:24:01 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.1.2-r1.ebuild,v 1.2 2013/02/07 22:25:40 ulm Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.darktable.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	doc? ( mirror://sourceforge/${PN}/${PN}-usermanual-${PV}.pdf )"
 
-LICENSE="GPL-3 CCPL-Attribution-3.0"
+LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="colord doc facebook flickr geo gnome-keyring gphoto2 kde
diff --git a/media-gfx/darktable/darktable-1.1.2.ebuild b/media-gfx/darktable/darktable-1.1.2.ebuild
index fba9fac73e71..c70aa04d424b 100644
--- a/media-gfx/darktable/darktable-1.1.2.ebuild
+++ b/media-gfx/darktable/darktable-1.1.2.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/media-gfx/darktable/darktable-1.1.2.ebuild,v 1.2 2013/01/12 19:34:53 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.1.2.ebuild,v 1.3 2013/02/07 22:25:40 ulm Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.darktable.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	doc? ( mirror://sourceforge/${PN}/${PN}-usermanual-1.1.1.pdf )"
 
-LICENSE="GPL-3 CCPL-Attribution-3.0"
+LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="colord doc facebook flickr geo gnome-keyring gphoto2 kde
diff --git a/media-gfx/paint-mono/ChangeLog b/media-gfx/paint-mono/ChangeLog
index 380b55003653..50167580e29c 100644
--- a/media-gfx/paint-mono/ChangeLog
+++ b/media-gfx/paint-mono/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/paint-mono
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/paint-mono/ChangeLog,v 1.3 2011/01/29 17:07:14 hwoarang Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/paint-mono/ChangeLog,v 1.4 2013/02/07 22:26:37 ulm Exp $
+
+  07 Feb 2013; Ulrich Müller <ulm@gentoo.org> paint-mono-0.1.63.ebuild:
+  Move Creative Commons licenses to shorter names.
 
   29 Jan 2011; Markos Chandras <hwoarang@gentoo.org> paint-mono-0.1.63.ebuild:
   Stable on amd64 wrt bug #352808
diff --git a/media-gfx/paint-mono/Manifest b/media-gfx/paint-mono/Manifest
index 1015956b4ba5..b2b82b3aec6d 100644
--- a/media-gfx/paint-mono/Manifest
+++ b/media-gfx/paint-mono/Manifest
@@ -1,14 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST paintdotnet-0.1.63.tar.gz 1318570 RMD160 15308f86ba1662c968602948b5a50a736de186cd SHA1 4e902b1bd2f37169f696bdf910e310d586cd8f4a SHA256 32273a51d1643ff6eb28186c732e91f70474ecf796bbba3fbebb3eee7e1b53a5
-EBUILD paint-mono-0.1.63.ebuild 850 RMD160 5642bae7f04e6f85bcca0773ce8868d4d1e82b4c SHA1 7a4e166e0c6fbe481f2d64e09f85df1eaf1372cf SHA256 b169fe35018446103f5a3c52c032c6f77469e5e1f1f48fb14c52103a60ac9c32
-MISC ChangeLog 665 RMD160 59591312f52adc76ea35a9492c4726b93c6b93b0 SHA1 84a741722174ced5e820ddd5d206547d8fc8fc50 SHA256 ce4ec2807d6162c908f77a0bd93f9bb8e87a039214ea833a62ae76027f5dc7ce
-MISC metadata.xml 240 RMD160 323befc1f0eb0c1fc9f640980cbd57e75bbd9d8c SHA1 06da421f6404111050733064168d7c0e52990adb SHA256 e4d159d1244ad2992fd08bcc0c674359c9440d38b7dd489f538d6e2506cb7ad4
+DIST paintdotnet-0.1.63.tar.gz 1318570 SHA256 32273a51d1643ff6eb28186c732e91f70474ecf796bbba3fbebb3eee7e1b53a5
+EBUILD paint-mono-0.1.63.ebuild 817 SHA256 460179ceca52df9c49f83180a27a56a3c690a649f28f0b35e2f3702c5351b9bc SHA512 c2a3c2f33b6d8563f59def882f2035c9aa289d55927cf21bae0184e2f17dd9b6bafa9d3fdd404a7c963497b7330b3074013cbc493d35af891b150ca33ee7c4c1 WHIRLPOOL b533dc4f367f8353d601e4ec40acbfbb0899d07fde379b916fbe499e660e7afd92e3c3f7374d79aa05faee2e209d5702c34af45f2d3142a3b5e50a1d90d38ed1
+MISC ChangeLog 785 SHA256 a0d6861f962a04a6877bbfb094afe78614896049ad86ffe817bb5c54abdefec1 SHA512 a445e59818a9aef06b65b069243f81256458759dc022491cb67ff7f8340416bcaafa12abaea6c0b8f313d21a13003de64d95d46dc95c00c15a81a65eb6933d81 WHIRLPOOL 7f0135ebf5514556e1da51116fc7dbe0d2fed2bf9c740b6b64c0b5a5b72aaee6e62140a78384f750786e98f579eb552d4585766ca204812a64de9a45bed06c24
+MISC metadata.xml 240 SHA256 e4d159d1244ad2992fd08bcc0c674359c9440d38b7dd489f538d6e2506cb7ad4 SHA512 008fabcec41629b9af58953873d7b2247fbf4a99158a6bb3ba9f9a6295f173ae413184a8ebafc9f75cf09f44dcc29e9bd0b10fcf4f103b38ca1f3af5d0342c59 WHIRLPOOL e5ad9ae816b3c956554aedd8da932e3592d09b5a1325c9db33328537fb5acdfeedba3cdbf5a7fc22b59f16c8e50ee0bc92ce662a4e6210ea95336ba7fa4b35f9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk93TiQACgkQ/ejvha5XGaNw/QCg6D/Nwn82IbL8rvOCfzK5U0IP
-yKcAn34zBV94WyIF9+ceUIZz9bLkvTb2
-=KvVu
+iQIcBAEBCAAGBQJRFCsJAAoJEDxpGckxwJCBQUoQAI1H/UGlG6RnJkR1vAyKJMb5
+X9QThVzt4PgZ2rL1JCxzLUdlYuFaX0CYLQOzGN+S6X4uvZPeXHJTt7cGtZDgA40c
+ZesTqfstYaQjozxXgt7KIOJF7LBoxz943fJV+/NWRJlLquWM7vaP5HWBBQDYmo9n
+715WfDf5Vmq2XLYlR+YhemakSWe3706kElgQGmrThUJ0B6Vla21YpGssaVFLs+ie
+xBGyINrvdUmIy3K6a6WgVNVxZASL4y2ZRKqy4hX2lZRxwzsvZjz1kbDwBFaaRjdk
+DmB4HbphIIxkyMb6c/dmXb9Xb+1YKqxnWDEc+0vX/B3Qqhwphudu7DblP9srKoVa
+AyUwf5qyzN0z2ASkZ/l/n6JTgyuVJgHBmPTWdu0l0RIAtLSlYMf899Q0V3BOBQv+
+CsEzZ1Cts5rxEKvL/PVhsGExIKXCn0Zj0vMGTKjsBSuYkZeJFDIZJKU0aJDveRxF
+IIwKDZLqrMImNfDWsSRgD47ZEaQgBkJb0CkuH2NgbbVXYCmnCNIMl4gN438PzeYW
+X2B/NomgwF9EvpP03f2ePM+b/i5mUoSGd/+svYNIpq7CJuQKjUWGJPtrTXx0Pqr6
+rThVDBTVTDA6vqJ+xvwIMeFJtTkJ2G9XY8OEdoV0fClVbvFkC8xxJbJxsWlak9eC
+DPess7qiFX/00msneL0y
+=WE40
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/paint-mono/paint-mono-0.1.63.ebuild b/media-gfx/paint-mono/paint-mono-0.1.63.ebuild
index 9df6b34276fc..71e655d804c2 100644
--- a/media-gfx/paint-mono/paint-mono-0.1.63.ebuild
+++ b/media-gfx/paint-mono/paint-mono-0.1.63.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/media-gfx/paint-mono/paint-mono-0.1.63.ebuild,v 1.3 2011/01/29 17:07:14 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/paint-mono/paint-mono-0.1.63.ebuild,v 1.4 2013/02/07 22:26:37 ulm Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ DESCRIPTION="An unofficial effort to port Paint.NET 3.0 to Linux using Mono."
 HOMEPAGE="http://code.google.com/p/paint-mono/"
 SRC_URI="http://${PN}.googlecode.com/files/paintdotnet-${PV}.tar.gz"
 
-LICENSE="MIT CCPL-Attribution-NonCommercial-NoDerivs-2.5"
+LICENSE="MIT CC-BY-NC-ND-2.5"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/media-gfx/pinta/ChangeLog b/media-gfx/pinta/ChangeLog
index 0b36416d8bcc..0169f155360e 100644
--- a/media-gfx/pinta/ChangeLog
+++ b/media-gfx/pinta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/pinta
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pinta/ChangeLog,v 1.11 2012/11/21 10:16:29 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pinta/ChangeLog,v 1.12 2013/02/07 22:27:30 ulm Exp $
+
+  07 Feb 2013; Ulrich Müller <ulm@gentoo.org> pinta-1.3.ebuild,
+  pinta-1.4.ebuild, pinta-9999.ebuild:
+  Move Creative Commons licenses to shorter names.
 
   21 Nov 2012; Agostino Sarubbo <ago@gentoo.org> pinta-1.4.ebuild:
   Stable for x86, wrt bug #439794
diff --git a/media-gfx/pinta/Manifest b/media-gfx/pinta/Manifest
index a7452445f37c..163b6cadc60b 100644
--- a/media-gfx/pinta/Manifest
+++ b/media-gfx/pinta/Manifest
@@ -1,7 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST pinta-1.3.tar.gz 1131567 SHA256 514103d11c6fe8de5f09c45de77d5c8c5403d13198fd7716930abb08e9d0b5a2 SHA512 107f3cb26ea8aa0ccf53ba6ccf817243b94fb2019aa687186fe7be118a2967f4cb9dae5fd84aab1943ef108553d23e5f9c500dc00df59e1974ddccde51f799b3 WHIRLPOOL cb70c83e98bf1950da7d9c64e332a217ce972c9f27c05c2bde05c63fa15bc9de5388cd7190d3f0ae32734f4fe86362634d080ae875afa74126ffdcda65b81314
 DIST pinta-1.4.tar.gz 1230765 SHA256 fde40f78560aab5a891bf499396db099b86bbd365c1eb81df480b35b4d37d8bb SHA512 7a1abd62a10569aa572ab956a860d1813104e4cc35c800798d78085ff2c66f4bf0583f8270d279d1342959c86cdc9383b93e004e1ee8e96cfc99de45bc9fe79f WHIRLPOOL 71101a513748d8cdd0a46ab2c115b1719cb987d5efc6c1ceb24e4a8a0b12e898218209f310887564279065ac8c69a6e349799c7300f1f0bc2a53e8e15ba9d401
-EBUILD pinta-1.3.ebuild 1082 SHA256 24acea370dbed059f5d75410b5ffe06fba25221daf7c4a83924b29180fad3166 SHA512 40e3fc3300dbcca4a05bb3f173ba6acff3086c0411527760b9f4c86f95c7cd8239105090950f6bd7bb3ec2e679821900d2d5a51805b0bbd239920b79495ee565 WHIRLPOOL dddf77a5fe22a543c73d86fad60a395cc7203aec4cceb8a1fcd5bf3d2246ea9837def800d1dc0ca2136fccb505e113712382e569b15f616caa023becafd82f7b
-EBUILD pinta-1.4.ebuild 991 SHA256 5ad0a4b72fc5f948db330515dcb93a6392924b7498de167086ddbb7d2de8b0a2 SHA512 4f25bee078005425b461bce306fcb15d26e48cf956bb0c7da5531274ceba11d76db453ad90759679da0b0defcfe57604445e511d60884c581091d80efe357ce6 WHIRLPOOL 8754b4648c27e25f141fd3dc52665af7410676af3d0aa76f4925c1bc3400d66f5005d66143872a659088fc756d2ae0f7d6b22dcdd3ad275b606b63a000d51e19
-EBUILD pinta-9999.ebuild 1114 SHA256 0fa75185f2afe06f541b7416819fa231ff64a8142cf880d94f452f3b9c8649b0 SHA512 01dbcdfe7b3d0587574e2d2f9fe314b00c0b8b3f7c1d058405a3454c6b15391af21d500c9bec074482b2a80cfee78619668c80851d466e136323a40650b5d465 WHIRLPOOL 6c134ba77d262fa71f976430384d1d8c3d8df1b08100753d2561633b379f0dce08e38c6f8dc3bbee88b03891a8d9f1fb4a6c4a9475da229e0577ff43c3d4a0e2
-MISC ChangeLog 1348 SHA256 0aeba1ce0eea685f582f666d1dade3b68ee3382b6f1d37d9cb65da2470e2067c SHA512 8db7e086bf3b3a7ddafa91f9029e3ca8d278fa70417e5a326c6ce51858544a55e596a2763d5c37603a67a3f98ab1cba69d2510a00394dbce088d3ba1639e9a17 WHIRLPOOL f941fb551778c0e89e6fdd1a8028d5fe4d9a225a9c47346622f11f2378c1a26bdfb7cce4bec8198dfe64aa2ac3e41bf25886bdecae5b897af26a2f3964a82c8a
+EBUILD pinta-1.3.ebuild 1066 SHA256 6f7655bccbeb92ac7c74d582923853d434ce16a68bc5727a506910cac9671600 SHA512 da42df4ae4cde3400bbef6d527e503124a8b93bea322738efee2c2fe73080b045c3bde665a911b14a42362a4890b5750e015462ee76ad7ee8c5a74d7fd2c923b WHIRLPOOL 5ab7413f28e44c283b3cb87e4df137932d0fb58f1484bd97ece117dee6bf0a22606f7bc67d294d47748c071f5fbb6fea7356659b04af93177338b42bd9ae8f2e
+EBUILD pinta-1.4.ebuild 980 SHA256 02ed4c0142f747d168885c6914f1f10ee0804d7ac54742a3be16ee387c234fd3 SHA512 9d8f3237cadcab561c739bb1f14de3064b240f8c824a608c1ea6cb0bbd1c938c410615d09e6c2c8a105f07699ba52342a993d212c2d380f9fafb77060dc17a00 WHIRLPOOL f0cd1cb09890d17443586d6ff74559d703038eea46bf53251e3e5a6f0f746986d3a65594fa14ef085ab1e395fdf8d0c07b2c632d8cd7849ef35b31a08ef1ab81
+EBUILD pinta-9999.ebuild 1098 SHA256 9c4cc5df0d7d92d31aa585c57adc7a638018164caa1e1112853d482c27db1dcf SHA512 1359fec6c29b474a3b8e4592729d2fcccb07461c899aa953ed8c6259092d424f446748960d3683a35435ff5f0eeabf39a324c1dfdcbcc035707d35b7e0d333cd WHIRLPOOL 107ff5736b8ccb5eb366dd8b9a5bd054f80a51135abefc28656fc79eadccd80f68aa66782b9c9aba83fae5e4675b3f8729710038c84d6d013ee03b186d374101
+MISC ChangeLog 1504 SHA256 4877bfcd6eb388bcdd37fdd126f8b2519dd046d6fe3c3f10406e930271f14410 SHA512 ef9d0603e6b757bdf04fb3ec73b321b6feb001079cc0965a32cbf572e22e39db50b5789d04943d40d530eaec6c546a6ebf05debf9c696e826c52939de3bc0fa9 WHIRLPOOL b0aa9c2aa351f2244f0d464169b8da885523121d7a5467500882647b80e89ddad678dab62bd5b6be4d86b2e79a4894803d83956de5e14b46e7d568bf31e3cfd4
 MISC metadata.xml 819 SHA256 a2671c72134c884a6be0fdf439ceedba0fbadc53d4a601840ba4a51959dcdc5b SHA512 00f1bd8955e0310de78ab5210648ad715503b1c1f121300a9730e7dbda545c5e93af1de369b77d42e4ad252ff73a02f5f2098356d9b596d513326fddd8e245fa WHIRLPOOL 98dfbc817bcc9d53952aa333d2db6a2e1d91df4c49d78eb78a7208d95af6f2c0850cccafbaf09eb05529e25c32b0b8eff4e44da75672f46574d0d913fdbcf39d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRFCtAAAoJEDxpGckxwJCB2TcQAI6ipuCyHm4lRdZxuBDP55W2
+oFtJwIIpeOu2eVqky7YHQHayIVjlFOjLeGJzCZ3lrWM3ZppJtuI/Ewdk/qMo12/U
+4zk2a4d3yn23ytbrZZSkJV+SRgyxZOqbNxaPoLzO0gz8xHxCBmkeLYA0xgUJqL3+
+Wcarqi5c540v+eLKu00754nvfrWDbRAEUgixl3QqUcVyFAm+L7mxDIGiBvB1Raal
+XIhBbuqSqo2Em4GqwddZyHtQiQvQEGVJ4ltxWSd9Lfm5Q0TL6Jsju9CAhybNtdgI
+vTY9nLWUcwXQ8Fg8FGdfGFTOSI1Suo93AqBYZ4c8eKOggEIAcW62h0qctqo6DzaN
+Bls/KdOKs4iGBb147g/2EeWXIcaJdxV1yeIhgDChWlHXmfanIG4vHsNmGe5vFYGe
+hQYToreXdLhZ6A62SOTSVLXM1tQo/LuuVoBQybpkwCVOde5J07kdv2qw/dFU9/oI
+3BBvnaqzfRQ0Lq8nyiimMbogMoOeRJ2CdLiTAapzn2G9C7zfXqlN3DY3WkJeEwpj
+aOYw2JJjznUBES+fs7vDA5uy+yD/wVbKxbETITW8bDH/TpjWvqD4+2sBK2vfYqNF
+Ac4IpL5kSKoO3s0vOH447AQuz8+IFuoajuZqw6zrUPUmVlE+hqXsvXAYyS6TWpgf
+f8yJRkTrejNqafsJ3fck
+=003I
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/pinta/pinta-1.3.ebuild b/media-gfx/pinta/pinta-1.3.ebuild
index 0bac2787bed4..45090c6c0c9e 100644
--- a/media-gfx/pinta/pinta-1.3.ebuild
+++ b/media-gfx/pinta/pinta-1.3.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/media-gfx/pinta/pinta-1.3.ebuild,v 1.5 2012/06/17 22:57:08 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pinta/pinta-1.3.ebuild,v 1.6 2013/02/07 22:27:30 ulm Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ DESCRIPTION="Simple Painting for Gtk"
 HOMEPAGE="http://pinta-project.com"
 SRC_URI="mirror://github/PintaProject/Pinta/${P}.tar.gz"
 
-LICENSE="MIT CCPL-Attribution-3.0"
+LICENSE="MIT CC-BY-3.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/media-gfx/pinta/pinta-1.4.ebuild b/media-gfx/pinta/pinta-1.4.ebuild
index 9dd04a558edc..f831cc618e5f 100644
--- a/media-gfx/pinta/pinta-1.4.ebuild
+++ b/media-gfx/pinta/pinta-1.4.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/media-gfx/pinta/pinta-1.4.ebuild,v 1.3 2012/11/21 10:16:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pinta/pinta-1.4.ebuild,v 1.4 2013/02/07 22:27:30 ulm Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ DESCRIPTION="Simple Painting for Gtk"
 HOMEPAGE="http://pinta-project.com"
 SRC_URI="mirror://github/PintaProject/Pinta/${P}.tar.gz"
 
-LICENSE="MIT CCPL-Attribution-3.0"
+LICENSE="MIT CC-BY-3.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/media-gfx/pinta/pinta-9999.ebuild b/media-gfx/pinta/pinta-9999.ebuild
index 082adabbbc54..c74ecea91194 100644
--- a/media-gfx/pinta/pinta-9999.ebuild
+++ b/media-gfx/pinta/pinta-9999.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/media-gfx/pinta/pinta-9999.ebuild,v 1.4 2012/06/17 22:57:08 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pinta/pinta-9999.ebuild,v 1.5 2013/02/07 22:27:30 ulm Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 EGIT_REPO_URI="git://github.com/PintaProject/Pinta.git"
 
-LICENSE="MIT CCPL-Attribution-3.0"
+LICENSE="MIT CC-BY-3.0"
 SLOT="0"
 KEYWORDS=""
 IUSE=""
diff --git a/media-gfx/postr/ChangeLog b/media-gfx/postr/ChangeLog
index 4eae966fa1a3..5a56177e3813 100644
--- a/media-gfx/postr/ChangeLog
+++ b/media-gfx/postr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/postr
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/postr/ChangeLog,v 1.3 2012/10/09 22:53:51 tetromino Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/postr/ChangeLog,v 1.4 2013/02/07 22:28:22 ulm Exp $
+
+  07 Feb 2013; Ulrich Müller <ulm@gentoo.org> postr-0.13.ebuild:
+  Move Creative Commons licenses to shorter names.
 
 *postr-0.13 (09 Oct 2012)
 
diff --git a/media-gfx/postr/Manifest b/media-gfx/postr/Manifest
index 1482080295e3..052d065c56f4 100644
--- a/media-gfx/postr/Manifest
+++ b/media-gfx/postr/Manifest
@@ -5,17 +5,23 @@ AUX postr-0.13-exception-after-quit.patch 1593 SHA256 382dc5d5f588386f8fbf094408
 DIST postr-0.12.4.tar.bz2 68195 SHA256 195027ca4853c2f98207ee9cc2fdc73ebf074174060f3cceb9ac503a9bc30ccb SHA512 bc6f30032f71ccafe304a5f961a79050f3617603537b3a6bef72da84a8737b26a4566d04ad22613ce2767f5759944ba04366be0f1e19a64a5ea9cfe93c6d1525 WHIRLPOOL 74373cb86bb65bd69190e1c8c5e7abec9d2f8b887625df159e42c11e85b5a7c9880d5d01054b325ec2e97851a39d8661d032b5b679294d4eb356b07042c2df8a
 DIST postr-0.13.tar.xz 382364 SHA256 3d5d4515892c8b81494257d7fc35d1c13a857bbdaf7b01ba67bde62ebddb962c SHA512 2d6673e3e2715c6a2a2dc50aeb9c9636d44ef2c6eafdb1b6d87118a3f9d825b15e3f196bc3a9abc7cba35ebe0f88d569bc0c777c3d9096ac9b0a28c084a58828 WHIRLPOOL d84e31e33bce2180b96fbae5dc9ca0fda761b37ba822d7e367ea38c4cff6763acbd1ea872ee550c55a874da9ff8c1d4a493d5739dec385c6b9a8623daef313a7
 EBUILD postr-0.12.4.ebuild 814 SHA256 447a933764d8967af47c468b244acb8315ac5d7c81da354425f50bfbfb54f776 SHA512 ce6eeef7d6bc0b772a54dfad05ea552e75dec1db80c1bf4e3fdee6774eb591c0f47fa0f166a5df8561d15405db8d3bb130bb050fac399918d429230df6f93b13 WHIRLPOOL 3e968ee06d4171d48ecd68d49ff1cce1096983f7f856038f581a70ca69d04e493886e425d00c403de78319a4f25b9805ef4943250878b5feeaa932113674d86f
-EBUILD postr-0.13.ebuild 2000 SHA256 884ee6220d419d82da10558b89a44fd6343a4eba14f10fe73a84e3aac49d8ff6 SHA512 a966075640ad4431590bd3ec9f04ca7264613aee3e3b61232d83bba7596db13adf4a3276936fd43c5e1d00588cee8a8a78749b56e1e0bb5879d0e6b4f17e3dab WHIRLPOOL 2c57331cc8c3a832f8b600a6233befec96895cc910cc9580b634bbe4f2f6db05b290a48831fe4ca33a86fe29f27d50b24370b32cae7bcb4d67adf30af7978037
-MISC ChangeLog 889 SHA256 c746412db9fdad6772be3feee0a4d5bebac31c76451d8e7d56047605e45632af SHA512 84e7041e90a0e07789988477aab0316c8cc157602413ef05a748a1d2d6a12574043fd134656bb4a8ad5217175a238bbbfba7e06aee700369ec1899693da6deb6 WHIRLPOOL 503e083064324a5741c97394cf60b80bc4791a770aa940420bb3f2d0aef95575258f296032fec4b32f0f890585f884d1185ce23bb8112db32c387f03ca8224ad
+EBUILD postr-0.13.ebuild 1975 SHA256 08c5303f0bd864a04c39814b3f9fdc27b250b7868d72bc19060b9084454da13c SHA512 d96a7ff55318e6e3a419a026771e52ed97dbef5e2e95c0a8223b41b176237268302f2d8d4b8a5d0dc0862aaca6ef4ef8a7aacfceed72fd7439bc1a23f62f0c2b WHIRLPOOL 906764dafff8a910231920ad5cd29b6fd1c4e8a9e0afeedf83ace18360c0d93b4acda5ad0700fa6f552b95121c478f9a364692551beb444e661df5701ce819fe
+MISC ChangeLog 1001 SHA256 bd76257e784d186fb8b90fd2d496d4a1a2d6090646903605f173bf9176fc3da8 SHA512 920ad87a1637390cd36019205750b33ee08257bca34f8b618fd30e8a03bcc3fa66cfb4badf4e04f42a94ea915d2bc32c307b80e63d972406d287694c2a30b93c WHIRLPOOL 0de3514298b06ecd4b97041cc47f59603634b7196d53e798afad2e8f001c4f64e304a7e04e9e1d1899d81cd84bc369314da140c266d295d6d8dd1291a5f9621b
 MISC metadata.xml 295 SHA256 07e212d1cab89a586f5ee814992de03bf84c4edfffe869dca642ce8c37eafee0 SHA512 c0c6b458c2c27b5de838bc58432de28b873b2b53fbbb5e17503b048f17e87ef105ade23ce7d3ec80223494521e65602d875459b5a278c29e31e1dca4d943b7f0 WHIRLPOOL 3b54e9887709bdd689ac82c6cf987ae088038da73cad5d3968db46a252cc6a9a0159e37809488c527c5c32ea42c4fd8cb312105959d41c9ea382b071622ee29d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQdKsAAAoJEJ0WA1zPCt1hchAIAIKbIlReStWYs9z1jgjKkPie
-7Nr9PsjweekSa/aTLXD3E8O642lvOkBz1qp7ZGR6NUUEkXbtSJrAnNvbofTgHtnF
-l2jsDLdm7EhjzDut+QKlK35ajEBPesLyq0JVyxxT/qzFOfd0+keansnPW+ZbkCsx
-RbprbhZe64LUDrYzN4jff+1BtZgVUDkfvUsNVw/ywNa7nMAbnovwjb8GVkN9pfG4
-7LvSssUoQGC5lRBNSKoJkd2S+PyyvVkcijyNOdo2XOWnqRTwzgQLr/Y7Wg410XCz
-Vp5Uy3jfcgjQrILXxssKZJ8BW9lXuMSnD2l7DvcW6b4p2EmFQz01r3mnqbzrs/8=
-=Hu1J
+iQIcBAEBCAAGBQJRFCtzAAoJEDxpGckxwJCBauwQAJ0Yn6KLPG/vSR+Ml1xPXaI1
+peW1PNwNI4Ziwhb0yQPwPJu3fne9fS5TKYWBvo4p5sUVJ7e0qzv/VP7Xid4ER14v
+wo2SvH7QkRE9ChWoqcIaPz7FIQ8hqvNXHwm5lA1JCP1GI2LeLsgH+4hU1Dv+Zo6C
+LxrdyNcyvVWnmJucjACm/2KRmBK4+ph1QzHAxPNtMxq6o9lGqeq/HNnkdfZjCUuI
+9PIOn8hmzsCEU9ncU1hXhGRkeb9/6IQ7wYH758+Hyw2S4GlZhPrVCHMv9ed0JSiJ
+of6dkgI6kh9BzR8SepSFxJ0zCmB9Ut+tBdFlFCtvSAx984cvPoO/VrPagK4ybL2b
+BpMu076TbXoHHdw+1rzlfZ9hGrNbM55YH5U1vDUIvYnTa3ABVvP9ovWtrgl8zOzo
+QdnZMYc6YpXChF8xZQYtH7MPjyTnkqcFBVDsy5YPni7QwvPmp2KsLLktI2MA27vH
+2rglP3r/URB44um8N/iGGo0onXewJn1a7//q6hlrKFdvSIE2VJydKAj5zh72GO+/
+Yej0Kmn2xlphvPou0A2XIVGOFf7gvegzLD3EFCMDzWK50zwW+tGgCMRWC3645ZCt
+lk3S2e4LCAelqjyYcisrhvjEO2E1wDMbw8omui9SKTL93etNN6HxmSBkqz3MUCTR
+jiGRYmiN78NelOzIs+jZ
+=VZna
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/postr/postr-0.13.ebuild b/media-gfx/postr/postr-0.13.ebuild
index 3108d924a619..940fc37aa6cb 100644
--- a/media-gfx/postr/postr-0.13.ebuild
+++ b/media-gfx/postr/postr-0.13.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/media-gfx/postr/postr-0.13.ebuild,v 1.1 2012/10/09 22:53:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/postr/postr-0.13.ebuild,v 1.2 2013/02/07 22:28:22 ulm Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ inherit eutils gnome2 python
 DESCRIPTION="Flickr uploader for GNOME"
 HOMEPAGE="http://projects.gnome.org/postr/"
 
-LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0"
+LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gnome2"
diff --git a/media-gfx/rawstudio/ChangeLog b/media-gfx/rawstudio/ChangeLog
index d173c77a5c97..ea4d9de9f722 100644
--- a/media-gfx/rawstudio/ChangeLog
+++ b/media-gfx/rawstudio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/rawstudio
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/ChangeLog,v 1.27 2012/09/23 08:53:57 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/ChangeLog,v 1.28 2013/02/07 22:29:07 ulm Exp $
+
+  07 Feb 2013; Ulrich Müller <ulm@gentoo.org> rawstudio-1.2.ebuild,
+  rawstudio-2.0.ebuild:
+  Move Creative Commons licenses to shorter names.
 
   23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> rawstudio-2.0.ebuild:
   x86 stable wrt bug #431060
diff --git a/media-gfx/rawstudio/Manifest b/media-gfx/rawstudio/Manifest
index aacde63d425c..2ece3235f6c2 100644
--- a/media-gfx/rawstudio/Manifest
+++ b/media-gfx/rawstudio/Manifest
@@ -6,14 +6,24 @@ AUX rawstudio-2.0-g_thread_init.patch 584 SHA256 dd65929abac0e961573f333af267ce9
 AUX rawstudio-2.0-libpng15.patch 1439 SHA256 7cd80575ffb9e0f6a518d2ee16b6c34ab43a0be2bb9bdb2ef15021592ae30f34 SHA512 bf3458e58e3d639f6f7ab6f1269f237b4606b0409e1c7da0246ec00fa977f47a5e3055bfb21cd9883dd0ae9e65f0a726fc80a85235b6485d18866ad16b851d9d WHIRLPOOL 72437017bc82c157935035272fe754a8b4f4d2f7f9a17f89d31c5321e63ec3decbedd3002ac0522b304eaffd3ef481310b4f88a66957742819c025873b7d69ea
 DIST rawstudio-1.2.tar.gz 516171 SHA256 bce8525bbd0d59a9097a4404e0d70856faa5c671f77cd32ca0d28c7bc28e6d85 SHA512 4cdae123ab71b8aa030ab2ea99bbdc1a6648b8f9c93f7c3f83236af4bd8db6b6c5a18043a96ca6939638708727e260232765cdca20d4416b28c384cc27ab3add WHIRLPOOL fd8ad7a23fce59372bc5f948fa977c0aa756433bd2349530d820b9c39dbd2177ac7ca8dddb0a226e2121b2015bf822d9f0978fa4ce2f6293565e15aafb7793e5
 DIST rawstudio-2.0.tar.gz 1537703 SHA256 14cd5aff315ca9a28ec359ed2da0d993f0022b548a1751f208463ea823b2a7fc SHA512 583018b26b77485f8eccab44ccb1301d2d3f55e1751e01fb51d8d5b0088a2ef94cd0b10b0ca7435b14071681afebf4be6b8722a5f152ee7e4f36427b824c5071 WHIRLPOOL 9b9a574d5fc13b004bc2837de0c2b8876e5a98362f1c7d493bff61eb91560b1fa86f0a2ae37f154e2cb73adf4ffe986b6d91d928923bd473d67c38af8dfc11c4
-EBUILD rawstudio-1.2.ebuild 960 SHA256 2b9c1c8a9e876747c944a045127ea200fdbd8eabf37e451fdcbc11950a064af6 SHA512 1e8e575c6f136648141bf94ef816eb87b05c9f05ee67fff3b411181a0b498a0a58d3a7c35dbe42b3fe233c1215e9433f81b92b90b78695bdfd118c112ae4361d WHIRLPOOL c12a27eb63474358c7ed5b7ca82a3dd946f1a0d3edd98c395cfddbd32617ff8fa72c0b5acfaddd8b3dd96d16d1f4af0f4085d97a171b9b454c60cf3631d0dc4e
-EBUILD rawstudio-2.0.ebuild 1282 SHA256 4c167088d26662f6f98929471400c9c9eaa098dc34b70eb016d81620b63dc2ce SHA512 28841195a1c2f06be672070abc186b57886d7db2793a338911456509767d89d9ff2e511b74ab79c51aa119b5e76fc104056c936b5e65d0973d655c7e209dba0b WHIRLPOOL 96cf4f802a6d93e3a050126c49eab0393171cd22462e0ef05a89141ff2c6669145e9f11ebd7a371932b64ba5f6d0839008b55cc70566f335ffb547246b1bce2e
-MISC ChangeLog 4218 SHA256 977d5740dc49672ff4ef3cc5b4f47da862d82a2131d1aab31b30a70b82bf3741 SHA512 14937d2bb4776a52aae15982215a91751290f8533d7e4a10e875c065af8d189b04a4fe369a57a45709f196b18ffa1280f0d6c7db20ef239e17b070eedf6d54ac WHIRLPOOL f8f8f1a880140bf20241ec480d77733a5dcc83518cd6c4e56c78bc8cec60f8051cff9db1aaadb311ca2ee275f367bc7dc92e9aaa171c7177e206d6109d682c31
+EBUILD rawstudio-1.2.ebuild 940 SHA256 1f13c7ddf9d768ce9e6081a8a5a10ecf20cff4ba1f8fb8275d601cd6fd06b148 SHA512 102b0709024f97a0be8f59358e067435a42332546e7814204db6dd00c767a5e6b39282cf9bb77c142d468303fb730fe31b1f1ada4398e16e5b3ff97f751cdc55 WHIRLPOOL ec017bb252749976aa1a86a5cdc4a1200e01ec05ba498a1f8a56eeed197c75aa0d222251720f4d319a324aaf92c0e6c7207be3c82bb5f4b69cda6a42af4fcc6c
+EBUILD rawstudio-2.0.ebuild 1256 SHA256 ce360a0ecd47961191b9a848b6d906e3ef094f86b6e902b7bfc2afa26476fcc9 SHA512 0b91e04d353d6d39e64e70675d750dbfbba57d06243e953def32fc0320e339f28d85dd4d2114d40b15cc96a6e02284818c8eba5bda71d7d31cc37dbdde9cfbcd WHIRLPOOL a0aa2522c70f6f8ec4114dc59af0c600d55537596430532608c268510478bbfef82e31435b29943fc38274e0e08d14e9ee2a41587f96b8ee9bab3c682a34f387
+MISC ChangeLog 4356 SHA256 6c6cb209570bde7503946b93d0a54b4686e1e59679ede1327836b72c70584b6d SHA512 8a8aaa09b84c5393dd41b3e44354e31a7e8b6ed957788a34080a12af217b792e2401367fa56f2fe5c06f90863c42a53e6f4e16a8c4b3c4eddc6858cb89a84715 WHIRLPOOL f4b2dc3d5b6f8667f60eb69438ac68d4de7350f5234e92a4fb4c987b71242c39a6cf5f84394a2a4f45881f47d4c779e6c7a6253a025deed91d06efd6e04b9ae9
 MISC metadata.xml 161 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 SHA512 425caf0160f1410ce7bf1d4639020be7f6335152c339edbce80676bff4166f1cab3ae9e13161c47b98dc00741dab3bfa45e9572a3314844476e480f5c2b58d7d WHIRLPOOL ad7cdd3352dbc12cb4181fb5d63b5aee5ce3a151b975c12a96c4a5c91f751736d27282ad22633c7e768230266bce5d17947735d33ef5c5c2341c3f9435b9ebb0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBezi0ACgkQuUQtlDBCeQKNcgCff8XAIrb3styIOOE4HnRy3hSM
-XtIAoIKKS1uO+w/1Ss7y//bcaWfDbZkG
-=87ZZ
+iQIcBAEBCAAGBQJRFCuhAAoJEDxpGckxwJCBdeUP/RNPXmaUwlX8jUJxDHotoitE
+Pcrt66hkWHJdoR14TN43J8Qy0GaugySePR7b/8put8O4aDAgCy6e4LNP1/MzD3xU
+I/OJGhgRo/N/XAedTr3Akjib/iP03knneYv+aXEVTYSBXpVG8YKTVAkSrRTdx2Bt
+OlxGpaHmgAABrskmDtBUynvcQby7Ijqq3F68hwprHKVd+x2Cdf19UejOHqS5EKzp
+6V2x4RENcDFeZL10F/G+dldADtoTz+z/1GTK32T65u372fGypX1gx7Q8vZ9YOc8w
+1gvaVQZ9WBsnOJJk6QHyRDvBeTTTVgGvw2F60OPbrAFTzPzNfgnxtFQR3EVC4noo
+Wjoysk+zRiT6W4oFIu8oBXPLFvI0P2g2tWLvQZBN8aCdulOXyq7eM43SKzS1tfLy
+4s0MW4Om0TVZOzvWTyOktNIs2gmvICDK7S9caMvIgNRcFd1W24FoAVDP8kTw3lqc
+p6/VEhPtfZnWqrKuCL2lyVs+JrTxNAR/mcY+6qiGZb0Tcoccm29VzJtKO+QY+zaD
+dshmESJ0KxYVYycuoJ1O7SftSapt4gRr7yZqSwoTDOSdKHfCIGRUfmuzr8afkM93
+70CqQPN64bygcg/ziHZw2FTA9AVoyzZJLw5UCLqAdOTogqjSCuHF7RCS3oLjIO/D
+0nQk4kBYXn9/bqKJ8vvx
+=weiu
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/rawstudio/rawstudio-1.2.ebuild b/media-gfx/rawstudio/rawstudio-1.2.ebuild
index 9b4814a69155..270c7792d5f0 100644
--- a/media-gfx/rawstudio/rawstudio-1.2.ebuild
+++ b/media-gfx/rawstudio/rawstudio-1.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/media-gfx/rawstudio/rawstudio-1.2.ebuild,v 1.8 2012/05/05 07:00:24 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/rawstudio-1.2.ebuild,v 1.9 2013/02/07 22:29:07 ulm Exp $
 
 EAPI=2
 inherit eutils
@@ -9,7 +9,7 @@ DESCRIPTION="a program to read and manipulate raw images from digital cameras."
 HOMEPAGE="http://rawstudio.org"
 SRC_URI="http://${PN}.org/files/release/${P}.tar.gz"
 
-LICENSE="GPL-2 CCPL-Attribution-NoDerivs-2.5"
+LICENSE="GPL-2 CC-BY-ND-2.5"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/media-gfx/rawstudio/rawstudio-2.0.ebuild b/media-gfx/rawstudio/rawstudio-2.0.ebuild
index 55ecc8e0e649..8dbda5c10197 100644
--- a/media-gfx/rawstudio/rawstudio-2.0.ebuild
+++ b/media-gfx/rawstudio/rawstudio-2.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/media-gfx/rawstudio/rawstudio-2.0.ebuild,v 1.5 2012/09/23 08:53:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/rawstudio-2.0.ebuild,v 1.6 2013/02/07 22:29:08 ulm Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -9,7 +9,7 @@ DESCRIPTION="A program for reading and manipulating raw images from digital came
 HOMEPAGE="http://rawstudio.org/"
 SRC_URI="http://${PN}.org/files/release/${P}.tar.gz"
 
-LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
+LICENSE="GPL-2 CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""