gentoo resync : 16.01.2018

7 files changed, 4 insertions, 135 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 661f706fc16d..7ec41e26af51 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 8b71763e2e8b..c80c11dc0d80 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -3,6 +3,6 @@ AUX hexchat-2.12.4-configure.ac.patch 9671 BLAKE2B 0e1391f6a07759167cc64829e8218
 AUX hexchat-2.12.4-libressl.patch 1040 BLAKE2B ee063f1ce4ea2d355959df5ec3b0271e66f4db0fd65645a72a6705bd8480f8e7b403b82d9c6eeb810e356e74c5a1d9903abc9f09a95a1de292fd045eb217758f SHA512 a309ce5e0bb25aa6c88c62bb5a5e1758e49d431cd51ef8186f29ac3c09af544ff75fd043ef8d9217c2779fb1c76fa27d392d9f7e9165a5772e401345bddce1ca
 DIST hexchat-2.12.4.tar.xz 1451468 BLAKE2B 91db1486b421f9707f9dddfe8aba812aa283d5e3cc3c12815faa7e515d00b803bde0bbf30e1ca5c0b69fe954dd30a6f69e5094dabe1dc641ae4f0742ad1965b4 SHA512 48d30c23973a19efc7a8e6d00a3e9675e8556a6fa9da046175b3d87bdab0bebbc6caf58970d654e270421d0d49c2cd9f498b425b7e3a49dd81670dc4825fca40
 EBUILD hexchat-2.12.4-r1.ebuild 3609 BLAKE2B f1d3828bb8e4a9c1315fe2ad0e4abd2e3da682ee95882ccbfb5bbe546df994208750a8d628b55198d281678a61da583a938423561145a10a1cf08d622877befb SHA512 84c8fb88e9cfe25ac42f255c5fd1dd73d096ebb6e1f50ccd0bcff394b5c3f90791cf2d8841ae1ae2192422f0658d0825c01cee8a83a8583c590ddafaa6365c87
-EBUILD hexchat-2.12.4-r2.ebuild 3404 BLAKE2B b619f9673dfcb2c0e2d6ba6c0526dded71149e620d58bee14f0f9838f73b40c2818fbfcbdf860dd268a5603f2af36caa03664dc3fd26159d62e0cb45b100b94d SHA512 92c224e7c90640a7eee2400454243c9e611b30f28bb215b73d3f7880f30db5798f1f7ccb4ddf701dfa11cc959abd542d55c22f9149ae5bab8a08d6f9cb84acdf
-EBUILD hexchat-9999.ebuild 3469 BLAKE2B 91cedae7220e6e47932381c7160601bc10bfeecb7d21fcbf653f5959ef82906c7dd0850c841185864f4bc608716e465a182357c7c35c87bc61a7325327b1bc9e SHA512 bb51a41dbcf9a57a5d4d4e2a7c39810861c5771f156560fd63767912237efbd5871b2701c8174c27626696b4260e31f1f6c38e941f4390fc811f6a7e6b93f1ea
+EBUILD hexchat-2.12.4-r2.ebuild 3408 BLAKE2B ecaf76967360e6720de5018b2a8b8d354db06ead38bda2559871a87e15d2afa945580c226fafd32cc39c8ec3743d2eae972dbdecb7e5ea98e5a9a7f1de51e61b SHA512 9c93c3e0d39d911af72af03d9156b1f13dec40e22881ed8913db3b276ed3888472cfca59c0ec51ba779b58fecb49bf7c84f3e936a8dd1cc3e31257aa5ef9281e
+EBUILD hexchat-9999.ebuild 3473 BLAKE2B d582398297c3c26a61af331c33135b48583abd73ceea12e265a92d25d4f930f2b8365253aa74e3f65041adbeddc7da4f8c0df352e8fef60b419d9978eae39a13 SHA512 1d236912762d9543bce6e8faadcbb4e1e55a8568a5c6b3a82ba9ba40e5a9ad27e8c27dab5d5eb608ff7120686a16f7f446d149c495125251160348164ca93bdf
 MISC metadata.xml 1389 BLAKE2B 5a6e0276fb775a6b829411761601102e42b250a4ea4a3a2afff3f89fd87b4adffda374d1534fc632463caf5a5834686a792114e8980dcee7d7839e1c6ef60c58 SHA512 64ce08c2a4a3a786276bbadbb0a59be1e365bc72cacd42a18ee1e64ce546c4c55f4fb4f2c11dd3425a26c9654880f8b0254667456974270bc8c37d85d50f5c36
