summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2012-07-22 19:47:28 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2012-07-22 19:47:28 +0000
commit1248407bcc87d93a0978ced037201a8c896cfeb9 (patch)
tree185b69b53bc2f4a309dbe27189037d67e1b36f59 /app-admin
parentRemove media-gfx/gimp udev from p.use.mask (diff)
downloadgentoo-2-1248407bcc87d93a0978ced037201a8c896cfeb9.tar.gz
gentoo-2-1248407bcc87d93a0978ced037201a8c896cfeb9.tar.bz2
gentoo-2-1248407bcc87d93a0978ced037201a8c896cfeb9.zip
Fix LICENSE once again. BSD and GPL-2 should both be set unconditionally
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/webmin/ChangeLog6
-rw-r--r--app-admin/webmin/webmin-1.560-r1.ebuild4
-rw-r--r--app-admin/webmin/webmin-1.570-r1.ebuild4
-rw-r--r--app-admin/webmin/webmin-1.580.ebuild4
-rw-r--r--app-admin/webmin/webmin-1.590.ebuild4
5 files changed, 13 insertions, 9 deletions
diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 85c01440c4c7..eaca0a3eea85 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.196 2012/07/22 09:03:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.197 2012/07/22 19:47:28 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:
+ Fix LICENSE once again. BSD and GPL-2 should both be set unconditionally
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:
diff --git a/app-admin/webmin/webmin-1.560-r1.ebuild b/app-admin/webmin/webmin-1.560-r1.ebuild
index 0b64afe2dee5..c8e65d869557 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-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.2 2012/07/22 09:03:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.560-r1.ebuild,v 1.3 2012/07/22 19:47:28 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 GPL-2 )"
+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 6828426adb14..1db62ce10567 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-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.2 2012/07/22 09:03:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.570-r1.ebuild,v 1.3 2012/07/22 19:47:28 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 GPL-2 )"
+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 24ab98b4cb46..86f2a958fc92 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.3 2012/07/22 09:03:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.580.ebuild,v 1.4 2012/07/22 19:47:28 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 GPL-2 )"
+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 0a9f29689f13..616840781075 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.3 2012/07/22 09:03:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.590.ebuild,v 1.4 2012/07/22 19:47:28 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 GPL-2 )"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"