From d5bbf1b9473d59ab07f4d3cb57a18d0732cbc82e Mon Sep 17 00:00:00 2001
From: Mikle Kolyada <zlogene@gentoo.org>
Date: Sun, 18 Oct 2020 18:11:17 +0300
Subject: [PATCH] net-nds/openldap: migrate 2.4.53 to glep 81

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
---
 ....4.53.ebuild => openldap-2.4.53-r1.ebuild} | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)
 rename net-nds/openldap/{openldap-2.4.53.ebuild => openldap-2.4.53-r1.ebuild} (99%)

diff --git a/net-nds/openldap/openldap-2.4.53.ebuild b/net-nds/openldap/openldap-2.4.53-r1.ebuild
similarity index 99%
rename from net-nds/openldap/openldap-2.4.53.ebuild
rename to net-nds/openldap/openldap-2.4.53-r1.ebuild
index 759f154577651..f8eedca45d4f5 100644
--- a/net-nds/openldap/openldap-2.4.53.ebuild
+++ b/net-nds/openldap/openldap-2.4.53-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools db-use flag-o-matic multilib-minimal preserve-libs ssl-cert toolchain-funcs user systemd
+inherit autotools db-use flag-o-matic multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd
 
 BIS_PN=rfc2307bis.schema
 BIS_PV=20140524
@@ -93,7 +93,17 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-ldap )
 "
+
+# The user/group are only used for running daemons which are
+# disabled in minimal builds, so elide the accounts too.
 # for tracking versions
+
+BDEPEND="!minimal? (
+		acct-group/ldap
+		acct-user/ldap
+)
+"
+
 OPENLDAP_VERSIONTAG=".version-tag"
 OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
 
@@ -347,13 +357,6 @@ pkg_setup() {
 	else
 		openldap_find_versiontags
 	fi
-
-	# The user/group are only used for running daemons which are
-	# disabled in minimal builds, so elide the accounts too.
-	if ! use minimal ; then
-		enewgroup ldap 439
-		enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
-	fi
 }
 
 src_prepare() {