gentoo resync : 14.05.2020

6 files changed, 32 insertions, 10 deletions

diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index 737d09317758..6afb5c253ef1 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -1,9 +1,10 @@
+AUX anope-2.0.6-example.conf-pid-path.patch 521 BLAKE2B 4fb40f4913c41a2fa1925707ebdc50cceeb129b01f2487beba97242366da8577fde882a7389477aa051e03f519d71dfe6f7332a91f68bd7747179eebfd26af38 SHA512 55690d4057bd3703dff0674a6b339bda659db88d242c4216aa1cf14f06e1a95af33b2fffafa18540d37b7fc5620359dcab895e2365713ad243fa99ed572a6f3f
+AUX anope-2.0.7-example.conf-user.patch 391 BLAKE2B 781e413ef79a7ca601710957b519fb3038bb71e45960cf000afa837a8a8a3f71458390bab1323ae85fc601f143725a45d3a0a7b9c9aca8b530805c459d70b39c SHA512 13f0eb0dfc5f18a4621e2812aad418cab1f5a0cb70ff2f915bd4df2ac896b441f24e64014e218d473c5be92d4be7a5f83e4804e92610c2ef35e46ded229bd6a4
+AUX anope-2.0.7-musl-libintl.patch 566 BLAKE2B 7deb854a68c259c9055a086fbb33a63d00544bacd1a9dd2bdd6793d93a8885be195336aa66054933a6bc9cfd1dabb5ff8eaea2529f4fd4841ff51364931fd320 SHA512 11e69a97bc0cca89719584e849577868c045a75ab531bc43c61140b29f640cf761f9f73165ebb70079d0d9e1dfeb335222c8954bf2b037f6b80b9f33da69bf87
 AUX anope-conf.d-v2 344 BLAKE2B 8817bba9938aa03abf79e61b86ddde537c6ec68b6584074e1f9bc50fe8334c5d0135ca17551390618f60b26d93f0209789b9337879dbecdcb4fced3d2bb88b3b SHA512 ae1851ccaa128404f3a721c92571ae3c4e0efd18c318485594f87da565b2de505ee9ace580b5d1c4ce4a7b53a4eba8338874195ca3a2cbc415ab6facdb3c9d7a
 AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f9352f2ada8ba5bc90fc1a8b5e4779bd132606d9297c19fd418db02d8a26b6629da675f6fc0d8c SHA512 e058ccfb4a44238cd1540704f130207236be71799d0a5f4678638d313d958b10dfc5de9cd515f18ccdd9faf41dc93eaf33b5f4013f534efec00adc401a2cb97c
-AUX example.conf-user.patch 391 BLAKE2B 781e413ef79a7ca601710957b519fb3038bb71e45960cf000afa837a8a8a3f71458390bab1323ae85fc601f143725a45d3a0a7b9c9aca8b530805c459d70b39c SHA512 13f0eb0dfc5f18a4621e2812aad418cab1f5a0cb70ff2f915bd4df2ac896b441f24e64014e218d473c5be92d4be7a5f83e4804e92610c2ef35e46ded229bd6a4
-AUX pid-patch.patch 521 BLAKE2B 4fb40f4913c41a2fa1925707ebdc50cceeb129b01f2487beba97242366da8577fde882a7389477aa051e03f519d71dfe6f7332a91f68bd7747179eebfd26af38 SHA512 55690d4057bd3703dff0674a6b339bda659db88d242c4216aa1cf14f06e1a95af33b2fffafa18540d37b7fc5620359dcab895e2365713ad243fa99ed572a6f3f
 DIST anope-2.0.6-source.tar.gz 1792912 BLAKE2B 00c70723c887821d2dda065f9fdb4c4fc79a1534217dd567c2247c3ae9d0b3c1c07a9e1e9d87bfdf5f7f9be212af5139e29710224e02e80154290dd6d4b5ee7c SHA512 c100758d6159023832bc7a4dceb7d554a9b3cd9120b033efc9a93c7ff28e76a086d0594b66b9cd2946b231421217674990f2a3ebaa8a6598c2a25e2dafd1b65b
 DIST anope-2.0.7-source.tar.gz 1817484 BLAKE2B 13a4628db8cb885d4636ab1897aab322f7846740e4a3fccd02a417d84a8eb3c942aebf5e0a51f8ca1108f455b44b4e280e7386b42e03f640c9b0e68943252814 SHA512 22a9f3e0d9fe7f68304062829a19b693a3414f94c90f8da601ab98995cbff7310dc22ca40749d50d6722dfb4649817d2f4b1dbe4afa3254b28980f03a491de65
