gentoo resync : 19.04.2018

11 files changed, 9 insertions, 60 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index e3b7979af4f9..a75f7032e5fc 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/dccserver/Manifest b/net-irc/dccserver/Manifest
index 7574a49b16a6..9877f551bd7f 100644
--- a/net-irc/dccserver/Manifest
+++ b/net-irc/dccserver/Manifest
@@ -1,4 +1,3 @@
 DIST dccserver-0.5.tar.gz 139083 BLAKE2B cdb81051b65f79b6923b0b8cee5360f76395bd1a0d5d5b250a65a4ec12f3440f5e4c0f8c2020263c18265c03bd155563528bed3d80b9af6b468940cadcbbd70e SHA512 0fb2584dc4bee930fa259862206ba875cf0c7a8257799c3fe85d470de6827eab0b304b0e07b8692268fd1a63a82249204c447df92bed0dd994c78ec295040494
-EBUILD dccserver-0.5-r1.ebuild 333 BLAKE2B 2ff141d6deee890e544cf9ad5bb89b553494c512f83c7578ad339ddac9f1e79d6bf64844011f005823da87e49754bb0d63c809751d7384e11b2af2f5f97100e1 SHA512 c27208d29edccac210f49f4df071dba6f9b7c8a7576f48eb8c263c0827c8ad99e6d1e0e8327e619cb4f9fd9720a6531e773f1d8cc918e35c759ae96ee4b9361f
-EBUILD dccserver-0.5.ebuild 416 BLAKE2B 893efb2ea384c20bb8ad00187c0a179bd4d2446910cb9124c2470d7f89f26f55745620c694acee121a74b010bd5a1964fb1d6ca71e486ec3f5f29dc9b968c12b SHA512 7a8210e0fd3ba8d087cb27d82139bed7551cb263d0d2fc1dea1723c6fd0d6388e5e3712830f631934acfc0394a8dd838f64c646b9edb47fc56da161235a2a58a
+EBUILD dccserver-0.5-r1.ebuild 332 BLAKE2B 222b70c43a1ca5842bc4e91ef2f68e2a77b638cf6eb20e60bc692d5cb5219d3c25c969a7ab143c0164efbfbde2257af3af6536e9bd920ec8417f19df186ab960 SHA512 271c1cbf983420f66aec889778f59bba3aba1ffe7c1939ed18220da83fc6e9f67d8ccd36dae573706cb549a57d75be0d709fbbf1f024f7cac43ca548cbab550a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/dccserver/dccserver-0.5-r1.ebuild b/net-irc/dccserver/dccserver-0.5-r1.ebuild
index 866226b755bb..24b574915767 100644
--- a/net-irc/dccserver/dccserver-0.5-r1.ebuild
+++ b/net-irc/dccserver/dccserver-0.5-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.nih.at/dccserver/"
 SRC_URI="${HOMEPAGE}${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-irc/dccserver/dccserver-0.5.ebuild b/net-irc/dccserver/dccserver-0.5.ebuild
deleted file mode 100644
index 87d638825bf9..000000000000
--- a/net-irc/dccserver/dccserver-0.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="linux implementation of the mirc dccserver command"
-SRC_URI="http://www.nih.at/dccserver/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-HOMEPAGE="http://www.nih.at/dccserver/"
-
-DEPEND=""
-
-src_install() {
-	einstall || die "einstall failed"
-	dodoc AUTHORS NEWS THANKS TODO
-}
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 1ae656272b24..0ebac7edf44f 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -7,5 +7,5 @@ AUX inspircd.confd 1343 BLAKE2B d2ecb9509e9be700894bb2c9c85d8f68aed7b082f6b32beb
 DIST inspircd-2.0.23.tar.gz 731695 BLAKE2B 58cd38af6244926f620a7e65b14d44062cc5aacb3aed394b736062f9f5ac0c2b689f8967e2e9577570766547bf8f694e1762bab71114dda9414e05ba8e01bfd2 SHA512 93a3dab04e797cfde158de8c2e959d1bb5df115aa3fe5a4066cdf9f56cb0c548fd2664a12d61bf2dbdb45549577974be99a0d6ffc6114c72cf0697f5ca4f85bb
 DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
 EBUILD inspircd-2.0.23.ebuild 2881 BLAKE2B 27bcd6028bcfbf5f0cf8889669b53fb4d0197c8d0fe366497a413f49c73d8fbf6ff930c1e499c3bb0980ba4ba7a29eb2b746dc50b1df3fba8955412f50444250 SHA512 bfa28ed4e8cf27389745b8b0582d76c2265350b2e6f980a40b65a914e5429d9e1bc4c2d88094c36834d86b9dea3479e2be91a554be43f7d51ba9ac4841fd51cb
