Add GPL-2 to LICENSE for init scripts. Bug #425882

(Portage version: 2.1.11.9/cvs/Linux x86_64)

5 files changed, 15 insertions, 11 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 438a71713173..85c01440c4c7 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.195 2012/07/09 18:12:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.196 2012/07/22 09:03:02 hwoarang Exp $
+
+  22 Jul 2012; Markos Chandras <hwoarang@gentoo.org> webmin-1.560-r1.ebuild,
+  webmin-1.570-r1.ebuild, webmin-1.580.ebuild, webmin-1.590.ebuild:
+  Add GPL-2 to LICENSE for init scripts. Bug #425882
 
 *webmin-1.590 (09 Jul 2012)
 
diff --git a/app-admin/webmin/webmin-1.560-r1.ebuild b/app-admin/webmin/webmin-1.560-r1.ebuild
index e7749436f727..0b64afe2dee5 100644
--- a/app-admin/webmin/webmin-1.560-r1.ebuild
+++ b/app-admin/webmin/webmin-1.560-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/app-admin/webmin/webmin-1.560-r1.ebuild,v 1.1 2011/12/31 18:33:39 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.560-r1.ebuild,v 1.2 2012/07/22 09:03:02 hwoarang Exp $
 
 EAPI="3"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.webmin.com/"
 SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
 	!minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
 
-LICENSE="BSD"
+LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/app-admin/webmin/webmin-1.570-r1.ebuild b/app-admin/webmin/webmin-1.570-r1.ebuild
index 4096665eff90..6828426adb14 100644
--- a/app-admin/webmin/webmin-1.570-r1.ebuild
+++ b/app-admin/webmin/webmin-1.570-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/app-admin/webmin/webmin-1.570-r1.ebuild,v 1.1 2011/12/31 18:33:39 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.570-r1.ebuild,v 1.2 2012/07/22 09:03:02 hwoarang Exp $
 
 EAPI="3"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.webmin.com/"
 SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
 	!minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
 
-LICENSE="BSD"
+LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/app-admin/webmin/webmin-1.580.ebuild b/app-admin/webmin/webmin-1.580.ebuild
index 0ba753ab91bf..24ab98b4cb46 100644
--- a/app-admin/webmin/webmin-1.580.ebuild
+++ b/app-admin/webmin/webmin-1.580.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.580.ebuild,v 1.2 2012/01/26 22:00:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.580.ebuild,v 1.3 2012/07/22 09:03:02 hwoarang Exp $
 
 EAPI="3"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.webmin.com/"
 SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
 	!minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
 
-LICENSE="BSD"
+LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/app-admin/webmin/webmin-1.590.ebuild b/app-admin/webmin/webmin-1.590.ebuild
index e3da26e6f19c..0a9f29689f13 100644
--- a/app-admin/webmin/webmin-1.590.ebuild
+++ b/app-admin/webmin/webmin-1.590.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.590.ebuild,v 1.2 2012/07/10 14:25:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.590.ebuild,v 1.3 2012/07/22 09:03:02 hwoarang Exp $
 
 EAPI="3"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.webmin.com/"
 SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
 	!minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
 
-LICENSE="BSD"
+LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
 
 KEYWORDS="~amd64 ~x86"