3 files changed, 29 insertions, 15 deletions
diff --git a/net-dialup/dwun/ChangeLog b/net-dialup/dwun/ChangeLog
index fd5d3d4288ff..8c56e1cc9b47 100644
--- a/net-dialup/dwun/ChangeLog
+++ b/net-dialup/dwun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/dwun
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/dwun/ChangeLog,v 1.9 2009/06/20 10:03:48 mrness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/dwun/ChangeLog,v 1.10 2013/02/02 18:57:47 ulm Exp $
+
+  02 Feb 2013; Ulrich Müller <ulm@gentoo.org> dwun-0.96e-r2.ebuild:
+  Fix LICENSE, MIT (Expat) according to COPYING file, bug 453214. Add GPL-2 for
+  init script, bug 426010.
 
 *dwun-0.96e-r2 (20 Jun 2009)
 
diff --git a/net-dialup/dwun/Manifest b/net-dialup/dwun/Manifest
index 1d85d564627e..6d5b0e9b1d6d 100644
--- a/net-dialup/dwun/Manifest
+++ b/net-dialup/dwun/Manifest
@@ -1,15 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX dwun 518 RMD160 d1cc350108875a108272ca86a9e1ccce51cef3f0 SHA1 7ee153323eaaf8b1a0be293a28ce8398aeabc354 SHA256 7d9dbc5dded15345a9cd77d9dd7bb0cc6eb1e312b51b83b0d13d5a1fd102eee9
-DIST dwun-0.96e.tar.gz 147960 RMD160 e219114ba27abb7f4b40438bcca3b7beec9d0236 SHA1 44eba19c95ff56ff1c0f769de85e8386f15b6036 SHA256 43aafb4e3dcb9f0aebe54661e880e04f8764da23539621beead29bcaf618d887
-EBUILD dwun-0.96e-r2.ebuild 1104 RMD160 7aff4e25d9b491b55b7b2c42ea2f430f18e696f1 SHA1 b5d7d3f662e1b61441974b277a4ecaf4b80ede24 SHA256 fb7618b8e0ed68ec36e15c140535f3d25820cb0a04bf02d8b4026cb9fca51e73
-MISC ChangeLog 1273 RMD160 50c7b672535e3211f468d00ff7ab24f111d79ff6 SHA1 4c04c431d597ffa8f7c9101dd0ccbc0bb01f9685 SHA256 c08bff8670a9c9d3824264413edb2c6c80b963bbafb8300a22eb798fda9e82f7
-MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
+AUX dwun 518 SHA256 7d9dbc5dded15345a9cd77d9dd7bb0cc6eb1e312b51b83b0d13d5a1fd102eee9 SHA512 58aa31ff6e16b664e725d9d51ce778db004e3035abafb3ad0d268e2715b555edbfd1257b4d8b8fcd2a30db7ef56c33b952797dbbbdbffda242c6d60c7276d676 WHIRLPOOL 48cb08596d6640ee1e0510881b563fab3acb2a5fed4552c4c40283092cea3b918ecc09874cef2e84c9538d801a24dd67430a811531eac8621dc381657ae68d45
+DIST dwun-0.96e.tar.gz 147960 SHA256 43aafb4e3dcb9f0aebe54661e880e04f8764da23539621beead29bcaf618d887 SHA512 6763acd60192f18ffd81edd4f4e18ccfb8c5ac3882db96f9b7d2d032e9a0c61cb843094222744525a9927981c8cc7a603fd0aa1e1d4309d3f7fab21fec028115 WHIRLPOOL 81a102494a9a2279bfae3e7ef8609869dbe9076fef5be60ca90f8bd0dce32f4a424ea4e779560fcb7f1d88722272e44fa112fb641e1b367de8883c59197814db
+EBUILD dwun-0.96e-r2.ebuild 1134 SHA256 1def29838a49678cb7f1140f9ba0e617805f43912015cc4c33a686648d8c813d SHA512 3d269ef1b9e51679303493f571b92d72a264bd8fb4369f8668a8c629a3c30b7669b0be407814d5db4d43aab023d30438b5149eb6b935164fae1de877c0410364 WHIRLPOOL 351e2105a7bd51ed202bd6f507403de9d60889344fed9a660a384edc40722bf14ebe39458595e4d1a083e58a3bb95784092e2641710c07aeac34243f5c558704
+MISC ChangeLog 1448 SHA256 f76626c2c73945d8b7556207d3e469f6fb45a1b6dbe51de8ca4122d19ed7f69c SHA512 8f2ae291363e293f5e7d18429161501e454fc9a107a6a70ad263b76c22ff1f051165129dd0739ca87af718fb36bd4e1645cd92a2f2bfa097082494f8c7a3725b WHIRLPOOL 224e15fd4fe303390b86a17fea7746ec7e0c17f662d610d0e809f7594970743eed98e7dde1b610f474124931d82142c02996bc03dbbdb537979fca81eb41a530
+MISC metadata.xml 163 SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 SHA512 275566c067e365604d523694db8e2417e0ccf91227d1204a104912d46841d193d1cb0a39e31663f30bfb92bda09523277b61661093bfb80ca9a9e70b20ea91f0 WHIRLPOOL f02b3040d2c474daa9d38e7d17ee7d138245e06be8c26403efd656d03f54495e344157c23245bc925a0f5319f507d30a68924997ac9880e32593855d0ac0fad7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAko8tBIACgkQts85UDFmaOVMbgCfQcn09yKB4Cz19r0Tu+ufudQ+
-4u8AnRhEZEb6/SHnZPFkJlpwfOGRXf9B
-=9l0w
+iQIcBAEBCAAGBQJRDWJ0AAoJEDxpGckxwJCBsIMP+gNodCAd+vqFkpAC70nhudlh
+rckr0xRd/geaRbabpq5YrewFT/RlxjQ1MrwoCGC46987w32SRLgoBSAZ2keol0LK
+Z+JbWeJK2cB0E5XRQ5uWxy1Qdx4QDrnCqP4ZXlaM4f5ecCnlbNt6AP668GtbeNcj
+jdeB7ni+jIlnlukLpkdZyvPy4GnY+Ziu8uTCkgD5SYi9bwEvcU9WLI/a2qqgW2iV
+smY2Tztd66NanNK5IgwSqPQMBj59Dth3ql2xSn82rDHHyycAKCEOHMtJD5fpFztO
+wnL8nH2XHOCVxLE+hLH2SXafj09CtCvwzdJ4OBx9YjmLyobx+K7UxIIq1QbdKaFD
+LsAbHAv//zmB13kiA9g5WC63rQPrpas92dSqL4LMmNw4N1Hy77+BaehMa1hch7yc
+504zAjExOHKEHOjnoAqKRYN7fHcBZRv41EsZpfVrMQnEEpZEbvZ2aX0U0xjgATOZ
+lkcYlu+thL716YndfhpN3BODRBhjPOL4g2EE/SJF/RxegYsuPOQy/WrpBa3LCYaL
+lIlFR+TelvB103dyjQjOZzWqRYhGAdR60AZR60Sh7FXK9sL2DmZupzVtl2O2agZg
+FNossvQGb1/lvknO3hOvvtFuBjOl+KiZsHEArh4auxLvoaqNyjsXg/i/t4lx3Ok/
+ZatL4AVuNeJoT/or4flX
+=8rRb
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/dwun/dwun-0.96e-r2.ebuild b/net-dialup/dwun/dwun-0.96e-r2.ebuild
index 0f24a72f6666..07fe0721118e 100644
--- a/net-dialup/dwun/dwun-0.96e-r2.ebuild
+++ b/net-dialup/dwun/dwun-0.96e-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/dwun/dwun-0.96e-r2.ebuild,v 1.1 2009/06/20 10:03:48 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/dwun/dwun-0.96e-r2.ebuild,v 1.2 2013/02/02 18:57:47 ulm Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ DESCRIPTION="Dialer Without a Useful Name (DWUN)"
 HOMEPAGE="http://dwun.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="MIT GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""