-EBUILD inspircd-2.0.25.ebuild 3371 BLAKE2B d7cead1140a468d77ce4005901859a4666549599430bccd0537a953b42802e219705a70fc8d5a516dc39ae5bf9e85bc1024face5ce781ae6e44113ea6612ac41 SHA512 e0518097ccb0a8803d235e14128126a50ede0dcfe94e07141c029667b419033286cb95a6a1927f191bc6e66def41685b34d814a5fc74b1bd582e3f583f3b90fa
+EBUILD inspircd-2.0.25.ebuild 3370 BLAKE2B a9bb1b3d1ce28b6f52c7d0c07000cae99701d1051eb9437afb3081bfb7a3c624d9c02e55b277e1c49c02d9de0e329099e69d988c443c146350e2b7a9fa9b63f6 SHA512 72894f44b251c9b1dbb8064a2293993d2650cb2e62fe5149f887a4de8cf7526b8ad6f40c0f07995e82db8f2d6962a894b95e5791f119975887f901dd6dc62f16
 MISC metadata.xml 1674 BLAKE2B 4d00f675f380e0bd75adca0eabbf455cdb27dab9a5c8cb170abc670909d647cf5dda0a2f3fbfd9b9cad2ce210cad3ea5d2fa07683d236f6f437be6d6d8be7c40 SHA512 ae6a96d1093024c9796788dea7fb23c8d2bb51ddea56eeb041e2443db2730f7f38cdb5fde42911ba75dd0cdfc4eac2c9c424f87660361d65cac6766729a60d98
diff --git a/net-irc/inspircd/inspircd-2.0.25.ebuild b/net-irc/inspircd/inspircd-2.0.25.ebuild
index d3c92bdafc33..376956d4da65 100644
--- a/net-irc/inspircd/inspircd-2.0.25.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
 
 RDEPEND="
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index e8cb82ea08ee..566c2b83a4d0 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -7,7 +7,7 @@ DIST irssi-1.1.1.tar.xz 1080992 BLAKE2B a7f7f2004958d9b71d0bba3dea2ee09ebd7f9924
 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 1248 BLAKE2B c694a02939c61515d55cbcc08f192a593abe3df663dd108e169c68cc9430ab6a0e1148bd23f665fa9a3d085bc113a45faeb2f6847946c85b19f124202ad36655 SHA512 c06b8f15c5cb553cb70e4f305f5acd1359fa31fe0fd87cb63d35c1206035f2b44aec7aab745439bf245800c921850246332a143e559b800f24c035439eaf8a9d
-EBUILD irssi-1.0.7.ebuild 1250 BLAKE2B 9db2438083f466c8e6f98a9753bbd1e3521e7a6e823ce2b492b9ec6422d14155efc2ed574532f440c574ac8f241a36d00a463a668eba9ae0ed0864e51f4b1d84 SHA512 1d41a850b4983bb4cfa79fd5d62be3f5d2fda568b886ab6473ae52c33cb570249393309f6029d6ecbd920ab92381472ba629d05662f5f37a6c283f0e561133a7
+EBUILD irssi-1.0.7.ebuild 1249 BLAKE2B d7a66af35ca6c046584391bd8cf81181a696196de9d69ac6b2b1bcb130e6306d1d34bd541cfc068f7ef9bb535247013dd394edd9b5a2d9cc77b51c7e97f18777 SHA512 9242a17f15784ceeb2296f77a7577a1c70f8ca73ffe79d16ea419548a2caed72a0d6e3dbd5a153f17ebfdc7a34c99c059ba7d4154fac4c65a880d2dd2a418bc5
 EBUILD irssi-1.1.0.ebuild 1256 BLAKE2B 443e8c17a0656108d92f747a6957c5592066a3de21ac7e1684b5f523b569828f37df772662986ca195c0a042c15aa75d9bfab62b96272371ffc295776f5a0422 SHA512 7248fcf3cf33a9603c1148fea6d97e2116b9a5f8de4f169978d933021590def7fd782f5f93014a419e31f19c92efecc046a718a64fbd729ea20ad8db7a713da2
 EBUILD irssi-1.1.1.ebuild 1256 BLAKE2B 443e8c17a0656108d92f747a6957c5592066a3de21ac7e1684b5f523b569828f37df772662986ca195c0a042c15aa75d9bfab62b96272371ffc295776f5a0422 SHA512 7248fcf3cf33a9603c1148fea6d97e2116b9a5f8de4f169978d933021590def7fd782f5f93014a419e31f19c92efecc046a718a64fbd729ea20ad8db7a713da2
 EBUILD irssi-9999.ebuild 1202 BLAKE2B 6fdefbaa5021802fc8326b0a633c3ad666f226070972a34936dc02f26f8cb68eb6036ee7e94b2940c6952e49cd2d151c590aa1badbef35e1817df2fceb7996c9 SHA512 fc9126562591b6df88a71b2c3beb4d99a91f62f65f3df46da2808b63eee490f988291b6271de857ea430fcc3c4e1cedb9bc1e00248877bc22d5414f408943954
