diff options
| author |   Benjamin Smee <strerror@gentoo.org> | 2005-12-07 17:05:50 +0000 |
|---|---|---|
| committer | Benjamin Smee <strerror@gentoo.org> | 2005-12-07 17:05:50 +0000 |
| commit | 268dce517da31f2c5553f5482d4d2fa24c1b86f5 (patch) | |
| tree | 9c790c23b31e9118117cfcb27b721a69db8ed480 /dev-libs | |
| parent | version bump thanks to: Benno Schulenberg in bug #113084 (diff) | |
| download | historical-268dce517da31f2c5553f5482d4d2fa24c1b86f5.tar.gz historical-268dce517da31f2c5553f5482d4d2fa24c1b86f5.tar.bz2 historical-268dce517da31f2c5553f5482d4d2fa24c1b86f5.zip | |
changes for bug #110066 and bug #114719
Package-Manager: portage-2.0.51.22-r3
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/cyrus-sasl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild | 20 |
3 files changed, 11 insertions, 19 deletions
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog index 44f6ba77a106..032a6adb4c86 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.134 2005/11/30 00:39:42 strerror Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.135 2005/12/07 17:05:50 strerror Exp $ + + 07 Dec 2005; Benjamin Smee <strerror@gentoo.org> + cyrus-sasl-2.1.21-r2.ebuild: + changes for bug #110066 and bug #114719 *cyrus-sasl-2.1.21-r2 (30 Nov 2005) diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest index c948500abfaf..9833f1a9853a 100644 --- a/dev-libs/cyrus-sasl/Manifest +++ b/dev-libs/cyrus-sasl/Manifest @@ -5,10 +5,10 @@ MD5 3d105c5c251003e1df07df4c5f426d14 cyrus-sasl-2.1.21-r1.ebuild 9579 MD5 80e82039d1535646788bd0866629b1df cyrus-sasl-2.1.21.ebuild 9199 MD5 62922ef59be6add5b73bc4f12b9041ea cyrus-sasl-2.1.20-r1.ebuild 8558 MD5 d9fda6c54c37d9a72b5ec222a0f942cb cyrus-sasl-2.1.20-r3.ebuild 9191 -MD5 69f73875727b8e8b16239bf9517b6bf7 ChangeLog 23160 +MD5 482820bca1950deab9aa77efadbb3e1d ChangeLog 23285 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161 MD5 97de45d37a62d1c1e7e52740007637b7 cyrus-sasl-2.1.20.ebuild 7352 -MD5 895904f528b4c77b6d4a4c94de88a347 cyrus-sasl-2.1.21-r2.ebuild 9682 +MD5 a94e36583cd7f47e4e2fe26f6f99b5e6 cyrus-sasl-2.1.21-r2.ebuild 9283 MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448 MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.20-configdir.patch 8231 MD5 13c15e58d2fa734adeb718e4e3dea757 files/cyrus-sasl-2.1.18-db4.patch 1604 diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild index 306fb2abaa23..f7e8992fc383 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild @@ -1,6 +1,6 @@ # 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.21-r2.ebuild,v 1.1 2005/11/30 00:39:42 strerror Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21-r2.ebuild,v 1.2 2005/12/07 17:05:50 strerror Exp $ inherit eutils gnuconfig flag-o-matic java-pkg multilib @@ -171,21 +171,9 @@ src_compile() { # 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)" - LDFLAGS="$(echo ${LDFLAGS} | xargs)" - - # Parallel build doesn't work. - # Parallel build doesn't like distcc/ccache? Bug #78643. - if has distcc $FEATURES || has ccache $FEATURES; then - einfo "You have \"distcc\" or \"ccache\" enabled" - einfo "build with MAKEOPTS=-j1" - emake -j1 || die "compile problem" - else - einfo "build with MAKEOPTS=$MAKEOPTS" - emake || die "compile problem" - fi + einfo "build with MAKEOPTS=$MAKEOPTS" + # we force -j1 for bug #110066 + emake -j1 || die "compile problem" # Bug #60769. Default location for java classes breaks OpenOffice. # Thanks to axxo@gentoo.org for the solution. |