diff options
| author |   Simon Stelling <blubb@gentoo.org> | 2005-05-21 10:34:29 +0000 |
|---|---|---|
| committer | Simon Stelling <blubb@gentoo.org> | 2005-05-21 10:34:29 +0000 |
| commit | 07893170f569ad96cd94b0fef7cb5e87a918ced7 (patch) | |
| tree | a28841eb2338a94c7a158c59df31d7938455eb70 /net-nds | |
| parent | Security fix bug #93054 (diff) | |
| download | gentoo-2-07893170f569ad96cd94b0fef7cb5e87a918ced7.tar.gz gentoo-2-07893170f569ad96cd94b0fef7cb5e87a918ced7.tar.bz2 gentoo-2-07893170f569ad96cd94b0fef7cb5e87a918ced7.zip | |
fixed multilib-strict, bug 93009
(Portage version: 2.0.51.19)
Diffstat (limited to 'net-nds')
| -rw-r--r-- | net-nds/openldap/ChangeLog | 5 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.2.26-r2.ebuild | 17 |
2 files changed, 14 insertions, 8 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index e2d1d8f6beb4..3e87bfea1ca8 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-nds/openldap # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.113 2005/05/21 04:49:26 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.114 2005/05/21 10:34:29 blubb Exp $ + + 21 May 2005; Simon Stelling <blubb@gentoo.org> openldap-2.2.26-r2.ebuild: + fixed multilib-strict issues *openldap-2.2.26-r2 (21 May 2005) diff --git a/net-nds/openldap/openldap-2.2.26-r2.ebuild b/net-nds/openldap/openldap-2.2.26-r2.ebuild index ebcc687259ae..787dd4c636bf 100644 --- a/net-nds/openldap/openldap-2.2.26-r2.ebuild +++ b/net-nds/openldap/openldap-2.2.26-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.26-r2.ebuild,v 1.2 2005/05/21 08:12:49 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.26-r2.ebuild,v 1.3 2005/05/21 10:34:29 blubb Exp $ -inherit toolchain-funcs eutils +inherit toolchain-funcs eutils multilib OLD_PV="2.1.30" OLD_P="${PN}-${OLD_PV}" @@ -111,7 +111,7 @@ pkg_setup() { pkg_preinst() { openldap_upgrade_warning enewgroup ldap 439 - enewuser ldap 439 /bin/false /usr/lib/openldap ldap + enewuser ldap 439 /bin/false /usr/$(get_libdir)/openldap ldap } src_unpack() { @@ -206,7 +206,7 @@ src_compile() { econf \ --enable-static \ --enable-shared \ - --libexecdir=/usr/lib/openldap \ + --libexecdir=/usr/$(get_libdir)/openldap \ ${myconf} || die "configure failed" make depend || die "make depend failed" @@ -251,7 +251,7 @@ src_install() { # openldap modules go here # TODO: write some code to populate slapd.conf with moduleload statements - keepdir /usr/lib/openldap/openldap/ + keepdir /usr/$(get_libdir)/openldap/openldap/ # make state directories for x in data slurp ldbm; do @@ -266,7 +266,7 @@ src_install() { # manually remove /var/tmp references in .la # because it is packaged with an ancient libtool - for x in ${D}/usr/lib/lib*.la; do + for x in ${D}/usr/$(get_libdir)/lib*.la; do sed -i -e "s:-L${S}[/]*libraries::" ${x} done @@ -285,6 +285,9 @@ src_install() { exeinto /etc/init.d newexe ${FILESDIR}/2.0/slapd slapd newexe ${FILESDIR}/2.0/slurpd slurpd + if [ $(get_libdir) != lib ]; then + sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i ${D}/etc/init.d/{slapd,slurpd} + fi insinto /etc/conf.d newins ${FILESDIR}/2.0/slapd.conf slapd @@ -296,7 +299,7 @@ src_install() { fi if useq kerberos ; then - insinto /usr/lib/openldap/openldap + insinto /usr/$(get_libdir)/openldap/openldap doins ${S}/contrib/slapd-modules/passwd/pw-kerberos.so || \ die "failed to install kerberos passwd module" fi |