From 0bff53119f08d677db6c1a991bd30741682a8a08 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 2 Jun 2018 17:13:10 +0100 Subject: Revert "gentoo resync : 02.06.2018" This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec. --- app-emulation/Manifest.gz | Bin 19518 -> 19181 bytes app-emulation/coldfire/Manifest | 2 +- app-emulation/coldfire/coldfire-0.3.1.ebuild | 21 +++++++----- app-emulation/diskimage-builder/Manifest | 2 -- .../diskimage-builder-2.15.0.ebuild | 37 --------------------- app-emulation/img/Manifest | 5 --- app-emulation/img/img-0.3.6.ebuild | 32 ------------------ app-emulation/img/img-0.3.9.ebuild | 32 ------------------ app-emulation/img/metadata.xml | 11 ------ app-emulation/reg/Manifest | 3 -- app-emulation/reg/metadata.xml | 11 ------ app-emulation/reg/reg-0.13.0.ebuild | 31 ----------------- app-emulation/vkd3d/Manifest | 4 +-- app-emulation/vkd3d/vkd3d-1.0.ebuild | 17 +++++----- app-emulation/vkd3d/vkd3d-9999.ebuild | 17 +++++----- 15 files changed, 31 insertions(+), 194 deletions(-) delete mode 100644 app-emulation/diskimage-builder/diskimage-builder-2.15.0.ebuild delete mode 100644 app-emulation/img/Manifest delete mode 100644 app-emulation/img/img-0.3.6.ebuild delete mode 100644 app-emulation/img/img-0.3.9.ebuild delete mode 100644 app-emulation/img/metadata.xml delete mode 100644 app-emulation/reg/Manifest delete mode 100644 app-emulation/reg/metadata.xml delete mode 100644 app-emulation/reg/reg-0.13.0.ebuild (limited to 'app-emulation') diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index 8cc945c64bdd..eb4d25eb15bb 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/coldfire/Manifest b/app-emulation/coldfire/Manifest index 6c830117a5ba..3ba31ef9eb4a 100644 --- a/app-emulation/coldfire/Manifest +++ b/app-emulation/coldfire/Manifest @@ -1,5 +1,5 @@ AUX coldfire-0.3.1-build.patch 693 BLAKE2B 0b9ff6d289ea6e67403b895d7f85986601777473b75742bd44898739117be6697ea5785d25a1102f3994dfcaa003f1041f511df45f11050d5cb0c67bb9589cc8 SHA512 1999aa892c62f2ae98062bcd7711f0d120e7ba3fe7b812b236c82f9ecbe48654cc3782e5384a2d57c0e3d503e0df638f2d9efbbd8345becd36959ba1c54d456d AUX coldfire-0.3.1-headers.patch 386 BLAKE2B 8b4dd43d49064e9abb9c22685aaac946cf703988303337f206b8975c27d840d0f97b06c68cd11b877da77ed5cfbc9a1e0a1776d39c1db54fa8e501c6b7ffe11e SHA512 5a9c4aa70891421cdff2ef16a49c67483c95e95a88af2a26412e1a6d5161a2cef328a81f891560ede52126eb3b01a3285553e0673fe9e44ae659a35cad701a1d DIST coldfire-0.3.1.tar.gz 142964 BLAKE2B b2ec1d9a46b09426caada3cf2216e1aad6eadfc2756c7ea47236f6cebb51b2d09faf6d1e30af240656bc4ec876f425b049e6971e5ab532ceae66b4d80ab41585 SHA512 e9ac6fcd4a9a8cf0998a658c786f91f6d97dbe03cd32fdc7047c87baa14d412a45dfdd233f68e3136e8d0f36c4d6dd556e5df6e8a0645f82d4abf88fa574ff7b -EBUILD coldfire-0.3.1.ebuild 520 BLAKE2B 4cf2d90103c27adf07cf668304e0987c1431b6503b016575fd87fd91c420e52baeee8903089fe3e50dbc8abc9c90cb6924a1f0639075374a2fcb933d6d8672f9 SHA512 7f1a7142e1a9d5b4bf1bcc2a37ad3a18ad147b8dca566ffb74f87eb387462ac19240f6ab7b0bd15698dc16298903425e961eb8f7de2e8f1fc63d3c0a2b6cc91a +EBUILD coldfire-0.3.1.ebuild 569 BLAKE2B dc72ba3ed5283dbbe99fe9aaa9473af778d1d3fded09f0c4a29ddb5fee53bf5b7cc14d05cc5cbcd1adaabc68a89f226b6828349b1fa079191957df40426f0950 SHA512 c52a392333fab60404588c2cb5bd5acdb3b0b215b8e62b41fc3832c565bebe1182648b7e2a3f28470f8f0bf743accc9627080ecaf52b741923ef3de8c8b92fba MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e diff --git a/app-emulation/coldfire/coldfire-0.3.1.ebuild b/app-emulation/coldfire/coldfire-0.3.1.ebuild index 21e971272979..ac3e77cd5aa0 100644 --- a/app-emulation/coldfire/coldfire-0.3.1.ebuild +++ b/app-emulation/coldfire/coldfire-0.3.1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="2" + +inherit eutils DESCRIPTION="Motorola Coldfire Emulator" HOMEPAGE="http://www.slicer.ca/coldfire/" @@ -12,15 +14,16 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" -DEPEND="sys-libs/ncurses:0= - sys-libs/readline:0=" +DEPEND="sys-libs/ncurses + sys-libs/readline" -PATCHES=( - "${FILESDIR}/${P}-build.patch" - "${FILESDIR}/${P}-headers.patch" -) +src_prepare() { + epatch "${FILESDIR}"/${P}-build.patch + epatch "${FILESDIR}"/${P}-headers.patch +} src_install() { - dobin coldfire + dodir /usr/bin + einstall || die dodoc CONTRIBUTORS HACKING README } diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest index 17d27cd1af3b..33db40a1d910 100644 --- a/app-emulation/diskimage-builder/Manifest +++ b/app-emulation/diskimage-builder/Manifest @@ -1,5 +1,3 @@ DIST diskimage-builder-2.14.1.tar.gz 348188 BLAKE2B 3d751fc3f05578a7b5296c8b7ebde1b8dd0a38e40dc378fded93faa34c623db2abeac53c72048ce7ebd5747eb50a4f9e5525baba800adc4b2c1925f31a1dce0b SHA512 d056c89e78b3f42ccc5ced2dfdd9ac1c50ecdcb6861f81bdb3cd3c9d624fbba89c2a2b9ed08850dd79ff9fdf47fcaa3d3519b32f909bd1b0b12bbacf4d9ab758 -DIST diskimage-builder-2.15.0.tar.gz 350322 BLAKE2B 6eca37edbf556bf8aece189117510946dcc687af17060add95a1efd1a9136f16597b2f9ef3b0beead0079566c83e19683eb0019ea290fa3b5cc5b132aa97eca8 SHA512 ffc0a1938c02140144d3e057f24c051a620f66ca400cc65c7d1743adcb94d1e1f3c99811addac0a9fb47fc81a73713c2edc2d26f7526098e69b05fb9144176ea EBUILD diskimage-builder-2.14.1.ebuild 1136 BLAKE2B f83045e466b1684160ded8c1f473ca9f505a1a29deafa1ed6991bd4037361ce7f5b9a4c8f9973d457e487d657907b4e49235c018342f51b27b95839be0ad7b80 SHA512 b0e481a9d23db7fd0fced29e514106e6fe0367e0ebcdba22322908bd80eb5d8d17cd6c27925eaae3586fa25fd7a344053ce27da8d64adb3539563fcaead2ef60 -EBUILD diskimage-builder-2.15.0.ebuild 1138 BLAKE2B 5c90ef6e4eaff62dd734d18ae03b18329477e8c4757c631854e038d0aa189f46d96a38e4dc2297c98418e68986aa99f3dc01b97bd3b93ba44f9b4421aeee5dae SHA512 b908a4c30c9e5b5d7adb6ddcff9a539fec366e940a62ef8870f274353e2ba747da9e29d72139794769c7db943b5291a0f0feefeb59e08e65010edd0f1867abc0 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277 diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.15.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.15.0.ebuild deleted file mode 100644 index 1495264437fd..000000000000 --- a/app-emulation/diskimage-builder/diskimage-builder-2.15.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Golden Disk Image builder." -HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" -DEPEND="${CDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${CDEPEND} - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] - >=dev-python/networkx-1.10[${PYTHON_USEDEP}] - =dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/flake8-2.5.4[${PYTHON_USEDEP}] - =dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] - app-emulation/qemu - sys-block/parted - sys-fs/multipath-tools - sys-fs/dosfstools - sys-apps/gptfdisk - !dev-python/dib-utils[${PYTHON_USEDEP}]" diff --git a/app-emulation/img/Manifest b/app-emulation/img/Manifest deleted file mode 100644 index 7b58379c4d3d..000000000000 --- a/app-emulation/img/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST img-0.3.6.tar.gz 6043716 BLAKE2B 982a6f470f4b79cd4cc2b06be4060f516786f700872510948a25d5ad313cccf402b0fe26c053f7505b66c170221274568ce44632729c16e1ade680b5dc007b0d SHA512 911cf6a761741a04553d5e526399973c0e943cfda5eead7f94196969fed4f586134358b1e6f023c6cf07e755de802e498991eb320bd50af32649749622a26969 -DIST img-0.3.9.tar.gz 6153717 BLAKE2B b561ed349c2b08f0e3448886b6c979d86fd6d4f47af0f03d7dd479a12f078b99f39e10d6a6b3ba9caffe2a9966102e3f3069fa6eacb70bb36f9842314e8a8e7b SHA512 23bf1e85cb9238742ffef44408bece52b5b0fefbeae9541a7740a4d798d1dc2c0f8efd02d8342842753925135dee843c4a7a20abe3a87ce1c475178461c9b8da -EBUILD img-0.3.6.ebuild 911 BLAKE2B 556f2aacaabc9fd4c32e887c46a05e9759a405877fefd40294002fb2136d32329b62302abe1f7994f2112ab81b3bdffdbfceddc478b4bee3771eb5068be826fc SHA512 7a038c3c6f1742fa2f765310e5c0547d0d970b9db3fd7fc38e771fa6e016dfd2bd273cb5ff8e858e63b4daeb776cf4b2f594cd7e61da493b54c4a550f60e784b -EBUILD img-0.3.9.ebuild 911 BLAKE2B 556f2aacaabc9fd4c32e887c46a05e9759a405877fefd40294002fb2136d32329b62302abe1f7994f2112ab81b3bdffdbfceddc478b4bee3771eb5068be826fc SHA512 7a038c3c6f1742fa2f765310e5c0547d0d970b9db3fd7fc38e771fa6e016dfd2bd273cb5ff8e858e63b4daeb776cf4b2f594cd7e61da493b54c4a550f60e784b -MISC metadata.xml 326 BLAKE2B bade1307a8d5bd0a9945fbb417b8506b7aaa4b66d5a502e18af1f7b008e325b5514e0fc018932396aba1116b5a3c11b12b89c43d925f7e97c8a75efcd9ef4f3d SHA512 a75050de970991e19edf7b7560ca46d27c959b9a91dcf87d40d31532c85c7af24ab29743d7295c731a3153774d33b03afa5c92470ca0c0c572d50c6ec65e5692 diff --git a/app-emulation/img/img-0.3.6.ebuild b/app-emulation/img/img-0.3.6.ebuild deleted file mode 100644 index 661f99352151..000000000000 --- a/app-emulation/img/img-0.3.6.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 golang-build golang-vcs-snapshot - -EGO_PN="github.com/genuinetools/img" -EGIT_COMMIT="v${PV}" -GIT_COMMIT="e4a43d044778e3df56e0de3c6ca00706fcca8b50" -ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" - -DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder" -HOMEPAGE="https://github.com/genuinetools/img" -SRC_URI="${ARCHIVE_URI}" -LICENSE="MIT" -SLOT="0" -IUSE="seccomp" - -RESTRICT="test" - -src_compile() { - local TAGS=$(usex seccomp 'seccomp' '') - pushd src/${EGO_PN} || die - GOPATH="${S}" go build -tags ${TAGS} -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die - popd || die -} - -src_install() { - dobin bin/* - dodoc -r src/${EGO_PN}/README.md -} diff --git a/app-emulation/img/img-0.3.9.ebuild b/app-emulation/img/img-0.3.9.ebuild deleted file mode 100644 index 661f99352151..000000000000 --- a/app-emulation/img/img-0.3.9.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 golang-build golang-vcs-snapshot - -EGO_PN="github.com/genuinetools/img" -EGIT_COMMIT="v${PV}" -GIT_COMMIT="e4a43d044778e3df56e0de3c6ca00706fcca8b50" -ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" - -DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder" -HOMEPAGE="https://github.com/genuinetools/img" -SRC_URI="${ARCHIVE_URI}" -LICENSE="MIT" -SLOT="0" -IUSE="seccomp" - -RESTRICT="test" - -src_compile() { - local TAGS=$(usex seccomp 'seccomp' '') - pushd src/${EGO_PN} || die - GOPATH="${S}" go build -tags ${TAGS} -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die - popd || die -} - -src_install() { - dobin bin/* - dodoc -r src/${EGO_PN}/README.md -} diff --git a/app-emulation/img/metadata.xml b/app-emulation/img/metadata.xml deleted file mode 100644 index 06bfaa067c93..000000000000 --- a/app-emulation/img/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - mrueg@gentoo.org - Manuel Rüger - - - genuinetools/img - - diff --git a/app-emulation/reg/Manifest b/app-emulation/reg/Manifest deleted file mode 100644 index 3a1579a68546..000000000000 --- a/app-emulation/reg/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST reg-0.13.0.tar.gz 14958008 BLAKE2B 7afdb3f00732ad3fe4e8581d0773ba3d8ed4e9d41704e5aec7e45f16e407d19cc30cf8d4461d32719200b0253d26b609ff641c760b220685edb98bfb49f9b6b6 SHA512 7b9c23de23b798e9da4902a00d965c62452997240f53980eda478c8fa59ade985ca2f25fbe902597bcb32440dfcd41bd72c4631b4f4be956a48b75875e134018 -EBUILD reg-0.13.0.ebuild 806 BLAKE2B 739a613983e38fd102fb77b3bf4fd67a38cd9647920b1865d2614d5349aedc9cc91863a7e4796657b439265a4eef0685cae0aee7b0c986f4c9964e748ab816a8 SHA512 f9a9ac85074b42de05d5cc916f011903bc7088568b2d89beedfb3a65e323a7d50d31b3af9a7c574174f9fdcf520a450c1a5678259d874a4191f9e13c58fa67e1 -MISC metadata.xml 326 BLAKE2B 82f2440e792104c0c9e1afe4d95b9972efc7b233524637e32f11c2b5746aba7990d88f01a542e25f7a5c9c52aac0c5c1e25bc5703d3e855ea8e8ef4ffe87929c SHA512 9fea1224db7eb9316eff5bd89ebf748cbf35160516b33a9c9a3a07d1db6a2fa64dafcf8623a24af09429f7b76cc94ee02a39145162d0b039cb9d0137bc51a20e diff --git a/app-emulation/reg/metadata.xml b/app-emulation/reg/metadata.xml deleted file mode 100644 index e08ad1ff9a01..000000000000 --- a/app-emulation/reg/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - mrueg@gentoo.org - Manuel Rüger - - - genuinetools/reg - - diff --git a/app-emulation/reg/reg-0.13.0.ebuild b/app-emulation/reg/reg-0.13.0.ebuild deleted file mode 100644 index e053da6337af..000000000000 --- a/app-emulation/reg/reg-0.13.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit golang-build golang-vcs-snapshot - -EGO_PN="github.com/genuinetools/reg" -EGIT_COMMIT="v${PV}" -GIT_COMMIT="b2cdf0428ddc051f8a39143b63311b515e26d012" -ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" - -DESCRIPTION="Docker registry v2 command line client" -HOMEPAGE="https://github.com/genuinetools/reg" -SRC_URI="${ARCHIVE_URI}" -LICENSE="MIT" -SLOT="0" -IUSE="" - -RESTRICT="test" - -src_compile() { - pushd src/${EGO_PN} || die - GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die - popd || die -} - -src_install() { - dobin bin/* - dodoc src/${EGO_PN}/README.md -} diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest index bd02b406870e..a4737a2b10ac 100644 --- a/app-emulation/vkd3d/Manifest +++ b/app-emulation/vkd3d/Manifest @@ -1,4 +1,4 @@ DIST vkd3d-1.0.tar.xz 461884 BLAKE2B 4dbd729f9e795d3d81178abc1a8774c0bbe6a5257c96c97acf1e4b4cdb5b7e30c77235e8b8fa57f7db3196caf30c55c3b0c07e2981629dd6177436a3cd117d33 SHA512 55712528688cdedc63049e168b371b470dbb8e31ddc36d8b23b0655f4a061726eb8556b9abf3cb887f6bd21379959aed9fab93ba0fd53813aec413ebec71d615 -EBUILD vkd3d-1.0.ebuild 1006 BLAKE2B b015cc5986bd035c7cac40394067c4134186c0fd36fa1887bf316849d413c9d44921ec05cf8807f15521a0568baf6ffacf8868db2e36487193bfb8b1ea8a3109 SHA512 8dee8c46ffd20d441d8aea5905cb15da366d491e7fbc9f1d26ef33b9a656dfc6eb6d9018fd094eed62fb9281a1c463c9403fa201d6d21a524b5ebfb9c58f98b2 -EBUILD vkd3d-9999.ebuild 1006 BLAKE2B b015cc5986bd035c7cac40394067c4134186c0fd36fa1887bf316849d413c9d44921ec05cf8807f15521a0568baf6ffacf8868db2e36487193bfb8b1ea8a3109 SHA512 8dee8c46ffd20d441d8aea5905cb15da366d491e7fbc9f1d26ef33b9a656dfc6eb6d9018fd094eed62fb9281a1c463c9403fa201d6d21a524b5ebfb9c58f98b2 +EBUILD vkd3d-1.0.ebuild 950 BLAKE2B 0f853d0abd6d83a73efadf1ffd56ae3fa130a2968cdb19ada6c616c70cff16257bf8c1969c53370c9ff4e1f114522a9e178c18c59256d37acbdd6cc355aef09d SHA512 8c1f48f40811800b48d47b953f2ca7e22f86e89685a9cff059c40e0beb8e03c8e215bbbad6c53bfb1f61dac7875fd812dca6fabde1341a34cbda8ece0ce3f9b8 +EBUILD vkd3d-9999.ebuild 950 BLAKE2B 0f853d0abd6d83a73efadf1ffd56ae3fa130a2968cdb19ada6c616c70cff16257bf8c1969c53370c9ff4e1f114522a9e178c18c59256d37acbdd6cc355aef09d SHA512 8c1f48f40811800b48d47b953f2ca7e22f86e89685a9cff059c40e0beb8e03c8e215bbbad6c53bfb1f61dac7875fd812dca6fabde1341a34cbda8ece0ce3f9b8 MISC metadata.xml 562 BLAKE2B 2409531d0bc65f547844ae83bfd7aaea4d996f2cdf11ebbf7e95775465d4bed916a39a38a0aae0c6df91a417df484ecaf63b29ea4286fdcfd11b07c8177e3496 SHA512 2150c80fd4315d922521b43c650012008864b3ed1ff7d80e43622ad916e52411c6ef855b46693f96165e9d89fd6a6f18cdc88baab13bec9f7053c0c1795bcd71 diff --git a/app-emulation/vkd3d/vkd3d-1.0.ebuild b/app-emulation/vkd3d/vkd3d-1.0.ebuild index 6158c8e04d3e..e5f968f0a63f 100644 --- a/app-emulation/vkd3d/vkd3d-1.0.ebuild +++ b/app-emulation/vkd3d/vkd3d-1.0.ebuild @@ -15,17 +15,16 @@ fi IUSE="spirv-tools" RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] ) - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - x11-libs/xcb-util:=[${MULTILIB_USEDEP}] - x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}] - x11-libs/xcb-util-wm:=[${MULTILIB_USEDEP}]" - -DEPEND="${RDEPEND} dev-util/spirv-headers || ( - dev-util/vulkan-headers - <=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}] - )" + ( <=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}] ) + ( >media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}] + dev-util/vulkan-headers + ) + ) + x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]" + +DEPEND="${RDEPEND}" DESCRIPTION="D3D12 to Vulkan translation library" HOMEPAGE="https://source.winehq.org/git/vkd3d.git/" diff --git a/app-emulation/vkd3d/vkd3d-9999.ebuild b/app-emulation/vkd3d/vkd3d-9999.ebuild index 6158c8e04d3e..e5f968f0a63f 100644 --- a/app-emulation/vkd3d/vkd3d-9999.ebuild +++ b/app-emulation/vkd3d/vkd3d-9999.ebuild @@ -15,17 +15,16 @@ fi IUSE="spirv-tools" RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] ) - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - x11-libs/xcb-util:=[${MULTILIB_USEDEP}] - x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}] - x11-libs/xcb-util-wm:=[${MULTILIB_USEDEP}]" - -DEPEND="${RDEPEND} dev-util/spirv-headers || ( - dev-util/vulkan-headers - <=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}] - )" + ( <=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}] ) + ( >media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}] + dev-util/vulkan-headers + ) + ) + x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]" + +DEPEND="${RDEPEND}" DESCRIPTION="D3D12 to Vulkan translation library" HOMEPAGE="https://source.winehq.org/git/vkd3d.git/" -- cgit v1.2.3