diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-22 10:09:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-22 10:09:44 +0000 |
| commit | 09351e78166b5e864197c4456ebae3f89dd0bed9 (patch) | |
| tree | 41a96399f56ed3aa399006871bfce4430db84aa2 /dev-qt | |
| parent | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (diff) | |
gentoo resync : 22.01.2019
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/Manifest.gz | bin | 9852 -> 9851 bytes | |||
| -rw-r--r-- | dev-qt/qtwebkit/Manifest | 2 | ||||
| -rw-r--r-- | dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 8 |
3 files changed, 6 insertions, 4 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 0c585ecf6bc3..8e00b0e7d30a 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest index 00c0e2796821..de674f98ff58 100644 --- a/dev-qt/qtwebkit/Manifest +++ b/dev-qt/qtwebkit/Manifest @@ -2,5 +2,5 @@ AUX qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch 4466 BL AUX qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch 1164 BLAKE2B d0d12652387ed24a21548746687fb4689d3d9198e66ba5bb3fa6ec3aeb83db610f5f9e9910ec6c5f240ac6a0f2af855afa4413f971585588fe0d9bd6b718203c SHA512 52f34491d15cc8ca381347427cb440788f8ac6d7d8e52bab067fe997e321bd9e693c9d48669b6bbc23f060c9475d25563496e368b7a94198aff25a21a1491e3e AUX qtwebkit-5.212.0_pre20180120-functional.patch 723 BLAKE2B dec67933a798f485e59ea87fbcc2f9475f426427cbc80dff39808b48bcf4dd74f802b648db11f2611e85364e978f55eab029e09c7c88d9524a961bb6627682c1 SHA512 7f54f26a18f91ba7dd71e1c82c22533b13707d045c0d693c4102bd95c9a77ba74678c90394ea65816e9fa80845d46735d7c8b178e1b5ad34e6214e9a5ae8947f DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047 -EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3813 BLAKE2B 5dcfd0311f11e96beaa9e77a1e2ee0b1ab717093e011997d82f95fdf361c67570465fbedb3bd47c6fa3a4f7aa595242247af039dd66eeee76343599ccb1174a8 SHA512 ebc56bac4850fd81c7d4d91c70c32c037b6267f3ab528a415face02f2bbba944c47283fe8a711671cddadc1f30dfd366a699274fef13d324f90263a72bcc64e0 +EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3939 BLAKE2B bfb4ef5422e28c86f9a81ef41ca00ba1d07dc92c9277c67499d0d041dbab2306a410e22f73a7b42374b30eceb001083ec67c74623c065a72f0ea91ab9e0ac1fe SHA512 feeae8ef90249a5870552caa4f5e05f783851a43022d354c7b6f0524d872b0588a9460f3a3b8c048ed887e8ee3d141b317665ac593cb4ac9921c76baf556a59c MISC metadata.xml 1225 BLAKE2B 29d533721955dea3cd9f1d23494438d3abc079d713cf77d707920a765e3eba4e2160d0f80b05ec2ba8cbcf7999aad51201bbf002e8b59161bb2d0d85cd945e50 SHA512 b382f115f4705a577e210760d499fde421d0091818914674f0c2eb7fc4967d19d5dbf752be19f43f0edb27493ebec58b89e07a65ffa505842a089d06353aa122 diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild index d520d1f87ea0..49f0ae2bc990 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 COMMIT=72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da CMAKE_MAKEFILE_GENERATOR="ninja" PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby23 ruby24 ruby25" +USE_RUBY="ruby23 ruby24 ruby25 ruby26" inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs @@ -125,7 +125,9 @@ src_configure() { -DENABLE_X11_TARGET=$(usex X) ) - if has_version "virtual/rubygems[ruby_targets_ruby25]"; then + if has_version "virtual/rubygems[ruby_targets_ruby26]"; then + mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) ) + elif has_version "virtual/rubygems[ruby_targets_ruby25]"; then mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) ) elif has_version "virtual/rubygems[ruby_targets_ruby24]"; then mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) ) |