[gentoo-commits] repo/proj/wine:master commit in: app-emulation/vkd3d/

2022-04-15 Thread Nick Sarnie
commit: 0fddb34e05c1f58e00de87f90a025a8e1dbc392b
Author: Nick Sarnie  gentoo  org>
AuthorDate: Fri Apr 15 19:27:33 2022 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Fri Apr 15 19:29:39 2022 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=0fddb34e

app-emulation/vkd3d: Restrict test

Closes: https://bugs.gentoo.org/838655

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Nick Sarnie  gentoo.org>

 app-emulation/vkd3d/vkd3d-1.2.ebuild  |  5 -
 app-emulation/vkd3d/vkd3d-.ebuild | 18 +++---
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app-emulation/vkd3d/vkd3d-1.2.ebuild 
b/app-emulation/vkd3d/vkd3d-1.2.ebuild
index 90e8035..e64cc1a 100644
--- a/app-emulation/vkd3d/vkd3d-1.2.ebuild
+++ b/app-emulation/vkd3d/vkd3d-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,9 @@ else
SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz";
 fi
 
+#Tests fail: https://bugs.gentoo.org/838655
+RESTRICT="test"
+
 IUSE="spirv-tools"
 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
media-libs/vulkan-loader[${MULTILIB_USEDEP},X]

diff --git a/app-emulation/vkd3d/vkd3d-.ebuild 
b/app-emulation/vkd3d/vkd3d-.ebuild
index 0e542af..e64cc1a 100644
--- a/app-emulation/vkd3d/vkd3d-.ebuild
+++ b/app-emulation/vkd3d/vkd3d-.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit multilib-minimal autotools
-
-AUTOTOOLS_AUTORECONF="1"
+inherit multilib-minimal
 
 if [[ "${PV}" == "" ]]; then
EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git";
inherit git-r3
 else
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~x86"
SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz";
 fi
 
+#Tests fail: https://bugs.gentoo.org/838655
+RESTRICT="test"
+
 IUSE="spirv-tools"
 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
media-libs/vulkan-loader[${MULTILIB_USEDEP},X]
@@ -24,7 +25,7 @@ RDEPEND="spirv-tools? ( 
dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
 
 DEPEND="${RDEPEND}
dev-util/spirv-headers
-   >=dev-util/vulkan-headers-1.1.114"
+   dev-util/vulkan-headers"
 
 DESCRIPTION="D3D12 to Vulkan translation library"
 HOMEPAGE="https://source.winehq.org/git/vkd3d.git/";
@@ -32,11 +33,6 @@ HOMEPAGE="https://source.winehq.org/git/vkd3d.git/";
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-src_prepare() {
-   default
-   eautoreconf
-}
-
 multilib_src_configure() {
local myconf=(
$(use_with spirv-tools)



[gentoo-commits] repo/proj/wine:master commit in: app-emulation/vkd3d/

2020-09-29 Thread Nick Sarnie
commit: ac57db7693e62549d57fbdb076f406bae7bc5842
Author: Nick Sarnie  gentoo  org>
AuthorDate: Tue Sep 29 22:36:25 2020 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Tue Sep 29 22:36:25 2020 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=ac57db76

app-emulation/vkd3d: Sync with ::gentoo

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Nick Sarnie  gentoo.org>

 app-emulation/vkd3d/vkd3d-.ebuild | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app-emulation/vkd3d/vkd3d-.ebuild 
b/app-emulation/vkd3d/vkd3d-.ebuild
index 90e8035..0e542af 100644
--- a/app-emulation/vkd3d/vkd3d-.ebuild
+++ b/app-emulation/vkd3d/vkd3d-.ebuild
@@ -3,13 +3,15 @@
 
 EAPI=6
 
-inherit multilib-minimal
+inherit multilib-minimal autotools
+
+AUTOTOOLS_AUTORECONF="1"
 
 if [[ "${PV}" == "" ]]; then
EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git";
inherit git-r3
 else
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64"
SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz";
 fi
 
@@ -22,7 +24,7 @@ RDEPEND="spirv-tools? ( 
dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
 
 DEPEND="${RDEPEND}
dev-util/spirv-headers
-   dev-util/vulkan-headers"
+   >=dev-util/vulkan-headers-1.1.114"
 
 DESCRIPTION="D3D12 to Vulkan translation library"
 HOMEPAGE="https://source.winehq.org/git/vkd3d.git/";
@@ -30,6 +32,11 @@ HOMEPAGE="https://source.winehq.org/git/vkd3d.git/";
 LICENSE="LGPL-2.1"
 SLOT="0"
 
+src_prepare() {
+   default
+   eautoreconf
+}
+
 multilib_src_configure() {
local myconf=(
$(use_with spirv-tools)



[gentoo-commits] repo/proj/wine:master commit in: app-emulation/vkd3d/

2020-09-29 Thread Nick Sarnie
commit: 468cd930fd7bc7f2048d559ff3afee75288561a5
Author: Nick Sarnie  gentoo  org>
AuthorDate: Tue Sep 29 22:32:11 2020 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Tue Sep 29 22:32:11 2020 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=468cd930

app-emulation/vkd3d: Fix build

Closes: https://bugs.gentoo.org/745450
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Nick Sarnie  gentoo.org>

 app-emulation/vkd3d/vkd3d-1.2.ebuild  | 1 +
 app-emulation/vkd3d/vkd3d-.ebuild | 9 -
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-emulation/vkd3d/vkd3d-1.2.ebuild 
b/app-emulation/vkd3d/vkd3d-1.2.ebuild
index f866aca..90e8035 100644
--- a/app-emulation/vkd3d/vkd3d-1.2.ebuild
+++ b/app-emulation/vkd3d/vkd3d-1.2.ebuild
@@ -33,6 +33,7 @@ SLOT="0"
 multilib_src_configure() {
local myconf=(
$(use_with spirv-tools)
+   --disable-doxygen-pdf
)
 
ECONF_SOURCE=${S} econf "${myconf[@]}"

diff --git a/app-emulation/vkd3d/vkd3d-.ebuild 
b/app-emulation/vkd3d/vkd3d-.ebuild
index 56cb485..90e8035 100644
--- a/app-emulation/vkd3d/vkd3d-.ebuild
+++ b/app-emulation/vkd3d/vkd3d-.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit multilib-minimal
 
-AUTOTOOLS_AUTORECONF="1"
-
 if [[ "${PV}" == "" ]]; then
EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git";
inherit git-r3
 else
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~x86"
SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz";
 fi
 
@@ -24,7 +22,7 @@ RDEPEND="spirv-tools? ( 
dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
 
 DEPEND="${RDEPEND}
dev-util/spirv-headers
-   >=dev-util/vulkan-headers-1.1.114"
+   dev-util/vulkan-headers"
 
 DESCRIPTION="D3D12 to Vulkan translation library"
 HOMEPAGE="https://source.winehq.org/git/vkd3d.git/";
@@ -35,6 +33,7 @@ SLOT="0"
 multilib_src_configure() {
local myconf=(
$(use_with spirv-tools)
+   --disable-doxygen-pdf
)
 
ECONF_SOURCE=${S} econf "${myconf[@]}"



[gentoo-commits] repo/proj/wine:master commit in: app-emulation/vkd3d/

2020-09-27 Thread Nick Sarnie
commit: 7cddf9837754604d83a96b713b519834afc9c63c
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Sep 28 02:26:19 2020 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Sep 28 02:26:19 2020 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=7cddf983

app-emulation/vkd3d: Bump to 1.2

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Nick Sarnie  gentoo.org>

 app-emulation/vkd3d/Manifest |  1 +
 app-emulation/vkd3d/vkd3d-1.2.ebuild | 39 
 2 files changed, 40 insertions(+)

diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest
index 257e832..7014678 100644
--- a/app-emulation/vkd3d/Manifest
+++ b/app-emulation/vkd3d/Manifest
@@ -1 +1,2 @@
 DIST vkd3d-1.0.tar.xz 461884 BLAKE2B 
4dbd729f9e795d3d81178abc1a8774c0bbe6a5257c96c97acf1e4b4cdb5b7e30c77235e8b8fa57f7db3196caf30c55c3b0c07e2981629dd6177436a3cd117d33
 SHA512 
55712528688cdedc63049e168b371b470dbb8e31ddc36d8b23b0655f4a061726eb8556b9abf3cb887f6bd21379959aed9fab93ba0fd53813aec413ebec71d615
+DIST vkd3d-1.2.tar.xz 611240 BLAKE2B 
e7ea3f7120ad1092be0239bdc2e6d0dfdfecc3b1c2e7c359c4bfbd8c259f092e041a75a0e896da9a1c6370d5716590711128d31c9e552897b177b300b9a15107
 SHA512 
ca9d5b11e7770747b78b61f43196b45b7bda8d2dd4f1d76da915f895a04dc28c20499e1e433f5ce17416964fe0f37cdc907e7aa540ec9105afbc8a100094f3e7

diff --git a/app-emulation/vkd3d/vkd3d-1.2.ebuild 
b/app-emulation/vkd3d/vkd3d-1.2.ebuild
new file mode 100644
index 000..f866aca
--- /dev/null
+++ b/app-emulation/vkd3d/vkd3d-1.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "" ]]; then
+   EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git";
+   inherit git-r3
+else
+   KEYWORDS="~amd64 ~x86"
+   SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz";
+fi
+
+IUSE="spirv-tools"
+RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
+   media-libs/vulkan-loader[${MULTILIB_USEDEP},X]
+   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"
+
+DESCRIPTION="D3D12 to Vulkan translation library"
+HOMEPAGE="https://source.winehq.org/git/vkd3d.git/";
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+multilib_src_configure() {
+   local myconf=(
+   $(use_with spirv-tools)
+   )
+
+   ECONF_SOURCE=${S} econf "${myconf[@]}"
+}



[gentoo-commits] repo/proj/wine:master commit in: app-emulation/vkd3d/

2019-07-13 Thread Nick Sarnie
commit: 654bf478a80999a3bbc299466ffe8248d2b129cc
Author: Nick Sarnie  gentoo  org>
AuthorDate: Sat Jul 13 15:10:28 2019 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Sat Jul 13 15:10:28 2019 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=654bf478

app-emulation/vkd3d: Bump vulkan-headers requirement

Bug: https://bugs.gentoo.org/689756
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Nick Sarnie  gentoo.org>

 app-emulation/vkd3d/vkd3d-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vkd3d/vkd3d-.ebuild 
b/app-emulation/vkd3d/vkd3d-.ebuild
index 7d104fc..56cb485 100644
--- a/app-emulation/vkd3d/vkd3d-.ebuild
+++ b/app-emulation/vkd3d/vkd3d-.ebuild
@@ -24,7 +24,7 @@ RDEPEND="spirv-tools? ( 
dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
 
 DEPEND="${RDEPEND}
dev-util/spirv-headers
-   dev-util/vulkan-headers"
+   >=dev-util/vulkan-headers-1.1.114"
 
 DESCRIPTION="D3D12 to Vulkan translation library"
 HOMEPAGE="https://source.winehq.org/git/vkd3d.git/";



[gentoo-commits] repo/proj/wine:master commit in: app-emulation/vkd3d/

2019-05-14 Thread Nick Sarnie
commit: b84b11285b46ebf645d2b3567e05487a174ecdc9
Author: Nick Sarnie  gentoo  org>
AuthorDate: Tue May 14 23:01:36 2019 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Tue May 14 23:01:36 2019 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=b84b1128

app-emulation/vkd3d: Fix live ebuild

Fixes: https://bugs.gentoo.org/685918
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Nick Sarnie  gentoo.org>

 app-emulation/vkd3d/vkd3d-.ebuild | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app-emulation/vkd3d/vkd3d-.ebuild 
b/app-emulation/vkd3d/vkd3d-.ebuild
index 2adf5f1..7d104fc 100644
--- a/app-emulation/vkd3d/vkd3d-.ebuild
+++ b/app-emulation/vkd3d/vkd3d-.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit multilib-minimal
 
+AUTOTOOLS_AUTORECONF="1"
+
 if [[ "${PV}" == "" ]]; then
EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git";
inherit git-r3
@@ -22,10 +24,7 @@ RDEPEND="spirv-tools? ( 
dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
 
 DEPEND="${RDEPEND}
dev-util/spirv-headers
-   || (
-   dev-util/vulkan-headers
-   
<=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}]
-  )"
+   dev-util/vulkan-headers"
 
 DESCRIPTION="D3D12 to Vulkan translation library"
 HOMEPAGE="https://source.winehq.org/git/vkd3d.git/";



[gentoo-commits] repo/proj/wine:master commit in: app-emulation/vkd3d/

2018-06-03 Thread Nick Sarnie
commit: f3f5dabc855b0a0a6db68eca7d599d1d2ccc439a
Author: Nick Sarnie  gentoo  org>
AuthorDate: Sun Jun  3 20:28:49 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Sun Jun  3 20:29:42 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=f3f5dabc

app-emulation/vkd3d: Fix dep on media-libs/vulkan-loader

Bug: https://bugs.gentoo.org/656784

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/vkd3d/vkd3d-1.0.ebuild  | 2 +-
 app-emulation/vkd3d/vkd3d-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/vkd3d/vkd3d-1.0.ebuild 
b/app-emulation/vkd3d/vkd3d-1.0.ebuild
index 6158c8e..2adf5f1 100644
--- a/app-emulation/vkd3d/vkd3d-1.0.ebuild
+++ b/app-emulation/vkd3d/vkd3d-1.0.ebuild
@@ -15,7 +15,7 @@ fi
 
 IUSE="spirv-tools"
 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
-   media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+   media-libs/vulkan-loader[${MULTILIB_USEDEP},X]
x11-libs/xcb-util:=[${MULTILIB_USEDEP}]
x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]
x11-libs/xcb-util-wm:=[${MULTILIB_USEDEP}]"

diff --git a/app-emulation/vkd3d/vkd3d-.ebuild 
b/app-emulation/vkd3d/vkd3d-.ebuild
index 6158c8e..2adf5f1 100644
--- a/app-emulation/vkd3d/vkd3d-.ebuild
+++ b/app-emulation/vkd3d/vkd3d-.ebuild
@@ -15,7 +15,7 @@ fi
 
 IUSE="spirv-tools"
 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
-   media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+   media-libs/vulkan-loader[${MULTILIB_USEDEP},X]
x11-libs/xcb-util:=[${MULTILIB_USEDEP}]
x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]
x11-libs/xcb-util-wm:=[${MULTILIB_USEDEP}]"



