public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/diradm/
Date: Fri, 29 Dec 2017 22:33:29 +0000 (UTC)	[thread overview]
Message-ID: <1514586716.94f98b934f7d31fa1c987a30865e5d32f22d6f7b.soap@gentoo> (raw)

commit:     94f98b934f7d31fa1c987a30865e5d32f22d6f7b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 19:14:28 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 22:31:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94f98b93

app-admin/diradm: Port to EAPI 6

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-admin/diradm/diradm-2.9.7.1.ebuild | 39 ++++++++++++++--------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/app-admin/diradm/diradm-2.9.7.1.ebuild b/app-admin/diradm/diradm-2.9.7.1.ebuild
index 40dd1892dcc..2d645934617 100644
--- a/app-admin/diradm/diradm-2.9.7.1.ebuild
+++ b/app-admin/diradm/diradm-2.9.7.1.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit eutils
+EAPI=6
 
 DESCRIPTION="A nearly complete nss/shadow suite for managing POSIX users/groups/data in LDAP"
 #HOMEPAGE="http://research.iat.sfu.ca/custom-software/diradm/"
@@ -14,13 +12,15 @@ SRC_URI="http://orbis-terrarum.net/~robbat2/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="samba irixpasswd automount test"
+IUSE="automount irixpasswd samba test"
+REQUIRED_USE="test? ( automount irixpasswd samba )"
+
 RDEPEND=">=net-nds/openldap-2.3
 	sys-apps/gawk
 	sys-apps/coreutils
 	sys-apps/grep
 	dev-lang/perl
-	app-shells/bash
+	app-shells/bash:*
 	sys-apps/sed
 	virtual/perl-MIME-Base64
 	samba? (
@@ -36,27 +36,24 @@ DEPEND="
 		net-nds/openldap[-minimal]
 	)"
 
-pkg_setup() {
-	use test && elog "Warning, for test usage, diradm is built with all optional features!"
+src_configure() {
+	econf \
+		$(use_enable automount) \
+		$(use_enable irixpasswd) \
+		$(use_enable samba)
 }
 
-src_configure() {
-	local myconf
-	if use test; then
-		myconf="--enable-samba --enable-automount --enable-irixpasswd"
-	else
-		myconf="`use_enable samba` `use_enable automount` `use_enable irixpasswd`"
-	fi
-	econf ${myconf} || die "econf failed"
+src_test() {
+	emake -j1 check
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc CHANGES* README AUTHORS ChangeLog NEWS README.prefork \
-		THANKS TODO KNOWN-BUGS || die
+	default
+	dodoc CHANGES.prefork KNOWN-BUGS
+
 	if use irixpasswd; then
 		insinto /etc/openldap/schema
-		doins irixpassword.schema || die "Failed irixpassword.schema"
+		doins irixpassword.schema
 	fi
 }
 
@@ -69,7 +66,3 @@ pkg_postinst() {
 	elog "those packages, with a further fallback to /etc/openldap/ldap.conf"
 	elog "for server connection settings only."
 }
-
-src_test() {
-	emake -j1 check
-}


             reply	other threads:[~2017-12-29 22:33 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-29 22:33 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-12-10 20:02 [gentoo-commits] repo/gentoo:master commit in: app-admin/diradm/ Aaron Bauman
2023-09-13  3:49 Sam James
2023-11-05 19:09 Arthur Zamarin
2023-11-05 19:09 Arthur Zamarin
2023-11-10 14:00 Arthur Zamarin
2023-11-11 22:11 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1514586716.94f98b934f7d31fa1c987a30865e5d32f22d6f7b.soap@gentoo \
    --to=soap@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox