[gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/

["Patrice Clement" <monsieurp@gentoo.org>]

commit:     f9d412e232fc0b9402452e771beab2f50da95327
Author:     Ian Moone <csmk+gentoo <AT> chaoslab <DOT> org>
AuthorDate: Thu Oct 19 19:42:51 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 21:02:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d412e2

www-servers/h2o: update live ebuild to make use of ruby-single eclass.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 www-servers/h2o/h2o-9999.ebuild | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 761de2c20b0..0db4fc4f8f7 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=6
 
-inherit cmake-utils git-r3 systemd user
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit cmake-utils git-r3 ruby-single systemd user
 
 DESCRIPTION="An optimized HTTP server with support for HTTP/1.x and HTTP/2"
 HOMEPAGE="https://h2o.examp1e.net"
@@ -20,11 +22,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	mruby? (
 		sys-devel/bison
-		|| (
-			dev-lang/ruby:2.4
-			dev-lang/ruby:2.3
-			dev-lang/ruby:2.2
-		)
+		${RUBY_DEPS}
 	)"
 
 pkg_setup() {
@@ -32,14 +30,6 @@ pkg_setup() {
 	enewuser h2o -1 -1 -1 h2o
 }
 
-src_prepare() {
-	# Leave optimization level to user CFLAGS
-	sed -i 's/-O2 -g ${CC_WARNING_FLAGS} //g' ./CMakeLists.txt \
-		|| die "sed fix failed!"
-
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/h2o