diff --git a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild b/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
index 842eac30186a..1311a5c72562 100644
--- a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
+++ b/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit autotools fdo-mime flag-o-matic gnome2-utils python-single-r1
 
 DESCRIPTION="Graphical IRC client based on XChat"
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index de60cb5fd53b..2e5d52c8be2c 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit autotools fdo-mime gnome2-utils mono-env python-single-r1
 
 DESCRIPTION="Graphical IRC client based on XChat"
diff --git a/net-irc/shadowircd/Manifest b/net-irc/shadowircd/Manifest
index 9d138e9b3b66..86201fea3870 100644
--- a/net-irc/shadowircd/Manifest
+++ b/net-irc/shadowircd/Manifest
@@ -1,8 +1,6 @@
 AUX format-security.patch 14907 BLAKE2B ce52db28f71c7fe8cd94b8a3106c5672858bb94ad540b9ffb1d6e16f73c2241a4f2d8531ce1ac69bc743e0bc46cccb2d8c02ffc691ae2e304d8ba62e48733ff3 SHA512 1f258c683f49d053aed52a30e9d77ce1aeda39d4376332a8e2caa8247f3d9b476accf5847ce5c04e7ae322bf88bcb40d0849de40d4f1d270cde7df6b5609c8a0
 AUX shadowircd.confd 196 BLAKE2B 3f11d928ed529a4129f862178b4b24eaa973effb9e52ecf58c3b8a9eec3d86b259181e34073e61e9d45b81a2e99143f083f655ff89af5b4d7fe267ee9d74de1a SHA512 64ffcf4f2d90009e2d085f920f00de20812344c1cf03f1f3c128176f16e1dc7dcba70ea2193e5ac97775fc95a4fc6d2413826d0f29f58d077a50e4eccfc6f267
-AUX shadowircd.initd 857 BLAKE2B a7683d331ab526e86901d3a7255d5e67c9d23500263adb303e9eaec24215bc33e647af61004b87929c5ef7aae1689055c7c3db4647ccf2e44d0b83b632785e20 SHA512 7e9d8b8d7eea5e6ff8474b862e0b07aec426b96268b41fc294bb97f26609eda2518b65e285cbef80876b111ab94dd8d7c80a52ca9425cc7f9385516a3f4bd74b
 AUX shadowircd.initd-r1 595 BLAKE2B b19c47e817a35a8c48c53cfbbd07d4851efd61af67e5f5f6fd3389cf4e4b633ddbb8c8a24d42610ccf8f4a19607374915c5b091f2854904c13f2b3a8b593f5dd SHA512 d8c168c7fbe60ec0d90e780158a66a4b1f1a916a6e24a40ea834b43f7e9f6d153607a565e79de51b0b7b39e0750124cf41ac49f50bcfc3ce5ebecf0d73a59342
 DIST shadowircd-6.3.3.tar.gz 1980432 BLAKE2B d9f443011668bf407624cb5da2a9f8396861e4c4c7e587bae35d7ac3bd9513a109865e56fd92efc1d022d773c10a36ba95cc2f1f763e06b74f46e300cb142b5a SHA512 f3638bee6d49c56738cf05dd7c67d93344ed5787eb8777589390dbc38a1481e9a28895bdd4534124dcc8dbe247f3e28e299fe0bc0bb89e4d974b4aff734701d4
 EBUILD shadowircd-6.3.3-r1.ebuild 2381 BLAKE2B a21bd763aff33ceb8a4a4a46f6b3a40b00b4776c7c6957c669c1f83fb349d5d7046f8f833ca7ab5820073360636ca051071434ec93bcadfdb1c90c1792476194 SHA512 a3ff4f0cfe0d78d0a3f3ac8dabfe8acd1e538590801c9d91a92d6eaabb30a41b81ff5c802cab1724abdcac17441837ded029ea3674253a61c3d49d3c459ff183
