summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-11-15 22:25:02 +0000
committerMike Frysinger <vapier@gentoo.org>2011-11-15 22:25:02 +0000
commit58c4be0b31bc3ea093b288bda0b20fff940fb3c5 (patch)
treee116c2789f55c4ab49e0383b20b980788ffc34dc /app-admin
parentVersion bump thanks to teidakankan (bug #377625). (diff)
downloadgentoo-2-58c4be0b31bc3ea093b288bda0b20fff940fb3c5.tar.gz
gentoo-2-58c4be0b31bc3ea093b288bda0b20fff940fb3c5.tar.bz2
gentoo-2-58c4be0b31bc3ea093b288bda0b20fff940fb3c5.zip
Restore hardcoded --with-plugindir configure flag #390659 by Priit Laes.
(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/sudo/ChangeLog8
-rw-r--r--app-admin/sudo/sudo-1.8.3_p1-r2.ebuild (renamed from app-admin/sudo/sudo-1.8.3_p1-r1.ebuild)9
2 files changed, 13 insertions, 4 deletions
diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 815c7f4bddaa..8d1c35ad9fec 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-admin/sudo
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.285 2011/11/15 06:05:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.286 2011/11/15 22:25:02 vapier Exp $
+
+*sudo-1.8.3_p1-r2 (15 Nov 2011)
+
+ 15 Nov 2011; Mike Frysinger <vapier@gentoo.org> -sudo-1.8.3_p1-r1.ebuild,
+ +sudo-1.8.3_p1-r2.ebuild:
+ Restore hardcoded --with-plugindir configure flag #390659 by Priit Laes.
*sudo-1.8.3_p1-r1 (15 Nov 2011)
diff --git a/app-admin/sudo/sudo-1.8.3_p1-r1.ebuild b/app-admin/sudo/sudo-1.8.3_p1-r2.ebuild
index 1632b6692625..856a31d15c8f 100644
--- a/app-admin/sudo/sudo-1.8.3_p1-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.3_p1-r2.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/app-admin/sudo/sudo-1.8.3_p1-r1.ebuild,v 1.1 2011/11/15 06:05:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.3_p1-r2.ebuild,v 1.1 2011/11/15 22:25:02 vapier Exp $
EAPI="4"
-inherit eutils pam libtool
+inherit eutils pam multilib libtool
MY_P=${P/_/}
MY_P=${MY_P/beta/b}
@@ -100,6 +100,9 @@ src_configure() {
# audit: somebody got to explain me how I can test this before I
# enable it.. - Diego
+ # plugindir: autoconf code is crappy and does not delay evaluation
+ # until `make` time, so we have to use a full path here rather than
+ # basing off other values.
econf \
--enable-zlib=system \
--with-secure-path="${ROOTPATH}" \
@@ -114,7 +117,7 @@ src_configure() {
--without-opie \
--without-linux-audit \
--with-timedir=/var/db/sudo \
- --with-plugindir='${libdir}'/sudo \
+ --with-plugindir=/usr/$(get_libdir)/sudo \
--docdir=/usr/share/doc/${PF}
}