[gentoo-commits] repo/proj/wine:master commit in: app-emulation/vkd3d/

2018-05-30 Thread Nick Sarnie
commit: 463cbb14a12ae66e937a5c25a5f87618b761f28c
Author: Nick Sarnie  gentoo  org>
AuthorDate: Wed May 30 22:43:47 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Wed May 30 22:44:25 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=463cbb14

app-emulation/vkd3d: Add more xcb dependencies

Please help me

Fixes: https://bugs.gentoo.org/656960

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/vkd3d/vkd3d-1.0.ebuild  | 4 +++-
 app-emulation/vkd3d/vkd3d-.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app-emulation/vkd3d/vkd3d-1.0.ebuild 
b/app-emulation/vkd3d/vkd3d-1.0.ebuild
index db0b7d1..6158c8e 100644
--- a/app-emulation/vkd3d/vkd3d-1.0.ebuild
+++ b/app-emulation/vkd3d/vkd3d-1.0.ebuild
@@ -16,7 +16,9 @@ fi
 IUSE="spirv-tools"
 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
media-libs/vulkan-loader[${MULTILIB_USEDEP}]
-   x11-libs/xcb-util-keysyms:=[${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

diff --git a/app-emulation/vkd3d/vkd3d-.ebuild 
b/app-emulation/vkd3d/vkd3d-.ebuild
index db0b7d1..6158c8e 100644
--- a/app-emulation/vkd3d/vkd3d-.ebuild
+++ b/app-emulation/vkd3d/vkd3d-.ebuild
@@ -16,7 +16,9 @@ fi
 IUSE="spirv-tools"
 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
media-libs/vulkan-loader[${MULTILIB_USEDEP}]
-   x11-libs/xcb-util-keysyms:=[${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



[gentoo-commits] repo/proj/wine:master commit in: app-emulation/vkd3d/

2018-05-28 Thread Nick Sarnie
commit: 6e1b7a52225214a96632859b31cbd56aec309e2f
Author: Nick Sarnie  gentoo  org>
AuthorDate: Tue May 29 01:38:08 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Tue May 29 01:38:08 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=6e1b7a52

app-emulation/vkd3d: Fix dependencies again

Thanks [Arfrever]

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/vkd3d/vkd3d-1.0.ebuild  | 15 +++
 app-emulation/vkd3d/vkd3d-.ebuild | 15 +++
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app-emulation/vkd3d/vkd3d-1.0.ebuild 
b/app-emulation/vkd3d/vkd3d-1.0.ebuild
index e5f968f..db0b7d1 100644
--- a/app-emulation/vkd3d/vkd3d-1.0.ebuild
+++ b/app-emulation/vkd3d/vkd3d-1.0.ebuild
@@ -15,16 +15,15 @@ fi
 
 IUSE="spirv-tools"
 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
-   dev-util/spirv-headers
-   || (
-( 
<=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
-)
-  )
+   media-libs/vulkan-loader[${MULTILIB_USEDEP}]
x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]"
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   dev-util/spirv-headers
+   || (
+   dev-util/vulkan-headers
+   
<=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}]
+  )"
 
 DESCRIPTION="D3D12 to Vulkan translation library"
 HOMEPAGE="https://source.winehq.org/git/vkd3d.git/";

diff --git a/app-emulation/vkd3d/vkd3d-.ebuild 
b/app-emulation/vkd3d/vkd3d-.ebuild
index e5f968f..db0b7d1 100644
--- a/app-emulation/vkd3d/vkd3d-.ebuild
+++ b/app-emulation/vkd3d/vkd3d-.ebuild
@@ -15,16 +15,15 @@ fi
 
 IUSE="spirv-tools"
 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
-   dev-util/spirv-headers
-   || (
-( 
<=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
-)
-  )
+   media-libs/vulkan-loader[${MULTILIB_USEDEP}]
x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]"
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   dev-util/spirv-headers
+   || (
+   dev-util/vulkan-headers
+   
<=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}]
+  )"
 
 DESCRIPTION="D3D12 to Vulkan translation library"
 HOMEPAGE="https://source.winehq.org/git/vkd3d.git/";



