gentoo resync : 12.03.2021

4 files changed, 72 insertions, 8 deletions

diff --git a/net-dns/mydns/Manifest b/net-dns/mydns/Manifest
index ad9be3a9e7ca..749801cfc552 100644
--- a/net-dns/mydns/Manifest
+++ b/net-dns/mydns/Manifest
@@ -1,8 +1,10 @@
 AUX mydns-1.2.8.27-m4.patch 1983 BLAKE2B fb02b3acf709ff26c9448531989af0b014d520d5d7d75bf93a49732fe5e9a31d1d0bb93b10100657d811ba0812529870d4959d7443801500655806fdd9e45dae SHA512 0111a517bbeec7101bccf9cda54dc15e46952e156f3a27b9305e0a92d8aeda58756dd4fae568cc5695c2bda25e9232012e117dd52178f1f39992fb4be75167ea
+AUX mydns-1.2.8.31-misc-libdir.patch 1708 BLAKE2B 0de7521fd391c84990f7b3478220910b383066fba41f96c7955792d67ad420bbf736c1141ecfe362b657f1eebdd4cf4c4609ad0ef4b9bcd3fdf19e6e2c22f874 SHA512 feeba4d7ccd8a8e0c08b2e24081dcf495bb651554a7da151a33708f974c67cdf90d8a5bc20969b68ee29a02e1c3c898d9f457a40938ee34a2df965d694d7c9aa
+AUX mydns-1.2.8.31-ssl-libdir.patch 465 BLAKE2B 7fb59812e6b15a86c791c7d07801193981c10deeb9aa71694bc15d1003eb037be165c6dbd81eb92e6bc4786d144c5813608f31116402b10d4237780033016468 SHA512 a16a3b0a67663ea0270e6d5734c82ffe51db00e01a9fa097c6780228ef680b3a2619dc1fe20d981e99fa09dc89d32c79267f9aa97baecb9608d9f81cae57c460
 AUX mydns-1.2.8.31-texinfo.patch 923 BLAKE2B 64146ddd6714fd5fb29cf0e3d85d6cc4358693d5d8d0ab7ca09b2c58d6bcdddbab5725a28e426735bbeca1a8e39aae9a3ac51654f6a7fd8f0cb7f47d1ca5191b SHA512 a6539e9bf7c87425c9ae6c598edd6460e24c46a13de64b4eb08358a3127cc21bd78bdbf6dcb071795b76262d8944d79daa18e3729dbafaea94067b4c4061d915
 AUX mydns.confd 84 BLAKE2B e95e66b464e9f7e7d3742312c9cd9bebc5cedc1f4f49fb4e632ef1f51820c6400c598ea611af51fde11da6cca93dd126bda8dd8ef20905c4f165935612e92681 SHA512 7fd98de31583d0556734b7313afa257b9f73f4d74611ce03dd44f2d7e833ec4f95b4bf84dab627d59da18f89f7dc1d9eb6d840a90b16556b4e1d97439944452a
 AUX mydns.initd 850 BLAKE2B 58275e0415dbf27344045e9cc19037e09a5ee9dd1a52f80b6c05852313b646c7b41a52f1be46ff13629bc0873b2b7fc1db73e0cd45cfc7bb4c6d9a0582524fa1 SHA512 919a7022a350b121c8c0eed962d7a7233dc41f2e4cfda1185d642114719a533cff580367b9302b24e8c9d377c2ccb9b02ad45d638d5b483b7c101405cb9ba1be
 DIST mydns-1.2.8.31.tar.gz 958701 BLAKE2B a07ca8314f6f8d3ce6cf88ce3a49238d00f1ed8e2352f3a76a9ffa348711f76e0cf19fa304a92a71b420c39db2795094d42997daddb091c7046e4bf1b61f6fe8 SHA512 471dfed9b4f38b446fd5896939faa4c58f4e1b3a3e6928fa84eddf769eba8f3406ef08c77ab39ee79d2ac85c1e72a499b283c7404a0cae9830ffe0faee9e2737
 EBUILD mydns-1.2.8.31-r1.ebuild 2066 BLAKE2B b12db9aa17463d5372cf18033d297f14f9bfdffce143ca1f92fcef6eab2e2d3ca2fd52b6458c392af2d2305c6320943102e602d01bfe07de93c0d9f59fdb01a9 SHA512 b32b6cb484e7b05bc8d99cf62b111005c7d39b0be7f2323a08ed4f19920dd797cebdb42b6f884ddcc967e6cf9dfd76d92b22009c098d1d41faa3f35c7dfcc97a
