gentoo resync : 25.01.2018

7 files changed, 15 insertions, 199 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 9547e908ff85..2a64ad34d3ee 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index 37239e32de26..ccb0fe977fed 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -5,5 +5,5 @@ AUX epic5-1.1.10-without-localdir.patch 1780 BLAKE2B 97b29e5c3efd4f9048db52f501a
 AUX epic5-1.1.2-libarchive-automagic.patch 1707 BLAKE2B 94eb0be15058b7ce86fe6500337477729ab2b4ab792d8c100c941c1fd9ff8ff96982616c539ae41bda111b08c1792478e4f47e2ec44e6e84d800e5b5d3ee7fd9 SHA512 6f438cc70982538e09d9a0eef7e2c42c331aa73c279157d4bd44b48c6aea26b08b9433927a51fef025acf22bfeec330c4c99946538eae5dca50360963e5f828c
 AUX epic5-1.1.2-perl-automagic-as-needed.patch 3123 BLAKE2B b104b7ab792010e0113e8f4ef378a53dac2f64182e7045866e3d57176427a735ded0b3a3b7975fab892dfa77692589e7324c927206dfb7a636d7f9ad69950f90 SHA512 bd58fa5b49b0b9c900612d1183d696e6683113420f79702df0706a3bd3885bc6215a178a11ca9dff8c9337314cf72488b85217d731b162dea95f4c8e22d50a6c
 DIST epic5-1.1.10.tar.bz2 851439 BLAKE2B 13cf0f78ed2009595479fac8173b2936cf74382ec22964e00de2d84fd89c6cee661e4ea9e3d8ba44ec715ac7e861f4639b3459d3ac2d67c74cc49ad4aeebf127 SHA512 d0215570962253a0d5c60dacec86db1094575b0765db039247cf16b5957ba721576618ff73588610ba528782f4460fd4bbe5a1869e60e2c10d832d41ea3c6048
-EBUILD epic5-1.1.10-r1.ebuild 2218 BLAKE2B 40657072c79eba74198882f83e6054c11466bbc7992e23349aee2969659053ff478fd7b66d75c1e2f424273af0a3861036885c7383d908fe1f2b042433131e3e SHA512 2e16408ba7ee0246f7b6ad7389675208cd6d25ff94dfb8454a467e6572e57c5e17a78c27d5b07cb174423ddc4253106e223b06f6a257060f119f4dc2c00a26f3
+EBUILD epic5-1.1.10-r1.ebuild 2211 BLAKE2B 66eadd474ad71e72267844f1cec015b4fd12ce811d55262df74b7624b0f36fbc9151f4e1674146afaa47a4ef8b95a4a88b2557b2cacabfac96de8a88630d6bd2 SHA512 16c5a47784f0d8ed534b8f269f693497be01079b3b6a8fa563f36116f3aea65f3af829af938db002775aa59613e09281cc1b4071710065d4a8fe721c000ad6d4
 MISC metadata.xml 447 BLAKE2B f5ff4e910d6fd13784c843496888c28eac53df6973350b2839f581f07740f4a8cf03ea71d53e5ed11d5531d6512abb9a4727843094870c7ce5fae5dd90ccf38f SHA512 a3f99db42705f69febe961e85d76a3c4686918e253fc1c979941daa135ae65d920ad5127a4ea6ad9a8628df405ef937731168eb47b7a69fb92131d4ce703947a
diff --git a/net-irc/epic5/epic5-1.1.10-r1.ebuild b/net-irc/epic5/epic5-1.1.10-r1.ebuild
index b10edb0ea041..97036b79137d 100644
--- a/net-irc/epic5/epic5-1.1.10-r1.ebuild
+++ b/net-irc/epic5/epic5-1.1.10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby22 ruby23"
 RUBY_OPTIONAL=yes
 inherit autotools eutils multilib ruby-ng toolchain-funcs
 
