Bump and fix license

Package-Manager: portage-2.1.11.40/cvs/Linux x86_64
Manifest-Sign-Key: 0xA5880072BBB51E42

4 files changed, 59 insertions, 19 deletions

diff --git a/media-gfx/pngnq/ChangeLog b/media-gfx/pngnq/ChangeLog
index 44eb0ed37a06..21c4d2ee9bc8 100644
--- a/media-gfx/pngnq/ChangeLog
+++ b/media-gfx/pngnq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/pngnq
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/ChangeLog,v 1.11 2011/08/08 16:39:53 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/ChangeLog,v 1.12 2013/01/12 13:08:21 hanno Exp $
+
+*pngnq-1.1 (12 Jan 2013)
+
+  12 Jan 2013; Hanno Boeck <hanno@gentoo.org> +pngnq-1.1.ebuild,
+  pngnq-1.0.ebuild:
+  Bump and fix license
 
   08 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> pngnq-1.0.ebuild,
   +files/pngnq-1.0-libpng15.patch:
@@ -40,4 +46,3 @@
 
   27 Jul 2008; Hanno Boeck <hanno@gentoo.org> +pngnq-0.5.ebuild:
   Initial commit of pngnq, bug #203000.
-
diff --git a/media-gfx/pngnq/Manifest b/media-gfx/pngnq/Manifest
index e95bb23ea79f..eaf1187bea76 100644
--- a/media-gfx/pngnq/Manifest
+++ b/media-gfx/pngnq/Manifest
@@ -1,19 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX pngnq-1.0-as-needed.patch 1348 RMD160 bc3e003a3e574dd2335a69312380a53496a74302 SHA1 49ed5a95cdc05af175155fecd4c9a5b82a865662 SHA256 184be7fb7ed9418080e00c799ac6e91d6be992e4de334016581a4606368a6b1f
-AUX pngnq-1.0-libpng14.patch 378 RMD160 d65871500df7388c498865cc9689e4da16559156 SHA1 8a33fe6735c8780e6dea0b58f13165480994874d SHA256 2f56e5f3c71462d70fb1e73f103bdab136399afba7ae49df3357622a7f9e17d0
-AUX pngnq-1.0-libpng15.patch 355 RMD160 f5739e5ef295a4419c662392833147126728a18c SHA1 e5ed78f6a4010c1fbf430c59b69c3818580964c2 SHA256 4f9675b5ff007fe46aad998df17a94b683aa4a647d93eb600b15c2cde117e56f
-DIST pngnq-1.0.tar.gz 105155 RMD160 6b5ef5d1cfb838874bcb9a9f554a42c36cec2459 SHA1 cc58af70cfe5ba26f6abfa4dc41d828985cf560b SHA256 3413cb72af4e1a25268892ad182f6f9f516c5b67d9ff873968e5a60c293c00a7
-EBUILD pngnq-1.0.ebuild 661 RMD160 9d384203e5bd4b514121c0a6b87f3aebda1e7399 SHA1 fe3c45d35f0dfe715f6612b3ff5d8df25b73d5d8 SHA256 332d0d629dfa9d97c91ac396d083d79d87b66c215b4d263a5840552b079cc559
-MISC ChangeLog 1500 RMD160 8dbc76c85953ed0ee96f085755a4fcdc77926639 SHA1 6da95335d7be11e76800927a3cb491934d4e887a SHA256 88c477e1ef8553f3b298edaf7fe6d0e5ef86d8625707555aa4b94b5a02883be1
-MISC metadata.xml 196 RMD160 38d93373061ffec39f901f9710573fe2eb6224fc SHA1 9f792f2f8c83cd88b49c8d7e989604a2b21cff6e SHA256 e8ef5daeda229c876fcf81068b64452d16ca1674618ee72fe8c294f6ead29445
+AUX pngnq-1.0-as-needed.patch 1348 SHA256 184be7fb7ed9418080e00c799ac6e91d6be992e4de334016581a4606368a6b1f SHA512 3d25f01e746a3d64fea1ca02c0d6b9e80f80ed4ce8deb5f5e2a3d240b5c756ce997ddd770afed7b8537b092d6f02c3a4126101305b34dc0df53992cbc109531c WHIRLPOOL 4ff034198a46391186b85484399ca5834ba5aa46f85e3186ff7750a5c169650cfcf3e12f2da1b86e073f026eb2fd5d4f31078d3c4b6ea3f4fb3e8fc88ade52be
+AUX pngnq-1.0-libpng14.patch 378 SHA256 2f56e5f3c71462d70fb1e73f103bdab136399afba7ae49df3357622a7f9e17d0 SHA512 7a91550806ecc84bb5646b8a654f26d059ed253389626f5069de9e43b0667d2e2c3ee7a94efa96e908b1083d9af5efb80f942a78b6547b0bca8827c245f154fa WHIRLPOOL 9abb54c71110ceb1c6f46ef05f52061b048d9dcc498c895d7b4f7d4214e37ef07d6ccf3001d6023a62e07435cf75f0d40a0169e57762cdac9188a6653b60fc36
+AUX pngnq-1.0-libpng15.patch 355 SHA256 4f9675b5ff007fe46aad998df17a94b683aa4a647d93eb600b15c2cde117e56f SHA512 5ae6782a36bff27560318d5ca98101a49c0d66db71682d4976407af18e637740c68c1eb4b609d1b301e23d3dd62ef4a8bbe180f941e5333e91e17d900f66e96c WHIRLPOOL 2883f7dc593341fe199509ed0572b8925961d71be5c12a663f69e0ed747d39f8d247bc44a3a8993b900f74061bf5fe43be44f413ce4335075f9993410350c439
+DIST pngnq-1.0.tar.gz 105155 SHA256 3413cb72af4e1a25268892ad182f6f9f516c5b67d9ff873968e5a60c293c00a7
+DIST pngnq-1.1.tar.gz 117372 SHA256 c147fe0a94b32d323ef60be9fdcc9b683d1a82cd7513786229ef294310b5b6e2 SHA512 3bbc4ace1375517a7a73bbc65ff39512ef316e4b67fc3941cd0b7269e584a26f915f30591f8aa1c44eea73fe4ebe9519063a7bc426841e412c648aaa188be234 WHIRLPOOL 7d9ef79ed10d452cae47262104258210b0d51f898c477dd3d6d6ef23c7cde577c15e7b29ada4b14217bc4005a8efea2ee244b0eefa9e5bfc95adf812d133eb6d
+EBUILD pngnq-1.0.ebuild 661 SHA256 7a84e7fd7ce0cc72f2fe0886f11188b6f88b4618eda9b441ade3937c59669671 SHA512 d06f921c7e59b976d80fc59360bc6dd6da07354a356e2ef82ed3ff4d7779dc1846be071fd8539458d78d2c84e60c8b7cfeec98f61548a95c4e70259c51834ca5 WHIRLPOOL be553d23f4644e890156b138d6b9c56fd48615b77299dc48c1b08dd922cb7b6875f7a6cfdb22848f6bdf3a3d5b16a13e70702cbd1cceb8ff04ef309b80c1312b
+EBUILD pngnq-1.1.ebuild 623 SHA256 a3e14b44467659ffe018df857e5d386d8f104737f86ef8eb05605ce62475061c SHA512 a03f60c4af25ebb396d9a632d1b8a71463ce171b1cb3902a98bd20140948ea88b7758251db3d2405c82fc3ef32e036a94f001e9a346e564148f2e0f7c1b836e7 WHIRLPOOL a68fd09a6ce54aecc9e6c3fe9790c8d70b75b98e3832a4011cf030dd65d1915844b8677a9aa653e60107f3c7df57b3fed22422b906dc962c149dc1d5fe90c376
+MISC ChangeLog 1630 SHA256 80496c1bffbac0f132494b75b44dd52e4a8363b694d5ed98aeb0ee08c13fff56 SHA512 dfc97031bbe2cf153de3c03b8dedf84de9ee3897688986f9a3de7e1d0515fb390bde49e1c5aba40658afe7d2bc872a73e5e7c71602a5b6fbdb1669b0770a4ee4 WHIRLPOOL 451d6f4e2d15382a67afbce9af58b14168ab47d15d4bfa02196bdae320d3077d86cdcba9254da26e49605e42a6c9bdfb6f2f0118a50f6cd932b13b37f33eec23
+MISC metadata.xml 196 SHA256 e8ef5daeda229c876fcf81068b64452d16ca1674618ee72fe8c294f6ead29445 SHA512 ba2a04029fc9fd51726e618311fc0d5ca87333acb0c067a353000a5e0cd31a9f4095adc14faae4d1f14409303051f381c66c3a4cd6ac6699a9476193ac7030f4 WHIRLPOOL 002f8951fc98cfd1917aeef67a1ef0fbc7b662f4cce3c4d9735f198ec8fcaa7e258524a80dbdea1eb485db6faae224dfb317af827582c0777faeba8cd2950ccb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk59ovcACgkQfXuS5UK5QB13OgQAlqQDQuGL62pbUmZZxPPF1ERU
-ADuZc86KhnewmYQnEW2372vDIusmrsPMfAsFEKbYCs3LvuIxNa94xYuWnh+sTwXH
-QF1dBes/4Tm/5GsJtUIwgr8Oxq7yRjkRC5A3lzEGg5yln/H44r9zWSsXpCpM4r4u
-XacM7SU1JpIm3LazQsY=
-=11zc
+iQIcBAEBCAAGBQJQ8WBIAAoJEKWIAHK7tR5CNokP/3vjaLVRtBaujdXCXURBKUdp
+7I2XLoTZOL5//JXaxtFniFsaDqYL8mNR+K89hxfa8mLWtV5gnK5bnWAPXZye6QC8
+NLKYcV1fYzrtylZ/b+vjF5CHjoNM93iZG+47gRyYxbqg9fDLclMC7R0jp5gZCZJF
+ebm9Xt9q46owLF13MBahBT5fJyKWB8ShrlLBYeG2Sg6sauAmueliJon7toJkQ769
+hex1qaGC2da3Ts7+Ilq0lkYQMrrs4iR+FPnEeY2vOr7hX39k5BtWLnL1DK6OyRxg
+DZA34J74yteUE3tQlXSt++s6wZv6pSoK7657WmBkd3eAJG/25wuVTh75x/fTUxNW
+1z/0DugLCjoYZhnf91UjIv82bqncfJBNj9lgQ+v7OfuvbY3lXj2T8Uy/9nHyNZq3
+6hXQt/xBmzU5XqX0CYGVRf4+L6DNlSFCW1LARWW4fpSjl38dt4d+MYNcNFaAAZeY
+WydHULdp3dwqWFB94iwZ8+GH1yDaL/WkXKA7qIqIwitsw0X9O7te+03V5ILTwn1+
+zHTUslP3sdi/YTE4RI569/KK1NpVaHudagiuVeORt86h4pA/9K0xIYxpldPO0tYW
+dKSnz/kNtuap/ElYEPT1p864ZI7XxTV/vao7sM8nE7rpdxMSWXc3VX9UlbhqHxk7
+aXI8TnZhI6IjwLldEuxN
+=oz1I
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/pngnq/pngnq-1.0.ebuild b/media-gfx/pngnq/pngnq-1.0.ebuild
index 5d946d8716b8..669683ec7702 100644
--- a/media-gfx/pngnq/pngnq-1.0.ebuild
+++ b/media-gfx/pngnq/pngnq-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-gfx/pngnq/pngnq-1.0.ebuild,v 1.6 2011/08/08 16:37:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/pngnq-1.0.ebuild,v 1.7 2013/01/12 13:08:21 hanno Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -9,7 +9,7 @@ DESCRIPTION="Pngnq is a tool for quantizing PNG images in RGBA format."
 HOMEPAGE="http://pngnq.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="BSD pngnq"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/media-gfx/pngnq/pngnq-1.1.ebuild b/media-gfx/pngnq/pngnq-1.1.ebuild
new file mode 100644
index 000000000000..553410098601
--- /dev/null
+++ b/media-gfx/pngnq/pngnq-1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/pngnq-1.1.ebuild,v 1.1 2013/01/12 13:08:21 hanno Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Pngnq is a tool for quantizing PNG images in RGBA format."
+HOMEPAGE="http://pngnq.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD pngnq"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libpng"
+RDEPEND="${DEPEND}"
+
+DOCS=( NEWS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0-libpng1{4,5}.patch
+	eautoreconf
+}