-EBUILD mydns-1.2.8.31-r2.ebuild 2084 BLAKE2B 38d087732dfe55dd1b92ce3b2ff5691ca08d79d01dc419d969912a473d1c5ac65438715a90ab83ef6c4dcb938bc842ad1a19f65661835db806b2c6f33a80d5eb SHA512 9b5f116e870527c4e8cda4b4d4d6cf28081842fa1c26c60e1f182d25df79e2fec8096e59a006e3dc5e4ae02bf209d817388fbf7fb7b2f53db6f9f4703d3ec3b8
+EBUILD mydns-1.2.8.31-r2.ebuild 2245 BLAKE2B 49c777b2f2dc5c22d69f0c6a8bb94605be608618bc59567bac677ba6234c2897e01619c7d16780078752addc2d23da8094736ea2fc5d6ce880df0728c6ca4277 SHA512 6dac36a161ff0a158731a82dbf50068cf47a5ca5a05657d2657fd61e7f104d3053227710a5e7a69d5031468c2eadfc870c7ea67af86c0c5291f5932ea67a531b
 MISC metadata.xml 396 BLAKE2B c343b16b422a587d568b331f868e959348bd12cdb7ee28d6390ebeca8234f1e34ef9efcf7aa70e9b18dac66777ab46763c41f8b68e3f9d96b3863d085ed51066 SHA512 cba5e716877204e00ef18549d35bb39f47921389f8712c69ce81b8dd365505d6ea95fed89976bfc6722343dadd15f914f27d26fe35416c242e7963d467b147d0
