Fix license by Alon Bar-Lev (bug #336227).

Package-Manager: portage-2.2_rc74/cvs/Linux i686

6 files changed, 18 insertions, 14 deletions

diff --git a/net-libs/libnids/ChangeLog b/net-libs/libnids/ChangeLog
index 8f2f25129936..0850b2dfedd9 100644
--- a/net-libs/libnids/ChangeLog
+++ b/net-libs/libnids/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libnids
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.42 2010/06/28 05:52:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.43 2010/09/06 17:42:40 jer Exp $
+
+  06 Sep 2010; Jeroen Roovers <jer@gentoo.org> libnids-1.18.ebuild,
+  libnids-1.18-r1.ebuild, libnids-1.24.ebuild, libnids-1.24-r1.ebuild:
+  Fix license by Alon Bar-Lev (bug #336227).
 
 *libnids-1.24-r1 (28 Jun 2010)
 
diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index 2172652a99ad..3a1e6b9b9c06 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -2,9 +2,9 @@ AUX libnids-1.18-chksum.c-ebx.patch 615 RMD160 53ba9fe99c2175ff64277f485887d68a4
 AUX libnids-1.24-ldflags.patch 494 RMD160 d838d04e2ab8021eabfc7560315e71a48cec13e5 SHA1 ecdeec72628a325c9c838751e0d33f4ef312182b SHA256 e1d61d854398cd23570fb81cba078449d6c74a61644a3451b3f9c19d37c68ef9
 DIST libnids-1.18.tar.gz 114013 RMD160 b33ba8237ba0bb31d2515bd5b7552449cfcca8f3 SHA1 3494e614e5e5d2f60f2ffe738307e60e77e04a81 SHA256 b0275c914197a53c6ccf631eac756fd37ec6f2d8f09f15757061495cf9be0fcd
 DIST libnids-1.24.tar.gz 151021 RMD160 66a1a332a70b316fd83905887dc731b5bf28d715 SHA1 9a421df05cefdc4f5f7db95efc001b3c2b5249ce SHA256 314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359
-EBUILD libnids-1.18-r1.ebuild 944 RMD160 1eb2f369ec82bbe6ad07e95a43892f46235062dc SHA1 2f9288c19791c15e2fd435a9a2f4f177341f9084 SHA256 7ea782a946cca9989583ad39106d1b8b9f6e64c3002798798bfab8614e112ea1
-EBUILD libnids-1.18.ebuild 927 RMD160 b5ce9c01990961226aaa827916728d9763bbafa6 SHA1 4cf5bb2c0d102bad2a01e1d617113bc0ff1a181a SHA256 8cb9190cd05d7412f4b1f3bf198ce365fbcea8589866855249a8431493473c10
-EBUILD libnids-1.24-r1.ebuild 1084 RMD160 05f61146c1fb4b194d677d4ff4a1f0d811ae6a71 SHA1 d214eb1951480836e31fb84dac780225e3882fa8 SHA256 40d36e64145c0a9cf2a8d7a1db3f96d2cf44651aed8883638deb0e73ce5b9139
-EBUILD libnids-1.24.ebuild 911 RMD160 fc7afecc590d6319b998b54783269310a03e1213 SHA1 7c0c19da78f81140e33465a6a60a8befb707b734 SHA256 e4f5609aee2286a12f6bad4654cfa749cd15b3018079c2fdfe53e2052407935a
-MISC ChangeLog 6322 RMD160 e5782c4485aa5ab14de5fc3a4e2b8157a692a189 SHA1 b03b9b9bd5a928638e23a43acb465f311a195d7e SHA256 e0d4071426f0a7dd021bb0aacd7bd75cdd8b14869ffcdd719fec86e36fbe812c
+EBUILD libnids-1.18-r1.ebuild 941 RMD160 258f97552a8e1c05e29a81a9bbdd86d4bdee9265 SHA1 66cfe1da730573c04218b2aaa6fdeedfb0a6f3e1 SHA256 fc43c3858272fd54763a367c03765e32c9091cd44c7e834ae836c7d7042528f7
+EBUILD libnids-1.18.ebuild 924 RMD160 598b3f1bdf06f3141b22a22fc4266eba2e4566fc SHA1 877996426d4d7f81ebe9d6a375246bbfb2f7ba0e SHA256 ade236a62537e98377ec2d83bcfe833db7089cb09acd0ab5cd3393874d729482
+EBUILD libnids-1.24-r1.ebuild 1081 RMD160 0756f82e2445c230ff180aa4a6675e0b27e6364a SHA1 c9ae0a5b0661118f6f423b092cbdb6ce50aa027a SHA256 6851f6385e7eb06deccc19e014a1f37c5a9c765527ce42b016b39952036bb0cb
+EBUILD libnids-1.24.ebuild 908 RMD160 baa92d3b240e1830bbd4aa8cd671f60dc63d903c SHA1 c07e5c2841ddf7190ad93fe02e10344580561b0e SHA256 8efa40e07fdc808ac97ff56cb8b0dd04f4b90eaef3dfa70bbf03edf7f94a395b
+MISC ChangeLog 6507 RMD160 46640f65a8e0721c81cfb0a3f190a16247c83e50 SHA1 1a611b95f6332c5f4ebbb085d42896baf7ed059a SHA256 74fe4d145fa5e202d53c8a423e813ecf405cabea38eb75f25216e75b345a3398
 MISC metadata.xml 483 RMD160 2735c54f423a6bdd2d47536a7d22eec3b2717e2f SHA1 3012df70c36825300e4e78c707ccd4414b53db7d SHA256 fea8cd5f14b2ecdcb26227be10d73862452542ea2ac9e41738c8dd1a1a093015
diff --git a/net-libs/libnids/libnids-1.18-r1.ebuild b/net-libs/libnids/libnids-1.18-r1.ebuild
index 5a901b84fffc..6cca1126b56c 100644
--- a/net-libs/libnids/libnids-1.18-r1.ebuild
+++ b/net-libs/libnids/libnids-1.18-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18-r1.ebuild,v 1.1 2010/06/28 04:18:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18-r1.ebuild,v 1.2 2010/09/06 17:42:40 jer Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ DESCRIPTION="emulates the IP stack of Linux 2.0.x and offers IP defragmentation,
 HOMEPAGE="http://www.packetfactory.net/Projects/libnids/"
 SRC_URI="http://www.packetfactory.net/Projects/libnids/dist/${P/_}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="GPL-2"
 SLOT="1.1"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE=""
diff --git a/net-libs/libnids/libnids-1.18.ebuild b/net-libs/libnids/libnids-1.18.ebuild
index de13b56f6bbb..c14e336d7a00 100644
--- a/net-libs/libnids/libnids-1.18.ebuild
+++ b/net-libs/libnids/libnids-1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18.ebuild,v 1.15 2010/06/28 04:09:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18.ebuild,v 1.16 2010/09/06 17:42:40 jer Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="emulates the IP stack of Linux 2.0.x and offers IP defragmentation,
 HOMEPAGE="http://www.packetfactory.net/Projects/libnids/"
 SRC_URI="http://www.packetfactory.net/Projects/libnids/dist/${P/_}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="GPL-2"
 SLOT="1.1"
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
diff --git a/net-libs/libnids/libnids-1.24-r1.ebuild b/net-libs/libnids/libnids-1.24-r1.ebuild
index 00a47bd81371..47b7832451fe 100644
--- a/net-libs/libnids/libnids-1.24-r1.ebuild
+++ b/net-libs/libnids/libnids-1.24-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.24-r1.ebuild,v 1.1 2010/06/28 05:52:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.24-r1.ebuild,v 1.2 2010/09/06 17:42:40 jer Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ DESCRIPTION="emulates the IP stack of Linux 2.0.x and offers IP defragmentation,
 HOMEPAGE="http://libnids.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="GPL-2"
 SLOT="1.2"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="+glib +libnet"
diff --git a/net-libs/libnids/libnids-1.24.ebuild b/net-libs/libnids/libnids-1.24.ebuild
index 6b90f9cc600c..f8c6790c8708 100644
--- a/net-libs/libnids/libnids-1.24.ebuild
+++ b/net-libs/libnids/libnids-1.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.24.ebuild,v 1.7 2010/06/28 04:18:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.24.ebuild,v 1.8 2010/09/06 17:42:40 jer Exp $
 
 EAPI=2
 inherit eutils
@@ -9,7 +9,7 @@ DESCRIPTION="emulates the IP stack of Linux 2.0.x and offers IP defragmentation,
 HOMEPAGE="http://libnids.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="GPL-2"
 SLOT="1.2"
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""