summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-05-04 12:02:00 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-05-04 12:02:00 +0100
commiteab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch)
treece35c6d01b5ff5de95c3a20fef853b9a6518ad2e /dev-util
parentb7ebc951da8800f711142f69d9d958bde67a112d (diff)
gentoo resync : 04.05.2019
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/Manifest.gzbin66773 -> 67110 bytes
-rw-r--r--dev-util/android-studio/Manifest2
-rw-r--r--dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild2
-rw-r--r--dev-util/apitrace/Manifest12
-rw-r--r--dev-util/apitrace/apitrace-8.0.ebuild (renamed from dev-util/apitrace/apitrace-7.1-r1.ebuild)31
-rw-r--r--dev-util/apitrace/files/apitrace-7.1-docs-install.patch23
-rw-r--r--dev-util/apitrace/files/apitrace-7.1-glxtrace-only.patch32
-rw-r--r--dev-util/apitrace/files/apitrace-7.1-snappy-license.patch11
-rw-r--r--dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch159
-rw-r--r--dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch (renamed from dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch)32
-rw-r--r--dev-util/apitrace/files/apitrace-8.0-docs-install.patch54
-rw-r--r--dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch49
-rw-r--r--dev-util/aruba/Manifest2
-rw-r--r--dev-util/aruba/aruba-0.6.2-r2.ebuild4
-rw-r--r--dev-util/ccache/Manifest4
-rw-r--r--dev-util/ccache/ccache-3.6.ebuild2
-rw-r--r--dev-util/ccache/ccache-3.7.1.ebuild84
-rw-r--r--dev-util/conan/Manifest2
-rw-r--r--dev-util/conan/conan-1.0.4-r1.ebuild (renamed from dev-util/conan/conan-1.0.4.ebuild)4
-rw-r--r--dev-util/ctags/Manifest2
-rw-r--r--dev-util/ctags/ctags-20190331.ebuild2
-rw-r--r--dev-util/cucumber-core/Manifest2
-rw-r--r--dev-util/cucumber-core/cucumber-core-3.2.1.ebuild4
-rw-r--r--dev-util/cucumber-expressions/Manifest2
-rw-r--r--dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild2
-rw-r--r--dev-util/cucumber-messages/Manifest2
-rw-r--r--dev-util/cucumber-messages/cucumber-messages-2.1.2.ebuild20
-rw-r--r--dev-util/cucumber-rails/Manifest2
-rw-r--r--dev-util/cucumber-rails/cucumber-rails-1.7.0.ebuild2
-rw-r--r--dev-util/cucumber-tag_expressions/Manifest2
-rw-r--r--dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild2
-rw-r--r--dev-util/cucumber-wire/Manifest2
-rw-r--r--dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild4
-rw-r--r--dev-util/cucumber/Manifest2
-rw-r--r--dev-util/cucumber/cucumber-3.1.2.ebuild10
-rw-r--r--dev-util/debugedit/Manifest2
-rw-r--r--dev-util/debugedit/debugedit-4.14.2-r1.ebuild2
-rw-r--r--dev-util/devhelp/Manifest2
-rw-r--r--dev-util/devhelp/devhelp-3.30.1.ebuild2
-rw-r--r--dev-util/flawfinder/Manifest4
-rw-r--r--dev-util/flawfinder/flawfinder-2.0.7.ebuild36
-rw-r--r--dev-util/flawfinder/metadata.xml14
-rw-r--r--dev-util/geany-plugins/Manifest2
-rw-r--r--dev-util/geany-plugins/geany-plugins-1.34.ebuild2
-rw-r--r--dev-util/geany/Manifest6
-rw-r--r--dev-util/geany/geany-1.34.1.ebuild3
-rw-r--r--dev-util/geany/geany-1.35.ebuild83
-rw-r--r--dev-util/geany/geany-9999.ebuild1
-rw-r--r--dev-util/intel-graphics-compiler/Manifest3
-rw-r--r--dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3.ebuild35
-rw-r--r--dev-util/intel-graphics-compiler/metadata.xml12
-rw-r--r--dev-util/meson/Manifest2
-rw-r--r--dev-util/meson/meson-0.49.2.ebuild2
-rw-r--r--dev-util/nvidia-cuda-toolkit/Manifest2
-rw-r--r--dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r1.ebuild (renamed from dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105.ebuild)19
-rw-r--r--dev-util/patchelf/Manifest4
-rw-r--r--dev-util/patchelf/patchelf-0.10.ebuild6
-rw-r--r--dev-util/patchelf/patchelf-0.8.ebuild6
-rw-r--r--dev-util/pkgconfig/Manifest2
-rw-r--r--dev-util/pkgconfig/pkgconfig-0.29.2.ebuild4
-rw-r--r--dev-util/qbs/Manifest2
-rw-r--r--dev-util/qbs/qbs-1.13.0.ebuild115
-rw-r--r--dev-util/re2c/Manifest13
-rw-r--r--dev-util/re2c/files/re2c-1.1-dash-V.patch49
-rw-r--r--dev-util/re2c/re2c-0.13.5-r1.ebuild29
-rw-r--r--dev-util/re2c/re2c-0.16.ebuild28
-rw-r--r--dev-util/re2c/re2c-1.0.1.ebuild28
-rw-r--r--dev-util/re2c/re2c-1.0.2.ebuild28
-rw-r--r--dev-util/re2c/re2c-1.0.3.ebuild28
-rw-r--r--dev-util/re2c/re2c-1.1-r1.ebuild32
-rw-r--r--dev-util/scons/Manifest2
-rw-r--r--dev-util/scons/scons-3.0.4.ebuild2
-rw-r--r--dev-util/spirv-llvm-translator/Manifest6
-rw-r--r--dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch18
-rw-r--r--dev-util/spirv-llvm-translator/metadata.xml12
-rw-r--r--dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1-r1.ebuild67
-rw-r--r--dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1.ebuild65
77 files changed, 963 insertions, 388 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c68fa60114e0..f0287633e379 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
Binary files differ
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 3786a9ccaa73..52a3584e237b 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -2,5 +2,5 @@ AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951
DIST android-studio-ide-181.5056338-linux.zip 1055510234 BLAKE2B d22e4455ccbe7c6f12eacbcc2b707d840945586d9824bfbd2b6f093ef986d54eb042ba0ecc5bdca17c74a20b43e73821eaeefdfb28d4e129bebbb885c7b17483 SHA512 d1e225ed97f4737bdc9cddfc40e85ed5cfea7b4f911a088d2a1cc09558f010affe0a0661fb6f6911d47902b49bbde81868eb56363b90bbec70dd87b679850156
DIST android-studio-ide-182.5199772-linux.zip 1059268546 BLAKE2B b5485c444eea49e10b155a763d40a08c09a05e34c151cf21b79bfbb9b039f0bb112fc806b3b8cf4fe7e17127fe89c8651fac7ff83163ff1cf78c24b330273490 SHA512 76647fc50fbe06f93b733962b51dc8fb57d59c1e30364b82bf7a03a7700a0f7835eab240db6bd93ae71f4147408cbe8641b41965c97d40494c2e5fe0fecfba4d
EBUILD android-studio-3.2.1.0.181.5056338.ebuild 3240 BLAKE2B 7c2780bd4988f6ed98717846474992a3332599f16570f71837bfcf3a82c5659154cac12066a5a2362db6abd15468fb20816b35df0656aad24f55684b22b077af SHA512 8abdb86fba3d3135faff90623bfa68cd92c83374b2a01754657c17007aac46c408179c1ab4ffcb7c74dc123f0177bcdc251171856837044a76b4ca7eb51816eb
-EBUILD android-studio-3.3.0.20.182.5199772.ebuild 3242 BLAKE2B 45c6157958c23297226bdcaae982d31006050fc0158b8e3954c35cbdf0f96d7d49a04f0d12b1498432f91a25ed67e01108484b47c60a83f4ea4eeec5816a3330 SHA512 79d3632caddd7b19f2d2cee3e575b00da7d608312d22d185bbbeb1226b30de33911bf659268fc1cd3ff347e5a80605dc7d589e64536990c99d151b180edcb92d
+EBUILD android-studio-3.3.0.20.182.5199772.ebuild 3240 BLAKE2B 7c2780bd4988f6ed98717846474992a3332599f16570f71837bfcf3a82c5659154cac12066a5a2362db6abd15468fb20816b35df0656aad24f55684b22b077af SHA512 8abdb86fba3d3135faff90623bfa68cd92c83374b2a01754657c17007aac46c408179c1ab4ffcb7c74dc123f0177bcdc251171856837044a76b4ca7eb51816eb
MISC metadata.xml 220 BLAKE2B d2e2757e926d61fa1d52be7a4f8e61b94c2f09f9868089255d89dd548d58b5898d8be4e5ea0c5c36cba3436b12026702443d43af0e4f7d6d41754b5c84c1c879 SHA512 9316c4d43c1ca819f3d2111553313246af1166f9fb95a666797ff28ca6b0410e92fbe4f94cf70a046e8086d824b47bed8b3c0d1ec1498a3be779cf9a828e9868
diff --git a/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild b/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild
index 4c9b9ac5af87..008bd20b140e 100644
--- a/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild
+++ b/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild
@@ -30,7 +30,7 @@ SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-
LICENSE="Apache-2.0"
SLOT="0"
IUSE="selinux"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="app-arch/zip
dev-java/commons-logging:0
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 76678e6ed159..bdf7a98ae5da 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,7 +1,7 @@
-AUX apitrace-7.1-disable-multiarch.patch 1250 BLAKE2B eaa7b29dc07abd6a86962ed8986772db070c0f3f01882a227193d853b3d296a9973b7ab3b04a77bae10b58c3bc3570a7db963aa80fdfcfe8a528a6bae91d84b2 SHA512 f9ec915c3221697ae81f9d49fcd56d846a5cc8d2f5e44d3da5df0ee3674c790370dbb4d58350d631d735f725a63fc323b1386f5399b89ae311ec783e29b0d396
-AUX apitrace-7.1-docs-install.patch 526 BLAKE2B 0b0412e17de8e5ad10fbca93afcb94031b87261ad1616d1a5a5f6c32ec1cc693887351e00a864358a9c38c42d8e202ca5eb5b9180aec6cdc0b87edda342b6b19 SHA512 530d232c41a447ce0e95f5b9d25bd0f48cfcad2867c7efd69e69b7179d85fd35d60a27adce1295e9499a6449f968ef3989c9e5f874224fb11086b92a714e5831
-AUX apitrace-7.1-glxtrace-only.patch 1022 BLAKE2B 1265fd4dc70702f6cba1d50437a55177ca19867e1a1c0b9ee0ab1f52b85864aa3a109fc7852aa60225de328cb67c6b987af37bf797aa03eac61b5b81af6980d2 SHA512 3cbb1b25dcfbb57785feba8ef83450e270f062fc771e5fd1ae99c8ac893cad6e33162a12fccc962da08778a77377db652690efe3c54d60b2a56a6d1971cefdf1
-AUX apitrace-7.1-snappy-license.patch 240 BLAKE2B ef144dba8882466d0fce8da74ffaa008840ca1d9fc411f37e56ec7bfa3ab1637c001b87fb80186b1844abe7694419719a0c1ad011bba5002752d4c1fcc448e96 SHA512 0ea2d2fe38c0ecd12a41dcef66efda7e55d02c43a9a8ec52da621f711e50f040542efa65e855d52715fa0ab78d54b4c5620ee0cfc0795f4d9eb4a433d07da60c
-DIST apitrace-7.1.tar.gz 2343156 BLAKE2B ab450535a585d476726b0bb3fbb8f85f930dafd883419ac9a575ca0b487890b26d39baee920c5f4c29b929bce13450643bc27d7f5d269aa60c044dca9975bcce SHA512 b4ebe4eb0b16770a156cffe7cccccff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84
-EBUILD apitrace-7.1-r1.ebuild 2439 BLAKE2B 37393fe352c333c50f870dea34cbcff7e53878bc84194d64c5bfe7eb0812e6dcad9477a6634444d37498b359d456a739a24b5fa6fe4a56152deb3360d56ca1f6 SHA512 c916ea1fd2a816d59979e9490a4d7cb8d0fadde7f47c5e32b53711d53cc59ebb078f57548bfad5b2dc206d89182b8c34fe12b18fcb4a22dd297a703c74312763
+AUX apitrace-8.0-brotli-unbundle.patch 4729 BLAKE2B 62d035f6924b4c1af7d8cffe8b57845c4e1b4f10423c6c54438ef069f37c3ed39cad62a5066189a604601f5df1a2949c584481948a662f0d00a27305fd6b6416 SHA512 209d41f221c439a0abe4a021c8335cc51eaa6d4769c41c7526501be127e2089b99ccad5e417b10339ff65af37e37c51975be25a68e23a33cae71c61ab9e968ce
+AUX apitrace-8.0-disable-multiarch.patch 1800 BLAKE2B e7eb8a642392ecbdf5a29c17520df137e6c581073571114e4e1e60b00a027780f41057368dc5ac7d20d6be42371ff4171de342ac88745d00ff1ee4822f814f69 SHA512 73213188d4e2506bf61142c9366a2163cf713ba7f06676e241a05b20bc6601858f707bd21dcf675630315aebfc667b943290e1e7343bff9f89b625527d0b3f5c
+AUX apitrace-8.0-docs-install.patch 1452 BLAKE2B e8fe92e29614dcf416221c61cab5989cea2308771e8b87cd914194c26a79a27abdc5594938e7d7578d6d2a2980136446d1091d4a73d84cdb21125f46e97556e8 SHA512 ce405289a0c526b8e83e1624f9cd98e8eec9843509dc52f905ab884ad1091c61bdf06497f70233e703001ac638906875747d07167aca3e881e9dee1e543fe7b0
+AUX apitrace-8.0-glxtrace-only.patch 1591 BLAKE2B 45dae3a9bfdea147fd865124db7865bd389e15f7feec491f1ae520077e06134b9305351295975449dceea13aa65fee11db1a245eec73666b63c8874e72043cd3 SHA512 eea930563f125df25ff0912bcddb925fd3724fa17c1d3f1a9a5648b1f44351d3f79cf44d5e7f59ca8282a0dffb62afba583059721f9e5545707294ea62fa90c4
+DIST apitrace-8.0.tar.gz 3601109 BLAKE2B f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc SHA512 1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c
+EBUILD apitrace-8.0.ebuild 2471 BLAKE2B eba6b605d9fcdb8397159323d7dd2769db436150e8f75334a0055e0dd32586299dbb6c6439004ad134d93cb9a1e1a14b2cb361b0d0503d584a4dd90bedc25110 SHA512 e4bb4a6e85b2d6af3604ae2b71ef73759de22bf6e7e739d4d05eeb8149e575438438f7e69d0ef4cfabbbedc1626345021cd2eef11ddfd0f655035bebdffd2e82
MISC metadata.xml 438 BLAKE2B f88a54537c6bd0c1f9965ec8d520928cea727ba4f8424b49993c4e310078676d9394ddaa64c3c0fb9e0f1bf9eca36142260148945f455e0700dbc362dce73fd6 SHA512 45a818f2bbbfd046e403940734323c027929de373f8366a7de29e4342fe3f98ea27ba2c151f80dbbd33d1110acf2f363669c3c4176d2c15d8b5a783182128cd5
diff --git a/dev-util/apitrace/apitrace-7.1-r1.ebuild b/dev-util/apitrace/apitrace-8.0.ebuild
index c39555ef4931..96e336ad5adc 100644
--- a/dev-util/apitrace/apitrace-7.1-r1.ebuild
+++ b/dev-util/apitrace/apitrace-8.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python2_7 )
inherit cmake-multilib python-single-r1
@@ -10,18 +10,19 @@ DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
HOMEPAGE="https://github.com/apitrace/apitrace"
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-LICENSE+=" BSD CC-BY-3.0 CC-BY-4.0 public-domain" #bundled snappy
+LICENSE="MIT !system-snappy? ( BSD CC-BY-3.0 CC-BY-4.0 public-domain )" #bundled snappy
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="+cli egl qt5 system-snappy"
+
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="${PYTHON_DEPS}
+DEPEND="${PYTHON_DEPS}
+ app-arch/brotli:=
media-libs/libpng:0=
media-libs/mesa[egl?,${MULTILIB_USEDEP}]
- sys-libs/zlib:=[${MULTILIB_USEDEP}]
- sys-process/procps
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ sys-process/procps:=
x11-libs/libX11
egl? (
>=media-libs/mesa-8.0[gles1,gles2]
@@ -31,18 +32,17 @@ RDEPEND="${PYTHON_DEPS}
dev-qt/qtcore:5
dev-qt/qtgui:5[-gles2]
dev-qt/qtnetwork:5
- dev-qt/qtwebkit:5
dev-qt/qtwidgets:5[-gles2]
)
system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}"/${PN}-7.1-glxtrace-only.patch
- "${FILESDIR}"/${PN}-7.1-disable-multiarch.patch
- "${FILESDIR}"/${PN}-7.1-docs-install.patch
- "${FILESDIR}"/${PN}-7.1-snappy-license.patch
+ "${FILESDIR}"/${P}-disable-multiarch.patch
+ "${FILESDIR}"/${P}-glxtrace-only.patch
+ "${FILESDIR}"/${P}-docs-install.patch
+ "${FILESDIR}"/${P}-brotli-unbundle.patch
)
src_prepare() {
@@ -51,15 +51,16 @@ src_prepare() {
# The apitrace code grubs around in the internal zlib structures.
# We have to extract this header and clean it up to keep that working.
# Do not be surprised if a zlib upgrade breaks things ...
- rm -rf "${S}"/thirdparty/{getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die
+ rm -rf thirdparty/{brotli,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die
if use system-snappy ; then
- rm -rf "${S}"/thirdparty/snappy || die
+ rm -rf thirdparty/snappy || die
fi
}
src_configure() {
my_configure() {
local mycmakeargs=(
+ -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
-DENABLE_EGL=$(usex egl)
-DENABLE_STATIC_SNAPPY=$(usex !system-snappy)
)
diff --git a/dev-util/apitrace/files/apitrace-7.1-docs-install.patch b/dev-util/apitrace/files/apitrace-7.1-docs-install.patch
deleted file mode 100644
index 9fdc04ffe996..000000000000
--- a/dev-util/apitrace/files/apitrace-7.1-docs-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- apitrace-7.1/CMakeLists.txt
-+++ apitrace-7.1/CMakeLists.txt
-@@ -553,20 +553,6 @@
- ##############################################################################
- # Packaging
-
--install (
-- FILES
-- README.markdown
-- docs/BUGS.markdown
-- docs/NEWS.markdown
-- docs/USAGE.markdown
-- DESTINATION ${DOC_INSTALL_DIR}
--)
--install (
-- FILES LICENSE
-- DESTINATION ${DOC_INSTALL_DIR}
-- RENAME LICENSE.txt
--)
--
- set (CPACK_PACKAGE_VERSION_MAJOR "7")
- set (CPACK_PACKAGE_VERSION_MINOR "0")
-
diff --git a/dev-util/apitrace/files/apitrace-7.1-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-7.1-glxtrace-only.patch
deleted file mode 100644
index 91867affca26..000000000000
--- a/dev-util/apitrace/files/apitrace-7.1-glxtrace-only.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Allow building of just glxtrace library for ebuilds without GUI tools.
-
-Updated from 5.0 version of patch to apply against 7.1.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,6 +44,8 @@
-
- option (ENABLE_FRAME_POINTER "Disable frame pointer omission" ON)
-
-+option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
-+
- # Proprietary Linux games often ship their own libraries (zlib, libstdc++,
- # etc.) in order to ship a single set of binaries across multiple
- # distributions. Given that apitrace wrapper modules will be loaded into those
---- a/retrace/CMakeLists.txt
-+++ b/retrace/CMakeLists.txt
-@@ -12,6 +12,8 @@
-
- add_definitions (-DRETRACE)
-
-+if (NOT BUILD_LIB_ONLY)
-+
- add_custom_command (
- OUTPUT glretrace_gl.cpp
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
-@@ -368,3 +370,5 @@
- install (TARGETS d3dretrace RUNTIME DESTINATION bin)
- install_pdb (d3dretrace DESTINATION bin)
- endif ()
-+
-+endif (NOT BUILD_LIB_ONLY)
diff --git a/dev-util/apitrace/files/apitrace-7.1-snappy-license.patch b/dev-util/apitrace/files/apitrace-7.1-snappy-license.patch
deleted file mode 100644
index 2b211dc5ddb7..000000000000
--- a/dev-util/apitrace/files/apitrace-7.1-snappy-license.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- apitrace-7.1/thirdparty/snappy/CMakeLists.txt
-+++ apitrace-7.1/thirdparty/snappy/CMakeLists.txt
-@@ -16,8 +16,3 @@
- snappy-c.cc
- )
-
--install (
-- FILES COPYING
-- DESTINATION ${DOC_INSTALL_DIR}
-- RENAME LICENSE-snappy.txt
--)
diff --git a/dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch b/dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch
new file mode 100644
index 000000000000..09ed21c0c54e
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch
@@ -0,0 +1,159 @@
+From b0f5a220c41af013da3362e5c9751b593b22754a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 29 Apr 2019 21:08:02 +0200
+Subject: [PATCH 1/2] Import FindBrotliDec.cmake and FindBrotliEnc.cmake from
+ Igalia S.L.
+
+MIT License, which fits well.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ cmake/FindBrotliDec.cmake | 35 +++++++++++++++++++++++++++++++++++
+ cmake/FindBrotliEnc.cmake | 35 +++++++++++++++++++++++++++++++++++
+ 2 files changed, 70 insertions(+)
+ create mode 100644 cmake/FindBrotliDec.cmake
+ create mode 100644 cmake/FindBrotliEnc.cmake
+
+diff --git a/cmake/FindBrotliDec.cmake b/cmake/FindBrotliDec.cmake
+new file mode 100644
+index 00000000..abb06f44
+--- /dev/null
++++ b/cmake/FindBrotliDec.cmake
+@@ -0,0 +1,35 @@
++# Copyright 2017 Igalia S.L. All Rights Reserved.
++#
++# Distributed under MIT license.
++# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
++
++# Try to find BrotliDec. Once done, this will define
++#
++# BROTLIDEC_FOUND - system has BrotliDec.
++# BROTLIDEC_INCLUDE_DIRS - the BrotliDec include directories
++# BROTLIDEC_LIBRARIES - link these to use BrotliDec.
++
++find_package(PkgConfig)
++
++pkg_check_modules(PC_BROTLIDEC libbrotlidec)
++
++find_path(BROTLIDEC_INCLUDE_DIRS
++ NAMES brotli/decode.h
++ HINTS ${PC_BROTLIDEC_INCLUDEDIR}
++)
++
++find_library(BROTLIDEC_LIBRARIES
++ NAMES brotlidec
++ HINTS ${PC_BROTLIDEC_LIBDIR}
++)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(BrotliDec
++ REQUIRED_VARS BROTLIDEC_INCLUDE_DIRS BROTLIDEC_LIBRARIES
++ FOUND_VAR BROTLIDEC_FOUND
++ VERSION_VAR PC_BROTLIDEC_VERSION)
++
++mark_as_advanced(
++ BROTLIDEC_INCLUDE_DIRS
++ BROTLIDEC_LIBRARIES
++)
+diff --git a/cmake/FindBrotliEnc.cmake b/cmake/FindBrotliEnc.cmake
+new file mode 100644
+index 00000000..4be347db
+--- /dev/null
++++ b/cmake/FindBrotliEnc.cmake
+@@ -0,0 +1,35 @@
++# Copyright 2017 Igalia S.L. All Rights Reserved.
++#
++# Distributed under MIT license.
++# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
++
++# Try to find BrotliEnc. Once done, this will define
++#
++# BROTLIENC_FOUND - system has BrotliEnc.
++# BROTLIENC_INCLUDE_DIRS - the BrotliEnc include directories
++# BROTLIENC_LIBRARIES - link these to use BrotliEnc.
++
++find_package(PkgConfig)
++
++pkg_check_modules(PC_BROTLIENC libbrotlienc)
++
++find_path(BROTLIENC_INCLUDE_DIRS
++ NAMES brotli/encode.h
++ HINTS ${PC_BROTLIENC_INCLUDEDIR}
++)
++
++find_library(BROTLIENC_LIBRARIES
++ NAMES brotlienc
++ HINTS ${PC_BROTLIENC_LIBDIR}
++)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(BrotliEnc
++ REQUIRED_VARS BROTLIENC_INCLUDE_DIRS BROTLIENC_LIBRARIES
++ FOUND_VAR BROTLIENC_FOUND
++ VERSION_VAR PC_BROTLIENC_VERSION)
++
++mark_as_advanced(
++ BROTLIENC_INCLUDE_DIRS
++ BROTLIENC_LIBRARIES
++)
+--
+2.21.0
+
+
+From cd3486343001d6a47e4a468caa425ef835012463 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 29 Apr 2019 21:11:57 +0200
+Subject: [PATCH 2/2] Find system brotli instead of bundled
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 5 +++--
+ cli/CMakeLists.txt | 2 +-
+ lib/trace/CMakeLists.txt | 2 +-
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bc988e95..6a62b3b7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -483,8 +483,9 @@ if (ENABLE_STATIC_SNAPPY OR NOT SNAPPY_FOUND)
+ endif ()
+ include_directories (${SNAPPY_INCLUDE_DIRS})
+
+-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/brotli/c/include)
+-add_subdirectory (thirdparty/brotli)
++find_package(BrotliDec REQUIRED)
++find_package(BrotliEnc REQUIRED)
++include_directories (${BROTLIDEC_INCLUDE_DIRS} ${BROTLIENC_INCLUDE_DIRS})
+
+ if (NOT WIN32 AND NOT ENABLE_STATIC_EXE)
+ # zlib 1.2.4-1.2.5 made it impossible to read the last block of incomplete
+diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
+index a0189202..16428c63 100644
+--- a/cli/CMakeLists.txt
++++ b/cli/CMakeLists.txt
+@@ -39,7 +39,7 @@ add_executable (apitrace
+
+ target_link_libraries (apitrace
+ common
+- brotli_dec brotli_enc brotli_common
++ ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES}
+ ${ZLIB_LIBRARIES}
+ ${SNAPPY_LIBRARIES}
+ ${GETOPT_LIBRARIES}
+diff --git a/lib/trace/CMakeLists.txt b/lib/trace/CMakeLists.txt
+index c68bd00f..ce2e469e 100644
+--- a/lib/trace/CMakeLists.txt
++++ b/lib/trace/CMakeLists.txt
+@@ -31,7 +31,7 @@ target_link_libraries (common
+ guids
+ highlight
+ os
+- brotli_dec brotli_common
++ ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES}
+ )
+
+ add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp)
+--
+2.21.0
+
diff --git a/dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch
index 53d470d8705d..9ab6ca27f635 100644
--- a/dev-util/apitrace/files/apitrace-7.1-disable-multiarch.patch
+++ b/dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch
@@ -1,8 +1,23 @@
-respect the libdir cmake already set up for us instead of using debian-specific multiarch paths
+From 849289703b1c8ef1461d0d0f6a5465e20f3c0932 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 29 Apr 2019 20:32:04 +0200
+Subject: [PATCH 1/3] Use CMAKE_INSTALL_LIBDIR for LIB_INSTALL_DIR
---- apitrace-7.1/CMakeLists.txt
-+++ apitrace-7.1/CMakeLists.txt
-@@ -359,15 +359,6 @@
+Respect the libdir cmake already set up for us instead of using
+debian-specific multiarch paths.
+
+Patch was rebased multiple times from 4.0 to 8.0 now.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 17 ++---------------
+ 1 file changed, 2 insertions(+), 15 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 34b55554..36879db6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -429,15 +429,6 @@ endif ()
##############################################################################
# Installation directories
@@ -18,10 +33,10 @@ respect the libdir cmake already set up for us instead of using debian-specific
if (WIN32 OR APPLE)
# On Windows/MacOSX, applications are usually installed on a directory of
# their own
-@@ -376,12 +367,8 @@
+@@ -446,12 +437,8 @@ if (WIN32 OR APPLE)
set (LIB_ARCH_INSTALL_DIR lib)
else ()
- set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
+ set (DOC_DEFAULT_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
- set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
- if (ARCH_SUBDIR)
- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
@@ -32,4 +47,7 @@ respect the libdir cmake already set up for us instead of using debian-specific
+ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
endif ()
- set (SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts)
+ # Allow customization of the doc installation dir (Slackware uses different
+--
+2.21.0
+
diff --git a/dev-util/apitrace/files/apitrace-8.0-docs-install.patch b/dev-util/apitrace/files/apitrace-8.0-docs-install.patch
new file mode 100644
index 000000000000..4c8e215ff70c
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-8.0-docs-install.patch
@@ -0,0 +1,54 @@
+From 17864ae1e14362d56bbd7dd75149e094a4716bc6 Mon Sep 17 00:00:00 2001
+From: Michael Weber <xmw@gentoo.org>
+Date: Mon, 29 Apr 2019 20:56:28 +0200
+Subject: [PATCH 3/3] Disable doc files installation by build system
+
+Patch was rebased from 7.1 on top of 8.0.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 14 --------------
+ thirdparty/snappy/CMakeLists.txt | 5 -----
+ 2 files changed, 19 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6466cd8a..84fd0ae1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -604,20 +604,6 @@ endif ()
+ ##############################################################################
+ # Packaging
+
+-install (
+- FILES
+- README.markdown
+- docs/BUGS.markdown
+- docs/NEWS.markdown
+- docs/USAGE.markdown
+- DESTINATION ${DOC_INSTALL_DIR}
+-)
+-install (
+- FILES LICENSE
+- DESTINATION ${DOC_INSTALL_DIR}
+- RENAME LICENSE.txt
+-)
+-
+ set (CPACK_PACKAGE_VERSION_MAJOR "8")
+ set (CPACK_PACKAGE_VERSION_MINOR "0")
+
+diff --git a/thirdparty/snappy/CMakeLists.txt b/thirdparty/snappy/CMakeLists.txt
+index 84ecbac8..f732dbc0 100644
+--- a/thirdparty/snappy/CMakeLists.txt
++++ b/thirdparty/snappy/CMakeLists.txt
+@@ -26,8 +26,3 @@ add_convenience_library (snappy_bundled EXCLUDE_FROM_ALL
+ snappy-stubs-public.h
+ )
+
+-install (
+- FILES COPYING
+- DESTINATION ${DOC_INSTALL_DIR}
+- RENAME LICENSE-snappy.txt
+-)
+--
+2.21.0
+
diff --git a/dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch
new file mode 100644
index 000000000000..2655e0abfc09
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch
@@ -0,0 +1,49 @@
+From 747fe00d3b4e2648003715f949cf2ac18e32862a Mon Sep 17 00:00:00 2001
+From: Tim Harder <radhermit@gentoo.org>
+Date: Mon, 29 Apr 2019 20:45:42 +0200
+Subject: [PATCH 2/3] Allow building of just glxtrace library (without GUI
+ tools)
+
+Patch was rebased multiple times from 1.0 to 8.0 now.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 ++
+ retrace/CMakeLists.txt | 4 ++++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 36879db6..6466cd8a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,6 +47,8 @@ if (ANDROID)
+ message (FATAL_ERROR "Android is no longer supported (https://git.io/vH2gW)")
+ endif ()
+
++option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
++
+ # Proprietary Linux games often ship their own libraries (zlib, libstdc++,
+ # etc.) in order to ship a single set of binaries across multiple
+ # distributions. Given that apitrace wrapper modules will be loaded into those
+diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
+index 76dc8362..e1bad990 100644
+--- a/retrace/CMakeLists.txt
++++ b/retrace/CMakeLists.txt
+@@ -15,6 +15,8 @@ include_directories (
+
+ add_definitions (-DRETRACE)
+
++if (NOT BUILD_LIB_ONLY)
++
+ add_custom_command (
+ OUTPUT glretrace_gl.cpp
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
+@@ -343,3 +345,5 @@ if (WIN32)
+ install (TARGETS d3dretrace RUNTIME DESTINATION bin)
+ install_pdb (d3dretrace DESTINATION bin)
+ endif ()
++
++endif (NOT BUILD_LIB_ONLY)
+--
+2.21.0
+
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 016224cea19d..b7675491c231 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,6 +1,6 @@
DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
EBUILD aruba-0.6.2-r1.ebuild 996 BLAKE2B 80620a5bd3bdbc01901142c5feaffba15e3c95e2c55f38316af6f990c035e49dddcc76e15f11532dad444acac2aeb57151f72c22bce29d619382522faef064e5 SHA512 fea9848ac20fca8837763665d6771af000ead36a4552a24a55f42912374131b1f44999a3db2cb32716f3bbec50dc31f9baebe647edba1e003ca17dc8b0193171
-EBUILD aruba-0.6.2-r2.ebuild 996 BLAKE2B 61b0126b4acec56da8a4f75ceb6924d3cbed17cba41bdb96ca4373c1b0815baaad8d4582702a6023f838d22a2299f9039d63bf78e8224848915ddb6430ce542c SHA512 4b31af5b3b278601cffc27d9d9c87cd046caea4b59673d519b22fde5e0d0a493f46cc27225e0e88766ecbe442fb77481bb79991ff0124e38601341265f1ae3d4
+EBUILD aruba-0.6.2-r2.ebuild 1001 BLAKE2B 261b5a94b2f2ef57b8b1a65e985a6fddf94676bfbb196d1ad04977573887e3ee7f5784646655b7bef2a99890e22ffecd8e36989bcfbc53c2f98bab708b25f8d4 SHA512 2f10dd90cb2d4941aae7b027c3c451706db2bc88b08fa8f7cbd9a70d0c40dfaab405650965cb278e9894e993ea6b8919ecf0932c180cb30d04867aebcf550b73
EBUILD aruba-0.8.1.ebuild 1672 BLAKE2B a01b44c435d4594b8f58c5a272c2443c40ff04d20fd186a51421dc4d11dfcb7a1d68ea96191dcf3772c8247635e4ee296101cdbc26e441d67127509574dfc827 SHA512 411dfa207e15afc3bf6d32a0bfd02c0cf2c2f1a054cedb90c768e0435890d590e5723d810884405e69697df84394a7a545bc8bc4628ac4f8ec3046d0bc99433f
MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.6.2-r2.ebuild b/dev-util/aruba/aruba-0.6.2-r2.ebuild
index 26d29b4803a7..6ae6690572db 100644
--- a/dev-util/aruba/aruba-0.6.2-r2.ebuild
+++ b/dev-util/aruba/aruba-0.6.2-r2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_RECIPE_TEST="cucumber"
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
HOMEPAGE="https://github.com/cucumber/aruba"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
SLOT="0"
IUSE=""
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 6f6ca00eafff..dddd1091378a 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -9,11 +9,13 @@ DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d0904
DIST ccache-3.5.1a.tar.xz 335888 BLAKE2B 66c044b39dd42c91327e02528a4d6c917ac012c2d08190f7dbc2029ed6d1525aa3a6262fb7528f1721cec510306baa59b498a5afbcf955bb6aaf13594c00d178 SHA512 8a2e9eb06ba21fcf92084afd94fc221168693de545e0448f4da2098bef2bcbfdb017117c325b0bab4931b9e346dd8c1a9d1ebaed0cdc36496d9452985cdd1b43
DIST ccache-3.5.tar.xz 334668 BLAKE2B e3e2b63e8c4c8074514fb3a5794325fa05a4d52f48fc436ab0ad21b643ca4d1a1502c989cb47ed68972b105d4f1642e4fadc5ecef1235fe2bd3be5d218094a79 SHA512 92181fb794f06dc231baa4193c37e8f1d844c9281fd64bcb8f4b35c87b4a88dfc9bf36b810b37151ee85699778fcd3783818949a7010e619aeca7e3b33b7a2e3
DIST ccache-3.6.tar.xz 340608 BLAKE2B fa92180f53612f84b71c68da4acccefee129e5bfc9b269caa45a9c16219ed835ccf034d61ff938a54f3673fa23410d960475cc37cf5d27d7be641e7518a43f0a SHA512 13ce4c9084983ce77617cf005235987715cd6b630dac13a17cb9badce24aab71bff505e63da4206878e32d337cc674f05fbf78540711ec5b33a0b8384c47fa0d
+DIST ccache-3.7.1.tar.xz 349276 BLAKE2B 4f36ccb378b614668777d8be32dd343a0e59e36885a845ba004082f7ca0f69a5e4d01ed08af445c33bff218d33ad0385ed6ade383c06da20e3d0271b2f7423dd SHA512 c2f369c861998f82600272deedc436840af7f85baa355a1e119dacea8f41275d601a0805c3e2a8bc434df621a4e52647bd8654a71c2329542a8b160f7f179cdf
DIST ccache-3.7.tar.xz 348764 BLAKE2B a80ac0d5d94ff5d1aaee45a186037a9c8346c5e44d00afd29a4ba40b4fca877cd30b82357f344bed77f5caeb333bacfde8aff46d8fb866b484a3a1d3e5f513f5 SHA512 b8a5944072fcf8280b63ddbd6e2fcbc04d4ee99c0b2d3bfb9b47f61e760ce1dc5e191cf3f6437431b6d08af6cfb2162d6a2021ad49fd6746e531eb03cc26fd2e
EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3046ec700266ccd3a1d44240e7a5cf0e24deaef38bad30f66d823488e8979ebe79a9668ff55c6a417ec048229 SHA512 965dcf43bd7999352de8aa6097e90418160cf4f51e4016113c05dc37d023518e22d001a2415ad7948c07e55ab57ae044021e7e4f044df127b81a12ad2bd37653
EBUILD ccache-3.3.4-r1.ebuild 1917 BLAKE2B 740c0be412ab1c4402682dc403e292c96e3f7b4ef9c881bc71d8a4dfcf58716141a8eba73baba94ceb21d25cb3398c1e3f2a5a0e5435acc02f9c561e3777dc9b SHA512 d4c0899d3bd5f7c8040e4591a658ee93fa7fb96339a0f72169016ef433266a98e558242250697ba9b5abad0eccd636fd23892f6e88e7ee30f9bed84a38eba04b
EBUILD ccache-3.5-r1.ebuild 2046 BLAKE2B f5bd4d9cf89b0896d51152614c47f329e29d084c371b4fdd0291d2d6d1b2d880af38358a6ffbd620b9a8d1f3ec6a95d263ce2f8fa202955c2cb32c77cf33d758 SHA512 a90b898e8e261afe126321d7222ce41d4c91e068ce5baa15927a630ea66d141cce95f87b826c85b33599f33b0584055d22af6dd358651daea29487800f0cf2ae
EBUILD ccache-3.5.1a.ebuild 2096 BLAKE2B 3334ed2e2f022f39b27aa9fcfd39d98eb8982bad09b67d3d7a1cbb0a47115dbd416f886121e32aab00c75ee729038efa5696c8bf9c00e9ac0a513d99483ec2ad SHA512 246e5d788fcb590be2b2fe9cd6e214a87934e0547a6d0dd9e3c888f4955ed33be9cc87a2eb0afdc517e48d6dd1bb02129975b4a7b27fbaf77fe76e4a7d971137
-EBUILD ccache-3.6.ebuild 2094 BLAKE2B c500a209421345174099d4603fc592972862cdde7d961639b81bcaa3c723a9339b4dcb8dfc20287a21b6e22125992245926f317c6c856c672f9cb8f7f601d0da SHA512 bc60aff39b32ddedbd052ce7c0b90f42780fbb40f6b8a76773349c2406ed86b3d630a40d4c7ab9c75bb7b566c18753e7840ff589878918338933e75531c6c8ec
+EBUILD ccache-3.6.ebuild 2093 BLAKE2B 45c36a4fa8bc4c39f62a01343c27b7c6259bb104c9ad41da07d987ab2521e2300d1b35c98fcd89b236f2dd87470aae47fcaffd88bf90ff2e2df6e9b47f3a4314 SHA512 fe13c091e4ba3ddab8c1b3947b857f8930883ca596828b7f6d06a36af5d3f4ed428f86cebd5534be21c5202987c64b9e9ad75543bc70f4ac47b0e176508956de
+EBUILD ccache-3.7.1.ebuild 2126 BLAKE2B 11a1cdb3de7b56d6b97069c8646825ea10bf105d477b6fd16afc235d376b5bb888c53f9148b2ae0aa422d782b6b99e673a5aa821cfb09f0433388f6fa37a0c11 SHA512 b303a89fe8a501547394ba89ac44f9865320a737b8d9cb74acf1008b66803e2f62f46a38c22a1f4890891c97ffd0e249b0c3863ed3f3e2511f67a84f3164633f
EBUILD ccache-3.7.ebuild 2126 BLAKE2B 11a1cdb3de7b56d6b97069c8646825ea10bf105d477b6fd16afc235d376b5bb888c53f9148b2ae0aa422d782b6b99e673a5aa821cfb09f0433388f6fa37a0c11 SHA512 b303a89fe8a501547394ba89ac44f9865320a737b8d9cb74acf1008b66803e2f62f46a38c22a1f4890891c97ffd0e249b0c3863ed3f3e2511f67a84f3164633f
MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.6.ebuild b/dev-util/ccache/ccache-3.6.ebuild
index 155ab8c7ce3b..ed33366cc06c 100644
--- a/dev-util/ccache/ccache-3.6.ebuild
+++ b/dev-util/ccache/ccache-3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.1.ebuild b/dev-util/ccache/ccache-3.7.1.ebuild
new file mode 100644
index 000000000000..b8912ddeeee1
--- /dev/null
+++ b/dev-util/ccache/ccache-3.7.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+ sys-libs/zlib"
+RDEPEND="${DEPEND}
+ dev-util/shadowman
+ sys-apps/gentoo-functions"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
+ "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+ "${FILESDIR}"/${PN}-3.6-disable-sized-cleanup.patch #649440
+)
+
+src_prepare() {
+ default
+
+ # make sure we always use system zlib
+ rm -rf src/zlib || die
+ sed \
+ -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+ "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_compile() {
+ emake V=1
+}
+
+src_test() {
+ emake check V=1
+}
+
+src_install() {
+ DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+ default
+
+ dobin ccache-config
+ insinto /usr/share/shadowman/tools
+ newins - ccache <<<'/usr/lib/ccache/bin'
+
+ DOC_CONTENTS="
+To use ccache with **non-Portage** C compiling, add
+'${EPREFIX}/usr/lib/ccache/bin' to the beginning of your path, before
+'${EPREFIX}/usr/bin'. Portage will automatically take advantage of ccache with
+no additional steps. If this is your first install of ccache, type
+something like this to set a maximum cache size of 2GB:\\n
+# ccache -M 2G\\n
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
+ccache now supports sys-devel/clang and dev-lang/icc, too!"
+
+ readme.gentoo_create_doc
+}
+
+pkg_prerm() {
+ if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
+ eselect compiler-shadow remove ccache
+ fi
+}
+
+pkg_postinst() {
+ if [[ ${ROOT:-/} == / ]]; then
+ eselect compiler-shadow update ccache
+ fi
+
+ # nuke broken symlinks from previous versions that shouldn't exist
+ rm -rf "${EROOT}"/usr/lib/ccache.backup || die
+
+ readme.gentoo_print_elog
+}
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 1547db64dd53..2e1ed4fd7524 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,3 +1,3 @@
DIST conan-1.0.4.tar.gz 580404 BLAKE2B a3099e7f5bdb882591bab031da267f3df5582975d93a840cd7bf42d7b5b57850d42a28ea33440f6570149b7db8c2ae6a395460f375fee084a9336435d42e7df6 SHA512 47fe9632b0007cdc0456004e6c9122df387869c33b58694b4a2dca9956daf977532f79c204207b21d3a4e7d90337a25dba49cf84cba98c1f9bde3170f1a185a9
-EBUILD conan-1.0.4.ebuild 1610 BLAKE2B 1d53abfc05a4056bff26434097dda27f56ad2809ae62b7175a6d9b47bc13b71b217004670ccc009b353c163683557e2b8f6ef86fd6537405260b5c4fdbc57eed SHA512 eadc9fae7b90a2756c21ad94ba6eb66cd739e96514ffeead97ac991582f58ee63c6d230cf841ce8385a81d2308467aaef2892ab6c29e4427b87c726abd26fc64
+EBUILD conan-1.0.4-r1.ebuild 1612 BLAKE2B c8ad7f6357da3783488241aedfee8414d9ece36cdd2313dc4d765413eb509f995ea1229211ef755191cec69cee6d9a1c3df64f9b49bc0f9dce7d86a790e3eb4f SHA512 0d41b2e92bcead2243fdc18181202302490a5d2a53ca660036049b46fe4b770c8e961e5872227e44f2d606d61771036a7a5a93aa894b94acdcf3bb5555956722
MISC metadata.xml 735 BLAKE2B 0897f7e1776d123435a6843abf5f61168f1d089ed0bc3e62497961e552ba6e5826c1e09a77dcf5760f8559417c5db850455caa12cf0c8f77684abdaaabc55d06 SHA512 410e22e6701f402d13447f034e0c72180ca739fac1c18efc0b52739c9d11aea90125db1f732d5811ac798d9d74a2d7616c18bd779321ec4d8bbaf67a8a1d93dc
diff --git a/dev-util/conan/conan-1.0.4.ebuild b/dev-util/conan/conan-1.0.4-r1.ebuild
index 6a1147005c2c..d851c197e1bd 100644
--- a/dev-util/conan/conan-1.0.4.ebuild
+++ b/dev-util/conan/conan-1.0.4-r1.ebuild
@@ -24,13 +24,13 @@ RDEPEND="
>=dev-python/requests-2.7[${PYTHON_USEDEP}]
>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
- ~dev-python/patch-1.16[${PYTHON_USEDEP}]
+ >=dev-python/patch-1.16[${PYTHON_USEDEP}]
>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
>=dev-python/six-1.10[${PYTHON_USEDEP}]
>=dev-python/node-semver-0.2.0[${PYTHON_USEDEP}]
>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
>=dev-python/pylint-1.8.1[${PYTHON_USEDEP}]
- ~dev-python/future-0.16.0[${PYTHON_USEDEP}]
+ >=dev-python/future-0.16.0[${PYTHON_USEDEP}]
>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
>=dev-python/astroid-1.6[${PYTHON_USEDEP}]
>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 691499b16054..1a0a2af498e5 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -4,5 +4,5 @@ DIST ctags-20170704.tar.gz 1295281 BLAKE2B b58917a876d90df528f51bcd572301dcba8fa
DIST ctags-20190331.tar.gz 1537104 BLAKE2B 354ddf48cdc9421e70d9d37ec7251e51f7f78564dc4f6236d12e2e18519369c39c22585830fd301b7eff4898d550b824776541198b8c4a31425711776b14fde4 SHA512 414faef7628ecaa66fcd5f172781a32194e1d58637dded1f7e55c138239ad777796bb1510bd447af3ad8243b7178e6f4859139305b0c0efe298182408f34524c
EBUILD ctags-20161028.ebuild 1725 BLAKE2B f905914dba482790da1a5e5a940389e66b79eff95497440a507ee239830172f67221606639fa280edf6a3dd3f5a369cea627a4f04218e59bad82b3891bc7e80b SHA512 d982daeef17a03be793a29e09b37d52a309609820765bcc142e59904035669672b94c2c76d7725192c64fcf3de523fd239e22a288ae5d76ad09d4a35313eae71
EBUILD ctags-20170704.ebuild 1862 BLAKE2B 84fae77b0b5267b68cc01e8b64c922a1b5d864662b34f139251911303d0cb8adf53831dc228a384eb29d0110485aacaef1ab42a4aa1f3d632a7985a7e4d9817a SHA512 05e556c94810b7a2681a0e4182ed2a752f441bbf692af6dec6106e56d5a270db98e5f382d5903b950c9067c481b28f78213a4f3ce026815d0ff45542ed7df648
-EBUILD ctags-20190331.ebuild 1851 BLAKE2B d7987cfe4e4923529535145df8c4b0635af9946cab8c207f190babd517871788d73f4b1aa81bf2b0a2f971c73ddd3408ea469ae23520ca6c5328c0272cdc697c SHA512 a1c8effec48853958f4c200ca0489eb72bb5aa17e97b4758ea31931c751335ecd0cd5fcdad644165476fc56fae8b32145b600fa8a71d790fbc7498d69a427481
+EBUILD ctags-20190331.ebuild 1850 BLAKE2B 9668cc141efcffa17cad74acbb0df526c31c63c61b3b434a318358fbe70a0b6b5e76b909ee9f60ea43bf96b9c619c21b6d9c95d045f0cc7d2ca18cd38fcbab94 SHA512 d8a34edcfe71587a5687d34ddb357c3673c5413e7e6691af312cf2d39ab0a2e300bf05c63f5b8369d444216c0074f2816d465bd7fcd6815dbbc99b54bb9520ed
MISC metadata.xml 583 BLAKE2B 32e6225369d82b7aae04a238a314eb77911a38c2d670d4058260b75ced482199b343d1b5d7496bc3a6711b71a429b7205057ab66ed8369083b2533be5a7e0648 SHA512 df8ae31fbbb4546f21c3c06110bc6630f392cbbd937e2ccc3c504e08835e56ac2e7d8156686755217140906cc806001a18627778af0e09d753e50c9a47de28b5
diff --git a/dev-util/ctags/ctags-20190331.ebuild b/dev-util/ctags/ctags-20190331.ebuild
index dcf4704fc33b..dce47f62ecb7 100644
--- a/dev-util/ctags/ctags-20190331.ebuild
+++ b/dev-util/ctags/ctags-20190331.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/universal-ctags/ctags/archive/${COMMITHASH}.tar.gz -
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="json xml yaml"
CDEPEND="
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 86c41e8b0b08..08134b31a451 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -5,5 +5,5 @@ DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d575
EBUILD cucumber-core-1.5.0.ebuild 733 BLAKE2B 217c3b09430a5fecbca7ed945fb3189113fca5e6bb3ee61f04681c0f7f6cb64377c07ef957dadc4c0dd1b88713aa08fe3309181a118644f0c677d59476424464 SHA512 2ba20e7e2f6b6d33c34cc88f0cf7e816d9d5ef3c060f067a1e2e10df0a61a60e482c20dffce7a7d896bdfbf91709a7f77d06a3a1e6401a099edb3c546ef45189
EBUILD cucumber-core-3.0.0.ebuild 802 BLAKE2B d969e10078b0127a60683db02e4124458cd9ee666a0143e7c484efcf3ee8e0dac3dd0465f07f3fd78e1b0a6348497769ea8b4a6e738dd5b0d90f143631e4d960 SHA512 48c3ba8925b5b7b09fcd2cddadddccbfc2749ce2bad8724d23006e37a8f0280b0d7d7aa4d4e0f41f41b54e429f12e993262a6bf85518cd212f9784ab689ef6ca
EBUILD cucumber-core-3.1.0-r1.ebuild 976 BLAKE2B 35f0b120baf995712a7e2c21d2b1fe0c69a067466ca91795a5da3deed20991c4323b8e71cadf25b00b3cf4e543036bd24f59ce289de4dc5c800fb5bb86fd32e0 SHA512 890710ba3a5a91f996c1da8c9e6e0a11a539891db63155c98a2de0f54a66a201a06fb71070667282876d11c1e6e6866553ef3e8dbcb458323505fd5ef6c691e5
-EBUILD cucumber-core-3.2.1.ebuild 1002 BLAKE2B 69fee18824d9deea3b16091e9ce395813dc20c2a67421d0f10eeeb8b5a4fad8a37e0b86e4997e58844ab0904b1886fda5f622d5d6f0909806198da7e7ca0b20c SHA512 dad4373c7b06af54b9a1a9f76eaf0db20d52145794e2e1f2fe53c267c66959a100c115dad39117c541e0f9452b31d315f55ed6684446d41a0b427ac05ef8391f
+EBUILD cucumber-core-3.2.1.ebuild 1007 BLAKE2B 801df4e2474ff2101b22ca0337973909027f18d27d7974ccc7a3548268ebe7488b94e5aa9224b32658585f0144663fbaa5e80a9c6eb0b5cd832ba6a0527e2f1b SHA512 f7b92a1075fc51b2ecf13a1eac9352d702cff5733e0570fb95a721ccb5586aab9f604a6a8439f453d1ca0e5dc48a815ed11c397a6366533767b91dbef742a6be
MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
index ed85104380f0..6298eefba2b1 100644
--- a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz ->
RUBY_S="cucumber-ruby-core-${PV}"
LICENSE="Ruby"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
SLOT="$(ver_cut 1-2)"
IUSE="test"
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index 462be687a3a3..2b85b741cca9 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -3,5 +3,5 @@ DIST cucumber-expressions-5.0.18.gem 18432 BLAKE2B d5728a766ac568a0a2588dc99d453
DIST cucumber-expressions-6.0.1.gem 18944 BLAKE2B a30127598ff26ea60477bbdad9fc621d0cb1ebb09af3f38d329a15430a207616b6421a127c302ba8470089c8ee0daeccc8f38d4f951b6edb320cff1cc16760b9 SHA512 d9c6371d499ffbe9105038396cde0786cd889def866bf56284a66be77230aac03a74f565b2c3adb966a8d2c67e631ff83eaf426e4bc4b022cd7742bb3a030137
EBUILD cucumber-expressions-4.0.4.ebuild 486 BLAKE2B 1e32843c530edd3b6c108c2a8d88b6cec0072c5043f32f68ba245be22c8464791a416f4f81f806f7bb6a25cfb510071bd1641d48b236b63885fc73fe31abfad4 SHA512 2ef549ece304bec61447cb885034cdd8b4c654ae418dbf0efa12a151dabe382eb57f99cd7546d4166808754206db30b2797e324c9e4fadd2461c7978b57fbfd7
EBUILD cucumber-expressions-5.0.18.ebuild 486 BLAKE2B 5c9ef936e8f7695dc4a5f046bcf60de90c3c9fe9b6fa2d0dd6607084a4c0940c5162cdf9bbd14ca4dfd73681851874a33cf6adb36ecceec5c5adc18e4677e0e1 SHA512 8d5ea7734d0bb8a03b6b00c748a20af66075c84191280a0e9ba98236cb11eb900bc6c36977a5936b3ef698b32d34cb6e17db8c616265d10a87fc2b55ccdbd975
-EBUILD cucumber-expressions-6.0.1.ebuild 504 BLAKE2B 8e5614fa91f07c563f67f8fa5f64037cc3f6d45bd6449edff56b742428c0b16fd4fb2047dfcd802ed65dcc9167d0928d8d7ddbfabb8d224c3e551d135b0618f5 SHA512 a75d20be3ace5e685369c9a8f9f6a2cb144ce42f6f13fccb9f05c0c7bb936bec444fb3728481292107feb99a82d4301c3950d63ff6860116d6efa6fb8f359181
+EBUILD cucumber-expressions-6.0.1.ebuild 502 BLAKE2B ca7f27d694a464b61847ac6c1974e2a0bcc922f21b0ff26b546b5e2682d138c7b4adb7051a7796b6d8730478edeb2c6b9d7e451e311843796b58927cbb630bd0 SHA512 64b79aa5b1285d36c6265e43765a3dc8c60b92fb0fcfae5aabcd740a87e2dbf80c9c1f4104c903edaa330d7368caea0d39317dba0763b9166f5632cf49b8b85c
MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
index b7ec62310998..a40e9fcba6e8 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
SLOT="6.0"
diff --git a/dev-util/cucumber-messages/Manifest b/dev-util/cucumber-messages/Manifest
index 989e930bd2ed..fdf0f6c4d20e 100644
--- a/dev-util/cucumber-messages/Manifest
+++ b/dev-util/cucumber-messages/Manifest
@@ -1,3 +1,5 @@
DIST cucumber-messages-2.1.1.gem 9728 BLAKE2B 07ad0635f92d7aa25c9ede7915abd73a27db9894dd62d6a5b0f0e7b4bfd649f7a88b46bcab5cd42b18895933002e7650073becff16ab624b80abef97a23ea4e9 SHA512 0858de8b7211307c18f6c41c5316b5b29edd1f829ca27ada8c2bb13ef84099a5745b54894bf8ec72304d147a1cead693c109c5ffdf9fc105cf1795bd522e27fa
+DIST cucumber-messages-2.1.2.gem 9728 BLAKE2B 31753c5082814df61aeaf4f471112b79b27bec2b7be5fbe72c1320f1da44ec85890bbb91866b640905d73bd5a8f8723c2aa122c192040949c1725a0dc050b87a SHA512 f8973e4159aabae17b21dc76f314c6784eefc03ddc04a4ee6e3dc56844202034635343b51728cc3c028c4dc1881d19690eda4c3286ad0ad6da390a0b70ae6ae2
EBUILD cucumber-messages-2.1.1.ebuild 514 BLAKE2B 41410ace239a27dd7d0a4415fc314cda20eccf1f4cb53931a127d30ebd36be5ad6089e615fa53a8444caf9c83a75f1e4f292dac30241084cb4ce607ade2bfccf SHA512 0837c4c23f440c93bb4d6948a76c82deb2edc9e618a71dad4a6a8df62d4eac1a289a3cc9b7d915189675fed5684b222454726dd5679a251247eac80eff6c945f
+EBUILD cucumber-messages-2.1.2.ebuild 514 BLAKE2B 2be66af0bb17c166e44c78d4492838de363785d252572633551acb23d63dd49577417e3205e761b3b3eae375694ac3b1545cdc477848d7a7b3339cced4796dcf SHA512 7c2e2db8b2317c9b77c68e058b4e9d96860834357d97122102e90a581d801b13d48df080b65d659e0764b0cab6ee4d491ccde80cad9f1544ed67bb0e1223166d
MISC metadata.xml 313 BLAKE2B 8043a2240cf0e24b0307a6f068bd8bcccc65471d59ac643f3c654227695ec7a2392a6c1ed9ce4c0ca7cdd926a26be275b248626509c79aeaad48930e00f00c62 SHA512 949342e57dd6165f4402bd068865400a7affcc6e7f73adac6f8e121caf1ef9564bc95b61fa9bd7f80d9ca8597e5b5e0f3200a210d496577d4ec2fa881fbc23bb
diff --git a/dev-util/cucumber-messages/cucumber-messages-2.1.2.ebuild b/dev-util/cucumber-messages/cucumber-messages-2.1.2.ebuild
new file mode 100644
index 000000000000..2da0cb21a3b1
--- /dev/null
+++ b/dev-util/cucumber-messages/cucumber-messages-2.1.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication"
+HOMEPAGE="https://github.com/cucumber/cucumber-messages-ruby#readme"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="2.0"
+
+ruby_add_rdepend "~dev-ruby/google-protobuf-3.6.1"
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 3ea781acf20e..77cfaa3c9d9a 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,5 +1,5 @@
DIST cucumber-rails-1.6.0.gem 409088 BLAKE2B 05263cd0183a6b6ae4a3091eba6e4d6f6bc1f21f434757e86b0f150c1c18c98773b210db31a4f58710c05d09324605048586aa8d62274ed1861dd7e2bba97b25 SHA512 dab37f8777e2bc06c07141baa84091cd5128fa90631f1ecf381e2a8fb22f024a1f5af96edd212148c4a9e30791efb9f2602a71058f3b7c6fc494dfd10bfefb00
DIST cucumber-rails-1.7.0.gem 411648 BLAKE2B 09f6e79384869e0d901cb7dda607f2db29b0a924cd57fac56f88e5a90ef5f79348246e91195ecb437ae88e2e5f3f2e17bbfc651b8ff6e01cfc92cc86c544b5be SHA512 05f91606ebfd5db6608120b7057c767efaccee1dfb2eb99113e9cc6f55e594bd4181f54c8a38780b451bf7dc53862180e80a3c62a81ee8b1ea6aaf54682599c2
EBUILD cucumber-rails-1.6.0.ebuild 1213 BLAKE2B ba430abc294ee09c4d903f91aba1e6ff62cb5069df4d511bdd47184379b8269fe607b630d5dffcb6bbcc45db7fad514c5d74ca6a28f166379a6d681cc275e460 SHA512 25896ea0452c98e291cd03f0c05801fb15b01b98e143dd465eaf6fd5e55d37b2f5f7ae4c6028ba8fed04a2b0357b14de66727343b5572d25bf76257c7a9b130b
-EBUILD cucumber-rails-1.7.0.ebuild 1205 BLAKE2B c66c8dad299fbfcc8d1811138790f21d5e651cd7270ebb285a8862304a26a0bbcd326ee17a82c8da5cad62e3faa702646641f4ff639c6169119d643770e52e09 SHA512 3ada2192ba53a3fb6a3dbd870abc7f30c0cc884a6cc4eabbab64ffe012c745006dac76c9e499f048d32f79ce2c687d65d0c1c1c467d74cb971b9c178e72629ed
+EBUILD cucumber-rails-1.7.0.ebuild 1212 BLAKE2B 3395490b1f7a8956b8a72a9a2c18978089bb4d1c9ad423e5c10e669c4e21046db58e9ee8e769dde5e875e04ebcb03ea772c1fc6754cb4eebeb6176f13eb79ed7 SHA512 40ef5370f37e771af3c681f9df15a657bb8158d96ec9f98b06893abfb19c38784a373104e7609ba9b53c6a4cb8ec48a0eb0b356668dda18618016f757a5d3785
MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.7.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.7.0.ebuild
index 876df59ea5de..915e9be7b616 100644
--- a/dev-util/cucumber-rails/cucumber-rails-1.7.0.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-1.7.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-util/cucumber-tag_expressions/Manifest b/dev-util/cucumber-tag_expressions/Manifest
index 9728d836e260..d17e105a7877 100644
--- a/dev-util/cucumber-tag_expressions/Manifest
+++ b/dev-util/cucumber-tag_expressions/Manifest
@@ -1,3 +1,3 @@
DIST cucumber-tag_expressions-1.1.1.gem 7680 BLAKE2B 31e1f23c5fc008390c9221307473022107b109d409d8385a111f4fed1911fad15660faa824bee71cd87a2e183ec41a6ac9b5f7ecf5f1c417ed51d649c76712e8 SHA512 9b46d681be78b428c7cd29ca1cae21dbd410f7ca9844ec6f94368170c133f8de662a55e4f4440045704107e5428306ab81d2a90020c64102ef42f647cd8a66a6
-EBUILD cucumber-tag_expressions-1.1.1.ebuild 472 BLAKE2B 43dcf720547773fa97e66f43e6e76a85d8f865570da1580e8c031c2656d855c4bf412ad1111907028596a18ae3f6f40ef8dfc3dd859790401719444afbb1d4d2 SHA512 c525b9e4315ee173f727ba53d93a0579b8e50de76ef8d38ccd938edb7e48ec1ad43bb4111669a9590e285a443f23827c18b1c8c4675716f100a8c05651d13982
+EBUILD cucumber-tag_expressions-1.1.1.ebuild 470 BLAKE2B 04dbb50f4bdd9c1f8fe566685edb4d85fd2ef894fef6501b42465de5b4a79112074c37ea9260e393b5fb31314f769445064924978d49ed4531af953377554293 SHA512 3356191081fb7b9766d81429ebd0e50913b6ad0eb56d5768ee5f516c367d5cc6f87f6a926227fce1b01ef2a9a2f9256def40ceb8198287413962d692605dbe03
MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
index dd7be131c07d..0da7a4464f4c 100644
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
+++ b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="Cucumber tag expressions for ruby"
HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
SLOT="1"
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index c563c2007b2f..a0cd7495dd0a 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -1,4 +1,4 @@
DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087bcadd5f494b807fa530d20b7e14f327ca2ab377c3f9abc28df60c7986576b59a246e5fb7537daadb016bb21420b7 SHA512 c6bae727814f6a2d1dfa8cfee9bc9e63e3bfa755f6bb070f907a24d52009dd29652ab21ea7719527a5423ddf4471208f91a388ec53555d7021abac7769b2109a
-EBUILD cucumber-wire-0.0.1-r1.ebuild 527 BLAKE2B 3ca0734cbecd425d9289500ca1cf04dbb91ce9b83762a7a7b473acdbf9e7d15e3bb496377366f0ac5d61cd1cc0d2b224fe6cdbd706508e4c5f31e3fda9b29e97 SHA512 e5028f5be67915a392e1c53a2d8816bace3a3f0de5bb007080da83051a0af90cc6963941054e81e14e2c4d86d33a0cd1efd00931cdc7faaf2780f9c00b44ae57
+EBUILD cucumber-wire-0.0.1-r1.ebuild 532 BLAKE2B 649d43c1dd6842202b095c1c37b4434d6ad1dedbd3cb8389bb5fa46e4a086da097d056db530cbe58e2fe3f8efa9390f4582cd843fedb451c24b3fa60f2902744 SHA512 2b408ebd3a8fcdbf65a6bc7d1150efc4eac00128dee8e5e272889c0e1984a9b94f8c49f7a4e8d8936be3b8afd15e0a70d3a16d04349fc271625e0419664f77a9
EBUILD cucumber-wire-0.0.1.ebuild 522 BLAKE2B 649204a8b9a48f5e4009cf10d18e0c67b538e718f1887f88aaabf9ba778fa210b77275f70673ff904f6f121b7071854b206231ee6f7771b95138cbf5d98a57e4 SHA512 272aa3faaf6f654acdd283927b6793fb7ba48613b1c6d4078ac860930a812bd79b7a9e5ac3154fd7514d56e00cd04a6d415683e1e12b2e9c41654216c6e4afae
MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
index db8e324de135..6b382c60e67e 100644
--- a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
LICENSE="Ruby"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
SLOT="0"
IUSE="test"
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index bedc1bef015e..7225da3656fc 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,5 +1,5 @@
DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc575e652f6a94eca77b0c3397a48a2f3220a2a4eb164e9f0f747bf4866678b7927cd0ce47e5ce78ee057d273d SHA512 b7f9720e3f9e1f30aba9590ff92209073bdc028b880ac7a378f6dfe2a7f093c0521387cfc9319d7ed994c5e9de7106ccff23ba1f10c1cc5888785c69262c723e
DIST cucumber-3.1.2.tar.gz 267995 BLAKE2B a55d15d2c5746efd2e9f3518025b3b6d69e7712920b5731e1174ff429a9d6161d9aad7c0065c5ddf8b97fd87c9e658ff86b961b175db2c930bba52d1904d6b62 SHA512 abf0b562476653c393bc5a3c1f9669d91a2e312bcceb98bd20ac3771a61eeb696721cba76299d12871f7c61fdca176310e3a334b53d10c31ef3e201948c762d0
EBUILD cucumber-2.4.0-r1.ebuild 2477 BLAKE2B a460408873217510715ffbd842ca3a2b53d24a88b6c53b3e403f2bf1648e75d7fb32737214aa0b5ecbaeeb4db4849b6dbb20e497689d5853b000f251f2713bc3 SHA512 12d5d76a13a278b4d0249441294ca5a69bff6c334fd9db1482649e0acca0d8c83aa4a239ce930d4bf2a89e827aa42d993693a517afaf064bbef0e8bb1a20f795
-EBUILD cucumber-3.1.2.ebuild 2697 BLAKE2B d6384978c77e32cb9790e1a70b12583d3724dec3cf9c2ca830a2ff9a9dfc896292ddd18d88df500c59b1054b210519d0bf030241d55a2b73c9bfe982e6b0f929 SHA512 a672baf15b125b17634a8d0a5c3ead6f1dee64e6e28bcc55704a3dcc4a6029875d4d6a0eea6990aeccc7eeb1863e03d459ce45e80191e6bec54bf3047faea20e
+EBUILD cucumber-3.1.2.ebuild 2729 BLAKE2B 05172f0ac8479b586332cc49543eed83747149559ee1a40e1a12d4745000f5c3627e1c725e8d173380b56c3f875141c6a167595a50d667357f91eb2e9cb4ec3f SHA512 3b105154d46ae174ab22f93ae3ad46c7fa38f7221b39a22c636fa5efa854e756ae026c9c88d020255fe3319151d435a552b5d68dbfa3bae4b61e2bb9e91eafc5
MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.1.2.ebuild b/dev-util/cucumber/cucumber-3.1.2.ebuild
index d0087ecf4d21..52ac301d651a 100644
--- a/dev-util/cucumber/cucumber-3.1.2.ebuild
+++ b/dev-util/cucumber/cucumber-3.1.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
# Documentation task depends on sdoc which we currently don't have.
RUBY_FAKEGEM_TASK_DOC=""
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
RUBY_S="cucumber-ruby-${PV}"
LICENSE="Ruby"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
SLOT="0"
IUSE="examples test"
@@ -30,7 +30,7 @@ ruby_add_bdepend "
>=dev-ruby/nokogiri-1.5.2
>=dev-ruby/syntax-1.0.0
>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
- >=dev-ruby/json-1.8.6:0
+ dev-ruby/json
>=dev-util/cucumber-3
>=dev-ruby/mime-types-2.99:2
)"
@@ -49,7 +49,9 @@ ruby_add_rdepend "
all_ruby_prepare() {
# Remove development dependencies from the gemspec that we don't
# need or can't satisfy.
- sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+ sed -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' \
+ -e '/nokogiri/ s/1.8.1/1.8/' \
+ -i ${RUBY_FAKEGEM_GEMSPEC} || die
# Avoid dependency on unpackaged cucumber-pro
sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index f6e56038df09..a3412e91ed4d 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -3,5 +3,5 @@ AUX debugedit-5.3.5-DWARF-4.patch 3235 BLAKE2B 6c12d8dc99b746fb2b5b813fed429f94c
DIST debugedit-5.3.5.tar.bz2 27799 BLAKE2B f81b39122502afe66386b962d0e50e9a16a314f31acf2a44c6d53f16d24ac91b62483a67fed43d085c3dd573adcd312cbb5e15c214fd8f00bc5415835c2caa37 SHA512 afac800a8f2e035705fcf997500d8fd2c3dc658850f47754863e8811db97859748721c5a252cc90dc81d07bf08763a9507e2272e983ee3f6bf16d8016fe5b8c9
DIST rpm-4.14.2.tar.bz2 4151934 BLAKE2B eb7e32dd736a195f2e5effc184ee8f2c700dcaf80477574c2112b6c96504d86a67c81e611f82ea35ce244e95fad339bd262eb51c35ada5eeffa8d306b6938cb7 SHA512 22e309e8be936e6070430cedd6f5ea0c3871db4c6aadd0d567a9c418796c178c8dd45d44920d7eaa66681790cc2821347affe471cb215d7a490fe7947fbf291c
EBUILD debugedit-0.5.3.5-r1.ebuild 937 BLAKE2B dc741f4fc4f880fffe5775067878d47e357a904acc79bdc69d9d5d7f2f95fcd41f5de34022cf73eb396e9a0d9813ddfe5245724830b069c1cc8d80ab6d462b83 SHA512 7553d4e2fa0ca9c2d65b52636af1ee775eba337bbd7313bb63f6392dd6db140fe81eb513d64b89a4bc07b04b7d80b2f3f24be13b76001f15dff057a7f62de407
-EBUILD debugedit-4.14.2-r1.ebuild 1863 BLAKE2B 0cd7d77c26565d3e5aebfaab3c7e1627571c85c6078dca375a6647e8b75f1bd866209cb5efe5e69d95f375c3a1ad03d8595ba084d24d0641823d78ec0c270236 SHA512 67fa93c458fbca94baefeb99e12f7fe1a614deeff865537d59abd062bb0afeff3594a07d9ec2033eb98e1ace59b00da56bdb5203c25ae0b7b526e0a1e5557468
+EBUILD debugedit-4.14.2-r1.ebuild 1862 BLAKE2B 7298cef549ff97777f748cb871d01d959ed5b680cf693e4c42b0a7826c13d42df121243788f7c965cf56ef2297a00119dcab40a5914315cb1353bf587eb6971f SHA512 951edb87d4e6c55d73d3837140747ce098562787333198ee0cb35c06418b75d4f4e82b54bb6f23c01a0c98cb6999b402ec307fc35e7d78720713dc25d6df919a
MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.14.2-r1.ebuild b/dev-util/debugedit/debugedit-4.14.2-r1.ebuild
index 3f8c2951f133..ad6b532ec6c8 100644
--- a/dev-util/debugedit/debugedit-4.14.2-r1.ebuild
+++ b/dev-util/debugedit/debugedit-4.14.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 4943d7281090..a318032ff093 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -5,5 +5,5 @@ DIST devhelp-3.28.1.tar.xz 642992 BLAKE2B d3b3a2768b33fb47f05d35d9e6fe970d2f42c5
DIST devhelp-3.30.1.tar.xz 317956 BLAKE2B 8646fb97f0649bc166c8a21472f4c638f37bdfdc9e34b7214f0e5bd32c1c78664cc320f978fb27e313de54e88cf31685596f4bf7f43235ae96345292db6a9fc1 SHA512 f6f028948edd4c6954eaeeb026bf69c11284d725925d354ef42ecc67275cdcac66e8d3657d95d50926350543489b2bb2fa3a194d99d01494bedac60d3a2b4bbc
EBUILD devhelp-3.24.0.ebuild 1645 BLAKE2B 9581b7a802fd98b0d1734f20a3fa5af84cc21c1e6866eaa876e85d3d50e3484493c21d709416a9182118616e16b5f2cdfb1c9eaeb70d38d8e38fd37223f0ff24 SHA512 a9f2ac9f19a1cfa202f29308727e3c11c9aac3f79395c67b989572f4c2ad582571e722bb77641819932f0047751d6ead3c6e89f7d196c9a70d3e117bd89141fb
EBUILD devhelp-3.28.1.ebuild 1779 BLAKE2B e3cec87331d0cef4e55b9ce117baa29ee79f790a5a677cbfc4449acba2043322f9790bd72dd0c12fbe905656b54a4169a4ffffbe6bb3fbe670526b261f1bc5e5 SHA512 b05a76fdf0f3693f09298caf172cbd149fc23223b162d9d417f323f57e8bdcd0f80a0b2c231a5aa0ea9add7b2d17766933d9a3e1e6c7eb1635040d08d78cec92
-EBUILD devhelp-3.30.1.ebuild 1860 BLAKE2B cd407f4b908389931600fcab812a8c7336a523aec6cbf058a2a22edfb4fd4ee595fe44a6ff33e8fa2dd6f26346301f1451e34ed4e9469c4f6cbcbd3197523db0 SHA512 ecdfe80eb27cdd844696d42770cfb9f2347cdc28aef6e70fe104d39f7c8fe5ebd6a63efccbfef8179b510b6f1780bee34a9635fcbd9c05f1ee970dd6e1bc6a47
+EBUILD devhelp-3.30.1.ebuild 1867 BLAKE2B c4c55a445221c0c40d0e0d9bbfb3b364696d0ea9b987cd07dabc79b067c2134de886de147f91a13cd0ef843fc03cc7257fb222b62f844667fae41b43268de1dd SHA512 7a4a0bc9f1c6bb545225ce84b1157f85f626a64596211e2357ce87d5ee71c5642c192091fa774215da76c1973582fa96c15504f16de12fd7a96eb475ffd7bfcb
MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.30.1.ebuild b/dev-util/devhelp/devhelp-3.30.1.ebuild
index 8814b22a2d2c..819cf09379f6 100644
--- a/dev-util/devhelp/devhelp-3.30.1.ebuild
+++ b/dev-util/devhelp/devhelp-3.30.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
LICENSE="GPL-3+"
SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc"
IUSE="gedit gtk-doc +introspection"
REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index e5db1746c548..7101edf6c8d2 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,3 +1,5 @@
DIST flawfinder-1.31.tar.gz 174148 BLAKE2B f545a9d4dc8c0a9d7ae34fb5b26e06eb7c40a916155fdd738e4d56b6fccee4af1941935b6847d5f6c8f968ba45e95a8e9b44e5723b11a9c47fce725d1c27dcf1 SHA512 880919a05dbf0e29055f052b88c8bbfd403105504749bc65fb17675e6ebe0d84f9cd367e7a6efc68dc0d9209e0938185da4718b70f484007c507fe96b83e0355
+DIST flawfinder-2.0.7.tar.gz 249177 BLAKE2B 35dc5796ca7ecf456bf623247c7fb3944e05864bb714900a386f3e39eed81695409b44b9684365e4b172feb938a7c781c831856a8a94826c48b1027698b0967a SHA512 ecfe98c58e253b1d90b833747d69c41597ab7b4c82286e5f45dff45de90056216c25d2c9626540aebfc1e475882a04c3cfa3c0cb3ee242f498f5cdfe188d761f
EBUILD flawfinder-1.31.ebuild 724 BLAKE2B 4441a55be26ce38da31944675d0203dac0028b27acbf99dadc1e733114d8e6a80500aa0c90a592f89b188831faa1ffc1160a7f11e96a7b940f9af01f518e164b SHA512 d4730fd182db2bcd39ff3b44c0036fa4dfd00d26b98ff5732c03d89980de5ced3a9a955d926dcf40f1afb829839f5aab0f635d4a60464d15fb603bc7190eba39
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD flawfinder-2.0.7.ebuild 804 BLAKE2B c06f4c5294f71217367bde02d91d79d12f5ea23bf7d15ff62655c38a267d068b4085bd90a481145a0b915750c2c5c0a05dad0bdfcb40c04bd71e10aac3818b03 SHA512 bfa525396655d991640313738924849bd6ab1650d9e15bae5fcc3569ba5026bfcb520b8c64fee70834f40be08e574c62ba08809dce5aa03f7c82cf7c40a0e4c5
+MISC metadata.xml 622 BLAKE2B b86d650364e1cd87b7fadc99bfc02e6acb360147c849846bfc94b3e827042aca129c745240ef8e04e3270ec6468dd5654ef9dbc55eeeb59d0251a73ab9d5f888 SHA512 5eda245e47619da4309fe11fd709daf8aedfefe97624ffcdd898bb4915c29e8dbf07b25543071ea9fe15af604a96f030ba816e26580c7166fd9689a1062e8e2b
diff --git a/dev-util/flawfinder/flawfinder-2.0.7.ebuild b/dev-util/flawfinder/flawfinder-2.0.7.ebuild
new file mode 100644
index 000000000000..cf9cdb27f945
--- /dev/null
+++ b/dev-util/flawfinder/flawfinder-2.0.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Examines C/C++ source code for security flaws"
+HOMEPAGE="https://www.dwheeler.com/flawfinder/"
+SRC_URI="https://www.dwheeler.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -i "s/${PN}.1.gz/${PN}.1/g" setup.py || die 'sed failed.'
+ default
+}
+
+python_test() {
+ emake test
+}
+
+python_install_all() {
+ local DOCS=( announcement ChangeLog README.md ${PN}.pdf )
+ distutils-r1_python_install_all
+}
diff --git a/dev-util/flawfinder/metadata.xml b/dev-util/flawfinder/metadata.xml
index 6f49eba8f496..4b7937bc629a 100644
--- a/dev-util/flawfinder/metadata.xml
+++ b/dev-util/flawfinder/metadata.xml
@@ -1,5 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>ramage.lucas@protonmail.com</email>
+ <description>Lucas Ramage</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <changelog>https://sourceforge.net/p/flawfinder/code/ci/master/tree/ChangeLog</changelog>
+ <bugs-to>https://sourceforge.net/p/flawfinder/bugs/</bugs-to>
+ <remote-id type="sourceforge">flawfinder</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 37642f61c699..82a7c090c097 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,5 +1,5 @@
DIST geany-plugins-1.30.tar.gz 4469990 BLAKE2B 3cb8434765667814dc95227a82bdf204b2f918c951de8d5d9b56549c3fc343e1fe1c3e225d9f907da6b3227440dbdad09d0318d2738c213640a4629e9f7b42fe SHA512 11dc44215aaa369831c249ef84b5dd0ee7eecdfbbf4707fc6165d78201e9e755447463c171ac6c8b2bc70df28a97b23762073ab9b31f7c33285d4728089da807
DIST geany-plugins-1.34.tar.gz 4640059 BLAKE2B f6a2e001db42e348c129b503fd969f142fecbaa06a10bd220d348f70e6af087a0a856a403bdf866f65fdff02889fa03a2f3a662be3efad0a17401266ab883bcf SHA512 31d25e9b0946b7feeae40b81c4e0c177568cc161c24bfa1c8271dda1c15a44e86f5de9b5992a4acde6cfafe2924a1cc22e95c7b6fb253e8a358931fa5f8ecca3
EBUILD geany-plugins-1.30.ebuild 3438 BLAKE2B a0cf586e95195375680bbde21c7de798fabd3ad944c9a7934ace91285a267436938b8bf158af9a6da5d55caa3b5c258218c0f5f3c44170a0c7384bc447cec0be SHA512 ab7193e7c89b6824c33d489e8bf0b6098b814c9bff52987af9c4ca5eb059902102f94e659b90e4ba1748f9242d7fbb3a3564bd88d0826c36f4b4a3807083eb99
-EBUILD geany-plugins-1.34.ebuild 3358 BLAKE2B 9b786c3c6d919ed684661d6ae137d3b0358a8345eced9558653f35feb9878dac508f92b76496619cc3f13fa0f387785033fbcb8cbd685f75a804b951066219fe SHA512 4bc298324fde9550241e3f7bdda73139af8d9d1812f2a5e10a1e782a8f95e79a073e195eff4f4704daf74ecdad11d1dcc8fbe67b3bf81ad59e04543270f390b0
+EBUILD geany-plugins-1.34.ebuild 3357 BLAKE2B 6d4f51391647f7bd94b58178de79e398bcf3e9c0182ca89a9fc02cb60c7d082c635ed47744f61f2e30e85cf9b070b34135e6a76f54926ffe07dd6823de2592f6 SHA512 93e327855595f6ab1522303d87ce90980f030673461f7cb203509868f62ff42162ec92c956178b8f9c8b5304d9870d3282ad0e223a178f47f02a426c8cbea865
MISC metadata.xml 1591 BLAKE2B 33b24731bacbd726ff66b7c8915504c7cd74970d3d59a64f7de32c285d0674a272bae2f35798df90aacacc4c35e05ffc155ddb58d1d7f77f17e48d213dcd4f3e SHA512 b305d755827f8e73df732bead1ebc8af4d93a03958bac3e3b00c6cbcf2335caa51f83619779567b3744e76390b8aaefa71cd6487a3f77b54050963bc61e0ecf7
diff --git a/dev-util/geany-plugins/geany-plugins-1.34.ebuild b/dev-util/geany-plugins/geany-plugins-1.34.ebuild
index da4dedf3d9f9..5752e298afa2 100644
--- a/dev-util/geany-plugins/geany-plugins-1.34.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.34.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 sparc ~x86"
IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup"
REQUIRED_USE="
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index a20f6734602a..e10390b73bc2 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,6 +1,8 @@
DIST geany-1.30.1.tar.bz2 4352154 BLAKE2B 6efceb21e07aba3b0698196543746e926d6a73ef5d5f560467eee18a7b9ade4ce0ce37808176922b3399ea8a72b2f281af313a9f57aa325e1a9cb964f0f1c34e SHA512 55fb446b0c517ccee4d2f3023334b96a336788422a4dc41207a4f290c5d4b88df1eefa4b7f6fddf0567224f890ae7bea396306a935512f17e01682034f7200e3
DIST geany-1.34.1.tar.bz2 4474211 BLAKE2B 25c9b3f752b0b19582120ea342d8029f811040ef433adb065aec028f0bcc0909ea1b0005445bae70a53cbb2b1d3bfe0c2dd9d9c25c5e3f89bcdedebc0a392301 SHA512 3e075b23b22682324e4a56046d238d9d0087d095a6157b98c342fbe40a2bfa7118f72cfe1f414d110fff1411e4cc9c33fff800e0a2e32f9f0e5fd7b6fb560c9a
+DIST geany-1.35.tar.bz2 4593705 BLAKE2B 1d411da04a82987abccb33385d3b50025078b68dc2cc4accfb7822000a786b97f613a35864fde2389d0525b9547972d0e56699b75aae40686f0ad7e6e2beb4a6 SHA512 9ae2f168b1b5e9fa9029a32f5d1e9b591e50ea4e79041760524a4389572400c6f8f56f1fd6973299f152f9fd653cf3d52ca50136f0bbdbc15d3395bcf7388ccf
EBUILD geany-1.30.1.ebuild 1572 BLAKE2B 76511c81bddcb43513af0f8c4203137988e12641d1c426ff54aadca90dc3a300224a234d0d6f290687a4e93ee71fd2db9ee5b845eaa27014d32416eea7960fdc SHA512 5598cf20f2a491d24791ff1166457d8dde9aa967170d5140fbc4fac600ae668e1aeb8e26eba147752364fbb7104535003dbe2276d8fe3ec6cb808314813e45c2
-EBUILD geany-1.34.1.ebuild 1744 BLAKE2B b20dd575bb8fa54293f09f4257b24ee6cacf30a80dc9f3f34cb90002095d81c64325cc54cb3260390201a0f3e5ba3996e5af6a17e8955b1b9c41f07abaec25d3 SHA512 d3c462d73371608807c2c391639c290b3c2235b6d457dc6e3d327236fd1b5d4a588a0edcbc40fbda35d20c4c5d5349fafc40693eb6d8159a96ff1e7f660f5797
-EBUILD geany-9999.ebuild 1705 BLAKE2B 33a6aaecba29847f556b2e7282f49ad773ff07820b001b131db918932ba05ffcdad200b4ce2996c5d65f106c48153380255a60975e454c00ca887b06ab2671bf SHA512 5d649bed1d8de7a17d7c082fef1bfd11438ef5cfc5c20e685991e93bf3b60238689fb9cb33b7239f71a4359a73ef94f8932682ce10661658e487d0bdb928882e
+EBUILD geany-1.34.1.ebuild 1764 BLAKE2B 849bb385cb3ad8dbb0af76f515903a80865446eee99a4e1c78c0b35a492ea750ac8255fcb0b4653e1f232d837ed7342512cb0ae01f8c8ea17431dd31badd1062 SHA512 f04a579e01b2a021255c7453a15b41d174244d5925bd4d84bb09410aef89357b5cf9b61fe7b26fd1d30c8654cb09b1f58ebe46f968d634d2b72e5a9128704756
+EBUILD geany-1.35.ebuild 1726 BLAKE2B 032a836e7c4c2f29f6e2220627e21457dc42469293e041946b2ab669013d894d9d179cd8121e677a9f4e80674d6bc380e0be6b88a5be9913e4fd089b9eb95713 SHA512 0273728a66b6a4429d216cbfbd07124419a77a897533817b91b4df8037196cea680da1fb31911055c6f57e1b045743c8e1e5671569651afc03c61da02996993a
+EBUILD geany-9999.ebuild 1726 BLAKE2B 032a836e7c4c2f29f6e2220627e21457dc42469293e041946b2ab669013d894d9d179cd8121e677a9f4e80674d6bc380e0be6b88a5be9913e4fd089b9eb95713 SHA512 0273728a66b6a4429d216cbfbd07124419a77a897533817b91b4df8037196cea680da1fb31911055c6f57e1b045743c8e1e5671569651afc03c61da02996993a
MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
diff --git a/dev-util/geany/geany-1.34.1.ebuild b/dev-util/geany/geany-1.34.1.ebuild
index 416007a6e5ed..86401e2a402b 100644
--- a/dev-util/geany/geany-1.34.1.ebuild
+++ b/dev-util/geany/geany-1.34.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = 9999* ]] ; then
EGIT_REPO_URI="https://github.com/geany/geany.git"
else
SRC_URI="https://download.geany.org/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
fi
LICENSE="GPL-2+ HPND"
SLOT="0"
@@ -56,6 +56,7 @@ src_configure() {
local myeconfargs=(
--disable-html-docs
--disable-dependency-tracking
+ --disable-pdf-docs
--docdir="${EPREFIX}/usr/share/doc/${PF}"
$(use_enable gtk3)
$(use_enable vte)
diff --git a/dev-util/geany/geany-1.35.ebuild b/dev-util/geany/geany-1.35.ebuild
new file mode 100644
index 000000000000..9d0c528efc2b
--- /dev/null
+++ b/dev-util/geany/geany-1.35.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# eutils required for strip-linguas
+inherit eutils xdg
+
+LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
+NOSHORTLANGS="en_GB zh_CN zh_TW"
+
+DESCRIPTION="GTK+ based fast and lightweight IDE"
+HOMEPAGE="https://www.geany.org"
+if [[ "${PV}" = 9999* ]] ; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="https://github.com/geany/geany.git"
+else
+ [[ "${PV}" == *_pre* ]] && inherit autotools
+ SRC_URI="https://download.geany.org/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2+ HPND"
+SLOT="0"
+
+IUSE="+gtk3 +vte"
+
+RDEPEND=">=dev-libs/glib-2.32:2
+ !gtk3? (
+ >=x11-libs/gtk+-2.24:2
+ vte? ( x11-libs/vte:0 )
+ )
+ gtk3? (
+ >=x11-libs/gtk+-3.0:3
+ vte? ( x11-libs/vte:2.91 )
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dev-util/intltool
+ sys-devel/gettext"
+
+pkg_setup() {
+ strip-linguas ${LANGS}
+}
+
+src_prepare() {
+ xdg_src_prepare #588570
+
+ # Syntax highlighting for Portage
+ sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
+ data/filetype_extensions.conf || die
+
+ if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-html-docs
+ --disable-dependency-tracking
+ --disable-pdf-docs
+ $(use_enable gtk3)
+ $(use_enable vte)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
diff --git a/dev-util/geany/geany-9999.ebuild b/dev-util/geany/geany-9999.ebuild
index 79034d53feb2..9d0c528efc2b 100644
--- a/dev-util/geany/geany-9999.ebuild
+++ b/dev-util/geany/geany-9999.ebuild
@@ -58,6 +58,7 @@ src_configure() {
local myeconfargs=(
--disable-html-docs
--disable-dependency-tracking
+ --disable-pdf-docs
$(use_enable gtk3)
$(use_enable vte)
)
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
new file mode 100644
index 000000000000..966042409bc3
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -0,0 +1,3 @@
+DIST intel-graphics-compiler-1.0.3.tar.gz 6721202 BLAKE2B 2934778e931a4b38a239ede5944757cc42c0a965e700ba471272ba8e9ca08b1c1c790c920ed6896a870985b1d2819a182a9aaf5a5a8cbfc13038ecd7cf1def1e SHA512 c0c0cc21263b71bc57aed43a3e8bd641ea7853db0a574823a70abb592a69b7f8a9f426e88e7fddea4cf6a14de44e064f80abcfa3ea709701e5003e0d4b7adfb0
+EBUILD intel-graphics-compiler-1.0.3.ebuild 919 BLAKE2B b6bb9e5f2c49b110bcf771e10ad4ecdf04156e6c9e4fe0cc0c979daa0ad1efff4f1bc54fd4940e3e4f9f67beba22f85fcff79873edbef858459b15846cec4899 SHA512 2fbbc2ab3a22a4fd8637278e4e16a2b4be3dfd77b11e687948dc18ecd1401163e3d5a94ffc24ae2a1a29d53f8774139d2914b6197da9277af8384395dd88ef96
+MISC metadata.xml 340 BLAKE2B 6c0e5d932084dffd300a1dc70b29eb0871dfe2187ed8591a5a2f8cba001bf681e908c58a6f9471f7b08842ff538365258305da91004ed63ff97314a07fda529f SHA512 d24016b4ae0ffb05be475f86bb8d72ab4a85475655f409b8826dcd69726e048aa048e321f26ac36f2f52aec40abbfa66a95354a711332df94dc3e57e6c396a0c
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3.ebuild
new file mode 100644
index 000000000000..b15c94ceace5
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib llvm
+
+DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]
+ dev-libs/opencl-clang:8=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+
+LLVM_MAX_SLOT=8
+
+S="${WORKDIR}"/${PN}-igc-${PV}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCCLANG_BUILD_INTREE_LLVM=OFF
+ -DCMAKE_LIBRARY_PATH=$(get_llvm_prefix)/$(get_libdir)
+ -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
+ -DIGC_PREFERRED_LLVM_VERSION=8
+ # Until a new official release of opencl-clang
+ -DCOMMON_CLANG_LIBRARY_NAME=common_clang
+ )
+ cmake-utils_src_configure
+}
diff --git a/dev-util/intel-graphics-compiler/metadata.xml b/dev-util/intel-graphics-compiler/metadata.xml
new file mode 100644
index 000000000000..b124b9c53046
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">intel/intel-graphics-compiler</remote-id>
+ </upstream>
+</pkgmetadata>
+
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index be4f745729fc..af489cee7f55 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -3,7 +3,7 @@ DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c
DIST meson-0.49.2.tar.gz 1340730 BLAKE2B 07931bca42907eb961f5f15da5216448d33539a091de4e7df53f0713471f2b0c581d1e3f9ba7eac2a87b61861e5408a5af1a5cb8c17c9561f81cd377b2ea7fc3 SHA512 4aca4c273e7c23034c1ed76aa48c914aef34ca4be9df9d5810b8dd3dac9f5f67aa577a682490aa3d81c0503b5a5a8ac1e2452b2f2fdd7a5c7db2aa504047b87d
DIST meson-0.50.1.tar.gz 1402160 BLAKE2B 051e9949f3a216c1074ec826c6a232124a3d2615dc03f83f57bfe96427cd44aa95e2ec7c688e87252d0179882f91e0ccf440eda4b47ff2f0d3af7382a530e011 SHA512 0dcc19007b3b1626e198c0a4ddb0f37dfdfe25f447e511a772b302bffc02187a3e56046daea01a0ad5cf611d557bae12d5b858bb7a44f69919b9ac9ad696aafd
EBUILD meson-0.48.2.ebuild 1737 BLAKE2B 0015a7cb7dfa7dbf0a57352d7271e972490247914a091d429dfd547d7b92d9122441ad2ba3022b54442a6b94ca2913b0f82e69899055a6c60d65160ce1a2fea6 SHA512 11bf7cd817ddc3426c004ddf6a62419c2e4113299c57fc28f42267916060a349e584c17ac8fc10e54504c547cbd182928d1824b7be778eb5498056d3d2ca3167
-EBUILD meson-0.49.2.ebuild 1765 BLAKE2B afa08e7f0136b0db159a09c866bfe8b7244abe3d95ea460ddb450c07c0ad15601b0c4f11ba9136fc85ba01cc72514a9205d6ee13eccc43e97947689971bf05a8 SHA512 658cc3789a6f13a16159182d6074940e8d4dfcb74855129d926368789e3c6b2aca084ceaf923d790cdc7b8b843b5b1c195054990f51ee358ff99ac67c1fae5e0
+EBUILD meson-0.49.2.ebuild 1764 BLAKE2B 2fcc3df6587b19b4d0d9ab71ac2bc40f0e30e125f053369e7550e69913d631adfd74555159aabc4fabe0f3534ab78d4024c6b56763e9043ee3040939d23a901c SHA512 13278bf54455488f6e3c1710bf1c650bbfefdfbd2a76dcd1ca7dcf48c4c9b4a33ddcd43a4a0081a2fbac6549c992416e0986a441cacc9c19d3075c75f0204e9b
EBUILD meson-0.50.1.ebuild 1711 BLAKE2B afaca717bf2a872604765f13ae718d58d18fd47d506eecdfb20732a946b1e6fdadb01f987f1458ee82ab78523e14a86482c079bc5420c453313c7d404a622846 SHA512 30f19f93d1d3f1ecdea9b7174ace190904a94f81793e4085c702ec57be5172eca2ded880cf3735e70abe9c714ac4c3daeb09a00b738dc7620ff5214002b2bf23
EBUILD meson-9999.ebuild 1711 BLAKE2B afaca717bf2a872604765f13ae718d58d18fd47d506eecdfb20732a946b1e6fdadb01f987f1458ee82ab78523e14a86482c079bc5420c453313c7d404a622846 SHA512 30f19f93d1d3f1ecdea9b7174ace190904a94f81793e4085c702ec57be5172eca2ded880cf3735e70abe9c714ac4c3daeb09a00b738dc7620ff5214002b2bf23
MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild
index f598f3fd1ae8..21f7a7a357fb 100644
--- a/dev-util/meson/meson-0.49.2.ebuild
+++ b/dev-util/meson/meson-0.49.2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
fi
inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 77a18d4810dc..d29e3c38311b 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -12,7 +12,7 @@ DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc
DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
EBUILD nvidia-cuda-toolkit-10.0.130.ebuild 3344 BLAKE2B 37bb588383fdfb0ec480c8ad961d0faeb6fbce7159ffb6ce47efa600ade12c5f04598dc053dc44ff469ff9afabecfd31b00d04501ac541ea72378884a2f19475 SHA512 aa9e7a8afd6f3949006e3b1dd03db695126e77f01a38d1ba77ce8dc94137c9c89b7afada7f6deaf5dc160371f5ee0c61bbc3d09002169d5900b1baa12a870d44
-EBUILD nvidia-cuda-toolkit-10.1.105.ebuild 3702 BLAKE2B 55eee9117901646d47ab9e68f7a9c401a4acf456463cc079dcc11f066fa68e68dc5d687da3a4e918d689713df8add5beab1649b81b597e3fc054b5e3c0dcf7a4 SHA512 96e57036194e6fc074b72b588f182a7edf1b42eadab71f0372dc47fec17d65c8814aa09ff029debd4cf769d4de3110ac589864c736f78b3c306932d780dfef5f
+EBUILD nvidia-cuda-toolkit-10.1.105-r1.ebuild 3763 BLAKE2B bf65d5ff364028df8775cecce32e2aa291dcb1bcb7370e4d6c54d0f909c8d2cfb7407f3f130690cfef55d8ec7d2a579e3dd5a67f6606733b13c7d9f5a30d7028 SHA512 b49ce2212d33df71824f3a4e22495ce3e30dbda2e1d317dd9c6aac5c3bcf5599f7ecac5a7014c4d2fe9f858a90b17d05e7d0564a4e4cf8b26a391df38214d4b4
EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3818 BLAKE2B e368a3fa7258a86f920f53da56039b940cc84e551265d458e1a3c7bc7b9321c4020e5ada9b56fc588ef4708acc4cfe9a8d2e259ad12b0c71fb57635b05b873bf SHA512 7f73c4e321234f6a19166e6e28719f6c98cecb809f9878ee1182b812e18fcc6f8c29fb2ebd0ed520847f38bfddd6a0bc60fae6b711b75f563ab39a9b322468b2
EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3844 BLAKE2B 42603527c1f012d49c98026d3f96f5ecd832cc4f31fd1afcf6738dd4e3e2aeee0ac55beeae994bbff4f48562adfe11b72270e516f8fb70d32cf00ae59f55bd78 SHA512 f40103348972041a9d6c09a8c129b68603ce0fafa29df1fdf6b13014bb97156a44881161d4668beef8af9b77adea9df8034c88d6413a6ac2ad709285f785df79
EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3355 BLAKE2B 07076b6506902bcadb8f7b6430db04beb380b76da35c5745e313910518855bb7e4c5d746d880bf7f3bbd07fc06cbb17f0d7d76bb267f9679c3d8099e398f7d35 SHA512 4e8070e399766796b1589329db4de04fc0fda0cbd1dc8ec1984b8550f1bc10d490fed7b085066f4419d5cbdf98ea2ae8202b29a9d360fe3b2a3be6e20bc802be
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r1.ebuild
index 7030ff9fe1de..aeec8c41cba1 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r1.ebuild
@@ -90,15 +90,20 @@ src_install() {
eend
done
- dodir ${cudadir} || die
- # Install binaries separately to amke sure the X permission is set
- into ${cudadir} || die
- dobin $(find bin nvvm/bin -type f) || die
- find bin nvvm/bin -type f -delete || die
+ dodir ${cudadir}
+ into ${cudadir}
+
+ # Install binaries separately to make sure the X permission is set
+ local bindirs=( bin nvvm/bin extras/demo_suite )
+ for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do
+ exeinto ${cudadir}/${i%/*}
+ doexe ${i}
+ rm ${i} || die
+ done
# Install the rest
- insinto ${cudadir} || die
- doins -r * || die
+ insinto ${cudadir}
+ doins -r *
cat > "${T}"/99cuda <<- EOF || die
PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index feeafb7e41b1..5c33a9d91b6e 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,6 +1,6 @@
AUX patchelf-0.8-dash.patch 1060 BLAKE2B 37361c4221be04e4a8e672578e8414bde1d03e39fbac60e9dba20ed407347e1e84d193469bc0fba6744953fde4cdf04c807135465edb5519f7b970189df9d7ab SHA512 35f32d43a85ddcfa0a1c3879b0a934dea8c58c7121d3d86157183a175bcf64fc0d4aadf96a91b5e4d5aeade773ff3145c683378fbee019f5293bc0f636104a7e
DIST patchelf-0.10.tar.bz2 158604 BLAKE2B 6aed9c2e7f37ff0330ca517a9491c46a93212140367b720bf94da4e4ec29a4978c920b53ce306ec333b3f7ac0216ff59637048c6997cfea4a34a87f2a0448796 SHA512 647ad13b7d45b3c5d20683ef8fe9760cb7f213e879231b6c5780bf32771adfbf7c5e5ce694c08e5681dceda63857d7d8a2d53efb60f799d3e7290cebc02ab501
DIST patchelf-0.8.tar.bz2 119369 BLAKE2B bfe7dceea9a79845c61bc7490faad5cd4d5e83bc0be4ec7e3b19fbed91ecb7d15e0a0688d4914731b94f0522c80ea9f940b6a8ad5595931df8826ef43f2fd209 SHA512 819ace0ee032612e8bef56f230ea470be9d44bc03ef561f98ffac84f2555e419f87309280df6d265a8ae56452e54d46fc90be13a449847e93e4e7b413dc8605a
-EBUILD patchelf-0.10.ebuild 531 BLAKE2B ed3e41b15075a0cc7870e31552f771bfc88179ace0ae3686af5a750bd6f221f8bbe0db73ed7996c9f7301a24695b0fd1f2afbb8a3054a5861c6f0af3e6921978 SHA512 9bd402f545efc25cfa3dc4df0d6710e85b0f406a22d6ff1c20aff284c315e06f98a3a82f7363e15d4d716580491f05525a4b50d9ed59a57a97ed3752bc1f4814
-EBUILD patchelf-0.8.ebuild 795 BLAKE2B 92efb5ae34357cbdc5676b473e89b3411241c3f506ee6904b6f4b69c974370c3d9a69c66c9413f573aa9c736236b31c436b063b9dab1a24419f955dfcb8e2f4d SHA512 ab5ab9ce393c12b5439646cda2d25226a65a9f262481357dac7c4fd12133790b6623b4ca8fd939306b6fe31d10082597e1b28319f9cc26b66b23316443eff191
+EBUILD patchelf-0.10.ebuild 612 BLAKE2B 2bee5de87f750cc21a0f590270f10e78c35f1f6098f0df696bbeeac48a75bda3d8bb7b425a8551f70b9b746c61519a258efeb61e69da24a459bf40d476a5c2b4 SHA512 c321104e677c145cdb8079e7cde3a05ec58ae026d0e418356e79e29b30f71b6c6b90cefe7cddaf9d44315fae4216152b6d0afad8ded06dc3ad9599ca39518f05
+EBUILD patchelf-0.8.ebuild 852 BLAKE2B c08b543d4734772d5dfcde6615baff90bc712a61e2554b3dfb2f5eec62fd19397e27e10e82fd845b57f4b0bfe36b22b3d2aff3e40d501194ce60a069f668c7db SHA512 a4356803dcbe4142887896d0315709cab75e5ea103c8bfc7eef5c1d0fa607abd9d9c67a0a3e169ce439c1b0427c9f693de02a06cde8f00d9782d201bebe3f8b2
MISC metadata.xml 220 BLAKE2B 65b0d9db11c166b2887e1a22962830e288eb917a7f15d0ffcecb3c86a1845491cbcbf4ebc7e661ac7041443a8144b218123b4db7a962191a9e9f894ac086a4ed SHA512 512eee7a953300d5e721b64bade8be9bd1b62984e543552b58a7a72b42cb90973c8c6d557ecfe08c2355cab45f640c88dcd31ab8d116815bc01680a65c7a132c
diff --git a/dev-util/patchelf/patchelf-0.10.ebuild b/dev-util/patchelf/patchelf-0.10.ebuild
index dfc0d88d15f9..36271cd5f471 100644
--- a/dev-util/patchelf/patchelf-0.10.ebuild
+++ b/dev-util/patchelf/patchelf-0.10.ebuild
@@ -22,3 +22,9 @@ src_prepare() {
eautoreconf
}
+
+src_test() {
+ emake check \
+ CFLAGS+=" -no-pie" \
+ CXXFLAGS+=" -no-pie"
+}
diff --git a/dev-util/patchelf/patchelf-0.8.ebuild b/dev-util/patchelf/patchelf-0.8.ebuild
index 92c86cecf1a4..369a698a0395 100644
--- a/dev-util/patchelf/patchelf-0.8.ebuild
+++ b/dev-util/patchelf/patchelf-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -32,5 +32,7 @@ src_configure() {
}
src_test() {
- autotools-utils_src_test -j1
+ autotools-utils_src_test -j1 \
+ CFLAGS+=" -no-pie" \
+ CXXFLAGS+=" -no-pie"
}
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 55beea2ddb84..84bf1d0533a2 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -6,6 +6,6 @@ DIST pkg-config-0.29.2.tar.gz 2016830 BLAKE2B e8f0420033524ad768cac3c82138546e4c
EBUILD pkgconfig-0.28-r2.ebuild 2906 BLAKE2B e34421f1501a31d6effe56e22b2ebfafacf6661c295369aac744f4bcdfbc404d032bdf3648c15b28f8ce0b6774190c4b601c30b53f5874d36d986957376763d7 SHA512 977205c37301a9743edaf47ad980756a77539a02e1f3d28c3e6d4f0968ee664194d87aae043e70245d22c8b7dac3d37aa85c008d20ff4a0e7fc737aadb7c30fc
EBUILD pkgconfig-0.28-r3.ebuild 3429 BLAKE2B ceb0cf3a8abe4a51707d28275d95d53ea09ae15b0a1ede4c0ec47f4ce6f71689b2062e74f98b66c5e09e3f7d52e64b64a9427265b87df89561f37f4263d20a40 SHA512 dceb6e8aecbfd99f71d2cb92a734bd4b8ae109d185b8418463337dfb64da4c41c7cbb1499e8805fb1fa388cfac9c54afc66979b80f4182ab7c1e00ed7236cd32
EBUILD pkgconfig-0.29.1.ebuild 3793 BLAKE2B 140d9135253a3542fe128c344485508a7d85ed2351137a5c3266cd07cd4eb6d8f96324a3278258dc5d22f6ae44640f39879dab84c1341bf3369c66a220d09b2f SHA512 7fb87709af38ca0a857295b3822c8e3bbb81a82ff9644da3a9f800b46ad2cb24edb825246fcf2ce2bf04f6c019a7099493032f84497a0fbdfa79953e1ae2a1df
-EBUILD pkgconfig-0.29.2.ebuild 3780 BLAKE2B 93b4e7f4bc2cb353e255271f6dc4173b198ee2155b9d63fa769319b93bf3b6d6ff46ce695745bec6bf04ed68836a680143b2b3f275eecbc4d2db463b5e4e9b54 SHA512 3a269594fd9451cbbaec5ac9c17c9624a8b7aabe552b3c1b023726822d58f28917a241c21e9bcf42a3f7a6e15f0f86733cbecbd9d03a348080aaa38ab409b6a7
+EBUILD pkgconfig-0.29.2.ebuild 3784 BLAKE2B 964741f1d3cbb429102c7ea8f97d5cecc2710aecd1bc09c72e8f3e934a3c7ae0a468be6fa99f68a0bef63498f57bdfc425b929a2bea112d145a5909c98a0f2b1 SHA512 f7e6191565fba9e5dc38a9b5625b138e497856fedd61b0b8bc08ba6daece60391ae07e840ff57bf467d91b923ed59a63f741c9a0cae045b71f4b53865f6d5169
EBUILD pkgconfig-9999.ebuild 3793 BLAKE2B 140d9135253a3542fe128c344485508a7d85ed2351137a5c3266cd07cd4eb6d8f96324a3278258dc5d22f6ae44640f39879dab84c1341bf3369c66a220d09b2f SHA512 7fb87709af38ca0a857295b3822c8e3bbb81a82ff9644da3a9f800b46ad2cb24edb825246fcf2ce2bf04f6c019a7099493032f84497a0fbdfa79953e1ae2a1df
MISC metadata.xml 325 BLAKE2B af0abf473903faa5ce1e6d1918fa87b558b99b82d95c7f95ecb596684f7f55ee365a10e943752d1f3c8b6b1684ac4e0985329b89a6f19de2c926bcc0c3127382 SHA512 0db9510bbe132efa03acbbb4fb31407188edd83a6ac5c1d84316fa682db9399879957e8cd4447c1cbde01638f6d220f9a30a17611cd31e35769e71e5d38287a4
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
index bc08d1a581fe..b89fd976448d 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
inherit autotools git-r3
else
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
fi
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index c35fae279431..a3a52ba8a0a7 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,5 +1,7 @@
DIST qbs-src-1.11.1.tar.gz 4299125 BLAKE2B a2b2670b47bb122ccc586fee0c61d941533dc2dbc5e59028a7ab765eb18fe4a71b85cbd7373f88231b9cd75178982a17dddab0ba965de84ca197c49b2c9eefdf SHA512 90833792cb29b7b886df491263b620d2933c398ad8b2f495d0e5ae6acdde3f816ecd25638ae2e74d3efbf517a762644f751b7c01633aed3369bd7bf85c033ff5
DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B 8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13 SHA512 eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147
+DIST qbs-src-1.13.0.tar.gz 4323291 BLAKE2B ae5e20e38d2667acc3c6b9c62c06ec7733c94d8c8dcc7a9145e288b507e529b12afab27ea2e2761604605609d678d1f1dc0fb3f0e1448bc1aeac9fd4ea3fa37d SHA512 98207b39bb9e5926e218a4fc4da2c7b38160bdd8eac563ef3135be63076bd09763c895f23c3ef3d1640adb04bdc1977e1a66d10b6a9d243adc0414e7dffd4ade
EBUILD qbs-1.11.1.ebuild 3066 BLAKE2B 0f44337978b215817f91a6bb6d2bc278a8d7765ef0c7c8ff450a64d2c0324267ddf3a3a7f00ace808db44da440d91bd6949513e7aac56d7afc0387f4beedf3a4 SHA512 09f81791a84a2fd9905b9e7cf9a9271cb88221321be12f69c887215789763de7f77df65a0d37402262aaa0015f68128875b5c1c3ed7b36ceb7d750203d2840d2
EBUILD qbs-1.12.2.ebuild 2864 BLAKE2B c1b70e58f81cde7889ae07c5e0bee1f5b3d36fcd9b1b404b315090cf19f4eaea9c56367be5f24c99bb1ba56b2c66605b802bef946c5e4f3adfa6feecd9ca7f97 SHA512 2530d59f4a71ad0ba083b588943305af6a063d67aad509328428b2f9126e6438bc44faed40c89bceb2ec72be84e7ae052e224ff3bc71f93106cf675a9b2862ae
+EBUILD qbs-1.13.0.ebuild 2809 BLAKE2B 6072be9c788ec4f6d7e7427dcb3779595d733d2476d543de5ef1add7ccf0f7e2cd1e3e6dbf42257849f228e86951010b73b20f0d6a19bdd36b466250391c2639 SHA512 26798ae3683306f9979255c073058dd1efef270efe923ca7deba82da1d2fae77a4862ce6888bf84c78382b89afe3bcadc3c66795b3846a44df2fb1e628bd21ae
MISC metadata.xml 920 BLAKE2B ba6000d6db0ee2a6fb2edd9b999fe406e427ebf14f8ccf0dca6f21338dd98b8173c71b3599858a9f89e063c3138a307ac281413e671d5a6c706c93118c2db99e SHA512 ca8c93f9630e818e2f567388fd5f61f47882b843eee39a78f2882ec0ba8c310e0689fb70925762da7548040892d606ef21497503c6fb2a655af608b36bcc98da
diff --git a/dev-util/qbs/qbs-1.13.0.ebuild b/dev-util/qbs/qbs-1.13.0.ebuild
new file mode 100644
index 000000000000..01828115c967
--- /dev/null
+++ b/dev-util/qbs/qbs-1.13.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://wiki.qt.io/Qbs"
+SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples test"
+
+# see bug 581874 for the qttest dep in RDEPEND
+RDEPEND="
+ dev-qt/qtcore:5=
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ test? ( dev-qt/qttest:5 )
+"
+DEPEND="${RDEPEND}
+ doc? (
+ dev-qt/qdoc:5
+ dev-qt/qthelp:5
+ )
+ test? ( dev-qt/qtdeclarative:5 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ default
+
+ if ! use examples; then
+ sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+ fi
+
+ # replace hardcoded "lib" with QBS_LIBRARY_DIRNAME
+ sed -i -e '1i include(src/library_dirname.pri)' \
+ -e '/qbslibdir =/ s:/lib:/$$QBS_LIBRARY_DIRNAME:' \
+ static-res.pro || die
+
+ echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
+
+ # skip several tests that fail and/or have additional deps
+ sed -i \
+ -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \
+ -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \
+ -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \
+ -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
+ tests/auto/blackbox/tst_blackbox.cpp || die
+
+ # requires jdk, fails, bug 585398
+ sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
+}
+
+src_configure() {
+ local myqmakeargs=(
+ qbs.pro # bug 523218
+ -recursive
+ CONFIG+=qbs_disable_rpath
+ CONFIG+=qbs_enable_project_file_updates
+ $(usex test 'CONFIG+=qbs_enable_unit_tests' '')
+ QBS_INSTALL_PREFIX="${EPREFIX}/usr"
+ QBS_LIBRARY_DIRNAME="$(get_libdir)"
+ )
+ eqmake5 "${myqmakeargs[@]}"
+}
+
+src_test() {
+ einfo "Setting up test environment in ${T}"
+
+ export HOME=${T}
+ export LD_LIBRARY_PATH=${S}/$(get_libdir)
+ export QBS_AUTOTEST_PROFILE=autotests
+
+ "${S}"/bin/qbs-setup-toolchains --detect || die
+ "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" autotests || die
+
+ einfo "Running autotests"
+
+ # simply exporting LD_LIBRARY_PATH doesn't work
+ # we have to use a custom testrunner script
+ local testrunner=${WORKDIR}/gentoo-testrunner
+ cat <<-EOF > "${testrunner}"
+ #!/bin/sh
+ export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
+ exec "\$@"
+ EOF
+ chmod +x "${testrunner}"
+
+ emake TESTRUNNER="'${testrunner}'" check
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ dodoc -r changelogs
+
+ # install documentation
+ if use doc; then
+ emake docs
+ dodoc -r doc/qbs/html
+ dodoc doc/qbs.qch
+ docompress -x /usr/share/doc/${PF}/qbs.qch
+ fi
+}
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 5a89e507fbf0..35bbc5cf5e28 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,16 +1,3 @@
-AUX re2c-1.1-dash-V.patch 1311 BLAKE2B 470b6ff918a8aec8acec58c90271fb2e7e0f0e2edc331f5195a869c9fbec798e1e96235cbf96d055c62464f57efd3423a33aa78c3f9d6e8f924763b84aa02f53 SHA512 704ae4cae512d38319cddfe2de342b635422c2ca2dec460689406eb4de436f971abd3d2530df25ee69d4d2a1e1f9b1ae5ed166538e300a10d79eb374a576cae7
-DIST re2c-0.13.5.tar.gz 782725 BLAKE2B 569ded397a2139c76e1c97c73f52628e6723c5c8e2dc9fd46ddda6fb30c9dae8454460b5e457c4a5319ccf4e2fd0f45a7ebc28406881d9d44dc45bed106769c9 SHA512 56101bf01aea6f0c082b85382be34acada51d70036252581cd76ac4b2bdbc144633b97c63a94bfdba434ffb80884e11299a38853e2d805dc7ce6cf9d452c81c8
-DIST re2c-0.16.tar.gz 4892417 BLAKE2B e1160d3f6ebd63d42a22c112d83a31fcd7bb0d5ab239b7be569f603752794048685776602aae754d8b4e47cb6ae3540ce0977b0824e6bf3104e58a8fb0428f9b SHA512 d4fb8078d9566a1fa177331b649cac79e2e45cc9558a22a2212503f6c77c9e6b4238aa01c85c66b86fa4831cdc669cedf8b430d395be6a0c6cfabfb7c61cf8a3
-DIST re2c-1.0.1.tar.gz 5758988 BLAKE2B e02d8ce5f82441d33ec055d582e797d33a4b1a5244d37477b5c93117c735790a6a24e1b9e1456a6d4182c3282b59955838b625216cf47abfcc8c4fb5eacc953e SHA512 ab3b652d8f97b0d1be4c7561ce65e28870ab8976f8a31d74a6629b43d2057bfa608c7f393d5e5d59d26f991552a60e6274f554ef58752bdfcfeba330578f1299
-DIST re2c-1.0.2.tar.gz 5805526 BLAKE2B 931e7b00f57cf8c3e49e540496906208e5a5b73f87427c095e9f5744594007b5d536bf8a2920c3fb509f57bc0ba608ca80a6780ae8af033fdfe7bb3c26292007 SHA512 9d85933ae874cb9240175ce7210d3808173bafe246c67b9c333578846239b7bcef074287f26040b5a048bcd98db8d0393035c417918b80db1f74098695a77176
-DIST re2c-1.0.3.tar.gz 5806555 BLAKE2B 98664998a52e9f3198ac6d19e8c8af8db716414e42aa89b05750cb8a2054d53d0b13fa499ca004eecc294cef2756554c3e08c8167055d38d266be86f0684b83d SHA512 7b2a43828da872a957af88fb0a226e1936a45c8a1020ba1f6544b588aaa61dff8df40e84f9053c30ac8e17c41164e70627d57f5d3721a34b2aba7b1dbf25b6ae
DIST re2c-1.1.1.tar.gz 5907416 BLAKE2B da2544573de0dbca94db8a8e2112de5549ffbbad91bdba187e95c9d8dd36537e099dbc2871b54d62630d91928cdaf384ab069e5e1624f8ff749c2e2743cff766 SHA512 a6fe73611103588043748340976f0e6d07169a6546cb80627c0ccd2ceac83f362dbbf371530361d893537fd95deb19503b2c73c41ed40efe7787210d6c757397
-DIST re2c-1.1.tar.gz 5901198 BLAKE2B eacfbd19a6b32c1779d0d0bf45ed7b4159e0ebb000817911ac3daf4595a841efb2fe7810aaede404e95a85af9df66568be1845f96e229d66e381d0ff6f1e2d89 SHA512 a39a42977f271cbd4f245c5252cba52636519c052d61e080c607556f778e0a35709f832466c2be0467af09b1623faab25616ffc957e90c0f1f6af78decb97209
-EBUILD re2c-0.13.5-r1.ebuild 712 BLAKE2B 7dccc9fa372c83c421eb1ee12ceeac59765c37d8f8df2ee8d1a81671e4a2d05739863f5f9c32e42f61912b5cdcbfb17f29c0b3dcb3d667c2815c0dcec3b3b353 SHA512 446a7fe4ff39783c7172ae3110200e896955cf36bb2fa26133a671adc6394ca4efb92f012b074e3cf2dd392d27b4ee6bfbf43a86755b4b6edebb8fe77e395f86
-EBUILD re2c-0.16.ebuild 754 BLAKE2B 28913bde66f2630596b289eab49f003eb727f7beb56e45cdbea3ee664b210f0df9aeeda19119d6bd6155e6488fb4dab84e120cd56038dbcf57753169c9bd7950 SHA512 a869252b8c140ead837f6c3eb2fd6b46ef199480ed2e67acf684b9bc1d5fb858e2bed875d8d6eee7b246c3f0e73fa5522a53b11983af98b374b31cc55c8d539b
-EBUILD re2c-1.0.1.ebuild 763 BLAKE2B 590b767074a8478ef7f3bd01f2c050ce868ff2b4795f2ff3762b917d45d6976ff29ebbd7da914d76e6ba56cb3e70e352f53b48ef4374743e8ec482fdba24b786 SHA512 ded3ef724bc5624a00994a80739483e7a21278bb45f7d54001e060b71d591c44cca59e7202e1af5f36ec84b39003c97f7f9161d735a8ba67925d29bdb65253a7
-EBUILD re2c-1.0.2.ebuild 769 BLAKE2B 90d97ac18d6faf57040988b9aa1f5fd50c726359012a1d3f6f16155cb29c2ea3202aad01ad7f9fdd5c0e97b9d956ef998549f1e86ce84636993825b22b48593d SHA512 2845c30b034de806ec2339ad15e9a966349006db475d614c0399988cc1f6fee866f37e6d5c671d73414c11a14c28b7e56645b8cdebf1f785f47c15c5ca225d86
-EBUILD re2c-1.0.3.ebuild 766 BLAKE2B 17750d3d69f2272944e09c049520998ec7fe92ec92bb793beb18514f880fd01652d88846ccb8637dca995bacbc70c01ae8862b4dac56a25b3730fb0368f6974d SHA512 c565b69bbe3302a6f9f30dbc68caba388ddbcfa4f131c5accb3fc2bbef3489b623dcbab741e449486e39974510c2e52381c4cb569fcd77efc1fe3d4f5a0e24d4
-EBUILD re2c-1.1-r1.ebuild 828 BLAKE2B 77af82ac7fe4bb64d21edb1bffea6b9709a50a6d0fbbd17ee930f2a9f224f03adf1dfc2909812f95d0bb5f981e990eef44165f672b81313ee2a9c38f30e7d12e SHA512 a8cfe105c87aa5e5e499e0f9443702bad00bc57a849a817a4b5e5cac294111dd3278deca9e4a415e73be303ad59c7c154f9dbe1e2ac2a35b4183bfea86309a58
EBUILD re2c-1.1.1.ebuild 766 BLAKE2B 343221b5943692a836e299da5086d3a6b04b65d34bb9c6f590f414086e6346c19620f5cee25ec64f0a51e4acc33116ffade41554b32d238697818eec3f37cafe SHA512 daa284f8c54aa6f3f3bbdea8cc6e2e10a112ac900a2e29b1e708866715c39f4b36935084d150b44362b771b989bda61e0c01263fcacdd7bfcc28c2214a8a51d1
MISC metadata.xml 423 BLAKE2B 69ad12e8bd8cd2356e36736ab276efa0aadc2755f784fa4e7fe23ae4d4e7a27a06c8fcd4ee727f87847a7fdaf136d12e811a20345183d261d2b649724818f9f3 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9
diff --git a/dev-util/re2c/files/re2c-1.1-dash-V.patch b/dev-util/re2c/files/re2c-1.1-dash-V.patch
deleted file mode 100644
index 77c3d80dd123..000000000000
--- a/dev-util/re2c/files/re2c-1.1-dash-V.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 84a7bf8585c500572a8ad19f9458f31d34abbcdc Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 28 Aug 2018 12:01:07 -0400
-Subject: [PATCH] Rewrite vernum function
-
-Fixes: https://github.com/skvadrik/re2c/issues/211
----
- re2c/src/conf/msg.cc | 27 +++++++++++++--------------
- 1 file changed, 13 insertions(+), 14 deletions(-)
-
---- a/src/conf/msg.cc
-+++ b/src/conf/msg.cc
-@@ -102,23 +102,22 @@ void usage()
- void vernum ()
- {
- std::string vernum (PACKAGE_VERSION);
-- if (vernum[1] == '.')
-- {
-- vernum.insert(0, "0");
-- }
-- vernum.erase(2, 1);
-- if (vernum[3] == '.')
-- {
-- vernum.insert(2, "0");
-- }
-- vernum.erase(4, 1);
-- if (vernum.length() < 6 || vernum[5] < '0' || vernum[5] > '9')
-+ std::string parts[3];
-+ unsigned p = 0;
-+
-+ for (unsigned i = 0; p < 3 && i < vernum.length (); i++)
- {
-- vernum.insert(4, "0");
-+ if (vernum[i] == '.')
-+ p++;
-+ else
-+ parts[p].push_back (vernum[i]);
- }
-- vernum.resize(6, '0');
-
-- printf ("%s\n", vernum.c_str ());
-+ for (p = 0; p < 3; p++)
-+ while (parts[p].length () < 2)
-+ parts[p].insert (0, 1, '0');
-+
-+ printf ("%s%s%s\n", parts[0].c_str (), parts[1].c_str (), parts[2].c_str ());
- }
-
- void version ()
diff --git a/dev-util/re2c/re2c-0.13.5-r1.ebuild b/dev-util/re2c/re2c-0.13.5-r1.ebuild
deleted file mode 100644
index d04be68e9eb1..000000000000
--- a/dev-util/re2c/re2c-0.13.5-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.sourceforge.net/"
-MY_PV="${PV/_/.}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- dobin re2c
- doman re2c.1
- dodoc README CHANGELOG doc/*
- docinto examples
- dodoc examples/*.c examples/*.re
-}
diff --git a/dev-util/re2c/re2c-0.16.ebuild b/dev-util/re2c/re2c-0.16.ebuild
deleted file mode 100644
index 072d58199292..000000000000
--- a/dev-util/re2c/re2c-0.16.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-src_prepare() {
- epatch_user
- export ac_cv_path_BISON="no"
-}
-
-src_install() {
- default
-
- docompress -x /usr/share/doc/${PF}/{examples,paper}
- dodoc -r README CHANGELOG examples
- docinto paper
- dodoc doc/loplas.ps doc/sample.bib
-}
diff --git a/dev-util/re2c/re2c-1.0.1.ebuild b/dev-util/re2c/re2c-1.0.1.ebuild
deleted file mode 100644
index f81eb657511c..000000000000
--- a/dev-util/re2c/re2c-1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-src_prepare() {
- default
- export ac_cv_path_BISON="no"
-}
-
-src_install() {
- default
-
- docompress -x /usr/share/doc/${PF}/{examples,paper}
- dodoc -r README CHANGELOG examples
- docinto paper
- dodoc doc/loplas.ps doc/tdfa/tdfa.pdf
-}
diff --git a/dev-util/re2c/re2c-1.0.2.ebuild b/dev-util/re2c/re2c-1.0.2.ebuild
deleted file mode 100644
index bce28d1d0814..000000000000
--- a/dev-util/re2c/re2c-1.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-src_prepare() {
- default
- export ac_cv_path_BISON="no"
-}
-
-src_install() {
- default
-
- docompress -x /usr/share/doc/${PF}/{examples,paper}
- dodoc -r README CHANGELOG examples
- docinto paper
- dodoc doc/loplas.ps doc/tdfa/tdfa.pdf
-}
diff --git a/dev-util/re2c/re2c-1.0.3.ebuild b/dev-util/re2c/re2c-1.0.3.ebuild
deleted file mode 100644
index d24154a91110..000000000000
--- a/dev-util/re2c/re2c-1.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-src_prepare() {
- default
- export ac_cv_path_BISON="no"
-}
-
-src_install() {
- default
-
- docompress -x /usr/share/doc/${PF}/{examples,paper}
- dodoc -r README CHANGELOG examples
- docinto paper
- dodoc doc/loplas.ps doc/tdfa/tdfa.pdf
-}
diff --git a/dev-util/re2c/re2c-1.1-r1.ebuild b/dev-util/re2c/re2c-1.1-r1.ebuild
deleted file mode 100644
index 0599306ecfcf..000000000000
--- a/dev-util/re2c/re2c-1.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-PATCHES=(
- "${FILESDIR}"/${P}-dash-V.patch
-)
-
-src_prepare() {
- default
- export ac_cv_path_BISON="no"
-}
-
-src_install() {
- default
-
- docompress -x /usr/share/doc/${PF}/{examples,paper}
- dodoc -r README CHANGELOG examples
- docinto paper
- dodoc doc/loplas.ps doc/tdfa/tdfa.pdf
-}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 0ec55a5aebcb..b73141ac3584 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -13,6 +13,6 @@ DIST scons-3.0.5-user.pdf 2562305 BLAKE2B 48c206386f163a2779b27ede1b77783067a695
DIST scons-3.0.5.gh.tar.gz 5510846 BLAKE2B 64489a9335a9aa0e2b58a78c6bba613de41d7035f03e8b5b1c1db8aae92e54808f1bd5ad4e97b8481db0f5276c184040663ec31d7307c30a6b092c860c0bb1c0 SHA512 afd4e3d5a76c009f7a3f55934c2d479c611df5713fdaf60aaa9860fc685f95a314bbe54df92fcbca3570dc9a5b244dcf08bf63ce0cef837c3767a37628abae02
DIST scons-3.0.5.tar.gz 655236 BLAKE2B 1ccd35e393b3307e0be830c2a5491712cba59fe476dfd9c461567288eb76a42e10ca1552ce7603facb66caf5c0b82583c563bd2342b9d7c68c8cabbd0317467b SHA512 0477038b014674049f12899b64584d44a85283d521b2422561e42020a5ae296a5af005684087c3ff410ed3fcbdcc5ff61998bc429eb29513f2a864138ffc4945
EBUILD scons-2.5.1.ebuild 1591 BLAKE2B 5a370c069a841b45cb9d7ec214c66312f5b3f9febcb953fd466662c5e70b866a1f48c70adacc7d9a43f11bcb8c07cb7d18a7f3dde80843460812742d982b108a SHA512 a08e399a4b43143f13b13d4731e839039dbc1b53482078b990d67f06c65a481f4eca889616fb5fccbc9fccd6c1703f307af5b8a010466039ec149eca5c7fa309
-EBUILD scons-3.0.4.ebuild 2116 BLAKE2B bf772b8bd79ff3144fbd8a32d21058df12c7aa086839316d2d26857b05b33c91f732e6b6f3d819bb4aa1346c94ff471718af3df80243a363c63c47b653706389 SHA512 5c280de11216bbe96c5a302ba0e99f0162338d35951f668414e935982b1b76776a1a2c39142803c59ab33f8651b21b7d8cd93197a3543b17d2daa3c7d958b0d0
+EBUILD scons-3.0.4.ebuild 2115 BLAKE2B 87f1ed75b61212eb76233c2f3b91903a9e40c8214d164a0b2c72a86d32c80cfea76681176b333738ba577c4c73edd0d1474e1e10125caa85ddd19c070351b850 SHA512 71fe9496eebdf581b1b4ae793da2a3987ac900dfb50f62bf7e68bb1a3cc1f3539f4d226222e7b541be87fd661a0afb981c6ca65cb6c3e73c9ac34eba6294ec21
EBUILD scons-3.0.5.ebuild 2090 BLAKE2B 341713fffa258fa6f2c41716499236e77f3dec1c74e03754599192965461a7736e2e7070cdd053d083eaae823231b20820b71b1e337e2a75d528925a1420d6d7 SHA512 da0183be00184c9cdce3827119a7255903d802cc85211faac699d02c976ef88388907cb4d08542f28faaa8c4967f25fa8bbf34fe8d98eea4e68d026026616a5a
MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-3.0.4.ebuild b/dev-util/scons/scons-3.0.4.ebuild
index cdf49d51a18a..78790a3eb13e 100644
--- a/dev-util/scons/scons-3.0.4.ebuild
+++ b/dev-util/scons/scons-3.0.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
# unresolved & unpredictable test failures
RESTRICT="test"
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
new file mode 100644
index 000000000000..bfd04f155eb2
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -0,0 +1,6 @@
+AUX spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch 533 BLAKE2B 4d0d1b4c605681b2dbfc4c52730c9f20f8290f11a2be9c37db78e533a996c22140faafc2691c732b49b9de28a59644bd5e39a2b7d4209eb44486cdeee1338de8 SHA512 db4786a10e4380f4575d52cf861a82d0aa9f69cec7d47d574f453d159396e993527ba4e469fab75fabc36b977ee4b61abb9e3787ee2af45af8f5865b3b06e10c
+DIST spirv-llvm-translator-8.0.0.1-LowerOpenCL_new_block_representation.patch.xz 10108 BLAKE2B 96492a7d3ab25e1fe837ced225d50c7450595af52bc3aa6c17e02dc08c1cccaf7ca8dc5949da17da7cc6ea5fcae8688a5994a50bb7693a52493520e57981bc48 SHA512 574ca7b7fe054e82ee154556555e2d184f102faa7da08ce9d6ca5d2ca37463c7a86b3861b93969f9c886544551af8c8f95e57363ea017f7fc426b56d97eb7cf2
+DIST spirv-llvm-translator-8.0.0.1.tar.gz 437384 BLAKE2B bca52bfec04d0adc08b00f5fdbcb6cf953be00f835d2a393545e77bd8776063ef91e8fb62c232b50cbeab58a0a01bea6e47b89c1756699bf35481e87823995de SHA512 85faf176d1ce79d19f10c88055f4a102a5952dcdcd6709e5e5cfdbf69eb958d51020a3ad34198c7c874b42ee8e318f1ce3169ea92853134dfff3dc5843f84414
+EBUILD spirv-llvm-translator-8.0.0.1-r1.ebuild 1650 BLAKE2B 84b0fc6c6846382d5d172f59128f7d80d058537d4cf9f9fa4105756cf3f94e034d18a48a7f156a0976b80ae4f57e371c4aadc0975397f39efc79a5ebf39cd9ad SHA512 3a4f9e284d4007d8bae05b81ee220cd963e4e26e74fc5489d9d4de77d43409e81a18948b084f71ff2eae87d1418bbed20bddaccaf37a4972b8ac074fa97193a1
+EBUILD spirv-llvm-translator-8.0.0.1.ebuild 1474 BLAKE2B 4c0f80f4ad6ca1d465fbbbe46062f9f29cd5348deadd472e5346f56329dc3a420d98d534c2490a3632ecd199798fc79753b54aaa4a4a7c44b23a33cb93158dc4 SHA512 00070420d028527cd178430ddcda231643cbf4683fbc4c547640e2651f2bcea12f44fa4fa99aadd039b889a73011fb1e293ee3d84eb0226291e6e03e42f1aae8
+MISC metadata.xml 345 BLAKE2B d7d62cd25a192044ab04f58277f56278cd20d1fe77df030c18bdc3d39c96cfc9d2cd3c1ba4ad4b870dcbb1b9f3822f6eeb661212b77523cf25a3189b4581d86e SHA512 57484e916f6f9b003275398d7d244fc85276a744b6b720df010d23ba4e03898011f6364f817f4f8ce0c92d91a5d367819c142f4b3f000ca9c4802c017a419256
diff --git a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch
new file mode 100644
index 000000000000..66e81dc3b20d
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch
@@ -0,0 +1,18 @@
+Do not install pkgconfig data files, pkg-config does not presently look at
+/usr/lib/llvm/.../pkgconfig and putting them in /usr/lib*/pkgconfig would
+cause collisions between slots.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,11 +66,3 @@
+ DESTINATION
+ ${CMAKE_INSTALL_PREFIX}/include/LLVMSPIRVLib
+ )
+-
+-configure_file(LLVMSPIRVLib.pc.in ${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc @ONLY)
+-install(
+- FILES
+- ${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc
+- DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/pkgconfig
+-)
diff --git a/dev-util/spirv-llvm-translator/metadata.xml b/dev-util/spirv-llvm-translator/metadata.xml
new file mode 100644
index 000000000000..d7dec83e2de9
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">KhronosGroup/SPIRV-LLVM-Translator</remote-id>
+ </upstream>
+</pkgmetadata>
+
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1-r1.ebuild
new file mode 100644
index 000000000000..3412d8cf4a0c
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib flag-o-matic llvm eapi7-ver
+
+MY_PN="SPIRV-LLVM-Translator"
+MY_PV="$(ver_rs 3 -)"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~marecki/dists/${PN}/${PN}-8.0.0.1-LowerOpenCL_new_block_representation.patch.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="8"
+KEYWORDS="~amd64"
+IUSE="test"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}
+ test? ( dev-python/lit )"
+RDEPEND="${COMMON}"
+
+LLVM_MAX_SLOT=8
+
+PATCHES=(
+ "${WORKDIR}"/${PN}-8.0.0.1-LowerOpenCL_new_block_representation.patch
+ "${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
+)
+
+src_prepare() {
+ append-flags -fPIC
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+ $(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
+ )
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile llvm-spirv
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+ # CMake does not install the executable so do it by hand
+ if multilib_is_native_abi; then
+ exeinto "$(get_llvm_prefix)"/bin
+ doexe "${BUILD_DIR}"/tools/llvm-spirv/llvm-spirv
+ fi
+}
+
+multilib_src_test() {
+ # TODO: figure out why some tests fail on amd64 when ABI==x86
+ if multilib_is_native_abi; then
+ lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
+ fi
+}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1.ebuild
new file mode 100644
index 000000000000..9e8e3b39fed5
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib flag-o-matic llvm eapi7-ver
+
+MY_PN="SPIRV-LLVM-Translator"
+MY_PV="$(ver_rs 3 -)"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="8"
+KEYWORDS="~amd64"
+IUSE="test"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}
+ test? ( dev-python/lit )"
+RDEPEND="${COMMON}"
+
+LLVM_MAX_SLOT=8
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
+)
+
+src_prepare() {
+ append-flags -fPIC
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+ $(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
+ )
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile llvm-spirv
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+ # CMake does not install the executable so do it by hand
+ if multilib_is_native_abi; then
+ exeinto "$(get_llvm_prefix)"/bin
+ doexe "${BUILD_DIR}"/tools/llvm-spirv/llvm-spirv
+ fi
+}
+
+multilib_src_test() {
+ # TODO: figure out why some tests fail on amd64 when ABI==x86
+ if multilib_is_native_abi; then
+ lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
+ fi
+}