[gentoo-commits] repo/proj/wine:master commit in: app-emulation/vkd3d/

2018-05-28 Thread Nick Sarnie
commit: 5cd242b5b356c7bb99b9e4920acb282ce4b6197a
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon May 28 20:04:09 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon May 28 20:04:09 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=5cd242b5

app-emulation/vkd3d: Update metadata

Better USE description

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/vkd3d/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vkd3d/metadata.xml b/app-emulation/vkd3d/metadata.xml
index f83e30b..cad91c2 100644
--- a/app-emulation/vkd3d/metadata.xml
+++ b/app-emulation/vkd3d/metadata.xml
@@ -10,6 +10,6 @@



-   Enable better SPIRV support using 
dev-util/spirv-tools
+   Enable SPIRV shader debugging support 
using dev-util/spirv-tools

 



[gentoo-commits] repo/proj/wine:master commit in: app-emulation/vkd3d/

2018-05-28 Thread Nick Sarnie
commit: d1e6e3e2fe427e15bd6450b236c2287aa7f58d50
Author: Lucian Poston  pm  me>
AuthorDate: Mon May 28 17:16:54 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon May 28 19:57:30 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=d1e6e3e2

app-emulation/vkd3d: Add dependencies

Fixes: https://bugs.gentoo.org/656784
Fixes: https://bugs.gentoo.org/656794
Closes: https://github.com/gentoo/repo-proj-wine/pull/5

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-emulation/vkd3d/vkd3d-1.0.ebuild  | 9 -
 app-emulation/vkd3d/vkd3d-.ebuild | 9 -
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app-emulation/vkd3d/vkd3d-1.0.ebuild 
b/app-emulation/vkd3d/vkd3d-1.0.ebuild
index a84144c..e5f968f 100644
--- a/app-emulation/vkd3d/vkd3d-1.0.ebuild
+++ b/app-emulation/vkd3d/vkd3d-1.0.ebuild
@@ -15,7 +15,14 @@ fi
 
 IUSE="spirv-tools"
 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