diff --git a/net-irc/irssi/irssi-1.0.7.ebuild b/net-irc/irssi/irssi-1.0.7.ebuild
index 25c0b72d3f4f..7afaed251d76 100644
--- a/net-irc/irssi/irssi-1.0.7.ebuild
+++ b/net-irc/irssi/irssi-1.0.7.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/muh/Manifest b/net-irc/muh/Manifest
index f5f555805398..828b6a5d0910 100644
--- a/net-irc/muh/Manifest
+++ b/net-irc/muh/Manifest
@@ -1,4 +1,3 @@
 DIST muh-2.2a.tar.gz 130672 BLAKE2B dd1f925539e7656822c8d66b35ea84ccbf23278e78c5c5d692400a192bb2d93197ad4205169c76de5386dc2fd1bdd191e3979082766af5d759f79c9ceaa44536 SHA512 2e3ba080f420cf063627d4d9b1f4001c76575efb1d3e99ff9c5eee4a483d5beda6e326f0c0d60c3d848b78cac092aac51a98cabc351760ccfa38fe1549c4b4ee
-EBUILD muh-2.2a-r1.ebuild 740 BLAKE2B d5c6cdbe0ee2aeeac8af478ba989b2c910e19f830f53eb51d303fae8b9fe8e66b8c924c1f8204af9324ebfeafb9a99fd035a81ca75185440d0c55147a3e79b43 SHA512 972565afbf17e8e13ccf273de2a29325b0ce62417af0510162ef4c3b15c59ca3c649bcf5b6d7139dbb0e36915e9bae2640a6f588edd0827c70ea5a1b43efad7c
-EBUILD muh-2.2a.ebuild 790 BLAKE2B 7ae8896176a7551ba12bd65cf66ab7b82720894a6f6fc417d0ff0f2c8feb46078e896d1f285ef0f6e3d2adebcd326c6e292843c257b4498601fb7d80c15bd34c SHA512 0e8fbacf05c2fe058d0cf6b484eba62fe3e1d29bb53ad18e4085f36f00bc5551d706a0b2194d8ef3753a0f887e0786a4b73c479731428aba87cc66398fb01aee
+EBUILD muh-2.2a-r1.ebuild 739 BLAKE2B 02a84da5365962c489fa9750c9b3f9944fe7faeb472740be38a669a170ac1f63e28938d727d5bbe74fdbde52c14df04141ae7071f29451df3fbabe0186e75ef7 SHA512 2ad4b4a3b54dccface1457044493868b21d36c3641ea3a77d5d1d1705cce0957da2dd888c18c715b2ce3b9c79f0568cb0017284686c04afcc7fc74c1aca2d6dd
 MISC metadata.xml 312 BLAKE2B 6f854a035f538341f9196db3df9589460e24ba234ae497d0376e719b86a9f3566a775ebdf8f172c4a742616a2bc2dd13624fe80498351cf7dc892e040529882d SHA512 2f77f253666a974f580a98a89580870394b7e97488a21dbc80a0607842eff9c534ac061f9a66f8d8cbf576a7e0c366e0e307f35363fbe1c8b064590d02a4ec9c
diff --git a/net-irc/muh/muh-2.2a-r1.ebuild b/net-irc/muh/muh-2.2a-r1.ebuild
index cb57115efd24..a640b84e78d2 100644
--- a/net-irc/muh/muh-2.2a-r1.ebuild
+++ b/net-irc/muh/muh-2.2a-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~mips ~ppc ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86"
 IUSE="ipv6"
 
 RDEPEND=""
diff --git a/net-irc/muh/muh-2.2a.ebuild b/net-irc/muh/muh-2.2a.ebuild
deleted file mode 100644
index 8e6aff1cf710..000000000000
--- a/net-irc/muh/muh-2.2a.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Persistent IRC bouncer"
-HOMEPAGE="http://mind.riot.org/muh/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ~mips ppc ~sparc x86"
-IUSE="ipv6"
-
-DEPEND=""
-
-src_compile() {
-	econf --datadir=/usr/share/muh $(use_enable ipv6) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog TODO
-}
-
-pkg_postinst() {
-	elog
-	elog "You'll need to configure muh before running it."
-	elog "Put your config in ~/.muh/muhrc"
-	elog "A sample config is /usr/share/muh/muhrc"
-	elog "For more information, see the documentation."
-	elog
-}