diff --git a/net-irc/iroffer-dinoex/Manifest b/net-irc/iroffer-dinoex/Manifest
index 36c23eb44ab1..1c1acb97451e 100644
--- a/net-irc/iroffer-dinoex/Manifest
+++ b/net-irc/iroffer-dinoex/Manifest
@@ -6,5 +6,5 @@ AUX iroffer-dinoex.logrotate 173 BLAKE2B 855d14769a53f81135a2de494b90eeadbe487a9
 DIST iroffer-dinoex-3.29.tar.gz 537027 BLAKE2B f6dddd60b5e4e837cfb56c450ee32249607375a386f9215a9a4eb34e7696c066b6c817ae956c044bbc208f69a73967df5aee9835b2a94ca70a849045ff11f37d SHA512 bac4feaa0db11de3faed0beb7302cb090d3a6629a6c299bd1b4ee136bce7290f1a9fa998aab909f1fafe54f5577bed90f487d4b2592521a87d5d9ae7512eecb0
 DIST iroffer-dinoex-3.30.tar.gz 541131 BLAKE2B ea61113dffcd14b162153aa03c55a203d8ccd99e8f81de53a9ab8543bd91e948509281f753a8f332445eec102b6bd2b51972ff8bedb8b574b55b9325f6969269 SHA512 e45dc3dd901cbb73a9d59cd5a672834c7b6527864eb3385121856af562680a0f91e8846e8690fc60a6349dc4c4fc1cf190d3ac01813c6c045ef18147d61b7d4d
 EBUILD iroffer-dinoex-3.29.ebuild 2646 BLAKE2B b3db2502ebb186836894b1c8bf2083792623c0f6d2009241e432bb33ac0fc3716e684e44dcd4a7c9012989576d9667a14e4ef3631142a65a79af6bd5d602d76f SHA512 d47ffa947ae63147ce8939ce99f63114f9593b32f23d3a34d0ba3567bee14bb3d2ebcd14ae608fc0c841cc88d38abe7c2e57a06a54da0fbb3befd38af32b859e
-EBUILD iroffer-dinoex-3.30.ebuild 2654 BLAKE2B 0d00c4f5ef9339ffb88729313ed2c2522ae06c56e74cc9e0962f793e0a32c21223064e4f5ed4d8c8b5469cef67632cf19171c9e8f3adcc43269867d05131bbe7 SHA512 5101cf63561a1b87763568f94d06efd192e25ca4176d2a8ef31774f796f9c4f092b321c3d8f31bfa671c69bc98fccd15e750c0fe361f025ed4a8cc179f1184ad
+EBUILD iroffer-dinoex-3.30-r1.ebuild 2656 BLAKE2B 3dcc55257208076808e114ec96afd7ad9f9c73c63096977c84cb1e0ea012a59e4ef3d74c87c1445b2993e65d3c7607fcf297315d22dce1ca0012e803173b7b05 SHA512 de3d95e51e24b78d3a948d8a8187dc47cc2772304ef7df0638cbcb584e02333657955816d4e0cb7d5827c2acea9e0359f35f76d6338aa3179a8a21c7fd11bd70
 MISC metadata.xml 795 BLAKE2B a6290795083bbd2c847fce5f5fb16c0cdc65f459642dec45f0be9f364a3c2d61579fb96ad0c5ee72c255a02d5ab2f32257ec669cbdaa7304d83830fcfcd083b4 SHA512 9e0690f67c3039e88a122fc149049bbb604958d3f5a4d07fe80b67845a7e8005f79901ade56ab4e55ffab885d3fefb1aac16419b4c56c206479f9e97edf062b3
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild
index f9ffa93b3675..1776b3620bb7 100644
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30.ebuild
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PLOCALES="de en fr it"
 PLOCALE_BACKUP="en"
 
-inherit eutils l10n toolchain-funcs user
+inherit l10n toolchain-funcs user
 
 DESCRIPTION="IRC fileserver using DCC"
 HOMEPAGE="http://iroffer.dinoex.net/"
@@ -31,8 +31,8 @@ RDEPEND="chroot? ( dev-libs/nss )
 	)
 	geoip? ( dev-libs/geoip )
 	gnutls? ( net-libs/gnutls )
-	ruby? ( dev-lang/ruby )
-	ssl? ( !gnutls? ( dev-libs/openssl ) )"
+	ruby? ( dev-lang/ruby:* )
+	ssl? ( !gnutls? ( dev-libs/openssl:0= ) )"
 
 DEPEND="${RDEPEND}"
 
@@ -42,9 +42,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.29-config.patch"\
-	       "${FILESDIR}/${PN}-Werror.patch"
-	epatch_user
+	eapply "${FILESDIR}/${PN}-3.29-config.patch"
+	eapply -p0 "${FILESDIR}/${PN}-Werror.patch"
+
+	eapply_user
+
 	l10n_find_plocales_changes "" 'help-admin-' '.txt'
 }
 
