Stable for HPPA (bug #197446). Fixed quoting and whitespace issues.

Package-Manager: portage-2.1.4_rc3

3 files changed, 21 insertions, 18 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index bd41461de709..57a61e65e6fc 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.291 2007/11/27 01:28:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.292 2007/11/27 03:18:20 jer Exp $
+
+  27 Nov 2007; Jeroen Roovers <jer@gentoo.org> openldap-2.3.39-r1.ebuild:
+  Stable for HPPA (bug #197446). Fixed quoting and whitespace issues.
 
   27 Nov 2007; Brent Baude <ranger@gentoo.org> openldap-2.3.39-r1.ebuild:
   Marking openldap-2.3.39-r1 ppc64 stable for bug 197446
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 9ba6a3e42f9f..43c4325160b6 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -56,18 +56,18 @@ EBUILD openldap-2.3.38.ebuild 17494 RMD160 114a4e2892349bceeba21a5d25650598a7212
 MD5 a6ca9d896a11d0c0c9311b397a79a242 openldap-2.3.38.ebuild 17494
 RMD160 114a4e2892349bceeba21a5d25650598a7212acd openldap-2.3.38.ebuild 17494
 SHA256 849f6103bae1802658ebc92cd7d203125cf5149abadddf1f294e299f86477534 openldap-2.3.38.ebuild 17494
-EBUILD openldap-2.3.39-r1.ebuild 17592 RMD160 fb2ee1be03fcb1f483bb814303cd213150bbe0f3 SHA1 14c5cb212cab94a705996b15b98aea4393ba7e9b SHA256 517b8a240cdb819e80f3b4ebf8f165a7784795c2efd7e7dd876fc234a567a8ed
-MD5 3291ee2010c0784810e3a6d12ad581fb openldap-2.3.39-r1.ebuild 17592
-RMD160 fb2ee1be03fcb1f483bb814303cd213150bbe0f3 openldap-2.3.39-r1.ebuild 17592
-SHA256 517b8a240cdb819e80f3b4ebf8f165a7784795c2efd7e7dd876fc234a567a8ed openldap-2.3.39-r1.ebuild 17592
+EBUILD openldap-2.3.39-r1.ebuild 17586 RMD160 763b38abddec7e2fc7d7e8ba423b355e2e3b02f9 SHA1 9f98f9c0f07eb95b366b7e75a9108264c67d35f6 SHA256 9e761cc83ce1006b12ec3d9659a7c97488eeafcb68033356dcc766e1148061b8
+MD5 0baf937afa2c88af63a0f519a8774187 openldap-2.3.39-r1.ebuild 17586
+RMD160 763b38abddec7e2fc7d7e8ba423b355e2e3b02f9 openldap-2.3.39-r1.ebuild 17586
+SHA256 9e761cc83ce1006b12ec3d9659a7c97488eeafcb68033356dcc766e1148061b8 openldap-2.3.39-r1.ebuild 17586
 EBUILD openldap-2.3.39.ebuild 17519 RMD160 b221244116e214891c84c7b192d5a17140e0a07b SHA1 9f62d610a7c49483dbd13a7fb711175c068e79ad SHA256 2859096f8451f01b165ad90312f01db9ae7a05fb71489ad818033733d370eaf8
 MD5 8d62e341c07294235aa12adc1bf5eebf openldap-2.3.39.ebuild 17519
 RMD160 b221244116e214891c84c7b192d5a17140e0a07b openldap-2.3.39.ebuild 17519
 SHA256 2859096f8451f01b165ad90312f01db9ae7a05fb71489ad818033733d370eaf8 openldap-2.3.39.ebuild 17519
-MISC ChangeLog 50344 RMD160 2c71d01d9f500cc64ad62951e353960c350e2206 SHA1 1b9712f714de8bd39092cb341cc4f87432fb5975 SHA256 31964d40a3cdc0d6e494b01d3cf6fa83f03c5aadbc3bed5a57abae063aec64a7
-MD5 60f75cab807e456da5821495840e2eda ChangeLog 50344
-RMD160 2c71d01d9f500cc64ad62951e353960c350e2206 ChangeLog 50344
-SHA256 31964d40a3cdc0d6e494b01d3cf6fa83f03c5aadbc3bed5a57abae063aec64a7 ChangeLog 50344
+MISC ChangeLog 50486 RMD160 988da13f2f6e63969e54de0fd07ac5818126a1de SHA1 cd8e2032d1fe874059361515c02cf34062e986ff SHA256 60fc6aca108aca9ddebfd537f0ebdef8bc8cf18e1ba475bfc3b22be4681a1a14
+MD5 f662b93f0cd75f1c433ed95c44257d24 ChangeLog 50486
+RMD160 988da13f2f6e63969e54de0fd07ac5818126a1de ChangeLog 50486
+SHA256 60fc6aca108aca9ddebfd537f0ebdef8bc8cf18e1ba475bfc3b22be4681a1a14 ChangeLog 50486
 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6
 MD5 9a8efd7efb44b06913bf1d906d493407 metadata.xml 240
 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf metadata.xml 240
diff --git a/net-nds/openldap/openldap-2.3.39-r1.ebuild b/net-nds/openldap/openldap-2.3.39-r1.ebuild
index bf56be3da375..715f83d057b5 100644
--- a/net-nds/openldap/openldap-2.3.39-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.39-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.39-r1.ebuild,v 1.3 2007/11/27 01:28:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.39-r1.ebuild,v 1.4 2007/11/27 03:18:20 jer Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -13,7 +13,7 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc overlays perl readline
 samba sasl slp smbkrb5passwd ssl tcpd selinux"
 
@@ -79,7 +79,7 @@ openldap_upgrade_howto() {
 openldap_find_versiontags() {
 	# scan for all datadirs
 	openldap_datadirs=""
-	if [ -f ${ROOT}/etc/openldap/slapd.conf ]; then
+	if [ -f "${ROOT}"/etc/openldap/slapd.conf ]; then
 		openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)"
 	fi
 	openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}"
@@ -178,14 +178,14 @@ src_unpack() {
 	# (the net result is that "passwd" can be used to change ldap passwords w/
 	#  proper pam support)
 	sed -i -e 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' \
-		${S}/servers/slapd/Makefile.in
+		"${S}"/servers/slapd/Makefile.in
 
 	# supersedes old fix for bug #31202
 	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch
 
 	# ensure correct SLAPI path by default
 	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
-		${S}/include/ldap_defaults.h
+		"${S}"/include/ldap_defaults.h
 
 	EPATCH_OPTS="-p0 -d ${S}"
 
@@ -261,7 +261,7 @@ src_compile() {
 		# slapd overlay options
 		myconf="${myconf} --enable-dyngroup --enable-proxycache"
 		use overlays && myconf="${myconf} --enable-overlays=mod"
-                myconf="${myconf} --enable-syncprov"
+		myconf="${myconf} --enable-syncprov"
 	else
 		myconf="${myconf} --disable-slapd --disable-slurpd"
 		myconf="${myconf} --disable-bdb --disable-ldbm"
@@ -366,9 +366,9 @@ src_install() {
 		fperms 0700 /var/lib/openldap-${x}
 	done
 
-	echo "OLDPF='${PF}'" >${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-	echo "# do NOT delete this. it is used" >>${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
-	echo "# to track versions for upgrading." >>${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
+	echo "OLDPF='${PF}'" >"${D}"${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
+	echo "# do NOT delete this. it is used" >>"${D}"${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
+	echo "# to track versions for upgrading." >>"${D}"${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}
 
 	# manually remove /var/tmp references in .la
 	# because it is packaged with an ancient libtool