-x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]"
+   dev-util/spirv-headers
+   || (
+( 
<=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}"
 

diff --git a/app-emulation/vkd3d/vkd3d-.ebuild 
b/app-emulation/vkd3d/vkd3d-.ebuild
index a84144c..e5f968f 100644
--- a/app-emulation/vkd3d/vkd3d-.ebuild
+++ b/app-emulation/vkd3d/vkd3d-.ebuild
@@ -15,7 +15,14 @@ fi
 
 IUSE="spirv-tools"
 RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
-x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]"
+   dev-util/spirv-headers
+   || (
+( 
<=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}"
 



[gentoo-commits] repo/proj/wine:master commit in: app-emulation/vkd3d/

2018-05-28 Thread Nick Sarnie
commit: 3716343701fbb15605b15474bf787f3748032099
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon May 28 16:30:50 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon May 28 16:30:50 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=37163437

app-emulation/vkd3d: Fix SRC_URI

Turns out you can get it from winehq, thanks worch

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/vkd3d/Manifest  |  2 +-
 app-emulation/vkd3d/vkd3d-1.0.ebuild  | 10 ++
 app-emulation/vkd3d/vkd3d-.ebuild | 10 ++
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest
index a91ba6a..257e832 100644
--- a/app-emulation/vkd3d/Manifest
+++ b/app-emulation/vkd3d/Manifest
@@ -1 +1 @@
-DIST vkd3d-1.0.tar.xz 219856 BLAKE2B 
ebf4f7d95a4ed97e4a8f652850d1af563b1c8a6d2b78f157f3e729387da5e70f1b099d1fcedb075cdb1d521d3e3e5669401c9080fb4079be22c9f73a6de34c2e
 SHA512 
766eed31d4cb307d4575cc8f31495808c930cfd0be866ebecd5205112b0491a98dfe8b3818493774908ff551039baeac46c7b69c2b58e3df3963c22ad032ef6e
+DIST vkd3d-1.0.tar.xz 461884 BLAKE2B 
4dbd729f9e795d3d81178abc1a8774c0bbe6a5257c96c97acf1e4b4cdb5b7e30c77235e8b8fa57f7db3196caf30c55c3b0c07e2981629dd6177436a3cd117d33
 SHA512 
55712528688cdedc63049e168b371b470dbb8e31ddc36d8b23b0655f4a061726eb8556b9abf3cb887f6bd21379959aed9fab93ba0fd53813aec413ebec71d615

diff --git a/app-emulation/vkd3d/vkd3d-1.0.ebuild 
b/app-emulation/vkd3d/vkd3d-1.0.ebuild
index 88db9b6..a84144c 100644
--- a/app-emulation/vkd3d/vkd3d-1.0.ebuild
+++ b/app-emulation/vkd3d/vkd3d-1.0.ebuild
@@ -3,15 +3,14 @@
 
 EAPI=6
 
-inherit autotools multilib-minimal
+inherit multilib-minimal
 
 if [[ "${PV}" == "" ]]; then
EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git";
inherit git-r3
 else
KEYWORDS="~amd64"
-   SRC_URI="https://dev.gentoo.org/~sarnex/distfiles/vkd3d-${PV}.tar.xz";
-   S="${WORKDIR}/${PN}"
+   SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz";
 fi
 
 IUSE="spirv-tools"
@@ -26,11 +25,6 @@ HOMEPAGE="https://source.winehq.org/git/vkd3d.git/";
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-src_prepare() {
-   default
-   eautoreconf
-}
-
 multilib_src_configure() {
local myconf=(
$(use_with spirv-tools)

diff --git a/app-emulation/vkd3d/vkd3d-.ebuild 
b/app-emulation/vkd3d/vkd3d-.ebuild
index 88db9b6..a84144c 100644
--- a/app-emulation/vkd3d/vkd3d-.ebuild
+++ b/app-emulation/vkd3d/vkd3d-.ebuild
@@ -3,15 +3,14 @@
 
 EAPI=6
 
-inherit autotools multilib-minimal
+inherit multilib-minimal
 
 if [[ "${PV}" == "" ]]; then
EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git";
inherit git-r3
 else
KEYWORDS="~amd64"
-   SRC_URI="https://dev.gentoo.org/~sarnex/distfiles/vkd3d-${PV}.tar.xz";
-   S="${WORKDIR}/${PN}"
+   SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz";
 fi
 
 IUSE="spirv-tools"
@@ -26,11 +25,6 @@ HOMEPAGE="https://source.winehq.org/git/vkd3d.git/";
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-src_prepare() {
-   default
-   eautoreconf
-}
-
 multilib_src_configure() {
local myconf=(
$(use_with spirv-tools)



[gentoo-commits] repo/proj/wine:master commit in: app-emulation/vkd3d/

2018-05-28 Thread Nick Sarnie
commit: 416c2a5b768e06aa9450041c1cdb5e7145368d8a
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon May 28 15:27:30 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon May 28 15:48:21 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=416c2a5b

app-emulation/vkd3d: Initial version

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/vkd3d/Manifest  |  1 +
 app-emulation/vkd3d/metadata.xml  | 15 +
 app-emulation/vkd3d/vkd3d-1.0.ebuild  | 40 +++
 app-emulation/vkd3d/vkd3d-.ebuild | 40 +++
 4 files changed, 96 insertions(+)

diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest
new file mode 100644
index 000..a91ba6a
--- /dev/null
+++ b/app-emulation/vkd3d/Manifest
@@ -0,0 +1 @@
+DIST vkd3d-1.0.tar.xz 219856 BLAKE2B 
ebf4f7d95a4ed97e4a8f652850d1af563b1c8a6d2b78f157f3e729387da5e70f1b099d1fcedb075cdb1d521d3e3e5669401c9080fb4079be22c9f73a6de34c2e
 SHA512 
766eed31d4cb307d4575cc8f31495808c930cfd0be866ebecd5205112b0491a98dfe8b3818493774908ff551039baeac46c7b69c2b58e3df3963c22ad032ef6e

diff --git a/app-emulation/vkd3d/metadata.xml b/app-emulation/vkd3d/metadata.xml
new file mode 100644
index 000..f83e30b
--- /dev/null
+++ b/app-emulation/vkd3d/metadata.xml
@@ -0,0 +1,15 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   w...@gentoo.org
+   Wine
+   
+   This package must be kept in sync with repo/proj/wine 
repository.
+   Any changes need to be run past the maintainer to 
ensure the two repositories are kept in sync.
+   
+   
+   
+   Enable better SPIRV support using 
dev-util/spirv-tools
+   
+

diff --git a/app-emulation/vkd3d/vkd3d-1.0.ebuild 
b/app-emulation/vkd3d/vkd3d-1.0.ebuild
new file mode 100644
index 000..88db9b6
--- /dev/null
+++ b/app-emulation/vkd3d/vkd3d-1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+if [[ "${PV}" == "" ]]; then
+   EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git";
+   inherit git-r3
+else
+   KEYWORDS="~amd64"
+   SRC_URI="https://dev.gentoo.org/~sarnex/distfiles/vkd3d-${PV}.tar.xz";
+   S="${WORKDIR}/${PN}"
+fi
+
+IUSE="spirv-tools"
+RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
+x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+DESCRIPTION="D3D12 to Vulkan translation library"
+HOMEPAGE="https://source.winehq.org/git/vkd3d.git/";
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+multilib_src_configure() {
+   local myconf=(
+   $(use_with spirv-tools)
+   )
+
+   ECONF_SOURCE=${S} econf "${myconf[@]}"
+}

diff --git a/app-emulation/vkd3d/vkd3d-.ebuild 
b/app-emulation/vkd3d/vkd3d-.ebuild
new file mode 100644
index 000..88db9b6
--- /dev/null
+++ b/app-emulation/vkd3d/vkd3d-.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+if [[ "${PV}" == "" ]]; then
+   EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git";
+   inherit git-r3
+else
+   KEYWORDS="~amd64"
+   SRC_URI="https://dev.gentoo.org/~sarnex/distfiles/vkd3d-${PV}.tar.xz";
+   S="${WORKDIR}/${PN}"
+fi
+
+IUSE="spirv-tools"
+RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
+x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+DESCRIPTION="D3D12 to Vulkan translation library"
+HOMEPAGE="https://source.winehq.org/git/vkd3d.git/";
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+multilib_src_configure() {
+   local myconf=(
+   $(use_with spirv-tools)
+   )
+
+   ECONF_SOURCE=${S} econf "${myconf[@]}"
+}