From 5117aac7017dbcf286e839bc5ce252552df48963 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Tue, 22 Mar 2022 22:56:21 +0000
Subject: net-nds/adtool: add version limit on OpenLDAP (needs ldap_r)

We need (for now) the reentrant library from OpenLDAP which is gone.

Bug: https://bugs.gentoo.org/835649
Signed-off-by: Sam James <sam@gentoo.org>
---
 net-nds/adtool/adtool-1.3.3-r1.ebuild | 29 -----------------------------
 net-nds/adtool/adtool-1.3.3-r2.ebuild | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 29 deletions(-)
 delete mode 100644 net-nds/adtool/adtool-1.3.3-r1.ebuild
 create mode 100644 net-nds/adtool/adtool-1.3.3-r2.ebuild

(limited to 'net-nds')

diff --git a/net-nds/adtool/adtool-1.3.3-r1.ebuild b/net-nds/adtool/adtool-1.3.3-r1.ebuild
deleted file mode 100644
index 014b4436dca9..000000000000
--- a/net-nds/adtool/adtool-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools out-of-source
-
-DESCRIPTION="Utility for Active Directory administration"
-HOMEPAGE="http://gp2x.org/adtool/"
-SRC_URI="http://gp2x.org/adtool/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="net-nds/openldap"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-bfr-overflow.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-	"${FILESDIR}"/${P}-automake.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
diff --git a/net-nds/adtool/adtool-1.3.3-r2.ebuild b/net-nds/adtool/adtool-1.3.3-r2.ebuild
new file mode 100644
index 000000000000..cb955c1edee4
--- /dev/null
+++ b/net-nds/adtool/adtool-1.3.3-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source
+
+DESCRIPTION="Utility for Active Directory administration"
+HOMEPAGE="http://gp2x.org/adtool/"
+SRC_URI="http://gp2x.org/adtool/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# Older OpenLDAP for bug #835649 (ldap_r)
+RDEPEND="<net-nds/openldap-2.6:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-bfr-overflow.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-automake.patch
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
-- 
cgit v1.2.3-65-gdbad