@@ -82,7 +84,7 @@ myloc() {
 	emake DESTDIR="${D}" install-${1}
 
 	dodoc help-admin-${1}.txt
-	use http && dohtml doc/INSTALL-linux-${1}.html
+	use http && dodoc doc/INSTALL-linux-${1}.html
 
 	insinto /etc/${PN}
 	case ${1} in
diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
index 5e52882e86c2..1daca189fda1 100644
--- a/net-irc/rbot/Manifest
+++ b/net-irc/rbot/Manifest
@@ -5,5 +5,4 @@ AUX rbot.init 1459 BLAKE2B 3b58ca09d2073ef01f94ae1980ed9203d4cadc1a9512842e1ce53
 AUX rbot.init2 1345 BLAKE2B 137df6384fde1e3ee9501ce38b31470605bf308827213924033b291f8aa567e90cb8421be6865f4df269aa9b8cc3b20c4b729f3cc4aaaa90959dec39382752ea SHA512 b3d8b83eea4d429a47657f4f9b6cb0aed6c283aa4e7535307305f33bc84c53c0c82e2b76a7cf45ec192c7db68c71e70ee5b000ffbd6f0ff59039de8f69f88dff
 DIST rbot-0.9.15_p20160325.tar.gz 762685 BLAKE2B 68146d241bd57198e0a7a9e5ae033827116bbe31d3bdc05bf42aa644c5dd900254bbe7317461aa553ad92daac299439721a85cd8dd41033cf38b9e97b268e1ee SHA512 b0bc90ee2c6ddb3cdd92cdd5f3a45520d20bc97327b3d694235f7ba94f13ef3c884d4658b083f71bfee2cbeff3cbc7a57c251c4d28bfee293e2556f64e7b4160
 EBUILD rbot-0.9.15_p20160325-r1.ebuild 5325 BLAKE2B 2648782ddb6029ed133b1c1093e9ddd43d1a98c26b8346441e96173da00443617de8f2ad115b62f71fb84cb884c031e5016dafb88c02dd1143b306b40ca446de SHA512 42df0523d058827fcac570f4f6e1790774f42b781f2cee460823c56b717fa7b3540d5b4b388bfa59c1edfa650dcfdba7951ca0fcbeec47bd95da95c1aaa1ea14
-EBUILD rbot-0.9.15_p20160325.ebuild 5021 BLAKE2B 1a8db5a4f0f31cc86032ebb0132448829679ae53f784f86a6e9982e312d3a83066bc18b5c547cd25ac454370817fc0a3240b7a0c17a5046584dd64d4bdb5c8fe SHA512 e2bb206bcc8439fe93474caa8d77b639340c42b77bbc48f425fbc1bdb818d97d726e4f9eda023c7f31963ffaf71a3d1b70e775d4769c1e34a59824327b38f35f
 MISC metadata.xml 2656 BLAKE2B 47090f64bb983dfca142443a0f35ae99fa57927781177255e375e414c61a7555507d0110259f3a9ace86e42fadb237bbb5aecc251371bee9ff8ddaf1d414ea36 SHA512 03c3fc8b4f700eb1039feb5f656f772a55c3b928658e494c542cf69d3325d08b2723e23cfb753afe5ea3bad240011e642a4923e9a84673cba1e06b24cfc60918
diff --git a/net-irc/rbot/rbot-0.9.15_p20160325.ebuild b/net-irc/rbot/rbot-0.9.15_p20160325.ebuild
deleted file mode 100644
index ee7d5458ae7e..000000000000
--- a/net-irc/rbot/rbot-0.9.15_p20160325.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-GITHUB_COMMIT="e358601cc521d8aced941eb928fae2d8c53cf0c2"
-inherit ruby-ng eutils user
-
-DESCRIPTION="A ruby IRC bot"
-HOMEPAGE="http://ruby-rbot.org/"
-SRC_URI="https://github.com/ruby-rbot/rbot/archive/${GITHUB_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( feh GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="spell aspell timezone translator shorturl nls figlet
-	fortune cal host toilet"
-ILINGUAS="zh_CN zh_TW ru nl de fi fr it ja"
-RUBY_S="${PN}-${GITHUB_COMMIT}"
-
-RUBY_PATCHES=( rbot-rakefile-gettext.patch )
-
-RDEPEND+="
-	spell? (
-		aspell? ( app-text/aspell )
-		!aspell? ( app-text/hunspell )
-	)
-	figlet? ( app-misc/figlet )
-	toilet? ( app-misc/toilet )
-	fortune? ( games-misc/fortune-mod )
-	cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) )
-	host? ( net-dns/bind-tools )"
-
-ruby_add_bdepend "
-	nls? (
-		>=dev-ruby/ruby-gettext-2
-		dev-ruby/rake
-	)"
-
-ruby_add_rdepend "
-	dev-ruby/tokyocabinet
-	timezone? ( dev-ruby/tzinfo:* )
-	translator? ( dev-ruby/mechanize )
-	shorturl? ( dev-ruby/shorturl )
-	nls? ( dev-ruby/ruby-gettext >=dev-ruby/locale-2.0.5-r2 )
-"
-
-pkg_setup() {
-	enewuser rbot -1 -1 /var/lib/rbot nobody
-}
-
-all_ruby_prepare() {
-	# Avoid tests that are only compatible with ruby22
-	rm -f test/test_journal.rb || die
-
-	# Fix deprecated code that was removed with ruby22
-	sed -i -e 's/::Config/::RbConfig/' setup.rb || die
-}
-
-all_ruby_compile() {
-	disable_rbot_plugin() {
-		mv "${S}"/data/rbot/plugins/$1.rb{,.disabled}
-	}
-	use_rbot_plugin() {
-		use $1 && return
-		disable_rbot_plugin "$2"
-	}
-	rbot_conf() {
-		echo "$1: $2" >> "${T}"/rbot.conf
-	}
-	use_rbot_conf_path() {
-		use "$1" \
-			&& rbot_conf "$2" "$3" \
-			|| rbot_conf "$2" /bin/false
-	}
-
-	local spell_program="/usr/bin/hunspell -i"
-	if use !spell; then
-		disable_rbot_plugin spell
-		spell_program="/bin/false"
-	elif use aspell; then
-		spell_program="/usr/bin/ispell-aspell"
-	fi
-
-	rbot_conf spell.program "${spell_program}"
-
-	if use !figlet && use !toilet; then
-		disable_rbot_plugin figlet
-	fi
-
-	use_rbot_conf_path figlet figlet.path /usr/bin/figlet
-	use_rbot_conf_path toilet toilet.path /usr/bin/toilet
-
-	use_rbot_plugin timezone time
-	use_rbot_plugin translator translator
-	use_rbot_plugin shorturl shortenurls
-
-	use_rbot_plugin fortune fortune
-	use_rbot_conf_path fortune fortune.path /usr/bin/fortune
-
-	use_rbot_plugin cal cal
-	use_rbot_conf_path cal cal.path /usr/bin/cal
-
-	use_rbot_plugin host host
-	use_rbot_conf_path host host.path /usr/bin/host
-
-	local rbot_datadir="${D}"/usr/share/rbot
-
-	# This is unfortunately pretty manual at the moment, but it's just
-	# to avoid having to run special scripts to package new versions
-	# of rbot. The default if new languages are added that are not
-	# considered for an opt-out here is to install them, so you just
-	# need to add them later.
-	if use nls; then
-		strip-linguas ${ILINGUAS}
-		if [[ -n ${LINGUAS+set} ]]; then
-			# As the the language name used by the rbot data files does
-			# not correspond to the ISO codes we usually use for LINGUAS,
-			# the following list of local varables will work as a
-			# dictionary to get the name used by rbot from the ISO code.
-			local lang_rbot_zh_CN="traditional_chinese"
-			local lang_rbot_ru="russian"
-			local lang_rbot_nl="dutch"
-			local lang_rbot_de="german"
-			local lang_rbot_fi="finnish"
-			local lang_rbot_fr="french"
-			local lang_rbot_it="italian"
-			local lang_rbot_ja="japanese"
-
-			for lang in ${ILINGUAS}; do
-				has ${lang} ${LINGUAS} && continue
-
-				lang_varname="lang_rbot_${lang}"
-				lang_rbot=${!lang_varname}
-
-				rm -r \
-					"${S}"/data/rbot/languages/${lang_rbot}.lang \
-					"${S}"/data/rbot/templates/lart/larts-${lang_rbot} \
-					"${S}"/data/rbot/templates/lart/praises-${lang_rbot} \
-					"${S}"/data/rbot/templates/salut/salut-${lang_rbot} \
-					"${S}"/po/${lang} &>/dev/null
-			done
-		fi
-
-		${RUBY} /usr/bin/rake makemo || die "locale generation failed"
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} setup.rb config --prefix="/usr" \
-		|| die "setup.rb install failed"
-}
-
-each_ruby_test() {
-	pushd test || die
-	${RUBY} -Ilib:. -e "Dir['test_*'].each{|f| require f}" || die
-	popd || die
-}
-
-each_ruby_install() {
-	${RUBY} setup.rb install --prefix="${D}" \
-		|| die "setup.rb install failed"
-}
-
-all_ruby_install() {
-	diropts -o rbot -g nobody -m 0700
-	keepdir /var/lib/rbot
-
-	insinto /etc
-	doins "${T}"/rbot.conf
-
-	newinitd "${FILESDIR}/rbot.init2" rbot
-	newconfd "${FILESDIR}/rbot.conf2" rbot
-}
-
-pkg_postinst() {
-	elog "rbot can be started as a normal service."
-	elog "Check /etc/conf.d/rbot file for more information about this feature."
-	ewarn "DEPRECATION NOTICE:"
-	ewarn "The bdb database backend is deprecated and only available on Ruby 1.8."
-	ewarn "To migrate to the new tokyocabinet-based backend, change the core.db"
-	ewarn "parameter in your bot's conf.yaml to 'tc' and restart rbot."
-	ewarn "This procedure requires a Ruby version supporting both BDB and TC."
-}