gentoo resync : 06.05.2018

27 files changed, 306 insertions, 396 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 0655a74238ff..0cb4ffa81966 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/freeradius-dialupadmin/Manifest b/www-apps/freeradius-dialupadmin/Manifest
deleted file mode 100644
index 9708a1c692be..000000000000
--- a/www-apps/freeradius-dialupadmin/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX freeradius-dialupadmin-1.70.3-sqldebug.patch 370 BLAKE2B fc83947f96ceebfb5f223c45b67d4288890efa0266752411a9c94f81703b1b4cc118e9ad16f12aeed4a3b1e89d4d23fe75ff391c3598ead4cee909c8a8b7e3cc SHA512 41b4902a452bd051e4e4b80b8661154806f276da99b0fa17baee0f9c45927b6abd41815fc19f8a89b481e7855eaf92c1bff3e53c4deaa5b9dc1d00c7626a7297
-AUX freeradius-dialupadmin-1.80-gentoo.patch 1162 BLAKE2B e288fdc7c941e699be545fb2d771bfd8d0c54013d23de9c9beddea0ffff7cf16ace99aa768ecf0228d0079dc2cc49f3f2c189441f06eaabaa252c24dcb5aa49a SHA512 a6b0cc0601ea8365dcad2804d6130e95ef9258c0445b8a7a82583fb93f1b80fb6d8e264387219b891f47ee618ccf7912c6880af1d7bc06335a957324bdc4c36d
-AUX freeradius-dialupadmin-1.80-tmpfile.patch 8171 BLAKE2B d2b2099c7004f1076ce138a5054e01015a3226de48522474bb176488be97ac49fc02510b69180dd4d43856429cf4604d2a4935e3f44ea5b56f4650ba783e5b24 SHA512 5726e15b43ed52cd0f548933bc9c12fbcae8fb15a60e1ef0074bc7c2e4d85475145e4ddba669a84c7330f404e462d174301b11c9596c11e2f957e17fbaf97695
-AUX setrootpath 200 BLAKE2B 290c436983a55a8f77ef83b0897a1a47ddaf21a5f4811059daf000ac7ea793627c94928bdfe34225f8c1522a599323f44e33847bddff1614f11d1a0d14ad13d4 SHA512 efa8c8ca5242f2b51b46ab25876bdf4cc3ca789a706567cad5e6e8889bcc94fff8b6bebfa8e1416d9f7a6ce8c832f37b17261516d79b970619ba024d8be10f38
-DIST freeradius-1.1.6.tar.gz 3175652 BLAKE2B 371b40cd1dcdd4b5bb5a83b0834d5582ad8050b78c8915b5c34a213bf9d85e0b52e80d4479d2a5a494ce62b5eb07d8471f9a4418d0e85cd4917b7c8a084097bf SHA512 437a1705d559849bce3c11216b0b25392668ee96300d455a2ae92b6ca233f0308eca62c06d659f26900509855237f7d17c5eb566b13bbc4cda8999a18da4b8a1
-DIST freeradius-server-2.1.1.tar.gz 3648766 BLAKE2B 25b42bd923499a450ac0fed91276ba816842ab5843c5a9c1d57b5d77891ed1104826fee2eedd68ea60f306f2325cc8081a81e2583b134ebccd725b6053fd72c8 SHA512 68f9abda7f3219ab2be6393021866ac3fda5302aa2cae85877666f3db86a09f293286003815e596cb1dfd67479b6577f7568d412953b7a2d22a7cbdc00c71b88
-EBUILD freeradius-dialupadmin-1.70.3.ebuild 1887 BLAKE2B 7c0e7b7a8ffcb5dce961a22c3adab49bc3425af2fe9e3026008a419d25b8b379fd11176e75fa0e1e5d8a216f105039b574563f57ac187347504f97f6d9663099 SHA512 fa175f2a006b2a1c7b8bf2db1f072dd9ddb4dcb44f23bde913bb9184cc6835876fa1c9ac72d686f388c39909b2100319c562041a9be6f34e470ac740dbb32da1
-EBUILD freeradius-dialupadmin-1.80.ebuild 1960 BLAKE2B 074bcd40e786c54e7da9b2c504f6e114c605825929821d537c42a48a9c0f99df617c43e3a7d736e65f25eb1935fb8c6b3f3a81d14064bb72298ad207873b3471 SHA512 b8e82ef61430f1cb9e73a8f746d6c424b73f3f49fa9f7ddc0a9ac9d9b4c9823e542f3520d34834b6a3188ab7baa4809ee8a7c693e4163a04d0e68bb3798f581c
-MISC metadata.xml 534 BLAKE2B 3a6adfd2ebcf41be1bd7596fcb2b3b053882d9d8dcd5203fa4be5ad841fd1394197f3ccb116503169c73fb993e3d980a401067ec781a412c6e651ebc9a3e89f0 SHA512 546c777bb50229dcf29c18d4f62a78c20e2715e49f97134c397133d632423b683426da3f37ceb7e1ccbcf392ed4dce6e5c97fb702d256a71844b09db074c845e
diff --git a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.70.3-sqldebug.patch b/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.70.3-sqldebug.patch
deleted file mode 100644
index 1fab1838917b..000000000000
--- a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.70.3-sqldebug.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dialup_admin/conf/admin.conf~	2005-07-24 17:32:01.000000000 -0400
-+++ dialup_admin/conf/admin.conf	2005-07-24 17:32:24.000000000 -0400
-@@ -247,7 +247,7 @@
- #
- # Uncomment to enable sql debug
- #
--sql_debug: true
-+#sql_debug: true
- #
- # If set to yes then the HTTP credentials (http authentication)
- # will be used to connect to the sql server instead of sql_username
diff --git a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-gentoo.patch b/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-gentoo.patch
deleted file mode 100644
index 7501ba11f1e4..000000000000
--- a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-gentoo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Nru freeradius-server-2.1.1.orig/dialup_admin/Makefile freeradius-server-2.1.1/dialup_admin/Makefile
---- freeradius-server-2.1.1.orig/dialup_admin/Makefile	2008-10-12 10:13:16.000000000 +0000
-+++ freeradius-server-2.1.1/dialup_admin/Makefile	2008-10-12 10:16:16.000000000 +0000
-@@ -4,7 +4,6 @@
- # Version:	$Id$
- #
- 
--include ../Make.inc
- 
- DIALUP_PREFIX := /usr/local/dialup_admin
- DIALUP_DOCDIR := $(DIALUP_PREFIX)/doc
-diff -Nru freeradius-server-2.1.1.orig/dialup_admin/conf/admin.conf freeradius-server-2.1.1/dialup_admin/conf/admin.conf
---- freeradius-server-2.1.1.orig/dialup_admin/conf/admin.conf	2008-09-25 08:41:26.000000000 +0000
-+++ freeradius-server-2.1.1/dialup_admin/conf/admin.conf	2008-10-12 09:14:12.000000000 +0000
-@@ -204,7 +204,7 @@
- #
- # Uncomment to enable ldap debug
- #
--ldap_debug: true
-+#ldap_debug: true
- #
- # Allow for defining the ldap filter used when searching for a user
- # Variables supported:
-@@ -274,7 +274,7 @@
- #
- # Uncomment to enable sql debug
- #
--sql_debug: true
-+#sql_debug: true
- #
- # If set to yes then the HTTP credentials (http authentication)
- # will be used to connect to the sql server instead of sql_username
diff --git a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-tmpfile.patch b/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-tmpfile.patch
deleted file mode 100644
index 1da5671761ff..000000000000
--- a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-tmpfile.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff -Nru freeradius-server-2.1.1.orig/dialup_admin/bin/clean_radacct freeradius-server-2.1.1/dialup_admin/bin/clean_radacct
---- freeradius-server-2.1.1.orig/dialup_admin/bin/clean_radacct	2008-09-25 08:41:26.000000000 +0000
-+++ freeradius-server-2.1.1/dialup_admin/bin/clean_radacct	2008-10-12 09:29:50.000000000 +0000
-@@ -5,6 +5,7 @@
- # Works with mysql and postgresql
- #
- use POSIX;
-+use File::Temp;
- 
- $conf=shift||'/usr/local/dialup_admin/conf/admin.conf';
- $back_days = 35;
-@@ -42,11 +43,10 @@
- 
- $query = "DELETE FROM $sql_accounting_table WHERE AcctStopTime IS NULL AND AcctStartTime < '$date';";
- print "$query\n";
--open TMP, ">/tmp/clean_radacct.query"
--        or die "Could not open tmp file\n";
--print TMP $query;
--close TMP;
--$command = "$sqlcmd -h$sql_server -u$sql_username $sql_password $sql_database </tmp/clean_radacct.query" if ($sql_type eq 'mysql');
--$command = "$sqlcmd  -U $sql_username -f /tmp/clean_radacct.query $sql_database" if ($sql_type eq 'pg');
--$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' </tmp/clean_radacct.query" if ($sql_type eq 'sqlrelay');
-+my ($fh, $tmp_filename) = tempfile() or die "Could not open tmp file\n";
-+print $fh $query;
-+close $fh;
-+$command = "$sqlcmd -h$sql_server -u$sql_username $sql_password $sql_database < $tmp_filename" if ($sql_type eq 'mysql');
-+$command = "$sqlcmd  -U $sql_username -f  $tmp_filename $sql_database" if ($sql_type eq 'pg');
-+$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename" if ($sql_type eq 'sqlrelay');
- `$command`;
-diff -Nru freeradius-server-2.1.1.orig/dialup_admin/bin/log_badlogins freeradius-server-2.1.1/dialup_admin/bin/log_badlogins
---- freeradius-server-2.1.1.orig/dialup_admin/bin/log_badlogins	2008-09-25 08:41:26.000000000 +0000
-+++ freeradius-server-2.1.1/dialup_admin/bin/log_badlogins	2008-10-12 10:09:58.000000000 +0000
-@@ -14,6 +14,7 @@
- 
- use Date::Manip qw(ParseDate UnixDate);
- use Digest::MD5;
-+use File::Temp;
- $|=1;
- 
- $file=shift||'none';
-@@ -29,7 +30,8 @@
- # CHANGE THESE TO MATCH YOUR SETUP
- #
- #$regexp = 'from client localhost port 135|from client blabla ';
--$tmpfile='/var/tmp/sql.input';
-+$tmpdir=tempdir( CLEANUP => 1 );
-+$tmpfile="$tmpdir/sql.input";
- #
- $verbose = 0;
- #
-diff -Nru freeradius-server-2.1.1.orig/dialup_admin/bin/monthly_tot_stats freeradius-server-2.1.1/dialup_admin/bin/monthly_tot_stats
---- freeradius-server-2.1.1.orig/dialup_admin/bin/monthly_tot_stats	2008-09-25 08:41:26.000000000 +0000
-+++ freeradius-server-2.1.1/dialup_admin/bin/monthly_tot_stats	2008-10-12 09:29:50.000000000 +0000
-@@ -1,5 +1,6 @@
- #!/usr/bin/perl
- use POSIX;
-+use File::Temp;
- 
- # Log in the mtotacct table aggregated accounting information for
- # each user spaning in one month period.
-@@ -51,14 +52,13 @@
- 	AcctDate <= '$date_end' GROUP BY UserName,NASIPAddress;";
- print "$query1\n";
- print "$query2\n";
--open TMP, ">/tmp/tot_stats.query"
--	or die "Could not open tmp file\n";
--print TMP "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
--print TMP $query1;
--print TMP $query2;
--close TMP;
--$command = "$sqlcmd -h $sql_server -u $sql_username $sql_password $sql_database </tmp/tot_stats.query" if ($sql_type eq 'mysql');
--$command = "$sqlcmd  -U $sql_username -f /tmp/tot_stats.query $sql_database" if ($sql_type eq 'pg');
-+my ($fh, $tmp_filename) = tempfile() or die "Could not open tmp file\n";
-+print $fh "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
-+print $fh $query1;
-+print $fh $query2;
-+close $fh;
-+$command = "$sqlcmd -h $sql_server -u $sql_username $sql_password $sql_database < $tmp_filename" if ($sql_type eq 'mysql');
-+$command = "$sqlcmd  -U $sql_username -f  $tmp_filename $sql_database" if ($sql_type eq 'pg');
- $command = "$sqlcmd  $sql_username/$pass" . "@" . "$sql_database <$tmpfile.$server" if ($sql_type eq 'oracle');
--$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' </tmp/tot_stats.query" if ($sql_type eq 'sqlrelay');
-+$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename" if ($sql_type eq 'sqlrelay');
- `$command`;
-diff -Nru freeradius-server-2.1.1.orig/dialup_admin/bin/tot_stats freeradius-server-2.1.1/dialup_admin/bin/tot_stats
---- freeradius-server-2.1.1.orig/dialup_admin/bin/tot_stats	2008-09-25 08:41:26.000000000 +0000
-+++ freeradius-server-2.1.1/dialup_admin/bin/tot_stats	2008-10-12 09:29:50.000000000 +0000
-@@ -1,5 +1,6 @@
- #!/usr/bin/perl
- use POSIX;
-+use File::Temp;
- 
- # Log in the totacct table aggregated daily accounting information for
- # each user.
-@@ -48,14 +49,13 @@
- 	AcctStopTime < '$date_end' GROUP BY UserName,NASIPAddress;";
- print "$query1\n";
- print "$query2\n";
--open TMP, ">/tmp/tot_stats.query"
--	or die "Could not open tmp file\n";
--print TMP "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
--print TMP $query1;
--print TMP $query2;
--close TMP;
--$command = "$sqlcmd -h $sql_server -u $sql_username $sql_password $sql_database </tmp/tot_stats.query" if ($sql_type eq 'mysql');
--$command = "$sqlcmd  -U $sql_username -f /tmp/tot_stats.query $sql_database" if ($sql_type eq 'pg');
-+my ($fh, $tmp_filename) = tempfile() or die "Could not open tmp file\n";
-+print $fh "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
-+print $fh $query1;
-+print $fh $query2;
-+close $fh;
-+$command = "$sqlcmd -h $sql_server -u $sql_username $sql_password $sql_database < $tmp_filename" if ($sql_type eq 'mysql');
-+$command = "$sqlcmd  -U $sql_username -f  $tmp_filename $sql_database" if ($sql_type eq 'pg');
- $command = "$sqlcmd  $sql_username/$pass" . "@" . "$sql_database <$tmpfile.$server" if ($sql_type eq 'oracle');
--$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' </tmp/tot_stats.query" if ($sql_type eq 'sqlrelay');
-+$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename" if ($sql_type eq 'sqlrelay');
- `$command`;
-diff -Nru freeradius-server-2.1.1.orig/dialup_admin/bin/truncate_radacct freeradius-server-2.1.1/dialup_admin/bin/truncate_radacct
---- freeradius-server-2.1.1.orig/dialup_admin/bin/truncate_radacct	2008-09-25 08:41:26.000000000 +0000
-+++ freeradius-server-2.1.1/dialup_admin/bin/truncate_radacct	2008-10-12 09:29:50.000000000 +0000
-@@ -5,6 +5,7 @@
- # Works with mysql and postgresql
- #
- use POSIX;
-+use File::Temp;
- 
- $conf=shift||'/usr/local/dialup_admin/conf/admin.conf';
- $back_days = 90;
-@@ -44,13 +45,12 @@
- $query .= "DELETE FROM $sql_accounting_table WHERE AcctStopTime < '$date' AND AcctStopTime IS NOT NULL ;";
- $query .= "UNLOCK TABLES;" if ($sql_type eq 'mysql');
- print "$query\n";
--open TMP, ">/tmp/truncate_radacct.query"
--        or die "Could not open tmp file\n";
--print TMP "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
--print TMP $query;
--close TMP;
--$command = "$sqlcmd -h$sql_server -u$sql_username $sql_password $sql_database </tmp/truncate_radacct.query" if ($sql_type eq 'mysql');
--$command = "$sqlcmd  -U $sql_username -f /tmp/truncate_radacct.query $sql_database" if ($sql_type eq 'pg');
-+my ($fh, $tmp_filename) = tempfile() or die "Could not open tmp file\n";
-+print $fh "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
-+print $fh $query;
-+close $fh;
-+$command = "$sqlcmd -h$sql_server -u$sql_username $sql_password $sql_database < $tmp_filename" if ($sql_type eq 'mysql');
-+$command = "$sqlcmd  -U $sql_username -f  $tmp_filename $sql_database" if ($sql_type eq 'pg');
- $command = "$sqlcmd  $sql_username/$pass" . "@" . "$sql_database <$tmpfile.$server" if ($sql_type eq 'oracle');
--$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' </tmp/truncate_radacct.query" if ($sql_type eq 'sqlrelay');
-+$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename" if ($sql_type eq 'sqlrelay');
- `$command`;
diff --git a/www-apps/freeradius-dialupadmin/files/setrootpath b/www-apps/freeradius-dialupadmin/files/setrootpath
deleted file mode 100644
index 124364c291ac..000000000000
--- a/www-apps/freeradius-dialupadmin/files/setrootpath
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "install" ]; then
-	sed -i -e "s:/usr/\(local/\)\?dialup_admin:${VHOST_ROOT}:" "${VHOST_ROOT}"/{conf/._*admin.conf,conf/admin.conf,bin/*}
-	chmod -R o-rwx "${VHOST_ROOT}"/conf
-fi
diff --git a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70.3.ebuild b/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70.3.ebuild
deleted file mode 100644
index 9bf34f6453b9..000000000000
--- a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils webapp
-MY_FREERADIUS_P="freeradius-1.1.6"
-
-DESCRIPTION="Web administration interface of freeradius server"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/${MY_FREERADIUS_P}.tar.gz"
-HOMEPAGE="http://www.freeradius.org/dialupadmin.html"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-LICENSE="GPL-2"
-
-DEPEND="dev-lang/php
-	dev-perl/Date-Manip
-	sys-apps/findutils
-	>=net-dialup/${MY_FREERADIUS_P}"
-
-S="${WORKDIR}/${MY_FREERADIUS_P}/dialup_admin"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-sqldebug.patch"
-
-	sed -i -e 's:/usr/local:/usr:' \
-		-e 's:/usr/etc/raddb:${general_raddb_dir}:' \
-		-e 's:/usr/radiusd::' \
-			conf/admin.conf
-	sed -i -e 's:/usr/local:/usr:' bin/*
-
-	#rename files .php3 -> .php
-	(find . -iname '*.php3' | (
-		local PHPFILE
-		while read PHPFILE; do
-			mv "${PHPFILE}" "${PHPFILE/.php3/.php}"
-		done
-	)) && \
-	(find . -type f | xargs sed -i -e 's:[.]php3:.php:g') || \
-		die "failed to replace php3 with php"
-
-	# remove cvs data
-	ecvs_clean
-
-	# fix dangling ../ to deal with the way webapp-config installs files
-	find . -name '*.php' | xargs sed -i \
-		-e 's:../conf/:../../conf/:' \
-		-e 's:../html/:../../html/:' \
-		-e 's:../lib/:../../lib/:'
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r htdocs/*
-	insinto "${MY_HOSTROOTDIR}"
-	doins -r conf html lib
-	exeinto "${MY_HOSTROOTDIR}/bin"
-	dodoc bin/*.cron bin/Changelog*
-	rm bin/*.cron bin/Changelog*
-	doexe bin/*
-
-	insinto "${MY_SQLSCRIPTSDIR}"
-	doins sql/*
-
-	dodoc Changelog README doc/*
-
-	webapp_hook_script "${FILESDIR}/setrootpath"
-
-	cd "${D}/${MY_HOSTROOTDIR}"
-	local CONFFILE
-	for CONFFILE in conf/* ; do
-		webapp_configfile "${MY_HOSTROOTDIR}/${CONFFILE}"
-		webapp_serverowned "${MY_HOSTROOTDIR}/${CONFFILE}"
-	done
-
-	webapp_src_install
-}
diff --git a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.80.ebuild b/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.80.ebuild
deleted file mode 100644
index c03e4900136e..000000000000
--- a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.80.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils webapp
-MY_FREERADIUS_PV="2.1.1"
-
-DESCRIPTION="Web administration interface of freeradius server"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/freeradius-server-${MY_FREERADIUS_PV}.tar.gz"
-HOMEPAGE="http://www.freeradius.org/dialupadmin.html"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-LICENSE="GPL-2"
-
-DEPEND="sys-apps/findutils
-	sys-apps/sed"
-RDEPEND="dev-lang/php
-	dev-perl/Date-Manip
-	>=net-dialup/freeradius-${MY_FREERADIUS_PV}"
-
-S="${WORKDIR}/freeradius-server-${MY_FREERADIUS_PV}/dialup_admin"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-tmpfile.patch"
-
-	sed -i -e 's:/usr/local:/usr:' \
-		-e 's:/usr/etc/raddb:${general_raddb_dir}:' \
-		-e 's:/usr/radiusd::' \
-			conf/admin.conf
-	sed -i -e 's:/usr/local:/usr:' bin/*
-
-	#rename files .php3 -> .php
-	(find . -iname '*.php3' | (
-		local PHPFILE
-		while read PHPFILE; do
-			mv "${PHPFILE}" "${PHPFILE/.php3/.php}"
-		done
-	)) && \
-	(find . -type f | xargs sed -i -e 's:[.]php3:.php:g') || \
-		die "failed to replace php3 with php"
-
-	# fix dangling ../ to deal with the way webapp-config installs files
-	find . -name '*.php' | xargs sed -i \
-		-e 's:../conf/:../../conf/:' \
-		-e 's:../html/:../../html/:' \
-		-e 's:../lib/:../../lib/:'
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r htdocs/*
-	insinto "${MY_HOSTROOTDIR}"
-	doins -r conf html lib
-	exeinto "${MY_HOSTROOTDIR}/bin"
-	dodoc bin/*.cron bin/Changelog*
-	rm bin/*.cron bin/Changelog*
-	doexe bin/*
-
-	insinto "${MY_SQLSCRIPTSDIR}"
-	doins -r sql/*
-
-	dodoc Changelog README doc/*
-
-	webapp_hook_script "${FILESDIR}/setrootpath"
-
-	cd "${D}/${MY_HOSTROOTDIR}"
-	local CONFFILE
-	for CONFFILE in conf/* ; do
-		webapp_configfile "${MY_HOSTROOTDIR}/${CONFFILE}"
-		webapp_serverowned "${MY_HOSTROOTDIR}/${CONFFILE}"
-	done
-
-	webapp_src_install
-}
diff --git a/www-apps/freeradius-dialupadmin/metadata.xml b/www-apps/freeradius-dialupadmin/metadata.xml
deleted file mode 100644
index f6fe7565b8f6..000000000000
--- a/www-apps/freeradius-dialupadmin/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
-The FreeRADIUS server comes including a powerfull web interface written in PHP 
-to administer radius users, called dialupadmin. Dialup Admin supports users 
-either in SQL (MySQL or PostgreSQL are supported) or in LDAP. Apart from the 
-web pages, it also includes a number of scripts to make the administrator's 
-life a lot easier.
-</longdescription>
-</pkgmetadata>
diff --git a/www-apps/jekyll-coffeescript/Manifest b/www-apps/jekyll-coffeescript/Manifest
index 1348b21dd687..bebe0705890d 100644
--- a/www-apps/jekyll-coffeescript/Manifest
+++ b/www-apps/jekyll-coffeescript/Manifest
@@ -1,5 +1,5 @@
 DIST jekyll-coffeescript-1.0.2.tar.gz 5042 BLAKE2B 1a08099b940118e15f5f2310671efe1cc61fc496242c94a3351654870518095d62f576922f1bbf882a64f7bbca6b9b00e1f692f00684f0a5c60005a5fb86c69b SHA512 cc8e3fc21d9ff0b4c0fb00652e8a8011fbb535f6c1b51c0c380637cb124524282f6ef5272e82976f964c5eae66a8340bd11f516f6625732d9ee51ef6c58b3a8f
 DIST jekyll-coffeescript-1.1.1.tar.gz 5350 BLAKE2B cbcb98f831b937458938e541e3b4d79bbdc1bf12444c5fbccf9f295744ca34fda019956ca5b7d011c8b88582d043157f7abf584af447e061f973b39da82227aa SHA512 6b748fb521a33be6dcf944bba35db2f2924d8ee403ba035f4e0e1411d91f1a7eb527af42237994c4f9839a3e6babfbd8b5441ecd5ef5c42db7afbdf4bfc643d2
 EBUILD jekyll-coffeescript-1.0.2-r1.ebuild 855 BLAKE2B a5b431c54dc590e943f785d902d71e72427defe36d4b204abf98b16e07e3150d3799d1d14839c931cba007b58fad2cd5286046a87e99a8d8634178abbb109bda SHA512 deee794f3b9b5c09e93243959976c5bc637be2b4753b44a5690594c37c5d07fdc473ea65316fcf1374cb45234d6c75e959d77cb1a2ab16ee744e2c1fa3bc0c6a
-EBUILD jekyll-coffeescript-1.1.1.ebuild 841 BLAKE2B 0789c95d1b1d99c808b2eaa4dcecd8b8435ccc7981b4aea8f8c937b83acb1a98ea6f89e10d9791bb22c2f62fc003bf1bf180f217fb421300d085bb33ab434a09 SHA512 d1982d06e7ccc9e74a367654c2acf97a387cdc8e1f1526035f055fee9ead2f313ed0283a796883ef1963d408fd946c167c4a44a76cf6ea128cbe05b4d52aa55e
+EBUILD jekyll-coffeescript-1.1.1.ebuild 848 BLAKE2B defd171fe2a7aaa5459e04c997cd7af9eb99567d536796d9f5782dfdf31ae4dd34d968ed267273d56ef608570e5ad2c00b469e16a2b37cf2eb2981c60ce07afa SHA512 da3438228d8b05e9f977bc9fdefc6848383706c1d3127d81753c0f75e789c4cde091687a174491e05de826db3b44fc60aa682200e1429f3087211bd5c010903e
 MISC metadata.xml 338 BLAKE2B 224b7454b4b3fb88128aafe4b0980619f366f5c5151d14f801bda08f2457c9a9bcac20767070cc4240ffcaed43b62382a14bc886d17a4259a9c7b9ecb0b6cb0b SHA512 01c630c47335166243996a64160cce9820e4b46086ccfba65c9ea6455c69ff94c3a0ab8760993b49e80f0f36d8375af02bc1774fba9fa020cdf7dc87c23bfded
diff --git a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.1.1.ebuild b/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.1.1.ebuild
index 456e51255cd7..2b29cafc7ab9 100644
--- a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.1.1.ebuild
+++ b/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
diff --git a/www-apps/jekyll-sass-converter/Manifest b/www-apps/jekyll-sass-converter/Manifest
index a87eb8906dd3..70f63fbff95d 100644
--- a/www-apps/jekyll-sass-converter/Manifest
+++ b/www-apps/jekyll-sass-converter/Manifest
@@ -1,3 +1,3 @@
 DIST jekyll-sass-converter-1.5.0.tar.gz 8516 BLAKE2B 78b4c49f2d49f28f1c7f02fe808ab98644cb9143038c179bbdb872bf8b8d45cbba84bd73da924a61e661d7d22ba26f2715531146ec8169089729046f196be403 SHA512 ece83d8c13e93a90c66ed899accc77746d56067f6841ca0d29050168c52d9eea6de3d78760b0f468be2dbc9b0b9df5ac02d5066a26809a33cdadd591fbbc9b52
-EBUILD jekyll-sass-converter-1.5.0.ebuild 688 BLAKE2B 8f8ed5094888b162e964e89849c4d60389f475471081b979a31977b63b4b60b29c2b04015ecfe1decaf78d7366cff3ed7469daf8f36dbb423377d7f37c6a7b87 SHA512 0e20ff537f10b709ad3546c3265832e89d0f9418aa6a74e460f3e959e5a2f19834514a74a4a3febaa181b05baf02e5e033c4b5a32c16f1eab8d8be52e274c605
+EBUILD jekyll-sass-converter-1.5.0.ebuild 688 BLAKE2B 7d3b78d33e59f71ca66639703993d5ef196e4dcc17c7f54f1f9108f0cbe4059bcd31f65bb133b00f2ef73abbfaad0f0db20fdcaad4afa7e34af46b5a0395b874 SHA512 129b02986be29745f21b3f84035985c9a0da7a1bacdfe3650bffca6ec9506cd352023fc2edf82a8246903ea8d9b60e3787c42583e385356017e656eb1b961419
 MISC metadata.xml 340 BLAKE2B 2e117f6e85b11458811aa3cab607946ca1baaf9b6022c02d1ffffa62da6be9443624e31642a6bc793a0fda23c6b84c91df7f4413de7ea84217fd984c7a5c4a58 SHA512 db6a48ae69a3e29603aa912dbc716f790f4d47e33a2fa416d71716b34f75122ae9f28d17fb97bdc1472e71f3dc311087443ed494c4e06eb500c4345c5cf37603
diff --git a/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.5.0.ebuild b/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.5.0.ebuild
index c1ab15057cc7..0a2f36d2c85d 100644
--- a/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.5.0.ebuild
+++ b/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/www-apps/jekyll-sitemap/Manifest b/www-apps/jekyll-sitemap/Manifest
index 3889d1d7ae04..3be46d7a4fba 100644
--- a/www-apps/jekyll-sitemap/Manifest
+++ b/www-apps/jekyll-sitemap/Manifest
@@ -1,3 +1,5 @@
 DIST jekyll-sitemap-0.11.0.tar.gz 64238 BLAKE2B eb3226d344972c82d328faf4149886d760bf240da1be36b878c9e9334a30b4b75954c0ea35acfe1d3fc0e638630376287ffe4c37dcbdbdd198632f280ff2959e SHA512 ba1bb162586b8383b1ede68e86cec73db023400586e373572aa8e7c3e26ef1024d313ce59aa1f7711b2b34ba08220be99d5bfeb0ea804e1a1091c0953f8de095
-EBUILD jekyll-sitemap-0.11.0.ebuild 625 BLAKE2B 4cd63b306b9d8164115ed5755399fa27b32aa7decdc3a3cd0cec41a8a8076459309d972c3fdac74f5abf0d5afa3cbe5933d7db267a97a281aaaefc707b23298e SHA512 55bd43adbc04d14f9aada76dd798e9fcbc90e90c851a77f7640fc80b11cc48a937a7b538fcb810cdf6f1cac4c2bb256d7dca23333fc1f3938b8165dddc8f8c50
+DIST jekyll-sitemap-0.13.0.tar.gz 65036 BLAKE2B 88477a9c1ee57975927e9b2a6044322d2c838eb3beded1263158ce4574fbc524453763c55026f88039746e77cbb7ff169dc2601fd0cb65f67d60a4a4252ec040 SHA512 97966c37c7126ac8d9d51069c8d5c448523fa06a7b2136baa1742495e21c76d0264a145e72896b4843111f519a9ddb4d7eab35bc1ea0130a3a77c3ff59066364
+EBUILD jekyll-sitemap-0.11.0.ebuild 625 BLAKE2B b6e7f94a0c292dca3ecc21330a0d94bb79881deda883a4ea92c2fe68e4b2ff45bf4a3ac88426824c8de637ecd6d041e850f972e8e0f96c27d399e430b0e1d5cc SHA512 6bb77f9b43470be7191b153d2d301207b154572540cb81567366be6391f6d2bee4d93a5be4313cf3cd0ada4735f9ebb3d4f197e2795506e8e889f6080f8722a7
+EBUILD jekyll-sitemap-0.13.0.ebuild 625 BLAKE2B b6e7f94a0c292dca3ecc21330a0d94bb79881deda883a4ea92c2fe68e4b2ff45bf4a3ac88426824c8de637ecd6d041e850f972e8e0f96c27d399e430b0e1d5cc SHA512 6bb77f9b43470be7191b153d2d301207b154572540cb81567366be6391f6d2bee4d93a5be4313cf3cd0ada4735f9ebb3d4f197e2795506e8e889f6080f8722a7
 MISC metadata.xml 253 BLAKE2B 04790d797238d114af848d448e7edfc2a4e14c62b472a24e1097cf831989b0042e4c6770e8a63d7285f4245dfce2787887f2db04d175923037a064c28b192490 SHA512 03899ba135dd5ebedf0c0157aeb74d2facdedbc4ea842a1f9133c0f20b8c49596dacc8f376810fe133ed8571adc0acee4dfd854bcf5f33b3f5c2a1d116250712
diff --git a/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild b/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild
index ac5b7cd2617b..9c4ccade8b48 100644
--- a/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild
+++ b/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/www-apps/jekyll-sitemap/jekyll-sitemap-0.13.0.ebuild b/www-apps/jekyll-sitemap/jekyll-sitemap-0.13.0.ebuild
new file mode 100644
index 000000000000..9c4ccade8b48
--- /dev/null
+++ b/www-apps/jekyll-sitemap/jekyll-sitemap-0.13.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Automatically generate a sitemap.xml for your Jekyll site"
+HOMEPAGE="https://github.com/jekyll/jekyll-sitemap"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
+ruby_add_rdepend ">=dev-ruby/addressable-2.4.0"
diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest
index 5cac785b99e2..7b7efe9f48c0 100644
--- a/www-apps/jekyll-watch/Manifest
+++ b/www-apps/jekyll-watch/Manifest
@@ -1,3 +1,5 @@
 DIST jekyll-watch-1.5.0.tar.gz 15076 BLAKE2B 1270f309fed8e4aff6712fdad1554b9ed6e4d0936512c8c80a6b1d77977411fd74c099d361a7c7a3ce785e794beeca7d865e17f9fa25f0b4d889e861614b5c8b SHA512 98c9df7f92c214b0047cf266e06c48350615836af3b7ea69e1f77b10d26e4ed441fdbbdc16e557ef2293fe5ab1314ed71bb3e0e65e3f1ad4c4224f71e1255c95
+DIST jekyll-watch-1.5.1.tar.gz 14764 BLAKE2B fcb0e80060e65e85e0047d54f6277cf5e31ec8347c2c960e15c00d74b7dc255bb8cd1fea3671e2ecc7d380227bdae7cf62d835a5dc1b249aa68ca8f0ed9a1f34 SHA512 05e7f89f213adf6695a8bd1f8ff25d7aa6338cc378a934981f1112df556380cc40d2352ea4ce0a362c4d8e51ed8a6e36ca96c86385a6f179347031396db94a54
 EBUILD jekyll-watch-1.5.0.ebuild 671 BLAKE2B 9705a331e0de3c2e660284195c9703a45fab18217a1a35dd5356702a279e2d8e9cfe4728566613f1b0d48a9793de919a79c216079200d6c146ba29caf61d40ae SHA512 38a1e258fa088e7e09ae02fb8342cdb3c9820d5a4b48c5a7071fbb8d5e2afae1de7f54bfe4de9b581c9ca128a1ba1cea619a2acec4c7d42c127c682681ff8fd7
+EBUILD jekyll-watch-1.5.1.ebuild 671 BLAKE2B 6e842e73c743ec350bcfc3ba3e2ebb6213d73ed6a8ecc99129916caf2a83b0281672c0edea34d7f1130c9213a757869e1aa1f77696a6cb090730f73944ae6031 SHA512 3b541b861dc860ec0ed6807479a2591313a0114399a9eeb4f7ae0746227e76ea619b13110a8d0e54568e6c6d12f64444d4d1878162ac6f5d96834d9a06e0b54c
 MISC metadata.xml 331 BLAKE2B c43bc1213adee987e9bd55089f8f5fa00f5de2461fe584b8715332d7ace822a5b0ffc47a2af7001e5c134ff20d9a3580d2225dacee73e4fbdadc1735cbe806a6 SHA512 53a2e135c948ee84fdf2f7ad1583d658636ea1077b80b6e2ab52c10615ceb5a30ac4a400c213e5fff5f4effdee0acd4afc8653adbca80178815f1fdfd3620004
diff --git a/www-apps/jekyll-watch/jekyll-watch-1.5.1.ebuild b/www-apps/jekyll-watch/jekyll-watch-1.5.1.ebuild
new file mode 100644
index 000000000000..3468c5c4a5e8
--- /dev/null
+++ b/www-apps/jekyll-watch/jekyll-watch-1.5.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rebuild your Jekyll site when a file changes with the --watch switch"
+HOMEPAGE="https://github.com/jekyll/jekyll-watch"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/listen-3.0"
+ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
+
+all_ruby_prepare() {
+	rm Rakefile || die
+}
diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index 62bd9ab956be..f29fdd248922 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -1,4 +1,6 @@
 AUX jekyll-3.6.0-test-helper.patch 657 BLAKE2B 8e9d9bb57efa2370976d459dac772f7f41c0bf02c2fc0c71f19d4b78714e06f96d8a800a45f7c3eca80f766639036a624df24e681a9258e4bdc76bfb563498ad SHA512 7b53cd03a988cc5c949d15be8de91ffd37d4f228822cc3bec64c961c163ba60946df1d314bdf746a33a42df091f06f481f945a712515cca04539e111393246d0
 DIST jekyll-3.6.0.tar.gz 737199 BLAKE2B b823d794c5f4e0fb78276d2af28821a7ac67b13159832cbda3a691ad0f9e32c2228da1dde22a0ee33890ffb8384ac6d92adbb7b47629f98dda1d92024488475a SHA512 87c17c31cda44d040308079aacbcdba1e704186a69d64c1240a44960f7a79e74b35bb230be7c14419bb89843cfbf48ecf3601a8018df2255deebc0afdb4fcd86
-EBUILD jekyll-3.6.0.ebuild 2060 BLAKE2B e4cc457be60914fc5ed7a2c01367026a8101ae3993b5596e8c0c9692019291ec4bd271437880057b36b78d5b953d2d3e614f0fed6f34046caff92a729a3818f9 SHA512 1d468fa1ee943368d07eeb8f2d303a4cace987838e501d4b5e773cf18782a0c44399611cd7ceb351b75aafd771ccebf7281475e6cf388da940a9f0fa516a06fc
+DIST jekyll-3.6.2.tar.gz 740389 BLAKE2B c51e8b1545bfd1bab64c890fdf8d53087e27b3ba2fac07d286d009f1c4b6efb81d3528d239f73a73afa68d1f2d320e816c7015bf385dc9e27cad13d1b4279a50 SHA512 3af17f32098bf1012393d0ad47269ef305138553735ede9c65e461c8f1e1033008a01805c8c96f9aa0f4682f7e68a9cff3eda83a70660a334161ec3d04ce9c72
+EBUILD jekyll-3.6.0.ebuild 2060 BLAKE2B 8c162677f23aaf5bd9fd5c78b5d20b0d51d3e2a47ec3a0fea2b7efa96b3e955052515d69798cfa0a651ba4ce93db5d72204d00879efdbdc3a3f689bf5c40f5cf SHA512 199f4db93d8be9eb5efa63fd25add64a486a1adc7b409bebfd8262f428f6a8b804118814d0eb3be0f1578b6dc3ea88c026024835cf72574288459b14c2ac1365
+EBUILD jekyll-3.6.2.ebuild 2060 BLAKE2B 8c162677f23aaf5bd9fd5c78b5d20b0d51d3e2a47ec3a0fea2b7efa96b3e955052515d69798cfa0a651ba4ce93db5d72204d00879efdbdc3a3f689bf5c40f5cf SHA512 199f4db93d8be9eb5efa63fd25add64a486a1adc7b409bebfd8262f428f6a8b804118814d0eb3be0f1578b6dc3ea88c026024835cf72574288459b14c2ac1365
 MISC metadata.xml 325 BLAKE2B c29145c8eacfee5164b55192ebd77d0b4134179380ac4c5f0ac29b1f708dc0cb1d91748ad68aca73380466451efcfe03c1115ebc706c16a70b527b2e3360a7d2 SHA512 02b93ff17a615bde6a2074bed7dc0d64c0cea0d11002e48fe5a132b3d8044c0329a5a69f62f917eadf8fb090ef1ea7ce99bd78496fd738a1d327599dde7582e2
diff --git a/www-apps/jekyll/jekyll-3.6.0.ebuild b/www-apps/jekyll/jekyll-3.6.0.ebuild
index f0c36c2a9a3c..2479d9e18425 100644
--- a/www-apps/jekyll/jekyll-3.6.0.ebuild
+++ b/www-apps/jekyll/jekyll-3.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 
 inherit ruby-fakegem
 
diff --git a/www-apps/jekyll/jekyll-3.6.2.ebuild b/www-apps/jekyll/jekyll-3.6.2.ebuild
new file mode 100644
index 000000000000..2479d9e18425
--- /dev/null
+++ b/www-apps/jekyll/jekyll-3.6.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
+RUBY_FAKEGEM_EXTRAINSTALL="features"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+DESCRIPTION="A simple, blog aware, static site generator"
+HOMEPAGE="http://jekyllrb.com https://github.com/jekyll/jekyll"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.4
+	>=dev-ruby/colorator-1.0
+	>=dev-ruby/kramdown-1.14
+	>=dev-ruby/liquid-4.0:4
+	>=dev-ruby/mercenary-0.3.3
+	>=dev-ruby/pathutil-0.9
+	>=dev-ruby/safe_yaml-1.0
+	>=dev-ruby/rouge-1.7:0
+	>=www-apps/jekyll-sass-converter-1.0
+	>=www-apps/jekyll-watch-1.1
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/classifier-reborn-2.1.0
+		dev-ruby/launchy
+		>=dev-ruby/pygments_rb-0.6.0
+		>=dev-ruby/rdiscount-2.0
+		>=dev-ruby/redcarpet-3.2.3
+		dev-ruby/rspec-mocks
+		>=dev-ruby/shoulda-3
+		dev-ruby/test-unit:2
+		www-apps/jekyll-coffeescript
+	)
+"
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}"/jekyll-3.6.0-test-helper.patch
+
+	# Drop tests requiring bundler
+	sed -i -e '/bundle_message/d' test/test_new_command.rb || die
+	rm test/test_plugin_manager.rb || die
+
+	# Replace git command in gemspec
+	sed -i 's/git ls-files -z/find -not -type d -print0/' $RUBY_FAKEGEM_GEMSPEC || die
+
+	# FIXMEs:
+	# fails to find fixtures
+	rm test/test_theme.rb || die
+	rm test/test_theme_assets_reader.rb || die
+	sed -i -e '/^    should.*theme/,/^    end$/d' \
+		-e '/^      should.*theme/,/^      end$/d' test/test_site.rb || die
+	# partially requires 'toml'
+	rm test/test_configuration.rb || die
+	# pygments tests fail because of line numbering
+	sed -i -e '/^  context.*pygments/,/^  end$/d' test/test_tags.rb || die
+	sed -i -e '/^    context.*pygments/,/^    end$/d' test/test_redcarpet.rb || die
+}
+
+src_test() {
+	local -x JEKYLL_NO_BUNDLER_REQUIRE=true
+
+	ruby-ng_src_test
+}
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 744ee398dd0f..257335c4552a 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,5 +1,7 @@
 DIST nanoc-4.7.14.gem 256000 BLAKE2B 73b6e038052407f2f698d9d2490476c13f39bca5b9f84bc224cfee64bc7db33efef6da96e6520350c3af958fbe6cb203c3b70ad855acf1e3bb08873fef2d66b7 SHA512 e7413771794e9d2931e3be2a5b5575f7cd207d9b11167a1838496edf34bee4e631c362d9ac50fb0f9dddbe2fd5836b402506565c704838327116a18f0ea34088
 DIST nanoc-4.8.10.gem 260608 BLAKE2B 102548bc4616287d7084f81f505f2c1f7fa294a6bfc87c9be80919a4fff6c547ecbc77cc5cb96d7b1fd9414f189cdf62bad9cd4cdf44fe536c60a2eb3c39ac63 SHA512 36080407696d19739af666d9ba4e04d051d679b29b3e8e5d24d893a2d05b05201b74777007781a0da80125a98fd8cc465fb0b78ca0c28c5fc80bdd5229d5fa24
+DIST nanoc-4.9.2.tar.gz 275891 BLAKE2B 6c2ca3b1f00f59762530ccf8dfb37599d89b67819e893fc49252afa0be334c64c0c2f771f7b05db14d24e264d355870a7308a117823750ba6edd68d82b113357 SHA512 593ed6def82e1c109983e37602a1def0bec0ea7a025d2badd3ddd3c564cb43ef619ea9173e563e32ae3891d4e3de85b5020e83292c5e16e1a6888399213c26cf
 EBUILD nanoc-4.7.14.ebuild 1527 BLAKE2B 4246e332e60334722e37db7ff9ca994f3af437859ed6fbe57375b11347e01c5b6bb179618c43854a46f55cdb02f06c5d1f14874ee9c73408131f82df093b0c67 SHA512 d8bed9a8d6bcb697bc2f6a406e56be084a2a60ff56580b4b6bda4e4e68081a9227c8ea793934332c891ff515ad54fbc83cf29f3d32352e416d994009878f0061
 EBUILD nanoc-4.8.10.ebuild 1579 BLAKE2B 98932d52b2f1db9f17e0d0af6117a380712a3bf6aad6506417368b797fb5a76a0a8a8908cf7c1c376c10eba31e1db216bae063e2e691c769b8934c7c925bf3e8 SHA512 c33f02538ec443598aeb7b103c7d452470898a74f1b9f28f53258b196287fc035f244fb5535cc84c64a898615b46a8b7ab2509e1b553e2da2039f068aa22f153
+EBUILD nanoc-4.9.2.ebuild 2441 BLAKE2B 66d7dbce1f5f4f0f0b7cbf6aad01772a581d2a616c1ec833c53393e5449805012ace501ab759e5166194abad8c59a21f0090e64d1ae58549fb1969402dc9b20d SHA512 2c78f6f710c56dca01cd07533dbac9d443d0bf12bdfd4bfb93c12d777005a0f021ee2c91811bc82dc6ca2139944303fa16fd45cf488359a3943f805207a57248
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc/nanoc-4.9.2.ebuild b/www-apps/nanoc/nanoc-4.9.2.ebuild
new file mode 100644
index 000000000000..31fbd3271a0e
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.9.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="${P}/nanoc"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/addressable-2.5
+	>=dev-ruby/cri-2.8:0
+	dev-ruby/ddmemoize:1
+	dev-ruby/ddmetrics:1
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	>=dev-ruby/parallel-1.12:1
+	dev-ruby/ref:2
+	>=dev-ruby/slow_enumerator_tools-1.1.0:1
+	>=dev-ruby/tomlrb-1.2:1"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/asciidoctor
+	dev-ruby/fuubar
+	dev-ruby/maruku
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	dev-ruby/rdoc
+	dev-ruby/rouge:2
+	dev-ruby/systemu
+	dev-ruby/timecop
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/checking/checks/test_{css,html}.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm spec/nanoc/deploying/fog_spec.rb \
+	   spec/nanoc/filters/less_spec.rb \
+	   test/filters/test_{markaby,rainpress}.rb || die
+
+	# Use useable tmp dir
+	sed -i -e 's:/tmp/whatever:'${T}'/whatever:' spec/nanoc/base/checksummer_spec.rb || die
+
+	# Avoid non-fatal failing tests due to specifics in the environment
+	sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
+	sed -i -e '/does not crash when output dir does not exist and/askip "gentoo"' spec/nanoc/cli/commands/view_spec.rb || die
+	sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index ec4469849c52..fd667b88ee38 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -2,11 +2,13 @@ DIST Nikola-7.8.11.tar.gz 4104413 BLAKE2B 22da280a7f7416ad88680a573aa103dc38a8e7
 DIST Nikola-7.8.12.tar.gz 4106202 BLAKE2B 95ef2d074145b40be90f8daf7de92dc4091e24b0db8e5f949daeff6e6bd03d2437198a4a1e33728c204c907cd94fc1ad6f6d0a1945119eaaa738cbc172dfaadb SHA512 8be18b4a9b61da7de1c0b3d75cd0d2bebc9c45191b30b8f918b2a6c8af333d1a6545f7336a033c3aef25a6920d905ff10f7d8238aba586b1dcbc6b92e03e376d
 DIST Nikola-7.8.13.tar.gz 4131250 BLAKE2B 6fdb12e59d7e977bc1ab9e2dd458de4a8a61104e1237926d5362ce1420fd3533617d268a4b496a4248932255459a2e3fa43488be62fedc86ab7c62a3c3cefeb3 SHA512 95118f9e2a7d884ab3e7f517749de6cde22439579cf6e05245111ab972f2def0c7ab824978cf750d2bedf788b2a994ec743e9574b70d17424e04c570ef796bef
 DIST Nikola-7.8.14.tar.gz 4130538 BLAKE2B dc8cd3a484bf203291ff8ca2b25233814e68bf916081f692a73c87af953cd57ea732dfdedfb8508187fb27566204f9442eb87847c98018fa0e5ef4ab4eb5295f SHA512 1a930e0cebbc9d54437ce438622eb2a6ad01988aaa9706f58cc0add17e483c3510d3a8ba120b8aa3b475c0e030cca471173f2520fd36e9528144cdee40fb1a9c
+DIST Nikola-7.8.15.tar.gz 4131518 BLAKE2B ea3dca9340852a68b668de82e5deeaa0ecf7bb8597f311721b27409fe0cf820919c79f6e631b030bd3ea4571dd8480c862c607d0b9e6015a8b03023de5a9b93e SHA512 b441ae014539b948d007183ceb574243b89a498be265da7245095f67510d4d7c109c4935e0f9765b4144e82f788a1b66a0eacfba1477a89ce6c2645cb77102d7
 DIST Nikola-7.8.8.tar.gz 3870991 BLAKE2B df6b3784acb339faccbcf1d269a2a9e315861be25e3880fab1c18754df1121b7081e9d1ad08d5a08d6b6913eacfdf184d9a19e5e1218a038913a6c7d2f78dcde SHA512 6222cfaea048a547d8a224828815b8334d2f39abf872d63b9a970ca017cee37e5efeaccc5327b8c21bea9fdfe7beafae7ac9af9f57d459a10fa991879bf74687
 EBUILD nikola-7.8.11.ebuild 2319 BLAKE2B 51f765e8b81757de7727cb3bd014620125f23b1cf91ad9647a9b1c067322b04c99edad91d307f362d49fce29a9aa0e5a0f7f9f3a90cee25d8c4af53cb7c1f44a SHA512 8abd19df5d529d4303f5fc68a6d8e693808e622907bb90a58fb871795de315187bc16c55a16538080148e4b92e1a21c90e3b9b383705d8baee2b639f3ca9dc62
 EBUILD nikola-7.8.12.ebuild 2319 BLAKE2B 51f765e8b81757de7727cb3bd014620125f23b1cf91ad9647a9b1c067322b04c99edad91d307f362d49fce29a9aa0e5a0f7f9f3a90cee25d8c4af53cb7c1f44a SHA512 8abd19df5d529d4303f5fc68a6d8e693808e622907bb90a58fb871795de315187bc16c55a16538080148e4b92e1a21c90e3b9b383705d8baee2b639f3ca9dc62
 EBUILD nikola-7.8.13.ebuild 2319 BLAKE2B 51f765e8b81757de7727cb3bd014620125f23b1cf91ad9647a9b1c067322b04c99edad91d307f362d49fce29a9aa0e5a0f7f9f3a90cee25d8c4af53cb7c1f44a SHA512 8abd19df5d529d4303f5fc68a6d8e693808e622907bb90a58fb871795de315187bc16c55a16538080148e4b92e1a21c90e3b9b383705d8baee2b639f3ca9dc62
 EBUILD nikola-7.8.14-r1.ebuild 2349 BLAKE2B 3294119cb0343de4adfec3cdc0d90e7368d3beff46511f737c841dfb0d956dc9472f303f6b92ae91e162ce10ca6ff9d06d474ce8b4cd911d5493f5bd60e28b9f SHA512 6446b544f4a5369ba92d56f85d81b7422a728e1ff13dfb03971d0ce45ccef07d901c80e45732b0f1761228ac3e0ce5db9ce46ecf8f785bcdda93e2d0be1d390e
 EBUILD nikola-7.8.14.ebuild 2353 BLAKE2B 37b97644d8d6a698482ef6a0886c5e5705aa98273d822a44550e655936593754aed4417866d19a615d06ab9b377dfb3d3dbe79f345f2e1397d403756e7b6bfdd SHA512 1d8475c52977358e626a9aa44242174908908df283796a0d0d87ca8a249d061deac1e3cd164603c5c31ea4aef5667a061226e52008338f7485359e96380b3e4d
+EBUILD nikola-7.8.15.ebuild 2349 BLAKE2B 3294119cb0343de4adfec3cdc0d90e7368d3beff46511f737c841dfb0d956dc9472f303f6b92ae91e162ce10ca6ff9d06d474ce8b4cd911d5493f5bd60e28b9f SHA512 6446b544f4a5369ba92d56f85d81b7422a728e1ff13dfb03971d0ce45ccef07d901c80e45732b0f1761228ac3e0ce5db9ce46ecf8f785bcdda93e2d0be1d390e
 EBUILD nikola-7.8.8.ebuild 2337 BLAKE2B df493ca81b4c03608e1aa10647c2edb436b9e2a7ec42bd7cbf85c523cc19fead482637456957a0dc5c59c36e94a30eeb70c9ed5485b0d9ba79f5aa2ad405a03a SHA512 da6b8ea3e723f0c5d4434d0a3e4bc3997ca85705cf360f0bf9aa7a76e1e2f2f61e72cd41cdd345cce9099c6fb89a59d6f97b0c951bdfd84f93803310f29cbe4b
 MISC metadata.xml 1360 BLAKE2B 694323edda02eec1a835c4c8a68a74c960a290ee44d1c95a59b5814fc6a8f6b248aec961ce69519da1a33970fba2868df81ed87155cd3c60193f79e8165c99d2 SHA512 ea8f610d5c5d7d568e29340e12701d652136a344f8aeb32c1df9a6909dc48180c5e9a7a91935c73e4d7df4f13cff82794e301d6a659262c52d8c88773e3b9697
diff --git a/www-apps/nikola/nikola-7.8.15.ebuild b/www-apps/nikola/nikola-7.8.15.ebuild
new file mode 100644
index 000000000000..05f442bd330a
--- /dev/null
+++ b/www-apps/nikola/nikola-7.8.15.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MY_PN="Nikola"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A static website and blog generator"
+HOMEPAGE="https://getnikola.com/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
+RESTRICT="test" # needs coveralls
+
+DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
+RDEPEND="${DEPEND}
+	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
+	>=dev-python/doit-0.29.0[${PYTHON_USEDEP}]
+	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
+	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-20.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
+	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
+	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
+	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
+	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
+	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
+	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
+	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
+	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
+	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
+#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	distutils-r1_src_install
+
+	# hackish way to remove docs that ended up in the wrong place
+	rm -rv "${D}/usr/share/doc/${PN}" || die
+
+	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
+	gunzip "docs/man/${PN}.1.gz" || die
+	doman "docs/man/${PN}.1"
+}
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 6ee8f9956108..8856274aa612 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -9,5 +9,5 @@ DIST redmine-3.3.6.tar.gz 2371226 BLAKE2B 4465ebf3d89e05a8c53f59b11190eb290a152e
 DIST redmine-3.4.4.tar.gz 2447358 BLAKE2B 1f5aa3c24e06029405c59e25c40c98975c98033658ee0a931b1fa95aac54187c7304f1fc0af4805226c4ef274f85d89856ffd39b0ae71b34337865d3e8f4a5ff SHA512 12bf58aade53c02df35b33ba62dd97091a5ac20fb6ef0f16f046226c62dfd06fc6cea5451f433e00f7d9374c158035dc5457d65eafdbc35a90199c5a407c7752
 EBUILD redmine-3.2.9.ebuild 6578 BLAKE2B 0455452412ad2a1883df471c933814d0d928f51377a4f7e6ed7ec84b1d702306fa0116427d8ca6f75266c0c0355dd3123eeec6414e059f2b222946e66367b636 SHA512 ba18f84e6d4cb9d98a01b3e0aa68ca89c80f326db4ae2e5546d4e6fbf1335460258b7d46b8888dfccd4d5bb492ed9c498dcd2d5156d143c035efdc442fac3695
 EBUILD redmine-3.3.6.ebuild 6578 BLAKE2B 0455452412ad2a1883df471c933814d0d928f51377a4f7e6ed7ec84b1d702306fa0116427d8ca6f75266c0c0355dd3123eeec6414e059f2b222946e66367b636 SHA512 ba18f84e6d4cb9d98a01b3e0aa68ca89c80f326db4ae2e5546d4e6fbf1335460258b7d46b8888dfccd4d5bb492ed9c498dcd2d5156d143c035efdc442fac3695
-EBUILD redmine-3.4.4.ebuild 6578 BLAKE2B 0455452412ad2a1883df471c933814d0d928f51377a4f7e6ed7ec84b1d702306fa0116427d8ca6f75266c0c0355dd3123eeec6414e059f2b222946e66367b636 SHA512 ba18f84e6d4cb9d98a01b3e0aa68ca89c80f326db4ae2e5546d4e6fbf1335460258b7d46b8888dfccd4d5bb492ed9c498dcd2d5156d143c035efdc442fac3695
+EBUILD redmine-3.4.4.ebuild 6544 BLAKE2B e644f5e299068644f489e01c811d89f9af522deda872723a9d57355d0f0dec832c0988b36090fa6527fed0d83462aa1f9900ff195093664665331b33f975764c SHA512 894f02797098d821eccfc1954b747a0b6c882689413954ee0bec546074459a03ccd06b7a65341ff5360429ba5b54cab706eafcba1bfe2e37b9962db93a0730cd
 MISC metadata.xml 527 BLAKE2B 251acbf9246fd6c986b37b6320e78619036d30bc8e155e97a93a2c3ca99847eb39d7919ba94f633aa021462cd200dd156b6f7d3c1575151c1d6b38a4ee999bfa SHA512 156e0ee607ad0ae734a98fab405679c55de4e2a5d620cce564a7ac17e8a029869f66c3df6d2733eb8106f9732537355c72be7c7261209af196264d069788eed4
diff --git a/www-apps/redmine/redmine-3.4.4.ebuild b/www-apps/redmine/redmine-3.4.4.ebuild
index c3b226cd21c4..c914e4add206 100644
--- a/www-apps/redmine/redmine-3.4.4.ebuild
+++ b/www-apps/redmine/redmine-3.4.4.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-# ruby24 don't have required deps
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 inherit eutils depend.apache ruby-ng user
 
 DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"