commit: 02eeb1fb172319951d5588663bac027c5307d4f5 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> AuthorDate: Tue Oct 13 14:14:15 2015 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Tue Oct 13 14:14:40 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02eeb1fb
app-admin/sudo: Revert changes brought about by PR #158. Package-Manager: portage-2.2.20.1 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> app-admin/sudo/sudo-1.8.12-r1.ebuild | 10 +++------- app-admin/sudo/sudo-1.8.13.ebuild | 9 +++------ app-admin/sudo/sudo-1.8.14_p3.ebuild | 9 +++------ app-admin/sudo/sudo-9999.ebuild | 9 +++------ 4 files changed, 12 insertions(+), 25 deletions(-) diff --git a/app-admin/sudo/sudo-1.8.12-r1.ebuild b/app-admin/sudo/sudo-1.8.12-r1.ebuild index c86666f..237f5c8 100644 --- a/app-admin/sudo/sudo-1.8.12-r1.ebuild +++ b/app-admin/sudo/sudo-1.8.12-r1.ebuild @@ -24,7 +24,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz LICENSE="ISC BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris" -IUSE="ldap nls pam offensive selinux skey +sendmail sssd" +IUSE="ldap nls pam offensive selinux skey +sendmail" DEPEND="pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) @@ -32,9 +32,7 @@ DEPEND="pam? ( virtual/pam ) >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) - sys-libs/zlib - sssd? ( sys-auth/sssd ) - " + sys-libs/zlib" RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) @@ -47,8 +45,7 @@ DEPEND="${DEPEND} S=${WORKDIR}/${MY_P} -REQUIRED_USE="pam? ( !skey ) skey? ( !pam ) - sssd? ( || ( amd64 x86 ) )" +REQUIRED_USE="pam? ( !skey ) skey? ( !pam )" MAKEOPTS+=" SAMPLES=" @@ -120,7 +117,6 @@ src_configure() { $(use_with skey) \ $(use_with selinux) \ $(use_with sendmail) \ - $(use_with sssd) \ --without-opie \ --without-linux-audit \ --with-rundir="${EPREFIX}"/var/run/sudo \ diff --git a/app-admin/sudo/sudo-1.8.13.ebuild b/app-admin/sudo/sudo-1.8.13.ebuild index 73008c2..d36ae5e 100644 --- a/app-admin/sudo/sudo-1.8.13.ebuild +++ b/app-admin/sudo/sudo-1.8.13.ebuild @@ -24,7 +24,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz LICENSE="ISC BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris" -IUSE="ldap nls pam offensive selinux skey +sendmail sssd" +IUSE="ldap nls pam offensive selinux skey +sendmail" DEPEND="pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) @@ -32,8 +32,7 @@ DEPEND="pam? ( virtual/pam ) >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) - sys-libs/zlib - sssd? ( sys-auth/sssd )" + sys-libs/zlib" RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) @@ -46,8 +45,7 @@ DEPEND="${DEPEND} S=${WORKDIR}/${MY_P} -REQUIRED_USE="pam? ( !skey ) skey? ( !pam ) - sssd? ( || ( amd64 x86 ) )" +REQUIRED_USE="pam? ( !skey ) skey? ( !pam )" MAKEOPTS+=" SAMPLES=" @@ -118,7 +116,6 @@ src_configure() { $(use_with skey) \ $(use_with selinux) \ $(use_with sendmail) \ - $(use_with sssd) \ --without-opie \ --without-linux-audit \ --with-rundir="${EPREFIX}"/var/run/sudo \ diff --git a/app-admin/sudo/sudo-1.8.14_p3.ebuild b/app-admin/sudo/sudo-1.8.14_p3.ebuild index 73008c2..d36ae5e 100644 --- a/app-admin/sudo/sudo-1.8.14_p3.ebuild +++ b/app-admin/sudo/sudo-1.8.14_p3.ebuild @@ -24,7 +24,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz LICENSE="ISC BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris" -IUSE="ldap nls pam offensive selinux skey +sendmail sssd" +IUSE="ldap nls pam offensive selinux skey +sendmail" DEPEND="pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) @@ -32,8 +32,7 @@ DEPEND="pam? ( virtual/pam ) >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) - sys-libs/zlib - sssd? ( sys-auth/sssd )" + sys-libs/zlib" RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) @@ -46,8 +45,7 @@ DEPEND="${DEPEND} S=${WORKDIR}/${MY_P} -REQUIRED_USE="pam? ( !skey ) skey? ( !pam ) - sssd? ( || ( amd64 x86 ) )" +REQUIRED_USE="pam? ( !skey ) skey? ( !pam )" MAKEOPTS+=" SAMPLES=" @@ -118,7 +116,6 @@ src_configure() { $(use_with skey) \ $(use_with selinux) \ $(use_with sendmail) \ - $(use_with sssd) \ --without-opie \ --without-linux-audit \ --with-rundir="${EPREFIX}"/var/run/sudo \ diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild index 2b422f4..c114383 100644 --- a/app-admin/sudo/sudo-9999.ebuild +++ b/app-admin/sudo/sudo-9999.ebuild @@ -30,7 +30,7 @@ fi # 3-clause BSD license LICENSE="ISC BSD" SLOT="0" -IUSE="ldap nls pam offensive selinux skey +sendmail sssd" +IUSE="ldap nls pam offensive selinux skey +sendmail" DEPEND="pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) @@ -38,8 +38,7 @@ DEPEND="pam? ( virtual/pam ) >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) - sys-libs/zlib - sssd? ( sys-auth/sssd )" + sys-libs/zlib" RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) @@ -52,8 +51,7 @@ DEPEND="${DEPEND} S=${WORKDIR}/${MY_P} -REQUIRED_USE="pam? ( !skey ) skey? ( !pam ) - sssd? ( || ( amd64 x86 ) )" +REQUIRED_USE="pam? ( !skey ) skey? ( !pam )" MAKEOPTS+=" SAMPLES=" @@ -124,7 +122,6 @@ src_configure() { $(use_with skey) \ $(use_with selinux) \ $(use_with sendmail) \ - $(use_with sssd) \ --without-opie \ --without-linux-audit \ --with-rundir="${EPREFIX}"/var/run/sudo \