diff --git a/net-dns/mydns/files/mydns-1.2.8.31-misc-libdir.patch b/net-dns/mydns/files/mydns-1.2.8.31-misc-libdir.patch
new file mode 100644
index 000000000000..0bab445621c6
--- /dev/null
+++ b/net-dns/mydns/files/mydns-1.2.8.31-misc-libdir.patch
@@ -0,0 +1,41 @@
+diff --git a/m4/mydns.m4 b/m4/mydns.m4
+index a2e39c2..c174a18 100644
+--- a/m4/mydns.m4
++++ b/m4/mydns.m4
+@@ -446,7 +446,7 @@ AC_DEFUN([AC_ENABLE_STATUS],
+ ##
+ AC_DEFUN([AC_LIB_Z],
+ 	[
+-		ac_zlib_dirs="/lib /usr/lib /usr/local/lib"
++		ac_zlib_dirs="/lib /usr/lib /usr/lib64 /usr/local/lib"
+ 		AC_ARG_WITH(zlib,
+ 			AC_HELP_STRING([--with-zlib=DIR], [look for the zlib compression library in DIR]),
+ 			ac_zlib_dirs="$withval $ac_zlib_dirs")
+@@ -476,7 +476,7 @@ AC_DEFUN([AC_LIB_Z],
+ ##
+ AC_DEFUN([AC_LIB_Z_STATIC],
+         [
+-                ac_zlib_static_dirs="/lib /usr/lib /usr/local/lib"
++                ac_zlib_static_dirs="/lib /usr/lib /usr/lib64 /usr/local/lib"
+                 AC_ARG_WITH(zlib_static,
+                         AC_HELP_STRING([--with-zlib-static=DIR], [look for the static zlib compression library in DIR]),
+                         ac_zlib_static_dirs="$withval $ac_zlib_static_dirs")
+@@ -607,7 +607,7 @@ AC_DEFUN([AC_CHECK_MYSQL],
+ ##
+ AC_DEFUN([AC_LIB_PQ],
+ 	[
+-		ac_mydns_lib_dirs="/usr/local/pgsql/lib /lib /usr/lib /usr/local/lib"
++		ac_mydns_lib_dirs="/lib /usr/lib /usr/lib64 /usr/local/lib /usr/local/pgsql/lib"
+ 		AC_ARG_WITH(pgsql-lib,
+ 			AC_HELP_STRING([--with-pgsql-lib=DIR],
+ 								[look for the PostgreSQL client library in DIR]),
+@@ -635,8 +635,7 @@ AC_DEFUN([AC_LIB_PQ],
+ ##
+ AC_DEFUN([AC_HEADER_PQ],
+ 	[
+-		ac_mydns_header_dirs="/usr/local/pgsql/include /usr/include/postgresql \
+-									 /usr/include /usr/local/include"
++		ac_mydns_header_dirs="/usr/include/postgresql /usr/include /usr/local/include /usr/local/pgsql/include"
+ 		ac_mydns_header_found=no, ac_mydns_header_ok=no
+ 		AC_ARG_WITH(pgsql-include,
+ 			AC_HELP_STRING([--with-pgsql-include=DIR],
diff --git a/net-dns/mydns/files/mydns-1.2.8.31-ssl-libdir.patch b/net-dns/mydns/files/mydns-1.2.8.31-ssl-libdir.patch
new file mode 100644
index 000000000000..febd52814006
--- /dev/null
+++ b/net-dns/mydns/files/mydns-1.2.8.31-ssl-libdir.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/695574
+--- a/m4/mydns.m4
++++ b/m4/mydns.m4
+@@ -37,7 +37,7 @@
+ ##
+ AC_DEFUN([AC_WITH_OPENSSL_LIB],
+ 	[
+-		ac_ssl_lib_dirs="/lib /usr/lib /usr/local/lib /usr/ssl/lib /usr/local/ssl/lib"
++		ac_ssl_lib_dirs="/lib /usr/lib /usr/lib64 /usr/local/lib /usr/ssl/lib /usr/local/ssl/lib"
+ 		AC_ARG_WITH(openssl-lib,
+ 			AC_HELP_STRING([--with-openssl-lib=DIR], [look for the OpenSSL libraries in DIR]),
+ 			ac_ssl_lib_dirs="$withval $ac_ssl_lib_dirs")
diff --git a/net-dns/mydns/mydns-1.2.8.31-r2.ebuild b/net-dns/mydns/mydns-1.2.8.31-r2.ebuild
index febcd54ce5da..e81a5dfecaf3 100644
--- a/net-dns/mydns/mydns-1.2.8.31-r2.ebuild
+++ b/net-dns/mydns/mydns-1.2.8.31-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools
+inherit autotools flag-o-matic
 
-DESCRIPTION="A DNS-Server which gets its data from a MySQL-/PostgreSQL-database"
+DESCRIPTION="A DNS-Server which gets its data from a MySQL/PostgreSQL-database"
 HOMEPAGE="http://www.mydns.pl/"
 SRC_URI="mirror://sourceforge/mydns-ng/${P}.tar.gz"
 
@@ -14,20 +14,26 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc x86"
 IUSE="alias debug nls mysql postgres ssl static status"
 
-RDEPEND="mysql? ( dev-db/mysql-connector-c:= )
+BDEPEND="sys-devel/bison"
+RDEPEND="
+	virtual/libiconv
+	mysql? ( dev-db/mysql-connector-c:= )
 	nls? ( virtual/libintl )
 	postgres? ( dev-db/postgresql )
 	ssl? ( dev-libs/openssl:0= )
-	virtual/libiconv"
-DEPEND="${RDEPEND}
+"
+DEPEND="
+	${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.12 )
-	sys-devel/bison"
+"
 
 REQUIRED_USE="^^ ( mysql postgres )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.2.8.27-m4.patch"
 	"${FILESDIR}/${P}-texinfo.patch"
+	"${FILESDIR}/${PN}-1.2.8.31-ssl-libdir.patch"
+	"${FILESDIR}/${PN}-1.2.8.31-misc-libdir.patch"
 )
 
 src_prepare() {
@@ -36,6 +42,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #775134
+	append-flags -fcommon
+
 	econf \
 		$(use_enable alias) \
 		$(use_enable nls) \