gentoo resync : 11.01.2018

5 files changed, 4 insertions, 13 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 9e380efdafb0..661f706fc16d 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index f9c5246d0f02..94b9fcb4adfc 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -3,6 +3,6 @@ DIST irssi-1.0.5.tar.xz 1032308 BLAKE2B 6b5d924871b135fdd3d380eca4520288c00d6ecd
 DIST irssi-1.0.6.tar.xz 1033428 BLAKE2B 63a482cc12a184f5117d97a6922a5fee4075e72b36c631718490c64a1fc203d6e9038c59d5748b7190af1523a85a0cf4cef4f920867e1ddf5d2f2269b36bd3e2 SHA512 ec7ac952fe0cfdf583540f1a466404a573da169e796a342b423126d7bb5d8f8336baafa27f9aed5d0eabc1f201cc4809723493b731d49e42ae1f2b7ec4099d16
 EBUILD irssi-1.0.4.ebuild 1262 BLAKE2B 7c9562df38e7b0889ef44c3c905d46ad1cf29d892889af131c96828e1e3656a62824b1dc714cb1e1411c500e61e8614a3ce2e736aa4cb9120394e4b367316189 SHA512 b4ba04fe03cc81a833aa1394303bb2055718293b8c906edd46fcc97af54ffb1cd0a353c16416bb3598626bbdfc2ff1b19c8a93f4f262a18b830eec0b7661c164
 EBUILD irssi-1.0.5.ebuild 1252 BLAKE2B ab7c9b9df8fe7c7c18e94a1c70a0a01b311d38fe8cf51587ba4c6ce35e15c03db32385724b47ba06707f713e5d16bcff8699c8b6572c0497a17a1656a4d0304f SHA512 709aa545bcacf13cd72be4d04359b02058e769952525cb2f95da12255cdfdce8dc8f400de5bfd8d0474fb031d61ce335761097b65cc2f5524df2fc37158fdfbc
-EBUILD irssi-1.0.6.ebuild 1252 BLAKE2B c514af86389f1ea714a4305713d8a44d4e3d1f8e185784b129b6eb34eac6b6a065b81828ba3ee9190fb75a05c191e56fdf08c4d21cd4c670c2e38caebc540fc0 SHA512 9bb0297e735f61dab9bf958e38ef747cce44f95ceecb325d3442c58de47eb9db6ecf3991cf07145420b72c236b1e8bdac55a17ea9814855d79e17f47c8334bc7
+EBUILD irssi-1.0.6.ebuild 1250 BLAKE2B 36c3e056e6ee14f02b56848c84db7d89c5765466b0af2735dfe9edfee8448a927af2110b45c42aa3281bde86f53a80ef3e8b134d3dede5bf0507c4c1ede27d1f SHA512 d09466ecc555c394f00a1f29a9d1366f2de9a02db33411cce37aad5e97541008cd070e59cf23958a8d93185e72b7b4a1c3445dd3f8e982725f0e3e0b51a35052
 EBUILD irssi-9999.ebuild 1202 BLAKE2B 6fdefbaa5021802fc8326b0a633c3ad666f226070972a34936dc02f26f8cb68eb6036ee7e94b2940c6952e49cd2d151c590aa1badbef35e1817df2fceb7996c9 SHA512 fc9126562591b6df88a71b2c3beb4d99a91f62f65f3df46da2808b63eee490f988291b6271de857ea430fcc3c4e1cedb9bc1e00248877bc22d5414f408943954
 MISC metadata.xml 571 BLAKE2B 5e7c22b7d70110157a041c76f8b4494257152a02698f331a1062ad0beedfeecbb8eb0069fefd5f22574208b2846f618607662db2fa1211cc2eaeafb7418a6906 SHA512 ec9159c0cb62b0901c30601a7750309f4474ab26c60a611065a8774ceac3c3f5dcc8f8cc69b7a3fd0f010b22e661c17b9789acd3ca4e224f437c2113edf511e7
