summaryrefslogtreecommitdiff
path: root/www-servers/h2o
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-29 11:22:34 +0000
committerV3n3RiX <venerix@redcorelinux.org>2017-10-29 11:22:34 +0000
commitbd7908c6630f38067350d396ac5d18c3cc2434a0 (patch)
tree3559b3e11424f5529527f2474d8a977a91ee3389 /www-servers/h2o
parent8b2628ad8526c806375e7b157889e4274b70248b (diff)
gentoo resync : 29.10.2017
Diffstat (limited to 'www-servers/h2o')
-rw-r--r--www-servers/h2o/Manifest6
-rw-r--r--www-servers/h2o/h2o-2.2.3.ebuild (renamed from www-servers/h2o/h2o-2.2.2.ebuild)10
-rw-r--r--www-servers/h2o/h2o-9999.ebuild18
3 files changed, 11 insertions, 23 deletions
diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index e73453ca24ee..dac948f7af7b 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -2,7 +2,7 @@ AUX h2o.conf 673 SHA256 e22bffda48ad6519d071d5de7afa6ea7acd6fba21c879d5c0b2e2f0b
AUX h2o.initd 1137 SHA256 4a2ab08c15b8c5d10cf538862f0cd48419e2968061f0e6ce56c1540ce064954b SHA512 2509b1b6996be25bba158b626c8eb260aae2400d76dc0edcee38869eb1124ae9ed125fb1887bf85f3c96db189b68c77706c7a9aeb9f4be2d2dfd998606d3a763 WHIRLPOOL 7ec5716442283b56f294016c211bd23a8d3d3c09cb667f72915f33e01bc59d5cdadba920938a8e5943d82afcdf68d696e6cc46df15ed228e1e1464a2484e1135
AUX h2o.logrotate 176 SHA256 31749cf8fbc34c73c8fd439579cbd07bf9d0c3c2d0db8f7fb32f340727131e13 SHA512 e7e15bb7813b45342a9d435d07eea0627b802a4c03c6f4204b533a7bfac9566152f875965e4ea761572324a278e7b85c507729210d92ca4bede3ef9b9d2ac305 WHIRLPOOL 2ab1cbffcebddb2a7e8ca9cefd124670b1b11be0e9bf4202727201aef9d25ffbc893ce5e9903c92aca4b5787a6d46c344e5445721d6f1bbcfac7a5441001b9cb
AUX h2o.service 290 SHA256 9eae3d4b08f22e2b140e736d36b347bcb5d817c60faff72804c80f5ccc660954 SHA512 e1acd226a5e333538be782f5d47c8debf418966c86eaa5d7464431ecc399821e336c9539e90370b9f8041c023f876815050e5ad5a7d29288b6f87bd3adbe0e95 WHIRLPOOL 1bd06fdcefb4bd35c02b0294af395efa172390114dbda375fcb136fec63d9bccf621850d4348caf77b24835b8b47e8c4bfb06ea38c2604667ed0df215cef0903
-DIST h2o-2.2.2.tar.gz 16192602 SHA256 cf45780058566bd63d90ad0b52b1d15f8515519090753398b9bcf770162a0433 SHA512 b5cc08f2be7056bbac4370f9b6ccb1ba0ad4ea61ce67e946a4f26b8f9c0a575f603c899b1a88f17d1065e0e72e1d1094199200ed24b4f3644a3c7df34aa04b51 WHIRLPOOL d9aff2d3e7caa0334efbac86a807fe8ecd5f146ae56315a5194b8de653ae4f91d33cad754714cd38fadd1c59d87cafe30c1f5f6cb2102362a7647ebd3f18dc84
-EBUILD h2o-2.2.2.ebuild 1353 SHA256 f3552a7bc90334d0d4dbb02cdfa39f97e683dca9ac077a6ea08ff3a83729bc30 SHA512 6595f5bd5f3ce4dec83ad9b6cc3a58d721f76ef6ec806340ceea6da0ed33d923ac813f91c380d41c751b7fe8abae575f0c0b270640cbd52c52db1d3c2446521c WHIRLPOOL 80fdbb82b1ceab4c32952bdc958d9fd6ff68ce0d0a20a7541940d2d4ca033234d27a1dd17cb555bcbdf0e9b021624ae95c9eabfec861a8ed869cdb335bb81130
-EBUILD h2o-9999.ebuild 1322 SHA256 011d3398ae8068e30406c5cb75289fe195f7fbce92a51488bf0be5da9f84b1b7 SHA512 16e9b6619038055c9e32b4acbced26a8d4c24f17d56638947ed8ef636e9e75ef36efb87ac9e1fb8574af46d35f9f8f4e60022e694f283545b49f2d6d0a6a2f3b WHIRLPOOL 77e30e65a2dc56a08a31047ee978fa1cd1f2e1eee7c678f370f195946a5298a76e83e4aad814321954aebfa463534e9deb43c89d9c391b8533496248372bf47e
+DIST h2o-2.2.3.tar.gz 16207150 SHA256 d40401ca714d00ca5204e8d22148dbaa9cae3407e3b4b6b62bd208543901ea51 SHA512 f138667e8e4370102028da469e09e8b2ee2e5dc92f4513b35467aa2a2fb7b02bbda2b2d158bbf3198b26faeea48d5ec07a7ebab1d0cb3032c532d4e6323630f1 WHIRLPOOL 0a5b498c7568b07af9e475eec00fd8db0122608843c5918616857ec96479a180a89d7a4274c98107129efa784b0d3714dd687a9f1463606be65e12987dc89303
+EBUILD h2o-2.2.3.ebuild 1339 SHA256 e05eaf68d9645ad17d6e0a669a8274e20e267a9ad864bfd00f5aebeaa3daad45 SHA512 25e445607b751a3f0cbc911e659e9f8610af67f924e36d0193e11d44679933bba3b053b3d5f58cd5c8affde6de6de8c47626f44b06d285737d29e22e59eb44fd WHIRLPOOL f8a94b7ca48eafe7a516f65e297a8d895fb9341acaedfcee7fc7242fbff6a20ea6fb415e5221f6875e27f82352eef12c2f91c4a5a663ad91647ae054313dfba3
+EBUILD h2o-9999.ebuild 1131 SHA256 e29ee7d39c70751231506485da4b75e6e354c61c300f8818fb757bac09448464 SHA512 c11d644f2dc377bc2f6f29de73b10c5125273a0a64c2ee544430dc604cb37defde7371b739fb64581f2ac382d323317573d65d763821258b54d4fdc19a2b19ac WHIRLPOOL 46914f866ac53fa1cfa2fd98135f40286889b019ecb0d47a6a485071b19b28caa7f48b6d9e5eaa794a69415719472fe23ba280b816dbcdb7202c4acc168d3a76
MISC metadata.xml 728 SHA256 1531440761f65dcd9833c08638bb78488c9a151e6adacc2209e5baf4e5907838 SHA512 ae4a00e6c50ef7930e264cb3a747e14e656908fab0e3da4673c6719dda3744b34451361cd118feaaa6eebf3980c56ec297df9306e9ffa56c56df6c150e27707b WHIRLPOOL fdbe147f6fe521123e68c847a829074bc7b5c9838d055f317b16e774769c78e8a0103c179086edec35abdb05f27694c91fd6c9fedad2e29467a089f0e2ba7c10
diff --git a/www-servers/h2o/h2o-2.2.2.ebuild b/www-servers/h2o/h2o-2.2.3.ebuild
index fef33e05d6fc..1ad169707581 100644
--- a/www-servers/h2o/h2o-2.2.2.ebuild
+++ b/www-servers/h2o/h2o-2.2.3.ebuild
@@ -3,7 +3,9 @@
EAPI=6
-inherit cmake-utils systemd user
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit cmake-utils 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() {
diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 761de2c20b03..0db4fc4f8f77 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