Version bump to rc2 for both 1.8.1 and 1.7.6; move plugins for 1.8 to /usr/lib/sudo; don't install sample plugins; filter gnat-gcc paths from secure_path as it's done for gcc already.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

5 files changed, 50 insertions, 24 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 2fed2103c916..37e7facb12ee 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,16 @@
 # 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.261 2011/04/06 08:33:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.262 2011/04/06 14:18:41 flameeyes Exp $
+
+*sudo-1.8.1_rc2 (06 Apr 2011)
+*sudo-1.7.6_rc2 (06 Apr 2011)
+
+  06 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> -sudo-1.7.6_rc1.ebuild,
+  +sudo-1.7.6_rc2.ebuild, -sudo-1.8.1_rc1.ebuild, +sudo-1.8.1_rc2.ebuild,
+  -files/sudo-1.8.1_rc1-ldflags.patch, +files/sudo-1.8.1_rc2-plugindir.patch:
+  Version bump to rc2 for both 1.8.1 and 1.7.6; move plugins for 1.8 to
+  /usr/lib/sudo; don't install sample plugins; filter gnat-gcc paths from
+  secure_path as it's done for gcc already.
 
   06 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> sudo-1.7.6_rc1.ebuild:
   Use EAPI=4 properly.
diff --git a/app-admin/sudo/files/sudo-1.8.1_rc1-ldflags.patch b/app-admin/sudo/files/sudo-1.8.1_rc1-ldflags.patch
deleted file mode 100644
index e0ac730b2d56..000000000000
--- a/app-admin/sudo/files/sudo-1.8.1_rc1-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: sudo-1.8.1rc1/plugins/sudoers/Makefile.in
-===================================================================
---- sudo-1.8.1rc1.orig/plugins/sudoers/Makefile.in
-+++ sudo-1.8.1rc1/plugins/sudoers/Makefile.in
-@@ -55,8 +55,8 @@ CPPFLAGS = -I$(incdir) -I$(top_builddir)
- CFLAGS = @CFLAGS@
- 
- # Flags to pass to the link stage
--LDFLAGS =
--SUDOERS_LDFLAGS = @SUDOERS_LDFLAGS@
-+LDFLAGS = @LDFLAGS@
-+SUDOERS_LDFLAGS = $(LDFLAGS) @SUDOERS_LDFLAGS@
- 
- # Where to install things...
- prefix = @prefix@
diff --git a/app-admin/sudo/files/sudo-1.8.1_rc2-plugindir.patch b/app-admin/sudo/files/sudo-1.8.1_rc2-plugindir.patch
new file mode 100644
index 000000000000..9fa2e0dd22f8
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.8.1_rc2-plugindir.patch
@@ -0,0 +1,24 @@
+Index: sudo-1.8.1rc2/configure.in
+===================================================================
+--- sudo-1.8.1rc2.orig/configure.in
++++ sudo-1.8.1rc2/configure.in
+@@ -1099,13 +1099,14 @@ AC_ARG_WITH(askpass, [AS_HELP_STRING([--
+ 		;;
+ esac], AC_MSG_RESULT(no))
+ 
+-with_plugindir="$libexecdir"
+-AC_ARG_WITH(plugin_dir, [AS_HELP_STRING([--with-plugin_dir], [set directory to load plugins from])],
+-[case $with_plugin_dir in
++AC_ARG_WITH(plugindir, [AS_HELP_STRING([--with-plugin_dir], [set directory to load plugins from])],
++[case $withval in
+     no)		AC_MSG_ERROR(["illegal argument: --without-plugin_dir."])
+ 		;;
+-    *)		;;
+-esac])
++    *)		with_plugindir=$withval;;
++esac],
++[with_plugindir="$libexecdir"
++])
+ 
+ dnl
+ dnl Options for --enable
diff --git a/app-admin/sudo/sudo-1.7.6_rc1.ebuild b/app-admin/sudo/sudo-1.7.6_rc2.ebuild
index 2e8de11c6945..caa4d4018c74 100644
--- a/app-admin/sudo/sudo-1.7.6_rc1.ebuild
+++ b/app-admin/sudo/sudo-1.7.6_rc2.ebuild
@@ -1,6 +1,6 @@
 # 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.7.6_rc1.ebuild,v 1.3 2011/04/06 08:33:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.6_rc2.ebuild,v 1.1 2011/04/06 14:18:41 flameeyes Exp $
 
 EAPI=4
 
@@ -107,6 +107,8 @@ src_configure() {
 		}
 
 		rmpath ROOTPATH '*/gcc-bin/*'
+		rmpath ROOTPATH '*/gnat-gcc-bin/*'
+		rmpath ROOTPATH '*/gnat-gcc/*'
 
 	einfo "...done."
 
diff --git a/app-admin/sudo/sudo-1.8.1_rc1.ebuild b/app-admin/sudo/sudo-1.8.1_rc2.ebuild
index 75bbaed6b9b3..dfa0492d119d 100644
--- a/app-admin/sudo/sudo-1.8.1_rc1.ebuild
+++ b/app-admin/sudo/sudo-1.8.1_rc2.ebuild
@@ -1,12 +1,12 @@
 # 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.1_rc1.ebuild,v 1.2 2011/04/06 08:30:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.1_rc2.ebuild,v 1.1 2011/04/06 14:18:41 flameeyes Exp $
 
 EAPI=4
 
 WANT_AUTOMAKE=none
 
-inherit eutils pam libtool autotools
+inherit eutils pam multilib libtool autotools
 
 MY_P=${P/_/}
 MY_P=${MY_P/beta/b}
@@ -52,10 +52,13 @@ S=${WORKDIR}/${MY_P}
 
 REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
 
+MAKEOPTS="${MAKEOPTS} SAMPLES="
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-recursion.patch \
-		"${FILESDIR}"/${P}-skey.patch
+	epatch\
+		"${FILESDIR}"/${PN}-1.8.1_rc1-recursion.patch \
+		"${FILESDIR}"/${PN}-1.8.1_rc1-skey.patch \
+		"${FILESDIR}"/${PN}-1.8.1_rc2-plugindir.patch
 
 	export AT_M4DIR="m4"
 	eautoheader
@@ -111,6 +114,8 @@ src_configure() {
 		}
 
 		rmpath ROOTPATH '*/gcc-bin/*'
+		rmpath ROOTPATH '*/gnat-gcc-bin/*'
+		rmpath ROOTPATH '*/gnat-gcc/*'
 
 	einfo "...done."
 
@@ -128,8 +133,8 @@ src_configure() {
 		--without-opie \
 		--without-linux-audit \
 		--with-timedir=/var/db/sudo \
-		--docdir=/usr/share/doc/${PF} \
-		${myconf}
+		--with-plugindir=/usr/$(get_libdir)/sudo \
+		--docdir=/usr/share/doc/${PF}
 }
 
 src_install() {