diff --git a/net-irc/irssi/irssi-1.0.6.ebuild b/net-irc/irssi/irssi-1.0.6.ebuild
index c5a15c5fa8af..4af3e254a763 100644
--- a/net-irc/irssi/irssi-1.0.6.ebuild
+++ b/net-irc/irssi/irssi-1.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+perl selinux socks5 +proxy libressl"
 
 CDEPEND="
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 9067f29672f8..56a8cb6bebe8 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -13,5 +13,5 @@ DIST znc-1.6.3.tar.gz 1464200 BLAKE2B 7ea0aeea29133308772df91f5a43748acbfa5998a6
 DIST znc-1.6.5.tar.gz 1470681 BLAKE2B 9de0b211280489423bc2894d0e76d7276aa42428d07d64516372a9ca6d1616db1f27c0142b54160c61cbee89d65ceadf941d001319254dbff9eb5b016988482e SHA512 d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626
 EBUILD znc-1.6.3-r1.ebuild 3385 BLAKE2B 41a388617dd5a8a00028491cec893631c57a027e192032f632ba9f8523ba8c54904abc6b9b63c48345457dbf62d0b1a2206f348b116e351daccb28b27a9f86ba SHA512 e5e74f8903c17f83c7d1380a8e8abb94e62ded858c01b8ad47a464f4273688bb26f8f5a38e428e9c8e984492fa1b6cd7f6281de99c0690ea0d96fb3a1ddbc2da
 EBUILD znc-1.6.5.ebuild 3473 BLAKE2B 621f5dee4eddcd369a6d99bbd8d26398e6464b2c377a7b9fe2d89db41e5fbf2fbd640c13a1292bc1e12b4119736ac6933643ea6d7be03cdb4dc32db4a4594997 SHA512 5360728c9eed15ecf686128fc9553627615dbb8b5db1662a39fc0d7da4587cb4980b617de2660efa5b0bdfe7cdbcd7e0defccc7359c4f27b4be0dd82d8cf3672
-EBUILD znc-9999.ebuild 4489 BLAKE2B 7711be7dd0309ffcde715252b00e39aa58c20fe03845bd53a10ababdce87b6ff0fbf0c2a6f4024dd2832ce029e0ef4223925ce1e19caef25825afc99acd88cd2 SHA512 e547df881db641029a2763020ee9a58c78ffd7f2608fd7d45f98787de058c7742f3889ebd4e2a62e1d89cd811e70e4516418237c8db43a03cb2f71e357db4797
+EBUILD znc-9999.ebuild 4235 BLAKE2B 98a1f0d9b72b054fe0f45ebaa07260bc1e06498c2e12500ec1ddd460f7f81d781ca4f7171e23f91d199a6c4ab1932057132e294f54076b0d70f4c02a19d1f728 SHA512 6d777a2a8ad2ed5010a41e5095656795e293d9e112f5336f46fe744c6eb93e0ff8c5b55cb17c7bb28c5c17623389829e6eeff45691ad6f9452f8f253e5016249
 MISC metadata.xml 757 BLAKE2B bbc8339f0d871c55ce85cee29b4217ec41dc56c835d1d332feecb98ff08f9297a9290ee9f217715832454a041bd372277ee6b7659d43d2ada9f778a29c32737d SHA512 fd055b958ea544d901a15bdf9f8af9ab437896f97d7fa76f84cb6eebfdf7b1de2e8f13d85757d8d4c7098fd6f2102b505084a8beb58156258aaa73367c479eaf
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index bfe3e235cf9a..de34be1322ea 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -4,9 +4,8 @@
 EAPI=6
 
 PYTHON_COMPAT=( python3_{4,5,6} )
-PLOCALES="de ru"
 
-inherit cmake-utils l10n python-single-r1 readme.gentoo-r1 systemd user
+inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
 
 GTEST_VER="1.8.0"
 GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
@@ -66,14 +65,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	l10n_find_plocales_changes "${S}/src/po" "${PN}." '.po'
-
-	remove_locale() {
-		# Some language/module pairs can be missing
-		rm -f src/po/${PN}.${1}.po modules/po/*.${1}.po || die
-	}
-	l10n_for_each_disabled_locale_do remove_locale
-
 	# Let SWIG rebuild modperl/modpython to make user patching easier.
 	if [[ ${PV} != *9999* ]]; then
 		rm modules/modperl/generated.tar.gz || die