-EBUILD anope-2.0.6.ebuild 4979 BLAKE2B 171b9a4e79cc20788f2d60aca8d20c308bea3d8d08241365d02180c57344402efd9a8ef7a5abea257af5fe2fc494526bbf885cfe8d394441aa38454d4b2aafa5 SHA512 cd4a6e963604249d1ebcb6fd7faa28bd588253285bb39afa9ba8d6144782a59fcd5ac19761419cc28620d08dadd5009e5ab1bf9c6eabe9f1112cfdba2bdf62ad
-EBUILD anope-2.0.7.ebuild 4284 BLAKE2B b632b76b133bfaea5d75bb84e1a8027b42743dd3cba955f645ae98f0c23243f56379a6704b3f69b268f19119fec3c5e4198a466038c32c31f6152c8ffe24a712 SHA512 8c1b0cbf7ffe5aed6646db95a9dde91948e224e78465854aa3e106e4bdb49cff5aec76161af284a33b78a0ff1c18e749302334e91757c2081b7c275f58031abe
+EBUILD anope-2.0.6.ebuild 5003 BLAKE2B d6d518195763f6673b6472daf36cf8e9ee792a04026b4289741b573cf6b3be669bb03e6a4be436ea5fb5ce4f66ad350918cf7bd6f97ef83b49589ebf7e9b0145 SHA512 9987c769735d6e1521c67143698ceeb3fa3143a020fe34b85d81a254f7b3761908ee1c5200b9999f73f51d7cb686236ecba9002f4e290c8ecdca82592f95bd98
+EBUILD anope-2.0.7.ebuild 4300 BLAKE2B 518e5927adb3377a4a6dd880546ee43a0e9e3cb36e5d5cf7e24238662f0cb890c58021aa4a708d369e7a75a2d59809e48509ee98b06b46c1bb45633ae77bfc61 SHA512 8defbd4c92bafbb223e1077b9436b1f6ad372d888c1b141e932e13369c3c73c46a83c3c9fd523270f1d0c9fac6928764c381e44c41fa89d22385060824f11cf9
 MISC metadata.xml 1766 BLAKE2B 468c8eada20fc23455d92c612f3268876d812a7c7a87a593f896fe8fa7246dbb75441430a2e0cb4d6a1fa36b611553c0df43de2edda195a51b390c70712d7ab9 SHA512 b40ef7336a091b3211826a3b2b1e51c0586187b903b3aa34e4d9e3df0194ae3ce92964d490e77b5d679aaaa76eadf40af5b1d785d6540a23c2b832474f0a5a03
diff --git a/net-irc/anope/anope-2.0.6.ebuild b/net-irc/anope/anope-2.0.6.ebuild
index 8bb47e7d54bc..1d78f2271b9f 100644
--- a/net-irc/anope/anope-2.0.6.ebuild
+++ b/net-irc/anope/anope-2.0.6.ebuild
@@ -38,7 +38,7 @@ DEPEND="${BDEPEND}
 	tre? ( dev-libs/tre )"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/pid-patch.patch" )
+PATCHES=( "${FILESDIR}/anope-2.0.6-example.conf-pid-path.patch" )
 
 S="${WORKDIR}/${P}-source"
 
diff --git a/net-irc/anope/anope-2.0.7.ebuild b/net-irc/anope/anope-2.0.7.ebuild
index 7761a88223ae..c97d65e1d2af 100644
--- a/net-irc/anope/anope-2.0.7.ebuild
+++ b/net-irc/anope/anope-2.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/anope/anope/releases/download/${PV}/${P}-source.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="gnutls ldap mysql pcre sql sqlite ssl tre"
 REQUIRED_USE="
 	sql? ( || ( mysql sqlite ) )
@@ -33,8 +33,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/pid-patch.patch"
-	"${FILESDIR}/example.conf-user.patch"
+	"${FILESDIR}/${PN}-2.0.6-example.conf-pid-path.patch"
+	"${FILESDIR}/${PN}-2.0.7-example.conf-user.patch"
+	"${FILESDIR}/${PN}-2.0.7-musl-libintl.patch"
 )
 
 S="${WORKDIR}/${P}-source"
@@ -65,8 +66,6 @@ src_prepare() {
 	# Any SQL implementation
 	if use sql ; then
 	   anope_enable_mod "m_sql_authentication.cpp"
-	   anope_enable_mod "m_sql.cpp"
-	   anope_enable_mod "m_sql_live.cpp"
 	fi
 
 	if use ldap ; then
diff --git a/net-irc/anope/files/pid-patch.patch b/net-irc/anope/files/anope-2.0.6-example.conf-pid-path.patch
index ddf661ba9803..ddf661ba9803 100644
--- a/net-irc/anope/files/pid-patch.patch
+++ b/net-irc/anope/files/anope-2.0.6-example.conf-pid-path.patch
diff --git a/net-irc/anope/files/example.conf-user.patch b/net-irc/anope/files/anope-2.0.7-example.conf-user.patch
index 7f7a3826cb10..7f7a3826cb10 100644
--- a/net-irc/anope/files/example.conf-user.patch
+++ b/net-irc/anope/files/anope-2.0.7-example.conf-user.patch
diff --git a/net-irc/anope/files/anope-2.0.7-musl-libintl.patch b/net-irc/anope/files/anope-2.0.7-musl-libintl.patch
new file mode 100644
index 000000000000..f14e494e0c18
--- /dev/null
+++ b/net-irc/anope/files/anope-2.0.7-musl-libintl.patch
@@ -0,0 +1,22 @@
+diff --git a/src/language.cpp b/src/language.cpp
+index 1915378..c1eeea5 100644
+--- a/src/language.cpp
++++ b/src/language.cpp
+@@ -75,7 +75,7 @@ const char *Language::Translate(const NickCore *nc, const char *string)
+ 
+ #if GETTEXT_FOUND
+ 
+-#ifdef __USE_GNU_GETTEXT
++#if defined(__GLIBC__)
+ extern "C" int _nl_msg_cat_cntr;
+ #endif
+ 
+@@ -87,7 +87,7 @@ const char *Language::Translate(const char *lang, const char *string)
+ 	if (!lang || !*lang)
+ 		lang = Config->DefLanguage.c_str();
+ 
+-#ifdef __USE_GNU_GETTEXT
++#if defined(__GLIBC__)
+ 	++_nl_msg_cat_cntr;
+ #endif
+