From: Michael Sterrett <mr_bones_@gentoo.org>
Date: Mon, 8 Nov 2004 09:14:15 +0000 (+0000)
Subject: LICENSE fix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a7e5b0ab2a08ec26844f64335719b856e1dbb93;p=gentoo.git

LICENSE fix
---

diff --git a/net-libs/pam_ldap/Manifest b/net-libs/pam_ldap/Manifest
index 35282e5718e1..2289377886b6 100644
--- a/net-libs/pam_ldap/Manifest
+++ b/net-libs/pam_ldap/Manifest
@@ -1,9 +1,9 @@
 MD5 7bb616cdfe4c6ab662283eeecac54a0a ChangeLog 1980
-MD5 c14c7766fd12010e941ef1756f6dabdd pam_ldap-156.ebuild 789
-MD5 5b68aa001d864600b5f21b42a4c2777b pam_ldap-161.ebuild 781
-MD5 9773c0adc34e54c0cc6d708d82050959 pam_ldap-164.ebuild 781
-MD5 9aae14b370f6034c0b25e458ff023001 pam_ldap-167.ebuild 863
-MD5 d6d45c60ceaf25ae63c6fb36e2fbb7ad pam_ldap-171.ebuild 882
+MD5 1f5cbdb91f9f1a79b004e594b3591050 pam_ldap-156.ebuild 796
+MD5 052b33d28ce6b4871fc8e2616a82c406 pam_ldap-161.ebuild 787
+MD5 4c730ad57bb865a55d81979d49ad2afd pam_ldap-164.ebuild 787
+MD5 0fa6528fad07f073758632f6ab0570be pam_ldap-167.ebuild 870
+MD5 3d3b7050ca07f725e0ab32ff5f5059a9 pam_ldap-171.ebuild 891
 MD5 1d05f0436f1c273d7862099f309afe4d metadata.xml 156
 MD5 f6a188644f736d46d200c045eff82bea files/digest-pam_ldap-156 64
 MD5 e7be3daad202a50aecd0d3888bf5c46e files/digest-pam_ldap-161 64
diff --git a/net-libs/pam_ldap/pam_ldap-156.ebuild b/net-libs/pam_ldap/pam_ldap-156.ebuild
index 027364390a18..95cce6c1ff52 100644
--- a/net-libs/pam_ldap/pam_ldap-156.ebuild
+++ b/net-libs/pam_ldap/pam_ldap-156.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pam_ldap/pam_ldap-156.ebuild,v 1.9 2004/10/15 19:31:40 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/pam_ldap/pam_ldap-156.ebuild,v 1.10 2004/11/08 09:14:15 mr_bones_ Exp $
 
 DESCRIPTION="PAM LDAP Module"
 HOMEPAGE="http://www.padl.com/OSS/pam_ldap.html"
 SRC_URI="ftp://ftp.padl.com/pub/${P}.tar.gz"
 
+LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-LICENSE="GPL-2 | LGPL-2"
 KEYWORDS="x86 sparc amd64 ppc"
 IUSE=""
 
diff --git a/net-libs/pam_ldap/pam_ldap-161.ebuild b/net-libs/pam_ldap/pam_ldap-161.ebuild
index 593d42b3d60a..5e299aa99733 100644
--- a/net-libs/pam_ldap/pam_ldap-161.ebuild
+++ b/net-libs/pam_ldap/pam_ldap-161.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pam_ldap/pam_ldap-161.ebuild,v 1.4 2004/07/15 01:27:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/pam_ldap/pam_ldap-161.ebuild,v 1.5 2004/11/08 09:14:15 mr_bones_ Exp $
 
 DESCRIPTION="PAM LDAP Module"
 HOMEPAGE="http://www.padl.com/OSS/pam_ldap.html"
 SRC_URI="ftp://ftp.padl.com/pub/${P}.tar.gz"
 
+LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-LICENSE="GPL-2 | LGPL-2"
 KEYWORDS="~x86 ~sparc"
 IUSE=""
 
diff --git a/net-libs/pam_ldap/pam_ldap-164.ebuild b/net-libs/pam_ldap/pam_ldap-164.ebuild
index a6476e9ebd67..e12b820fb506 100644
--- a/net-libs/pam_ldap/pam_ldap-164.ebuild
+++ b/net-libs/pam_ldap/pam_ldap-164.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pam_ldap/pam_ldap-164.ebuild,v 1.4 2004/07/15 01:27:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/pam_ldap/pam_ldap-164.ebuild,v 1.5 2004/11/08 09:14:15 mr_bones_ Exp $
 
 DESCRIPTION="PAM LDAP Module"
 HOMEPAGE="http://www.padl.com/OSS/pam_ldap.html"
 SRC_URI="ftp://ftp.padl.com/pub/${P}.tar.gz"
 
+LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-LICENSE="GPL-2 | LGPL-2"
 KEYWORDS="~x86 ~sparc"
 IUSE=""
 
diff --git a/net-libs/pam_ldap/pam_ldap-167.ebuild b/net-libs/pam_ldap/pam_ldap-167.ebuild
index 9aaf09761bd0..8a69c857224e 100644
--- a/net-libs/pam_ldap/pam_ldap-167.ebuild
+++ b/net-libs/pam_ldap/pam_ldap-167.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pam_ldap/pam_ldap-167.ebuild,v 1.5 2004/07/15 01:27:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/pam_ldap/pam_ldap-167.ebuild,v 1.6 2004/11/08 09:14:15 mr_bones_ Exp $
 
 DESCRIPTION="PAM LDAP Module"
 HOMEPAGE="http://www.padl.com/OSS/pam_ldap.html"
 SRC_URI="http://www.padl.com/download/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-LICENSE="GPL-2 | LGPL-2"
 KEYWORDS="~x86 ~sparc ~ppc hppa"
 IUSE="ssl"
 DEPEND=">=sys-libs/glibc-2.1.3
diff --git a/net-libs/pam_ldap/pam_ldap-171.ebuild b/net-libs/pam_ldap/pam_ldap-171.ebuild
index 885330612c25..bc14a45de419 100644
--- a/net-libs/pam_ldap/pam_ldap-171.ebuild
+++ b/net-libs/pam_ldap/pam_ldap-171.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pam_ldap/pam_ldap-171.ebuild,v 1.2 2004/09/19 22:30:33 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/pam_ldap/pam_ldap-171.ebuild,v 1.3 2004/11/08 09:14:15 mr_bones_ Exp $
 
 DESCRIPTION="PAM LDAP Module"
 HOMEPAGE="http://www.padl.com/OSS/pam_ldap.html"
 SRC_URI="http://www.padl.com/download/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-LICENSE="GPL-2 | LGPL-2"
 KEYWORDS="~x86 ~sparc ~ppc ~hppa ~alpha"
 IUSE="ssl"
 DEPEND=">=sys-libs/glibc-2.1.3