Fix LICENSE, see AUTHORS and COPYING, bug 448650.

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

3 files changed, 27 insertions, 14 deletions

diff --git a/media-libs/stimg/ChangeLog b/media-libs/stimg/ChangeLog
index ddbb7d2ea94f..b35baec1427e 100644
--- a/media-libs/stimg/ChangeLog
+++ b/media-libs/stimg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/stimg
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/stimg/ChangeLog,v 1.12 2011/08/09 09:10:30 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/stimg/ChangeLog,v 1.13 2013/01/08 23:39:41 ulm Exp $
+
+  08 Jan 2013; Ulrich Müller <ulm@gentoo.org> stimg-0.1.0.ebuild:
+  Fix LICENSE, see AUTHORS and COPYING, bug 448650.
 
   09 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> stimg-0.1.0.ebuild,
   +files/stimg-0.1.0-libpng15.patch:
diff --git a/media-libs/stimg/Manifest b/media-libs/stimg/Manifest
index 3d0f8123952e..87ac3b1c9804 100644
--- a/media-libs/stimg/Manifest
+++ b/media-libs/stimg/Manifest
@@ -1,15 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX stimg-0.1.0-libpng15.patch 1445 RMD160 ac15a81e3c974af4f288d17426a1e12173896e72 SHA1 742fe6033fcf5e4e3590765a40f793a0010ffb8a SHA256 b90c277e5749157dbfb5776885757350fb461e079fb499ba6bd2b0142be3e129
-DIST stimg-0.1.0.tar.gz 187172 RMD160 186f156788ad5631679b339cc9859ed60913f24b SHA1 a4ed6bd8d772e3482409d93983203d0a5b8ed1e0 SHA256 1098daac6fb37bd0135d700605d99cdbb8b8a9c9e16cdc892b3018a8534fb528
-EBUILD stimg-0.1.0.ebuild 858 RMD160 6fb5502beeb0cfbb73dd6f75350eebb5cebd0939 SHA1 46cade11e260ad5e48ef2fe92f27b75a72f07416 SHA256 23a17073dd0bb23329cc0286bc7622199ba2b1ae28aefffabb72490f6f328615
-MISC ChangeLog 1463 RMD160 9ad352aa41e11dab1183eedefbcb26c000d79d14 SHA1 2ddb560249f6c6dbd436fd954f9624f0a233f5e6 SHA256 9545ce5cf30c77d533fd1bb8436147d92152703f89d025e198f132651b671da2
-MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564
+AUX stimg-0.1.0-libpng15.patch 1445 SHA256 b90c277e5749157dbfb5776885757350fb461e079fb499ba6bd2b0142be3e129 SHA512 a615da45ba3579e92e246ead3784cba6802b4543c60528d7fbf7d660a7593e8083bab8d05a7c0f42fa4b0628c59c9cec5fc567a48f3c4627e05742e229f1fb94 WHIRLPOOL 331b8d7737addbe5520740a9cbb887ae280f34b297690752473d664274f73e2578ab82bebf1a9177daf7b0499c42d20f78a791a429438b3433bdba7219e74b25
+DIST stimg-0.1.0.tar.gz 187172 SHA256 1098daac6fb37bd0135d700605d99cdbb8b8a9c9e16cdc892b3018a8534fb528
+EBUILD stimg-0.1.0.ebuild 868 SHA256 1455e5d0e856436bbfaaab2e862f3d62bd66cb99e549f6e9ef600fa442934990 SHA512 db26bb34064ff9e582ca9ca8a3c5bc651c2f299d52af3df1850014a37911910fc53c9845e006a76741d9978ace7c02c2d5078abf0377f7d05ef4c808254f6e38 WHIRLPOOL b75345842224538bc0c441fc8f925c539e94eab693b33f959a989a369ac58748c0664ca589905302c359cdfe4242157c5c31fa80157108bef67e75601d693873
+MISC ChangeLog 1577 SHA256 31eeac6e4446358b2364804307eda95c5136ddac3835838a6d85fd18c4109771 SHA512 10bdfc07ae93f3d3e8e1f0b4cf666937736cba088616236bf0b9290398876df8ed0b59216ed66f5a14b24699aa6d2d297f3b5161feb78202039ef427400d3b68 WHIRLPOOL 693098371ee313bda912c4e8ca39fb712be8cf3159cbfcc0f06df025436362a36c66f9ef5393dc6344b7bc8da177f25080b8e800072dab81e37bf02e29b791e4
+MISC metadata.xml 163 SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564 SHA512 ff4552bc5fce771795ba67e190fc9eb90ac70aaff219130e7ff9a36cde348cd4a771d8b61e158ce9390771d29e2e0ffe17618746ff1843b2af7322e0f21cdf2c WHIRLPOOL b0db778b8dab215f2790081db3d51586e43bbc790ab06f704ef4ddd6e83e90e53685d3483feff33ed1763945fca36e934e7813bff822713869d0d7f208678fb1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk5A+YAACgkQXkR9YqOcLPEXCwD7BlDmkGrYwa/A+vKTjd9Dban/
-7/qluRcCkB/4BjR6OWMA/3Z24/mjIE3yO8D7HRB1R87UsgJGhq3LqP4spjRFoMaR
-=FT9d
+iQIcBAEBCAAGBQJQ7K7aAAoJEDxpGckxwJCB5XUQALFUDr0Rit/Bjahlt4AEWWuD
+q3U58wD6cHwKYUU/bYCLkBsoFJXTIO0hlBjD9h1c1UWJGS4bLnXA3kZNOrVaOS92
+gvsh7tvWbQfdsdm5UXmkLWlW/5EHgQoJCc7/PL0QiRcOn4zfZcZGydb17sXTBTJE
+6P9nxlDxSC3bVUZgDCKnGAiLk9daxd2hot0xKZocEyxmB/PfesSD7w8A/0OdT71Y
+Jk2Bog/HzGAXQxvRPrMNpJDvAtqEvRfxMreqMdFjp9KE4ipeMTn3FjdNnLT1Vhi9
+M+obADSwkGE5DIcYz/YXfbecwP3p6Abwo5n8b+lSX4swZbUVDAxYm0Vfmzq5PAvq
+WXU/Y0ty6/r/hx7Z3qwKCxoSB8coNo06bCWi3sRj5r9XGbrupzK453YdmUJqcyba
+zl/xGIC2HCZgw56pIFwVxW7A4Go6EysXybCyvOLoaUw+vslBAGWq2IEIQ45cam9M
+R/Z3bZ4TevjAbRSOY2ZGMaXYbL/BPfs+o7NUKUa/xpxgYWI+063JB8WYFnVJA7zD
+Ira3KgxbH1FHLv0azdNTjHECE6swCI1uaUaoMTCZ3zTGRzLvzYPJj4RQPjUnR6I8
+/d+lMF4bQJtGZEaU6QX399XUxBby5VqRv7X/oJOqWBf6mEFcIComhVhtJyGTi0Tq
+waFgb++Xgz7/NG/dF8yU
+=yDpb
 -----END PGP SIGNATURE-----
diff --git a/media-libs/stimg/stimg-0.1.0.ebuild b/media-libs/stimg/stimg-0.1.0.ebuild
index bb9c448dd956..fa02fd85265f 100644
--- a/media-libs/stimg/stimg-0.1.0.ebuild
+++ b/media-libs/stimg/stimg-0.1.0.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-libs/stimg/stimg-0.1.0.ebuild,v 1.12 2011/08/09 09:10:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/stimg/stimg-0.1.0.ebuild,v 1.13 2013/01/08 23:39:41 ulm Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -9,7 +9,7 @@ DESCRIPTION="Simple and tiny image loading library"
 HOMEPAGE="http://homepage3.nifty.com/slokar/fb/"
 SRC_URI="http://homepage3.nifty.com/slokar/stimg/${P}.tar.gz"
 
-LICENSE="as-is LGPL-2"
+LICENSE="LGPL-2+ MIT-with-advertising"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc x86"
 IUSE="linguas_ja static-libs"