diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-18 00:30:19 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-18 00:30:19 +0000 |
| commit | 60515a64e3ec511ae42762f14b604e2d23a3e95d (patch) | |
| tree | a3f67c36aed27b12584a8bcffda5117c2ea7e4b2 /dev-libs | |
| parent | Version bump. (Manifest recommit) (diff) | |
| download | gentoo-2-60515a64e3ec511ae42762f14b604e2d23a3e95d.tar.gz gentoo-2-60515a64e3ec511ae42762f14b604e2d23a3e95d.tar.bz2 gentoo-2-60515a64e3ec511ae42762f14b604e2d23a3e95d.zip | |
Multilib cleanup.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/cyrus-sasl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r2.ebuild | 20 |
2 files changed, 18 insertions, 8 deletions
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog index 58a74c2df3c6..f83f00e61ee9 100644 --- a/dev-libs/cyrus-sasl/ChangeLog +++ b/dev-libs/cyrus-sasl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/cyrus-sasl # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.115 2005/02/15 20:31:13 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.116 2005/02/18 00:30:19 eradicator Exp $ + + 17 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> + cyrus-sasl-2.1.20-r2.ebuild: + Multilib cleanup. 15 Feb 2005; Fernando J. Pereda <ferdy@gentoo.org> -files/cyrus-sasl-ntlm_impl-spnego.patch.gz, cyrus-sasl-2.1.20-r2.ebuild: diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r2.ebuild index 578a05a25a67..679190949d2c 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r2.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-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/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r2.ebuild,v 1.3 2005/02/15 20:31:13 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r2.ebuild,v 1.4 2005/02/18 00:30:19 eradicator Exp $ -inherit eutils gnuconfig flag-o-matic java-pkg +inherit eutils gnuconfig flag-o-matic java-pkg multilib ntlm_patch=${PN}-ntlm_impl-spnego.patch.gz @@ -113,6 +113,9 @@ src_unpack() { # Sypport for crypted passwords. Bug #45181 use crypt && epatch "${FILESDIR}/cyrus-sasl-2.1.19-checkpw.c.patch" + + # Upstream doesn't even honor their own configure options... grumble + sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile.{am,in} } src_compile() { @@ -164,10 +167,13 @@ src_compile() { --with-saslauthd=/var/lib/sasl2 \ --with-pwcheck=/var/lib/sasl2 \ --with-configdir=/etc/sasl2 \ - --with-plugindir=/usr/lib/sasl2 \ + --with-plugindir=/usr/$(get_libdir)/sasl2 \ --with-dbpath=/etc/sasl2/sasldb2 \ ${myconf} || die "econf failed" + # Upstream doesn't even honor their own configure options... grumble + sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile + # Fix PEBCAK in make.conf. Bug #75538. CFLAGS="$(echo ${CFLAGS} | xargs)" CXXFLAGS="$(echo ${CXXFLAGS} | xargs)" @@ -214,16 +220,16 @@ src_install () { insinto /usr/share/${PN}-2/examples/sample/.deps doins sample/.deps/* dodir /usr/share/${PN}-2/examples/lib - dosym /usr/lib/libsasl2.la /usr/share/${PN}-2/examples/lib/libsasl2.la + dosym /usr/$(get_libdir)/libsasl2.la /usr/share/${PN}-2/examples/lib/libsasl2.la dodir /usr/share/${PN}-2/examples/lib/.libs - dosym /usr/lib/libsasl2.so /usr/share/${PN}-2/examples/lib/.libs/libsasl2.so + dosym /usr/$(get_libdir)/libsasl2.so /usr/share/${PN}-2/examples/lib/.libs/libsasl2.so fi # Bug #60769. Default location for java classes breaks OpenOffice. if use java; then java-pkg_dojar ${PN}.jar #hackish, don't wanna dig though makefile - rm -rf ${D}/usr/lib/java + rm -rf ${D}/usr/$(get_libdir)/java docinto java dodoc ${S}/java/README ${FILESDIR}/java.README.gentoo ${S}/java/doc/* mkdir ${D}/usr/share/doc/${PF}/java/Test/ \ @@ -234,7 +240,7 @@ src_install () { # Generate an empty sasldb2 with correct permissions. LD_OLD="${LD_LIBRARY_PATH}" - export LD_LIBRARY_PATH="${D}/usr/lib" SASL_PATH="${D}/usr/lib/sasl2" + export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" SASL_PATH="${D}/usr/$(get_libdir)/sasl2" echo "p" | "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -p login "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -d login export LD_LIBRARY_PATH="${LD_OLD}" |