gentoo resync : 02.09.2020

5 files changed, 60 insertions, 34 deletions

diff --git a/net-nds/adtool/Manifest b/net-nds/adtool/Manifest
index 07006b2c5b43..6b5b61dfb630 100644
--- a/net-nds/adtool/Manifest
+++ b/net-nds/adtool/Manifest
@@ -1,4 +1,6 @@
+AUX adtool-1.3.3-automake.patch 306 BLAKE2B 34947a79d78ff15b218d4a152e31a1e28d36c7265813137e3847ebc8e5bc75f2b869af17bb7fbec39fc5f3368e4a4c935981f143afcb92f1bc839378d7d9e51c SHA512 54b18b732fdc154e551ecefa720842e67e38822e275d86ef325f143b75480fd1ba5fd11c53c386c990f4752163857a8894cbd2ae78e7dd277769b07132491d2c
 AUX adtool-1.3.3-bfr-overflow.patch 587 BLAKE2B ea6322d2dcc26575676ba26f048db2755012e63f2132b6b2c0e339bedd415e7d5a73d955be60c89329829c8cf0e30f4c96a6c1ed85a9c864e2aa8556c8366eaf SHA512 4ac3772f261f5a6e57a982d3985830083b227b87246bdc0909e5c75d47eee3cf62572b1de67b296368124e5007181988466832ff2333dcf74dcfae54e2db0ad4
+AUX adtool-1.3.3-fno-common.patch 528 BLAKE2B eca0e12bb41b9d52e634fee7670caa8c9b4f2b7b51ab5b1631d827b36a0cd5f705d44b1c044a71aaedd75de7564f5a7d90869d06252cf1dc01a44b652dcdcf2a SHA512 26f1b8fcba21b925c496090d90e4fe13f8f5d584ac24d40e218d1ba0e9b16a2c0cf088bbae6e43706a5737c0537c7b50bf32605747c2a411f8ac52003693756a
 DIST adtool-1.3.3.tar.gz 334767 BLAKE2B 401f10df2708a2e2b7384354192337145739d4a8df2f0366171d0989836c9795263dba9d95d597d3e129b72bfcd53df2532c55a62d126e773bcf79cac909df52 SHA512 800a9fd19481b2c986991c27674e24b40bd6f4d58d7cbcf94532acb88f6c36de1f18d4165d6a2dcffd7d5baeac86aaf6f0ff1ef1b46d93ffc28b826b3d857251
-EBUILD adtool-1.3.3.ebuild 696 BLAKE2B 4a153b148d750d23056d4471de7c2df57509d577e6b72cafa6bbb9132fec8aa1eededc2b151e96244577be193159444f34eac3f038ae4056ad4feb5466adc5af SHA512 c15688f889335192328cabd2b3c384601ad90abb6951879abfd363d6d9f4e9b8728b852fe24ec46e265ab810d25ac362fa10be3ee5f6394b21fc9f39892b338f
+EBUILD adtool-1.3.3-r1.ebuild 580 BLAKE2B c017a841de408e0c2bd596b9a1e02d0a067e41b0e6ab099be7e446219808f37d85ff45b4f10499cd3bb26f17fe95c267f83e8a3a2edc1e07a015f0d2946702fe SHA512 9000ed0995ff8d505d65cfb4d3c9bed2161ad84eeb9c5bdf6c65b67999ca3e392208cd5710a6479f552a68537cfa8cd78f6de0319f426f6e2157779072c59068
 MISC metadata.xml 316 BLAKE2B dab8286c90e963fa534872bbd0a14ead0cb628292468a6c049e901307527a3b7bb41cc9d7da91fb66a23169ccc34d70905c8c22535d4ff5706a135615f246c50 SHA512 f4998caf1492df78f9bc82c7fcf2661046f8d61dfc70bbaa36652accfe367b3af13ff10922841beb6e6dbd69018ae3be82a4f3346e77ed4070ff40d2137c07a6
diff --git a/net-nds/adtool/adtool-1.3.3-r1.ebuild b/net-nds/adtool/adtool-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..014b4436dca9
--- /dev/null
+++ b/net-nds/adtool/adtool-1.3.3-r1.ebuild
@@ -0,0 +1,29 @@
+# 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.ebuild b/net-nds/adtool/adtool-1.3.3.ebuild
deleted file mode 100644
index 851fdd24deb0..000000000000
--- a/net-nds/adtool/adtool-1.3.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Utility for Active Directory administration"
-HOMEPAGE="http://gp2x.org/adtool/"
-SRC_URI="http://gp2x.org/adtool/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ssl"
-
-DEPEND="
-	net-nds/openldap
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-bfr-overflow.patch )
-
-src_prepare() {
-	# automake-1.13
-	mv configure.{in,ac} || die
-	sed \
-		-e '/libactive_directory.a/s:@top_srcdir@:@top_builddir@:' \
-		-i src/tools/Makefile.am || die
-	autotools-utils_src_prepare
-}
diff --git a/net-nds/adtool/files/adtool-1.3.3-automake.patch b/net-nds/adtool/files/adtool-1.3.3-automake.patch
new file mode 100644
index 000000000000..df8f99edc46d
--- /dev/null
+++ b/net-nds/adtool/files/adtool-1.3.3-automake.patch
@@ -0,0 +1,9 @@
+--- a/src/tools/Makefile.am
++++ b/src/tools/Makefile.am
+@@ -4,5 +4,5 @@
+ 
+ bin_PROGRAMS = adtool
+ 
+-adtool_LDADD = @top_srcdir@/src/lib/libactive_directory.a -lldap -llber -lldap_r -lpthread -lresolv 
++adtool_LDADD = @top_builddir@/src/lib/libactive_directory.a -lldap -llber -lldap_r -lpthread -lresolv
+ 
diff --git a/net-nds/adtool/files/adtool-1.3.3-fno-common.patch b/net-nds/adtool/files/adtool-1.3.3-fno-common.patch
new file mode 100644
index 000000000000..49391a79920e
--- /dev/null
+++ b/net-nds/adtool/files/adtool-1.3.3-fno-common.patch
@@ -0,0 +1,19 @@
+--- a/src/lib/active_directory.h
++++ b/src/lib/active_directory.h
+@@ -28,11 +28,11 @@
+ | if there is a problem reading the config file, or
+ |	AD_SERVER_CONNECT_FAILURE if a connection can't be made.
+ */
+-char *system_config_file;
+-char *uri;
+-char *binddn;
+-char *bindpw;
+-char *search_base;
++extern char *system_config_file;
++extern char *uri;
++extern char *binddn;
++extern char *bindpw;
++extern char *search_base;
+ 
+ /* ad_get_error() returns a pointer to a string containing an
+ | explanation of the last error that occured.