4 files changed, 11 insertions, 7 deletions
diff --git a/app-admin/supervisor/ChangeLog b/app-admin/supervisor/ChangeLog
index 83b15b4655cb..d6ba90631f16 100644
--- a/app-admin/supervisor/ChangeLog
+++ b/app-admin/supervisor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/supervisor
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/ChangeLog,v 1.8 2012/11/13 07:27:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/ChangeLog,v 1.9 2012/12/07 19:10:36 ulm Exp $
+
+  07 Dec 2012; Ulrich Müller <ulm@gentoo.org> supervisor-3.0_alpha10.ebuild,
+  supervisor-3.0_alpha12.ebuild, supervisor-3.0_beta1.ebuild:
+  Fix LICENSE, bugs 425876 and 444378.
 
 *supervisor-3.0_beta1 (13 Nov 2012)
 
diff --git a/app-admin/supervisor/supervisor-3.0_alpha10.ebuild b/app-admin/supervisor/supervisor-3.0_alpha10.ebuild
index 9bd5fd620ebd..c00f0ad04cef 100644
--- a/app-admin/supervisor/supervisor-3.0_alpha10.ebuild
+++ b/app-admin/supervisor/supervisor-3.0_alpha10.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/supervisor/supervisor-3.0_alpha10.ebuild,v 1.2 2012/08/02 21:29:54 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.0_alpha10.ebuild,v 1.3 2012/12/07 19:10:36 ulm Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
@@ -18,7 +18,7 @@ DESCRIPTION="A system for controlling process state under UNIX"
 HOMEPAGE="http://supervisord.org/ http://pypi.python.org/pypi/supervisor"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
 
-LICENSE="repoze ZPL BSD as-is"
+LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
diff --git a/app-admin/supervisor/supervisor-3.0_alpha12.ebuild b/app-admin/supervisor/supervisor-3.0_alpha12.ebuild
index f152294056ed..80eb63e91526 100644
--- a/app-admin/supervisor/supervisor-3.0_alpha12.ebuild
+++ b/app-admin/supervisor/supervisor-3.0_alpha12.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/supervisor/supervisor-3.0_alpha12.ebuild,v 1.2 2012/08/02 21:29:54 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.0_alpha12.ebuild,v 1.3 2012/12/07 19:10:36 ulm Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
@@ -18,7 +18,7 @@ DESCRIPTION="A system for controlling process state under UNIX"
 HOMEPAGE="http://supervisord.org/ http://pypi.python.org/pypi/supervisor"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
 
-LICENSE="repoze ZPL BSD as-is"
+LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
diff --git a/app-admin/supervisor/supervisor-3.0_beta1.ebuild b/app-admin/supervisor/supervisor-3.0_beta1.ebuild
index 104ce608603e..11827aa7630a 100644
--- a/app-admin/supervisor/supervisor-3.0_beta1.ebuild
+++ b/app-admin/supervisor/supervisor-3.0_beta1.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/supervisor/supervisor-3.0_beta1.ebuild,v 1.1 2012/11/13 07:27:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.0_beta1.ebuild,v 1.2 2012/12/07 19:10:36 ulm Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
@@ -18,7 +18,7 @@ DESCRIPTION="A system for controlling process state under UNIX"
 HOMEPAGE="http://supervisord.org/ http://pypi.python.org/pypi/supervisor"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
 
-LICENSE="repoze ZPL BSD as-is"
+LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"