-EBUILD shadowircd-6.3.3.ebuild 2340 BLAKE2B b08f8886cfd9bee53be850be500a82212f63c8b1a5b0d96d0ee6a61820866aacd9009d0cf76df6703cf7438e7fb3c1953d89d5e15e331519ce9e4ee82ac50426 SHA512 16f3f9028bf9847d551e73f37b01e5b98ca63d82ad5e16cb3d77a1d4edc81f9ef863e1c10199a046a148bff865e107077b4420787f6c5dbd3795d26b004759a8
 MISC metadata.xml 320 BLAKE2B 50a60d79612a4a7d5c95b2fa371fa3e95cb409c23edb61fb910046bbc0e491ec5eb6470ce274c797a21ad3659a763994755109c7eb64c4999c04bc76d67a613a SHA512 6af904bec4c184c6f358b23ec08426cd5b0c1e670e559e21160b42fb5a9d3ab80f48974769cf38495df33bd7d8926bf1e46f8a3ace3124588b306f299997b5fd
diff --git a/net-irc/shadowircd/files/shadowircd.initd b/net-irc/shadowircd/files/shadowircd.initd
deleted file mode 100644
index 5b01c2366de7..000000000000
--- a/net-irc/shadowircd/files/shadowircd.initd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-depend() {
-	use dns net
-	provide ircd
-}
-
-start() {
-	if ! [ -d /var/run/shadowircd ]; then
-		ebegin "Creating /var/run/shadowircd for ${SVCNAME}"
-		mkdir /var/run/shadowircd \
-			&& chown :shadowircd /var/run/shadowircd \
-			&& chmod 770 /var/run/shadowircd
-		eend $?
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/bin/shadowircd-ircd \
-		--user shadowircd --pidfile /var/run/shadowircd/ircd.pid \
-		${SHADOWIRCD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile /var/run/shadowircd/ircd.pid
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile /var/run/shadowircd/ircd.pid
-	eend $?
-}
diff --git a/net-irc/shadowircd/shadowircd-6.3.3.ebuild b/net-irc/shadowircd/shadowircd-6.3.3.ebuild
deleted file mode 100644
index 422e14379dd0..000000000000
--- a/net-irc/shadowircd/shadowircd-6.3.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib user
-
-DESCRIPTION="An IRCd based on charybdis that adds several useful features"
-HOMEPAGE="http://shadowircd.net"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug +ipv6 largenet ssl zlib"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-
-S="${WORKDIR}/${PN}-${P}"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${EPREFIX}"/usr ${PN}
-}
-
-src_prepare() {
-	# Fill the example configuration file with proper paths.
-	sed -i \
-		-e "s:path =.*modules:path = \"$(get_libdir)/${PN}/modules:g" \
-		-e "s:etc/:../etc/${PN}/:g" \
-		-e "s:logs/:../var/log/shadowircd/:g" \
-		-e "s:test\.\(cert\|key\):ssl.\1:g" \
-		doc/example.conf \
-		doc/reference.conf \
-		|| die
-}
-
-src_configure() {
-	econf \
-		ac_cv_prog_cc_g=no \
-		--disable-gnutls \
-		$(use_enable debug assert soft) \
-		$(use_enable debug iodebug) \
-		$(use_enable ipv6) \
-		$(use_enable !largenet small-net) \
-		$(use_enable ssl openssl) \
-		$(use_enable zlib) \
-		--with-program-prefix=shadowircd- \
-		\
-		--enable-fhs-paths \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--libdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN} \
-		--with-logdir="${EPREFIX}"/var/log/${PN} \
-		--with-moduledir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
-		--with-rundir="${EPREFIX}"/var/run
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	insinto etc/${PN}
-	newins doc/reference.conf ircd.conf
-
-	keepdir var/{lib,log}/${PN}
-
-	# Ensure that if `make install' created /var/run/${PN}, we still
-	# force the initscript to create that directory.
-	rm -rf "${D}"/var/run || die
-
-	# shadowircd needs writing to its state (bandb) and log directories
-	fowners :shadowircd /var/{lib,log}/${PN}
-	fperms 770 /var/{lib,log}/${PN}
-
-	# ensure that shadowircd can access but not modify its configuration
-	# while protecting it from others
-	fowners :shadowircd /etc/${PN}{,/ircd.conf}
-	fperms 750 /etc/${PN}
-	fperms 640 /etc/${PN}/ircd.conf
-}
-
-pkg_postinst() {
-	elog "All of the shadowircd binaries in PATH have been prefixed with"
-	elog "'shadowircd-' to prevent file collisions."
-}