summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2011-11-27 22:55:54 +0000
committerJeroen Roovers <jer@gentoo.org>2011-11-27 22:55:54 +0000
commit04139a85c1c26884eb679d07b92805b1bbfc8582 (patch)
treed9a28d7494e45183649562b7264d410eb64ea5c1
parentthis package supports python 2.5 (diff)
downloadgentoo-2-04139a85c1c26884eb679d07b92805b1bbfc8582.tar.gz
gentoo-2-04139a85c1c26884eb679d07b92805b1bbfc8582.tar.bz2
gentoo-2-04139a85c1c26884eb679d07b92805b1bbfc8582.zip
Do not inherit autotools-utils.eclass (bug #392117).
(Portage version: 2.2.0_alpha78/cvs/Linux x86_64)
-rw-r--r--net-misc/gsasl/ChangeLog5
-rw-r--r--net-misc/gsasl/gsasl-1.6.1.ebuild10
2 files changed, 9 insertions, 6 deletions
diff --git a/net-misc/gsasl/ChangeLog b/net-misc/gsasl/ChangeLog
index 897c3b43b436..46c158aa3754 100644
--- a/net-misc/gsasl/ChangeLog
+++ b/net-misc/gsasl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/gsasl
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/ChangeLog,v 1.47 2011/11/27 04:33:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/ChangeLog,v 1.48 2011/11/27 22:55:54 jer Exp $
+
+ 27 Nov 2011; Jeroen Roovers <jer@gentoo.org> gsasl-1.6.1.ebuild:
+ Do not inherit autotools-utils.eclass (bug #392117).
27 Nov 2011; Tim Harder <radhermit@gentoo.org> gsasl-1.6.1.ebuild:
Build in the source tree.
diff --git a/net-misc/gsasl/gsasl-1.6.1.ebuild b/net-misc/gsasl/gsasl-1.6.1.ebuild
index 375da0095336..e72c2571966a 100644
--- a/net-misc/gsasl/gsasl-1.6.1.ebuild
+++ b/net-misc/gsasl/gsasl-1.6.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.6.1.ebuild,v 1.7 2011/11/27 04:33:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.6.1.ebuild,v 1.8 2011/11/27 22:55:54 jer Exp $
EAPI="2"
-inherit autotools-utils
+inherit autotools eutils
DESCRIPTION="The GNU SASL client, server, and library"
HOMEPAGE="http://www.gnu.org/software/gsasl/"
@@ -23,8 +23,6 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
src_prepare() {
epatch "${FILESDIR}/${PN}-gss-extra.patch"
eautoreconf
@@ -51,7 +49,9 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
- use static-libs || remove_libtool_files
+ if ! use static-libs; then
+ rm -f "${D}"/usr/lib*/lib*.la
+ fi
dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS
doman doc/gsasl.1 doc/man/*.3