fixed license issue (bug #426082)

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

5 files changed, 32 insertions, 13 deletions

diff --git a/net-misc/openntpd/ChangeLog b/net-misc/openntpd/ChangeLog
index 32da93c4b78d..933ce035e1c1 100644
--- a/net-misc/openntpd/ChangeLog
+++ b/net-misc/openntpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openntpd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.57 2012/12/16 19:50:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.58 2012/12/16 21:43:56 ottxor Exp $
+
+  16 Dec 2012; Christoph Junghans <ottxor@gentoo.org> metadata.xml,
+  openntpd-3.9_p1-r3.ebuild, openntpd-3.9_p1-r4.ebuild:
+  fixed license issue (bug #426082)
 
   16 Dec 2012; Agostino Sarubbo <ago@gentoo.org> openntpd-3.9_p1-r4.ebuild:
   Stable for ppc, wrt bug #426464
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 9c5d317b764a..f5ff7fac09ab 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -1,10 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX openntpd.conf.d-3.9_p1-r2 195 SHA256 1980b5dadcd9478e653ef05c099ef45caacfdf12a73a3745b39322f75773a738 SHA512 bd4579b005507f8ff22e901a678b1ba2f82a8064dd19118fae99e31f2e08fa21523ed5e9dce1fbbad9bbb0ee6dfe92f0b254827034333f813e6018bceb9d490f WHIRLPOOL 7af98dab593e701d20f1e3d23f976323d6b083b6c80e73e1c548de5c07ee4c635db3ecf63c3f07a95b18cb1d98bd3878c36b66146caba4bfb09f0637fe5e6094
 AUX openntpd.conf.d-3.9_p1-r4 195 SHA256 1980b5dadcd9478e653ef05c099ef45caacfdf12a73a3745b39322f75773a738 SHA512 bd4579b005507f8ff22e901a678b1ba2f82a8064dd19118fae99e31f2e08fa21523ed5e9dce1fbbad9bbb0ee6dfe92f0b254827034333f813e6018bceb9d490f WHIRLPOOL 7af98dab593e701d20f1e3d23f976323d6b083b6c80e73e1c548de5c07ee4c635db3ecf63c3f07a95b18cb1d98bd3878c36b66146caba4bfb09f0637fe5e6094
 AUX openntpd.init.d-3.9_p1-r4 861 SHA256 9ac5287d9c9397e69d62eac8ffc3fb1945ba09f03dce247cd1a2dbca495bf2c8 SHA512 deb4cc60aceda644848696333a776ecc814528ced150da1a062cced615f93cd89888dd825e293b38ea9586bc082782ca236e6e8762b446c317a16a224564fe8c WHIRLPOOL 9842439b95ed36ab61730239811b139654bae01d2e186f93a5029c023a0f1931873658d9331bce7620c572f6f64d64b81cbb5d4a28effa4a15d8ae28d2cfa0aa
 AUX openntpd.rc-3.9_p1-r2 1113 SHA256 7260bb5d1aa25beaf8e871e6a6fb8f02a3e297ab855ccdd3c4afad6ceaf9b08f SHA512 a0db9c625ae30da1c5cda2a1f2ce73dd3982206fa7ae6b1c3ce69924293ee8e0b0741c1919f34a9bbf101f85e4961b22a1fc54fac5b2b28e6a079e51960139e6 WHIRLPOOL 2858407f2c5c1e33bcce5eb7a8af65c6a73bacd6e2cd694fe35b7aa61b22a40c6c308b335a75db58fa7cf59d53838571ec87bdc525f62b77ad4a5f95a06f61e5
 DIST openntpd-3.9p1.tar.gz 152700 SHA256 83dd7c1e8ec8b4567afe49af539271b5a73562fb7a3ca51df73eccba89ec8c49 SHA512 e19e7242b67c8d12fbf0a78cd29dae4248afff5b5308069b190b663a9f9426666aad20f8c9ec70fabf8d2e5c2a2e61052191fe4ccc132c62a7decd8c498c2a13 WHIRLPOOL ba5793b8a5548d2b923d8cf2c7a6eba72689a6ea7e7f90b6c014e8244f8cb53f35f22945616782754e5bf0d1d24bd40132f90debbbc030aaf6576a2a0e27b0c2
 DIST openntpd_3.9p1+debian-8.debian.tar.gz 15052 SHA256 e3bc604d81d4e1e8008560cabc22942c76130854ec67eb5968ce638d598780ad SHA512 dd2249e16761ec0fc64ee47e343459d24603094cc59da516639b741951c891e7f3905fd6c34edba6766b1e15261b7286279128631248c69e894f8b645588468a WHIRLPOOL ba3426b0cf2efd600775eb748da777c78ebf82c7d1d821d39c389b393b1e538517fc5feb46230fa89765c3d5d76e29a820a62c5be64ca96e157441028a27541c
-EBUILD openntpd-3.9_p1-r3.ebuild 1542 SHA256 ed1dacfad1f75301cf0b2a4dacbc4e7c88794cd176981f0e9e50777e52fc5f37 SHA512 4474a8b72475a94e2055186a4b6b3872e0646b16a8ea91693d07f04374b0d35874c943e0f9b0cf3664a6d6763da3ad5802dc6d2988f0b4c239f157b490275e82 WHIRLPOOL 9550e225a1687b0be86b4568a06299100314ec8fab8108cac8687d272f7a18a7fc3dc41d59e49a8d3b2698df63e15ab2263f8e889f8ad2f6dd8ec61b9db13c12
-EBUILD openntpd-3.9_p1-r4.ebuild 1558 SHA256 5f438b00fbd57725788dc55ea78244a64ee51d7be33b6b6e6a1a28aaa3861600 SHA512 50fbd11bdcecc2256d44f4f9aa9f65a16e04139d541f5af0fcaa71716f7d184975ff8d927e097b3dec6d53151813169e397497abdd86ddca1fdef12b3abeab7c WHIRLPOOL cb9687b66d9e479edfc06c0e412f270e48a880fc13d5d96b927b9cf5334ac336010e60b17a3b99143f83ac942d3c6287cfe80eacc32ad0be780c214e167f3f5a
-MISC ChangeLog 8084 SHA256 3a8f0f11bc38efb632728c03ff96c6a463b23d000aa1956e0960f690f7e5f46d SHA512 57fe24c3cdd4c3c900f5a1b9803527dfd07f143594b8f0e37da969b8f7060d5e506a21b70b48a5154688988b0057cfe3d17d1cafc56cff33ca3eedd0921f2051 WHIRLPOOL 4da3b0be3bd1323d82572d0d90830d94de283df53fa7f739b25a367986244acd4dadbce172ba9f3e6fa2ac0afe6e80dbf79db2117b8327dd5daa4ef8dd6365f1
-MISC metadata.xml 483 SHA256 0b72458b00e866b2b27ce2e818f2a0a2ed287a903f25e665c22ee932c0f896f5 SHA512 abdfc9e3949a443687dbf3c4171a33a437a7322fe2671501a81813883992dbf0f7feb35ab0dd112bb009006689f28debf30c29b14505e5d207a46b940622e44c WHIRLPOOL 7fadd69423083661e883aebe6cf057793fae46d2be2a537239741aa7a71b4b74a7215f4c930b791dba4015128860000ccdb3220cdea86d1c2cdbc294707068ee
+EBUILD openntpd-3.9_p1-r3.ebuild 1552 SHA256 998da01cff7765e9a174aab7dc45cda34db0755b979a6393b32debd70aed4d18 SHA512 c9b4a6cd7dfc551e37511852b0fdc4495dfc32d2cf5b59e3f8f3d1ccec4f61bec752e5e8292009eced2f39b1684dfce8c7b7c5b183ca377964ace75de5034146 WHIRLPOOL 30a204c4fe437250a91dda15d981efffe9c482083e09e76ed0f90a3d2b32a80ba4d86d691eabc9c012184fcf50dd3c190664a23a843df482f5bda50f5223554f
+EBUILD openntpd-3.9_p1-r4.ebuild 1572 SHA256 1e3dd633df88e2fd18a12ddd33308ec37957bd704d1a3f8e58012f37f61fa499 SHA512 15e58da28ee658981510fa2841290cf576b6a6cd7291d8b047bb454125e3bb7f4ddf6f1d045851d8fa1a47d73bf85f2bca297b123b5c7e9665c3db390e7a2ab8 WHIRLPOOL d242436ef74ab033c68ad8a049cad811c577efec50b1831c31d66c54d87b306e35001ea400ad280911c796632bea62be1425b23125ac175b733d6a933d5c8bea
+MISC ChangeLog 8248 SHA256 8af4fd655515aa7fd09890cfcea72ff9b1a619f2c2cfa112a2252b2762caa131 SHA512 9917cd9141a46967d56c7db1c14ad6ba8d1d8699b087c6562e7f1361f1cfa49e7a37f264d1e49335b342f59d822a1f80a6d14652ef1250fa68081ebb5bda2d25 WHIRLPOOL c685e90491502c20c39188c795cc69d4cb7f1c6aa99615d276066e8029753ffd62250c4bcce49f2809f45c1845a70e893a379e4e5b74b009447c895dc7efc7aa
+MISC metadata.xml 507 SHA256 0b48739b9e971d26b7ddd260a7419009be85f1774855660f40e07e4b6c88a1a6 SHA512 b570088b143a26e7ecf28d6cb6a9cc0963899b9462d94bb5c63cd306fe4956f1c69841f12ba6afa67c520968c8a4bdf1d231356502e25564f84f3b5260d109ad WHIRLPOOL 3fa46846b3f005bac272608ce5e32678f8c6129ef968f9f248917558bcc0bf489c83f42850f06d8e7f3e8cf42b470659932867e0f36ca38741728bd1f3bbf773
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQzkDHAAoJEOeBhlrCAAWGF88IAIK8jbv9WUU+M4JTgzCzpUTb
+zUPFFDWgNonnagdG6jtrr+PfeviF4s9Iy9K7bH7q/LtNLggve/zxKS18zmoKIYC6
+Tnh9K0oZqYznlZPWL/h216ntQIzNAu8hHRTk1Mc9URs0z/m35jQfk8ookLQr4ftQ
+mZ+caLhx4JOJ0A0YYbCScbo5A9gpk9QUgD71qfV98ufhKjvMCDEWEf+ew5LgpJrM
+zn2Zw//8z42AkwValPmtThnEIvpuW/S8Yfj6x7x0L/hiDxHYX09ASn4EpFGzVJXK
+p0hONvPJ5XnvTUq3LWVUB7gtcNe6n1hwtoKSwM4Sv9pKb8TdGdXDXQgw6Y2N+uU=
+=sExT
+-----END PGP SIGNATURE-----
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
index 6a96804fa485..646abb897fc7 100644
--- a/net-misc/openntpd/metadata.xml
+++ b/net-misc/openntpd/metadata.xml
@@ -2,7 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
+		<email>ottxor@gentoo.org</email>
+		<name>Christoph Junghans</name>
 	</maintainer>
 	<longdescription lang="en">
 		OpenNTPD is a FREE, easy to use implementation of the Network Time
diff --git a/net-misc/openntpd/openntpd-3.9_p1-r3.ebuild b/net-misc/openntpd/openntpd-3.9_p1-r3.ebuild
index fc2ee7dbba83..853bf19237da 100644
--- a/net-misc/openntpd/openntpd-3.9_p1-r3.ebuild
+++ b/net-misc/openntpd/openntpd-3.9_p1-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-3.9_p1-r3.ebuild,v 1.5 2011/07/10 23:53:26 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-3.9_p1-r3.ebuild,v 1.6 2012/12/16 21:43:56 ottxor Exp $
 
 EAPI="2"
 
-inherit eutils autotools
+inherit eutils autotools user
 
 MY_P=${P/_/}
 DEB_VER="8"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.openntpd.org/"
 SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz
 	mirror://debian/pool/main/o/openntpd/${MY_P/-/_}+debian-${DEB_VER}.debian.tar.gz"
 
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="ssl selinux"
diff --git a/net-misc/openntpd/openntpd-3.9_p1-r4.ebuild b/net-misc/openntpd/openntpd-3.9_p1-r4.ebuild
index 5d78337b4d6b..101038d92048 100644
--- a/net-misc/openntpd/openntpd-3.9_p1-r4.ebuild
+++ b/net-misc/openntpd/openntpd-3.9_p1-r4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-3.9_p1-r4.ebuild,v 1.5 2012/12/16 19:50:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-3.9_p1-r4.ebuild,v 1.6 2012/12/16 21:43:56 ottxor Exp $
 
 EAPI="2"
 
-inherit eutils autotools
+inherit eutils autotools user
 
 MY_P=${P/_/}
 DEB_VER="8"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.openntpd.org/"
 SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz
 	mirror://debian/pool/main/o/openntpd/${MY_P/-/_}+debian-${DEB_VER}.debian.tar.gz"
 
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="ssl selinux"