[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2023-11-25 Thread Matt Turner 
commit: a51fead18e8fae530ac5043e02b2eb51676a4df9
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 25 17:53:31 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 25 17:53:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a51fead1

dev-util/apitrace: Update waffle USE deps

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/apitrace/{apitrace-9.0-r3.ebuild => apitrace-9.0-r4.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/apitrace/apitrace-9.0-r3.ebuild 
b/dev-util/apitrace/apitrace-9.0-r4.ebuild
similarity index 97%
rename from dev-util/apitrace/apitrace-9.0-r3.ebuild
rename to dev-util/apitrace/apitrace-9.0-r4.ebuild
index a0e487e61f88..673e673282b0 100644
--- a/dev-util/apitrace/apitrace-9.0-r3.ebuild
+++ b/dev-util/apitrace/apitrace-9.0-r4.ebuild
@@ -22,7 +22,7 @@ DEPEND="${PYTHON_DEPS}
>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
media-libs/libpng:0=
media-libs/mesa[egl(+),gles1,gles2,X?,${MULTILIB_USEDEP}]
-   >=media-libs/waffle-1.6.0-r1[egl,${MULTILIB_USEDEP}]
+   >=media-libs/waffle-1.6.0-r1[egl(+),${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
sys-process/procps:=[${MULTILIB_USEDEP}]
X? ( x11-libs/libX11 )

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2023-06-01 Thread Ionen Wolkens 
commit: 51eb0a90e9f06667ef4cb04bd11d1e3a79bc6d5f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jun  1 13:59:40 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jun  1 14:16:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51eb0a90

dev-util/apitrace: enable py3.11

Seems(?) fine (don't really use this, but tried it a bit with
glxgears), albeit tests still fail for unrelated (to python)
reasons wrt bug #73.

Still needs a bump, but this is just a quick drive-by and have
no intention to look at this myself.

Closes: https://bugs.gentoo.org/896914
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-util/apitrace/apitrace-9.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/apitrace/apitrace-9.0-r3.ebuild 
b/dev-util/apitrace/apitrace-9.0-r3.ebuild
index bf951a975ea6..a0e487e61f88 100644
--- a/dev-util/apitrace/apitrace-9.0-r3.ebuild
+++ b/dev-util/apitrace/apitrace-9.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit cmake-multilib multilib python-single-r1
 
 DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/files/, dev-util/apitrace/

2023-06-01 Thread Ionen Wolkens 
commit: e66b9fb7165acbbf4d7056ea9c93cf791aa806ff
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jun  1 13:38:17 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jun  1 14:16:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e66b9fb7

dev-util/apitrace: use pkg-config for waffle

Just a quick drive-by workaround as better-than-broken,
haven't really looked at this package nor upstream.

Still needs a bump, but I won't be looking at that.

Closes: https://bugs.gentoo.org/901365
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-util/apitrace/apitrace-9.0-r3.ebuild   |  1 +
 .../apitrace/files/apitrace-9.0-pkgconfig-waffle.patch | 14 ++
 2 files changed, 15 insertions(+)

diff --git a/dev-util/apitrace/apitrace-9.0-r3.ebuild 
b/dev-util/apitrace/apitrace-9.0-r3.ebuild
index 1801bf986786..bf951a975ea6 100644
--- a/dev-util/apitrace/apitrace-9.0-r3.ebuild
+++ b/dev-util/apitrace/apitrace-9.0-r3.ebuild
@@ -40,6 +40,7 @@ PATCHES=(
"${FILESDIR}"/${P}-disable-multiarch.patch
"${FILESDIR}"/${P}-brotli-unbundle.patch
"${FILESDIR}"/${P}-libc-dlopen-glibc-2.34.patch
+   "${FILESDIR}"/${P}-pkgconfig-waffle.patch
 )
 
 src_prepare() {

diff --git a/dev-util/apitrace/files/apitrace-9.0-pkgconfig-waffle.patch 
b/dev-util/apitrace/files/apitrace-9.0-pkgconfig-waffle.patch
new file mode 100644
index ..6d0450886672
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-9.0-pkgconfig-waffle.patch
@@ -0,0 +1,14 @@
+waffle's upstream intentionally does not ship cmake files anymore
+(just a quick fix that works for us, there may be more to consider)
+
+https://bugs.gentoo.org/901365
+https://gitlab.freedesktop.org/mesa/waffle/-/issues/74
+https://gitlab.freedesktop.org/mesa/waffle/-/commit/a16983fea590491727c8119256c7b938fe1f9d10
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -195,3 +195,4 @@
+ # Use Waffle for eglretrace
+-find_package (Waffle REQUIRED)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(Waffle REQUIRED waffle-1)
+ endif ()

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2022-08-15 Thread Andreas Sturmlechner 
commit: 1d43bf7a9d88e812e6ec4e69c9a4d3b6cfd60183
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 15 11:06:37 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 15 11:22:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d43bf7a

dev-util/apitrace: update EAPI 7 -> 8, fix Python3 cmake variable

Closes: https://bugs.gentoo.org/834034
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/apitrace/apitrace-9.0-r3.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-util/apitrace/apitrace-9.0-r3.ebuild 
b/dev-util/apitrace/apitrace-9.0-r3.ebuild
index f558e102537c..1faadb28629d 100644
--- a/dev-util/apitrace/apitrace-9.0-r3.ebuild
+++ b/dev-util/apitrace/apitrace-9.0-r3.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{7..10} )
 inherit cmake-multilib multilib python-single-r1
 
@@ -62,7 +61,7 @@ src_configure() {
-DENABLE_GUI=$(multilib_native_usex qt5)
-DENABLE_STATIC_SNAPPY=OFF
-DENABLE_WAFFLE=ON
-   -DPYTHON_EXECUTABLE="${PYTHON}"
+   -DPython3_EXECUTABLE="${PYTHON}"
)
cmake_src_configure
}

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2022-01-12 Thread Sam James 
commit: a141bede5b58ff33d70ee89eddd48ae1831eeca2
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 13 06:05:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 13 06:05:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a141bede

dev-util/apitrace: fix IndirectInherits

Signed-off-by: Sam James  gentoo.org>

 dev-util/apitrace/apitrace-9.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/apitrace/apitrace-9.0-r3.ebuild 
b/dev-util/apitrace/apitrace-9.0-r3.ebuild
index a150636da799..f558e102537c 100644
--- a/dev-util/apitrace/apitrace-9.0-r3.ebuild
+++ b/dev-util/apitrace/apitrace-9.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{7..10} )
-inherit cmake-multilib python-single-r1
+inherit cmake-multilib multilib python-single-r1
 
 DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
 HOMEPAGE="https://github.com/apitrace/apitrace;

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/

2022-01-12 Thread Sam James 
commit: 5de9423fbf17e94be54f48d9b5c613c2b8a7fb20
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 13 05:48:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 13 05:49:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de9423f

dev-util/apitrace: fix build with glibc-2.34

Closes: https://bugs.gentoo.org/812155
Thanks-to: Mihai Moldovan  ionic.de>
Signed-off-by: Sam James  gentoo.org>

 dev-util/apitrace/apitrace-9.0-r3.ebuild   |  3 ++-
 .../apitrace-9.0-libc-dlopen-glibc-2.34.patch  | 29 ++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/dev-util/apitrace/apitrace-9.0-r3.ebuild 
b/dev-util/apitrace/apitrace-9.0-r3.ebuild
index 7c0a0190acac..a150636da799 100644
--- a/dev-util/apitrace/apitrace-9.0-r3.ebuild
+++ b/dev-util/apitrace/apitrace-9.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,6 +40,7 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}"/${P}-disable-multiarch.patch
"${FILESDIR}"/${P}-brotli-unbundle.patch
+   "${FILESDIR}"/${P}-libc-dlopen-glibc-2.34.patch
 )
 
 src_prepare() {

diff --git a/dev-util/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch 
b/dev-util/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch
new file mode 100644
index ..6c1aff4bcb31
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch
@@ -0,0 +1,29 @@
+https://github.com/apitrace/apitrace/commit/d28a980802ad48568c87da02d630c8babfe163bb.patch
+https://bugs.gentoo.org/812155
+
+(rebased by sam)
+
+From: Jose Fonseca 
+Date: Wed, 1 Sep 2021 16:34:54 +0100
+Subject: [PATCH] gltrace: Avoid __libc_dlsym and __libc_dlopen_mode on GLIBC
+ 2.34.
+
+These GLIBC_PRIVATE symbols are gone from GLIBC 2.34 due to the merge of
+libdl.so onto libc.so.
+
+This means apitrace can't defend against infinite recursion when
+used with Steam Overlay, but at least it should work otherwise.
+
+Fixes https://github.com/apitrace/apitrace/issues/756
+--- a/wrappers/dlsym.cpp
 b/wrappers/dlsym.cpp
+@@ -34,7 +34,7 @@
+ #include "os.hpp"
+ 
+ 
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 34
+ 
+ 
+ #include 
+

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2021-05-23 Thread Michał Górny 
commit: ff572affc0bcc8462ae392ed067c55e0aadb8455
Author: Zamarin Arthur  gmail  com>
AuthorDate: Sun May 23 16:04:27 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun May 23 16:34:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff572aff

dev-util/apitrace: bump to python 3.9, 3.10

tested by running and reviewing upstream code

Signed-off-by: Zamarin Arthur  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20956
Signed-off-by: Michał Górny  gentoo.org>

 dev-util/apitrace/apitrace-9.0-r2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-util/apitrace/apitrace-9.0-r2.ebuild 
b/dev-util/apitrace/apitrace-9.0-r2.ebuild
index 4834bd7b743..cc8535b0a0a 100644
--- a/dev-util/apitrace/apitrace-9.0-r2.ebuild
+++ b/dev-util/apitrace/apitrace-9.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit cmake-multilib python-single-r1
 
 DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
@@ -61,6 +61,7 @@ src_configure() {
-DENABLE_GUI=$(multilib_native_usex qt5)
-DENABLE_STATIC_SNAPPY=OFF
-DENABLE_WAFFLE=ON
+   -DPYTHON_EXECUTABLE="${PYTHON}"
)
cmake_src_configure
}

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2021-04-10 Thread Joonas Niilola 
commit: f493874fb34c5817081a0545f61be16165bfca50
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Mon Mar 29 15:35:00 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Apr 10 07:44:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f493874f

dev-util/apitrace: Put libX11/mesa[X] behind USE=X

Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/20179
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-util/apitrace/apitrace-9.0-r1.ebuild | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dev-util/apitrace/apitrace-9.0-r1.ebuild 
b/dev-util/apitrace/apitrace-9.0-r1.ebuild
index dde14319289..4834bd7b743 100644
--- a/dev-util/apitrace/apitrace-9.0-r1.ebuild
+++ b/dev-util/apitrace/apitrace-9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="qt5"
+IUSE="qt5 X"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -22,11 +22,11 @@ DEPEND="${PYTHON_DEPS}
app-arch/brotli:=[${MULTILIB_USEDEP}]
>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
media-libs/libpng:0=
-   media-libs/mesa[egl,gles1,gles2,X(+),${MULTILIB_USEDEP}]
+   media-libs/mesa[egl,gles1,gles2,X?,${MULTILIB_USEDEP}]
>=media-libs/waffle-1.6.0-r1[egl,${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
sys-process/procps:=[${MULTILIB_USEDEP}]
-   x11-libs/libX11
+   X? ( x11-libs/libX11 )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5[-gles2-only]
@@ -55,6 +55,7 @@ src_configure() {
my_configure() {
local mycmakeargs=(
-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+   -DENABLE_X11=$(usex X)
-DENABLE_EGL=ON
-DENABLE_CLI=ON
-DENABLE_GUI=$(multilib_native_usex qt5)
@@ -71,8 +72,8 @@ src_install() {
MULTILIB_CHOST_TOOLS=(
/usr/bin/apitrace$(get_exeext)
/usr/bin/eglretrace$(get_exeext)
-   /usr/bin/glretrace$(get_exeext)
)
+   use X && MULTILIB_CHOST_TOOLS+=( /usr/bin/glretrace$(get_exeext) )
 
cmake-multilib_src_install
 
@@ -81,5 +82,5 @@ src_install() {
dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
}
-   multilib_foreach_abi make_libgl_symlinks
+   use X && multilib_foreach_abi make_libgl_symlinks
 }

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2021-04-10 Thread Joonas Niilola 
commit: 8e138179e59e3d38cbcc1704c1dbb54060686ff7
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Apr 10 07:44:59 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Apr 10 07:44:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e138179

dev-util/apitrace: revbump to propagate changes

Signed-off-by: Joonas Niilola  gentoo.org>

 dev-util/apitrace/{apitrace-9.0-r1.ebuild => apitrace-9.0-r2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-util/apitrace/apitrace-9.0-r1.ebuild 
b/dev-util/apitrace/apitrace-9.0-r2.ebuild
similarity index 100%
rename from dev-util/apitrace/apitrace-9.0-r1.ebuild
rename to dev-util/apitrace/apitrace-9.0-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2020-04-03 Thread Andreas Sturmlechner 
commit: c4a595ee9c6c05c191a4b41ee3f2c782a0dd9457
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Fri Mar 27 03:22:05 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  3 20:06:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4a595ee

dev-util/apitrace: dev-qt/*[-gles2 => -gles2-only]

Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/apitrace/{apitrace-9.0.ebuild => apitrace-9.0-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/apitrace/apitrace-9.0.ebuild 
b/dev-util/apitrace/apitrace-9.0-r1.ebuild
similarity index 97%
rename from dev-util/apitrace/apitrace-9.0.ebuild
rename to dev-util/apitrace/apitrace-9.0-r1.ebuild
index 8c100383021..76c3219d1c3 100644
--- a/dev-util/apitrace/apitrace-9.0.ebuild
+++ b/dev-util/apitrace/apitrace-9.0-r1.ebuild
@@ -29,9 +29,9 @@ DEPEND="${PYTHON_DEPS}
x11-libs/libX11
qt5? (
dev-qt/qtcore:5
-   dev-qt/qtgui:5[-gles2]
+   dev-qt/qtgui:5[-gles2-only]
dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5[-gles2]
+   dev-qt/qtwidgets:5[-gles2-only]
)
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/

2020-02-21 Thread Matt Turner 
commit: 6f55d4c1f7db9395524b94d62cfec7c71f6419fd
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Feb 21 22:32:08 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Feb 21 22:33:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f55d4c1

dev-util/apitrace: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/apitrace/Manifest |   1 -
 dev-util/apitrace/apitrace-8.0.ebuild  | 101 -
 .../files/apitrace-8.0-brotli-unbundle.patch   | 159 -
 .../files/apitrace-8.0-disable-multiarch.patch |  53 ---
 .../apitrace/files/apitrace-8.0-docs-install.patch |  54 ---
 .../files/apitrace-8.0-glxtrace-only.patch |  49 ---
 .../files/apitrace-8.0-system-snappy1.patch|  21 ---
 .../files/apitrace-8.0-system-snappy2.patch|  41 --
 dev-util/apitrace/metadata.xml |   5 -
 9 files changed, 484 deletions(-)

diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index defda19b6e8..8aee6fea902 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,2 +1 @@
-DIST apitrace-8.0.tar.gz 3601109 BLAKE2B 
f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc
 SHA512 
1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c
 DIST apitrace-9.0.tar.gz 3623693 BLAKE2B 
885cfd22d1cc82e36f7f0d65b816784986a8a693d04b483c059d3cffb0328c2cbbfd043793b964cea84d7b09a0dc8dda5f464099e91df26fd5eecef4bbeb28cc
 SHA512 
4234bc2d14378b1bd9554752d83f8ce0703b4e08c3edc85769dc988a2b3a44b8e55d2f5856954658155a11d69802849bae6350ed5031a5916c7ac7bc7287918c

diff --git a/dev-util/apitrace/apitrace-8.0.ebuild 
b/dev-util/apitrace/apitrace-8.0.ebuild
deleted file mode 100644
index 25faf457158..000
--- a/dev-util/apitrace/apitrace-8.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-multilib python-single-r1
-
-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 !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}"
-
-DEPEND="${PYTHON_DEPS}
-   app-arch/brotli:=
-   media-libs/libpng:0=
-   media-libs/mesa[egl?,X(+),${MULTILIB_USEDEP}]
-   sys-libs/zlib[${MULTILIB_USEDEP}]
-   sys-process/procps:=
-   x11-libs/libX11
-   egl? (
-   >=media-libs/mesa-8.0[gles1,gles2]
-   media-libs/waffle[egl]
-   )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5[-gles2]
-   dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5[-gles2]
-   )
-   system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   # TODO: upstream
-   "${FILESDIR}"/${P}-disable-multiarch.patch
-   "${FILESDIR}"/${P}-glxtrace-only.patch
-   "${FILESDIR}"/${P}-docs-install.patch
-   "${FILESDIR}"/${P}-brotli-unbundle.patch
-   # git master
-   "${FILESDIR}"/${P}-system-snappy{1,2}.patch
-)
-
-src_prepare() {
-   cmake_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 
thirdparty/{brotli,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die
-   if use system-snappy ; then
-   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)
-   )
-   if multilib_is_native_abi ; then
-   mycmakeargs+=(
-   -DENABLE_CLI=$(usex cli)
-   -DENABLE_GUI=$(usex qt5)
-   )
-   else
-   mycmakeargs+=(
-   -DBUILD_LIB_ONLY=ON
-   -DENABLE_CLI=OFF
-   -DENABLE_GUI=OFF
-   )
-   fi
-   cmake_src_configure
-   }
-
-   multilib_parallel_foreach_abi my_configure
-}
-
-src_install() {
-   cmake-multilib_src_install
-
-   dosym glxtrace.so

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/

2020-02-07 Thread Matt Turner 
commit: 50a8d17875e524c22f2c7d8be63e6f5c3d81b73b
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Feb  7 18:13:29 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Feb  7 21:47:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50a8d178

dev-util/apitrace: Version bump to 9.0.0

A lot of changes in this version bump:
- Python3 support
- Python2 support dropped
- IUSE=cli dropped. Enabled always
- IUSE=system-snappy dropped. Enabled always
- IUSE=egl dropped. Enabled always
- Install CLI binaries for all ABIs
- media-libs/waffle support enabled

Closes: https://bugs.gentoo.org/684830
Closes: https://bugs.gentoo.org/684964
Closes: https://bugs.gentoo.org/693116
Closes: https://bugs.gentoo.org/705320
Signed-off-by: Matt Turner  gentoo.org>

 dev-util/apitrace/Manifest |   1 +
 dev-util/apitrace/apitrace-9.0.ebuild  |  85 +++
 .../files/apitrace-9.0-brotli-unbundle.patch   | 158 +
 .../files/apitrace-9.0-disable-multiarch.patch |  53 +++
 4 files changed, 297 insertions(+)

diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 001d549c4d9..defda19b6e8 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1 +1,2 @@
 DIST apitrace-8.0.tar.gz 3601109 BLAKE2B 
f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc
 SHA512 
1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c
+DIST apitrace-9.0.tar.gz 3623693 BLAKE2B 
885cfd22d1cc82e36f7f0d65b816784986a8a693d04b483c059d3cffb0328c2cbbfd043793b964cea84d7b09a0dc8dda5f464099e91df26fd5eecef4bbeb28cc
 SHA512 
4234bc2d14378b1bd9554752d83f8ce0703b4e08c3edc85769dc988a2b3a44b8e55d2f5856954658155a11d69802849bae6350ed5031a5916c7ac7bc7287918c

diff --git a/dev-util/apitrace/apitrace-9.0.ebuild 
b/dev-util/apitrace/apitrace-9.0.ebuild
new file mode 100644
index 000..8c100383021
--- /dev/null
+++ b/dev-util/apitrace/apitrace-9.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-single-r1
+
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="qt5"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   app-arch/brotli:=[${MULTILIB_USEDEP}]
+   >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
+   media-libs/libpng:0=
+   media-libs/mesa[egl,gles1,gles2,X(+),${MULTILIB_USEDEP}]
+   >=media-libs/waffle-1.6.0-r1[egl,${MULTILIB_USEDEP}]
+   sys-libs/zlib[${MULTILIB_USEDEP}]
+   sys-process/procps:=[${MULTILIB_USEDEP}]
+   x11-libs/libX11
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5[-gles2]
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5[-gles2]
+   )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   # TODO: upstream
+   "${FILESDIR}"/${P}-disable-multiarch.patch
+   "${FILESDIR}"/${P}-brotli-unbundle.patch
+)
+
+src_prepare() {
+   cmake_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 
thirdparty/{brotli,snappy,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || 
die
+}
+
+src_configure() {
+   my_configure() {
+   local mycmakeargs=(
+   -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+   -DENABLE_EGL=ON
+   -DENABLE_CLI=ON
+   -DENABLE_GUI=$(multilib_native_usex qt5)
+   -DENABLE_STATIC_SNAPPY=OFF
+   -DENABLE_WAFFLE=ON
+   )
+   cmake_src_configure
+   }
+
+   multilib_foreach_abi my_configure
+}
+
+src_install() {
+   MULTILIB_CHOST_TOOLS=(
+   /usr/bin/apitrace$(get_exeext)
+   /usr/bin/eglretrace$(get_exeext)
+   /usr/bin/glretrace$(get_exeext)
+   )
+
+   cmake-multilib_src_install
+
+   make_libgl_symlinks() {
+   dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
+   dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
+   dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
+   }
+   multilib_foreach_abi make_libgl_symlinks
+}

diff --git a/dev-util/apitrace/files/apitrace-9.0-brotli-unbundle.patch

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/

2019-04-29 Thread Andreas Sturmlechner 
commit: 1c8cdb76debcadda786b60cda76a1c535841ac96
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Apr 29 19:23:04 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Apr 29 19:44:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c8cdb76

dev-util/apitrace: Drop 7.1-r1

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/apitrace/Manifest |  1 -
 dev-util/apitrace/apitrace-7.1-r1.ebuild   | 96 --
 .../files/apitrace-7.1-disable-multiarch.patch | 35 
 .../apitrace/files/apitrace-7.1-docs-install.patch | 23 --
 .../files/apitrace-7.1-glxtrace-only.patch | 32 
 .../files/apitrace-7.1-snappy-license.patch| 11 ---
 6 files changed, 198 deletions(-)

diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 18ef76c6bb4..001d549c4d9 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,2 +1 @@
-DIST apitrace-7.1.tar.gz 2343156 BLAKE2B 
ab450535a585d476726b0bb3fbb8f85f930dafd883419ac9a575ca0b487890b26d39baee920c5f4c29b929bce13450643bc27d7f5d269aa60c044dca9975bcce
 SHA512 
b4ebe4eb0b16770a156cffe7cff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84
 DIST apitrace-8.0.tar.gz 3601109 BLAKE2B 
f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc
 SHA512 
1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c

diff --git a/dev-util/apitrace/apitrace-7.1-r1.ebuild 
b/dev-util/apitrace/apitrace-7.1-r1.ebuild
deleted file mode 100644
index c39555ef493..000
--- a/dev-util/apitrace/apitrace-7.1-r1.ebuild
+++ /dev/null
@@ -1,96 +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 cmake-multilib python-single-r1
-
-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
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cli egl qt5 system-snappy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-   media-libs/libpng:0=
-   media-libs/mesa[egl?,${MULTILIB_USEDEP}]
-   sys-libs/zlib:=[${MULTILIB_USEDEP}]
-   sys-process/procps
-   x11-libs/libX11
-   egl? (
-   >=media-libs/mesa-8.0[gles1,gles2]
-   media-libs/waffle[egl]
-   )
-   qt5? (
-   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}"
-
-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
-)
-
-src_prepare() {
-   cmake-utils_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
-   if use system-snappy ; then
-   rm -rf "${S}"/thirdparty/snappy || die
-   fi
-}
-
-src_configure() {
-   my_configure() {
-   local mycmakeargs=(
-   -DENABLE_EGL=$(usex egl)
-   -DENABLE_STATIC_SNAPPY=$(usex !system-snappy)
-   )
-   if multilib_is_native_abi ; then
-   mycmakeargs+=(
-   -DENABLE_CLI=$(usex cli)
-   -DENABLE_GUI=$(usex qt5)
-   )
-   else
-   mycmakeargs+=(
-   -DBUILD_LIB_ONLY=ON
-   -DENABLE_CLI=OFF
-   -DENABLE_GUI=OFF
-   )
-   fi
-   cmake-utils_src_configure
-   }
-
-   multilib_parallel_foreach_abi my_configure
-}
-
-src_install() {
-   cmake-multilib_src_install
-
-   dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
-   dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
-   dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
-
-   rm docs/INSTALL.markdown || die
-   dodoc docs/* README.markdown
-
-   exeinto

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/

2019-04-29 Thread Andreas Sturmlechner 
commit: 88dc354ba18d93a07d46164bcb22bade72989186
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Apr 29 19:21:28 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Apr 29 19:44:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88dc354b

dev-util/apitrace: 8.0 version bump, EAPI-7, unbundle brotli

Getting rid of deprecated dev-qt/qtwebkit:5 dependency.

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/apitrace/Manifest |   1 +
 dev-util/apitrace/apitrace-8.0.ebuild  |  97 +
 .../files/apitrace-8.0-brotli-unbundle.patch   | 159 +
 .../files/apitrace-8.0-disable-multiarch.patch |  53 +++
 .../apitrace/files/apitrace-8.0-docs-install.patch |  54 +++
 .../files/apitrace-8.0-glxtrace-only.patch |  49 +++
 6 files changed, 413 insertions(+)

diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 659d9519d6d..18ef76c6bb4 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1 +1,2 @@
 DIST apitrace-7.1.tar.gz 2343156 BLAKE2B 
ab450535a585d476726b0bb3fbb8f85f930dafd883419ac9a575ca0b487890b26d39baee920c5f4c29b929bce13450643bc27d7f5d269aa60c044dca9975bcce
 SHA512 
b4ebe4eb0b16770a156cffe7cff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84
+DIST apitrace-8.0.tar.gz 3601109 BLAKE2B 
f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc
 SHA512 
1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c

diff --git a/dev-util/apitrace/apitrace-8.0.ebuild 
b/dev-util/apitrace/apitrace-8.0.ebuild
new file mode 100644
index 000..96e336ad5ad
--- /dev/null
+++ b/dev-util/apitrace/apitrace-8.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-multilib python-single-r1
+
+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 !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}"
+
+DEPEND="${PYTHON_DEPS}
+   app-arch/brotli:=
+   media-libs/libpng:0=
+   media-libs/mesa[egl?,${MULTILIB_USEDEP}]
+   sys-libs/zlib[${MULTILIB_USEDEP}]
+   sys-process/procps:=
+   x11-libs/libX11
+   egl? (
+   >=media-libs/mesa-8.0[gles1,gles2]
+   media-libs/waffle[egl]
+   )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5[-gles2]
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5[-gles2]
+   )
+   system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-disable-multiarch.patch
+   "${FILESDIR}"/${P}-glxtrace-only.patch
+   "${FILESDIR}"/${P}-docs-install.patch
+   "${FILESDIR}"/${P}-brotli-unbundle.patch
+)
+
+src_prepare() {
+   cmake-utils_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 
thirdparty/{brotli,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die
+   if use system-snappy ; then
+   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)
+   )
+   if multilib_is_native_abi ; then
+   mycmakeargs+=(
+   -DENABLE_CLI=$(usex cli)
+   -DENABLE_GUI=$(usex qt5)
+   )
+   else
+   mycmakeargs+=(
+   -DBUILD_LIB_ONLY=ON
+   -DENABLE_CLI=OFF
+   -DENABLE_GUI=OFF
+   )
+   fi
+   cmake-utils_src_configure
+   }
+
+   multilib_parallel_foreach_abi my_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
+   dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
+   dosym glxtrace.so

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2018-09-23 Thread Jonas Stein 
commit: 39a55479971ee7cb65ba4c2f2ba1c324a54e588d
Author: Jonas Stein  gentoo  org>
AuthorDate: Sun Sep 23 15:03:34 2018 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Sun Sep 23 20:27:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a55479

dev-util/apitrace: Maintainer retired

Proxied maintainer retired.
Closes: https://bugs.gentoo.org/632840
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 dev-util/apitrace/metadata.xml | 8 
 1 file changed, 8 deletions(-)

diff --git a/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml
index 6dbcc5997c0..21c4bb8fe8d 100644
--- a/dev-util/apitrace/metadata.xml
+++ b/dev-util/apitrace/metadata.xml
@@ -1,18 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   e...@xmw.de
-   EoD
-   

x...@gentoo.org
Michael Weber

-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   

Enable command line interface
Enable EGL support

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2018-08-18 Thread Andreas Sturmlechner 
commit: 5f7bad96f408e06d6f6e2eac6785e9a479ccbb3e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 18 11:03:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug 18 11:04:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f7bad96

dev-util/apitrace: Drop unused cmake arg

Arg is being removed by disable-multiarch.patch

Package-Manager: Portage-2.3.47, Repoman-2.3.10

 dev-util/apitrace/apitrace-7.1-r1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-util/apitrace/apitrace-7.1-r1.ebuild 
b/dev-util/apitrace/apitrace-7.1-r1.ebuild
index 5392ad595d4..c39555ef493 100644
--- a/dev-util/apitrace/apitrace-7.1-r1.ebuild
+++ b/dev-util/apitrace/apitrace-7.1-r1.ebuild
@@ -60,7 +60,6 @@ src_prepare() {
 src_configure() {
my_configure() {
local mycmakeargs=(
-   -DARCH_SUBDIR=
-DENABLE_EGL=$(usex egl)
-DENABLE_STATIC_SNAPPY=$(usex !system-snappy)
)

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2018-08-18 Thread Andreas Sturmlechner 
commit: 1a295b80fc9ad4e656be8df5b2cb7176949a7b5e
Author: EoD  xmw  de>
AuthorDate: Sat Aug 18 10:19:24 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug 18 11:04:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a295b80

dev-util/apitrace: Enforce non-gles2 USE-dep on Qt

Closes: https://bugs.gentoo.org/594066
Package-Manager: Portage-2.3.47, Repoman-2.3.10

 dev-util/apitrace/apitrace-7.1-r1.ebuild | 97 
 1 file changed, 97 insertions(+)

diff --git a/dev-util/apitrace/apitrace-7.1-r1.ebuild 
b/dev-util/apitrace/apitrace-7.1-r1.ebuild
new file mode 100644
index 000..63879492cc7
--- /dev/null
+++ b/dev-util/apitrace/apitrace-7.1-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-multilib eutils python-single-r1
+
+DESCRIPTION="A 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
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+cli egl qt5 system-snappy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+   >=sys-devel/gcc-4.7:*
+   system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
+   >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+   >=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
+   media-libs/libpng:0=
+   sys-process/procps
+   x11-libs/libX11
+   egl? (
+   >=media-libs/mesa-8.0[gles1,gles2]
+   media-libs/waffle[egl]
+   )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5[-gles2]
+   dev-qt/qtnetwork:5
+   dev-qt/qtwebkit:5
+   dev-qt/qtwidgets:5[-gles2]
+   )"
+DEPEND="${RDEPEND}"
+
+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
+)
+
+src_prepare() {
+   cmake-utils_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
+   if use system-snappy ; then
+   rm -rf "${S}"/thirdparty/snappy || die
+   fi
+}
+
+src_configure() {
+   my_configure() {
+   mycmakeargs=(
+   -DARCH_SUBDIR=
+   $(cmake-utils_use_enable egl EGL)
+   $(cmake-utils_use_enable !system-snappy STATIC_SNAPPY)
+   )
+   if multilib_is_native_abi ; then
+   mycmakeargs+=(
+   $(cmake-utils_use_enable cli CLI)
+   $(cmake-utils_use_enable qt5 GUI)
+   )
+   else
+   mycmakeargs+=(
+   -DBUILD_LIB_ONLY=ON
+   -DENABLE_CLI=OFF
+   -DENABLE_GUI=OFF
+   )
+   fi
+   cmake-utils_src_configure
+   }
+
+   multilib_parallel_foreach_abi my_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
+   dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
+   dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
+
+   rm docs/INSTALL.markdown
+   dodoc docs/* README.markdown
+
+   exeinto /usr/$(get_libdir)/${PN}/scripts
+   doexe $(find scripts -type f -executable)
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2018-08-18 Thread Andreas Sturmlechner 
commit: 9791e971fed60aa414953c99b7ce85855cf8af5c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 18 10:53:56 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug 18 11:04:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9791e971

dev-util/apitrace: EAPI-6 bump, drop eutils

Add missing || die
local mycmakeargs

Package-Manager: Portage-2.3.47, Repoman-2.3.10

 dev-util/apitrace/apitrace-7.1-r1.ebuild | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-util/apitrace/apitrace-7.1-r1.ebuild 
b/dev-util/apitrace/apitrace-7.1-r1.ebuild
index 3d5b2b97d42..5392ad595d4 100644
--- a/dev-util/apitrace/apitrace-7.1-r1.ebuild
+++ b/dev-util/apitrace/apitrace-7.1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit cmake-multilib eutils python-single-r1
+inherit cmake-multilib python-single-r1
 
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
+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"
 
@@ -59,15 +59,15 @@ src_prepare() {
 
 src_configure() {
my_configure() {
-   mycmakeargs=(
+   local mycmakeargs=(
-DARCH_SUBDIR=
-   $(cmake-utils_use_enable egl EGL)
-   $(cmake-utils_use_enable !system-snappy STATIC_SNAPPY)
+   -DENABLE_EGL=$(usex egl)
+   -DENABLE_STATIC_SNAPPY=$(usex !system-snappy)
)
if multilib_is_native_abi ; then
mycmakeargs+=(
-   $(cmake-utils_use_enable cli CLI)
-   $(cmake-utils_use_enable qt5 GUI)
+   -DENABLE_CLI=$(usex cli)
+   -DENABLE_GUI=$(usex qt5)
)
else
mycmakeargs+=(
@@ -89,7 +89,7 @@ src_install() {
dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
 
-   rm docs/INSTALL.markdown
+   rm docs/INSTALL.markdown || die
dodoc docs/* README.markdown
 
exeinto /usr/$(get_libdir)/${PN}/scripts

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2018-08-18 Thread Andreas Sturmlechner 
commit: 459af0e5e058a5bd5aa7361ea84a12d21dd7668c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 18 11:00:34 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug 18 11:04:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=459af0e5

dev-util/apitrace: Drop 7.1 (r0)

Package-Manager: Portage-2.3.47, Repoman-2.3.10

 dev-util/apitrace/apitrace-7.1.ebuild | 97 ---
 1 file changed, 97 deletions(-)

diff --git a/dev-util/apitrace/apitrace-7.1.ebuild 
b/dev-util/apitrace/apitrace-7.1.ebuild
deleted file mode 100644
index 7eeab313521..000
--- a/dev-util/apitrace/apitrace-7.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib eutils python-single-r1
-
-DESCRIPTION="A 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
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cli egl qt5 system-snappy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-   >=sys-devel/gcc-4.7:*
-   system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
-   >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-   >=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
-   media-libs/libpng:0=
-   sys-process/procps
-   x11-libs/libX11
-   egl? (
-   >=media-libs/mesa-8.0[gles1,gles2]
-   media-libs/waffle[egl]
-   )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtwebkit:5
-   dev-qt/qtwidgets:5
-   )"
-DEPEND="${RDEPEND}"
-
-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
-)
-
-src_prepare() {
-   cmake-utils_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
-   if use system-snappy ; then
-   rm -rf "${S}"/thirdparty/snappy || die
-   fi
-}
-
-src_configure() {
-   my_configure() {
-   mycmakeargs=(
-   -DARCH_SUBDIR=
-   $(cmake-utils_use_enable egl EGL)
-   $(cmake-utils_use_enable !system-snappy STATIC_SNAPPY)
-   )
-   if multilib_is_native_abi ; then
-   mycmakeargs+=(
-   $(cmake-utils_use_enable cli CLI)
-   $(cmake-utils_use_enable qt5 GUI)
-   )
-   else
-   mycmakeargs+=(
-   -DBUILD_LIB_ONLY=ON
-   -DENABLE_CLI=OFF
-   -DENABLE_GUI=OFF
-   )
-   fi
-   cmake-utils_src_configure
-   }
-
-   multilib_parallel_foreach_abi my_configure
-}
-
-src_install() {
-   cmake-multilib_src_install
-
-   dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
-   dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
-   dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
-
-   rm docs/INSTALL.markdown
-   dodoc docs/* README.markdown
-
-   exeinto /usr/$(get_libdir)/${PN}/scripts
-   doexe $(find scripts -type f -executable)
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2018-08-18 Thread Andreas Sturmlechner 
commit: 752e208318adeb7280e6f08acdc7b6740d169ad6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 18 10:24:16 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug 18 11:04:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=752e2083

dev-util/apitrace: Cleanup, sort, fix DEPENDs

- Add sys-libs/zlib slot op
- Drop useless sys-devel/gcc DEPEND, old versions are masked

Package-Manager: Portage-2.3.47, Repoman-2.3.10

 dev-util/apitrace/apitrace-7.1-r1.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-util/apitrace/apitrace-7.1-r1.ebuild 
b/dev-util/apitrace/apitrace-7.1-r1.ebuild
index 63879492cc7..3d5b2b97d42 100644
--- a/dev-util/apitrace/apitrace-7.1-r1.ebuild
+++ b/dev-util/apitrace/apitrace-7.1-r1.ebuild
@@ -18,11 +18,9 @@ IUSE="+cli egl qt5 system-snappy"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-   >=sys-devel/gcc-4.7:*
-   system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
-   >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-   >=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
media-libs/libpng:0=
+   media-libs/mesa[egl?,${MULTILIB_USEDEP}]
+   sys-libs/zlib:=[${MULTILIB_USEDEP}]
sys-process/procps
x11-libs/libX11
egl? (
@@ -35,7 +33,9 @@ RDEPEND="${PYTHON_DEPS}
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}"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2017-10-14 Thread Andreas Sturmlechner 
commit: d0f8514a8b044cff8d3df34614eb5a5006d76bd9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 14 20:43:17 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 14 20:46:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0f8514a

dev-util/apitrace: Cleanup indendation

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-util/apitrace/metadata.xml | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml
index 7e0a3f3a4d5..932ad0c7edf 100644
--- a/dev-util/apitrace/metadata.xml
+++ b/dev-util/apitrace/metadata.xml
@@ -2,18 +2,18 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   e...@xmw.de
-   EoD
-   Maintainer. Assign bugs to him.
-   
-   
-   x...@gentoo.org
-   Michael Weber
-   Proxy maintainer. CC him on bugs.
+   e...@xmw.de
+   EoD
+   Maintainer. Assign bugs to him.
+   
+   
+   x...@gentoo.org
+   Michael Weber
+   Proxy maintainer. CC him on bugs.


-   proxy-ma...@gentoo.org
-   Proxy Maintainers
+   proxy-ma...@gentoo.org
+   Proxy Maintainers


Enable command line interface

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2017-10-14 Thread Andreas Sturmlechner 
commit: 5396228ced4a5a11a5c08e62e6bf02e114f7d5b5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 14 20:45:45 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 14 20:46:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5396228c

dev-util/apitrace: Cleanup ancient mesa version dep

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-util/apitrace/apitrace-7.1.ebuild | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/dev-util/apitrace/apitrace-7.1.ebuild 
b/dev-util/apitrace/apitrace-7.1.ebuild
index 7ebcd73810e..7eeab313521 100644
--- a/dev-util/apitrace/apitrace-7.1.ebuild
+++ b/dev-util/apitrace/apitrace-7.1.ebuild
@@ -22,15 +22,13 @@ RDEPEND="${PYTHON_DEPS}
system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
-   egl? ( || (
-   >=media-libs/mesa-8.0[gles1,gles2]
-   =media-libs/mesa-8.0[gles1,gles2]
+   media-libs/waffle[egl]
+   )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/, dev-util/apitrace/files/

2017-10-14 Thread Andreas Sturmlechner 
commit: 7151840bfeaf4a2c5bd3416f3dc464c43b08e91e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 14 20:42:36 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 14 20:46:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7151840b

dev-util/apitrace: Cleanup old, Qt4WebKit-rdeps

Gentoo-bug: 631806
Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-util/apitrace/Manifest |  4 -
 dev-util/apitrace/apitrace-4.0.ebuild  | 95 --
 dev-util/apitrace/apitrace-5.0.ebuild  | 91 -
 dev-util/apitrace/apitrace-6.0.ebuild  | 91 -
 dev-util/apitrace/apitrace-6.1.ebuild  | 91 -
 .../files/apitrace-4.0-disable-multiarch.patch | 32 
 .../files/apitrace-4.0-glext-texture-storage.patch | 73 -
 .../files/apitrace-4.0-glxcopysubbuffermesa.patch  | 80 --
 .../files/apitrace-4.0-glxtrace-only.patch | 49 ---
 dev-util/apitrace/files/apitrace-4.0-memcpy.patch  | 13 ---
 .../apitrace/files/apitrace-4.0-multilib.patch | 59 --
 .../apitrace/files/apitrace-4.0-system-libs.patch  | 72 
 .../files/apitrace-5.0-disable-multiarch.patch | 34 
 .../files/apitrace-5.0-glxtrace-only.patch | 53 
 .../files/apitrace-6.0-disable-multiarch.patch | 35 
 15 files changed, 872 deletions(-)

diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 80ca682896a..822be0470bb 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,5 +1 @@
-DIST apitrace-4.0.tar.gz 1736912 SHA256 
078cfe09a5a021559326e8ee92ce863dd99d48c36433ac37140233616bb6cbd3 SHA512 
063e1dfc7993b6d014a8e62e5d038318b22a7cfdaac1970714cf6bcb7e31079f552ad198f2992f042b05a027322f86e58d77a0e3aa2e0b266b278c8d0708200c
 WHIRLPOOL 
a1b251929ffade5f5b498428d942a01fd6c141494e3de09520e7bcd5aa5b4e15e50144ccf6ef979650e75ddb03373a3f5c198a3554448161623c3e33d8a9160a
-DIST apitrace-5.0.tar.gz 1868044 SHA256 
c11e97452b3b74533b82af28951382c77e3d639bd434cbc4e1dc43bc799c8ea6 SHA512 
af83860c8bfd49a2a2b1483fe13a83f2e1aa93ca474f1efb12cb311a99f2ca29ce4c39831a941efdde80fe2ae76b11cdfc6fde3349d325c71fc2a3ecae6b1424
 WHIRLPOOL 
ba6fe7c354db3e6ba8edd46675631ef6d2edfc01c9201ffd951fc48110d0120463d52b4778984b01ae766d662edfc386a1965240377bcd2b2bae71936e94d42a
-DIST apitrace-6.0.tar.gz 1738830 SHA256 
4ac99fbd5076c9e4db9d09ef22fb1958f28115f162b6ee40a23130aacc1e2acb SHA512 
e937ca8ddece11d180ed306083788fc7e5fa5d4ceeef0ae69ab5a8140e4169c583b281f6f4806b5c4d71c72fb79ac8399e2f0f49fa1052b90f14306247a4091c
 WHIRLPOOL 
1d5f43f5576a4f258f249f3d2777ad221dce3d7dc9489db924568c5c26af3542d016d722ef9c9be7ae50e380684c597840cc869c4d11cf3f3dcb96f952cc4ee0
-DIST apitrace-6.1.tar.gz 1741041 SHA256 
0285610a6afbe9fbc47c0ecb80cafabb34dc1998c1c8308bacb7fdd15817930b SHA512 
218fc8e59bc6cff6733c98f53c57b0e793d2f7aa530560f8da0dff83c4fa255c5fd5db97a9a43c364490c355ddb1ea6557ced64eae3e6c5e0c6f4504b9299bcd
 WHIRLPOOL 
6334a96a0d70fce927faed0923efe1e320d4a52909ab01223f0486774a13e3cef53d2920933bc3167d9d766d647da6ab36b95ccbbcf78a0af55d16775000f2ea
 DIST apitrace-7.1.tar.gz 2343156 SHA256 
2103386d747d34f3d6fb1d01fde9078a45ad2e9976afab3a7489c95b08dde0a2 SHA512 
b4ebe4eb0b16770a156cffe7cff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84
 WHIRLPOOL 
d61aa9470faf61d4ffa3cd12a24fa13f993f9e21fc0bfcf0f2b9bf3d15803bc1c2120a1ed7e8c43668082dfe61f86434d5e297c5e21e4f2bbb1b88bf80b9bbe3

diff --git a/dev-util/apitrace/apitrace-4.0.ebuild 
b/dev-util/apitrace/apitrace-4.0.ebuild
deleted file mode 100644
index 9b529af0490..000
--- a/dev-util/apitrace/apitrace-4.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib eutils python-single-r1 vcs-snapshot
-
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/apitrace/apitrace;
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cli egl qt4"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-   >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
-   >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-   >=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
-   egl? ( || (
-   >=media-libs/mesa-8.0[gles1,gles2]
-   =dev-qt/qtcore-4.7:4
-   >=dev-qt/qtgui-4.7:4
-   >=dev-qt/qtwebkit-4.7:4
-   >=dev-libs/qjson-0.5
-   )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-system-libs.patch
-   "${FILESDIR}"/${P}-glxtrace-only.patch
-   "${FILESDIR}"/${P}-glext-texture-storage.patch
-

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2017-05-22 Thread Michał Górny 
commit: aa9fe7191f36c8bdaece354625131084cdd2090e
Author: Michał Górny  gentoo  org>
AuthorDate: Sun May 21 13:40:06 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May 22 14:43:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa9fe719

dev-util/apitrace: Do not call enable_cmake* directly

 dev-util/apitrace/apitrace-4.0.ebuild | 2 +-
 dev-util/apitrace/apitrace-5.0.ebuild | 2 +-
 dev-util/apitrace/apitrace-6.0.ebuild | 2 +-
 dev-util/apitrace/apitrace-6.1.ebuild | 2 +-
 dev-util/apitrace/apitrace-7.1.ebuild | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-util/apitrace/apitrace-4.0.ebuild 
b/dev-util/apitrace/apitrace-4.0.ebuild
index 5986a792373..9b529af0490 100644
--- a/dev-util/apitrace/apitrace-4.0.ebuild
+++ b/dev-util/apitrace/apitrace-4.0.ebuild
@@ -46,7 +46,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   enable_cmake-utils_src_prepare
+   cmake-utils_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.

diff --git a/dev-util/apitrace/apitrace-5.0.ebuild 
b/dev-util/apitrace/apitrace-5.0.ebuild
index fcab924e2fe..712b310b558 100644
--- a/dev-util/apitrace/apitrace-5.0.ebuild
+++ b/dev-util/apitrace/apitrace-5.0.ebuild
@@ -42,7 +42,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   enable_cmake-utils_src_prepare
+   cmake-utils_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.

diff --git a/dev-util/apitrace/apitrace-6.0.ebuild 
b/dev-util/apitrace/apitrace-6.0.ebuild
index 995d8975574..9e36010d4e4 100644
--- a/dev-util/apitrace/apitrace-6.0.ebuild
+++ b/dev-util/apitrace/apitrace-6.0.ebuild
@@ -42,7 +42,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   enable_cmake-utils_src_prepare
+   cmake-utils_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.

diff --git a/dev-util/apitrace/apitrace-6.1.ebuild 
b/dev-util/apitrace/apitrace-6.1.ebuild
index 1c0210a3bda..3439c4a2830 100644
--- a/dev-util/apitrace/apitrace-6.1.ebuild
+++ b/dev-util/apitrace/apitrace-6.1.ebuild
@@ -42,7 +42,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   enable_cmake-utils_src_prepare
+   cmake-utils_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.

diff --git a/dev-util/apitrace/apitrace-7.1.ebuild 
b/dev-util/apitrace/apitrace-7.1.ebuild
index d79578e64e0..7ebcd73810e 100644
--- a/dev-util/apitrace/apitrace-7.1.ebuild
+++ b/dev-util/apitrace/apitrace-7.1.ebuild
@@ -48,7 +48,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   enable_cmake-utils_src_prepare
+   cmake-utils_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.

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2017-04-20 Thread David Seifert 
commit: 9d09d0ddad1ef8c42dbf18c0642d4477ab8cab26
Author: David Seifert  gentoo  org>
AuthorDate: Thu Apr 20 19:59:12 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Apr 20 20:46:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d09d0dd

dev-util/apitrace: [QA] Add missing python metadata variables

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-util/apitrace/apitrace-4.0.ebuild | 3 ++-
 dev-util/apitrace/apitrace-5.0.ebuild | 3 ++-
 dev-util/apitrace/apitrace-6.0.ebuild | 3 ++-
 dev-util/apitrace/apitrace-6.1.ebuild | 3 ++-
 dev-util/apitrace/apitrace-7.1.ebuild | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dev-util/apitrace/apitrace-4.0.ebuild 
b/dev-util/apitrace/apitrace-4.0.ebuild
index 2e9fa0dba87..5986a792373 100644
--- a/dev-util/apitrace/apitrace-4.0.ebuild
+++ b/dev-util/apitrace/apitrace-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+cli egl qt4"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]

diff --git a/dev-util/apitrace/apitrace-5.0.ebuild 
b/dev-util/apitrace/apitrace-5.0.ebuild
index 83c1923d2b3..fcab924e2fe 100644
--- a/dev-util/apitrace/apitrace-5.0.ebuild
+++ b/dev-util/apitrace/apitrace-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+cli egl qt4"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]

diff --git a/dev-util/apitrace/apitrace-6.0.ebuild 
b/dev-util/apitrace/apitrace-6.0.ebuild
index 1128fb732d5..995d8975574 100644
--- a/dev-util/apitrace/apitrace-6.0.ebuild
+++ b/dev-util/apitrace/apitrace-6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+cli egl qt4"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]

diff --git a/dev-util/apitrace/apitrace-6.1.ebuild 
b/dev-util/apitrace/apitrace-6.1.ebuild
index 4920e2bd25e..1c0210a3bda 100644
--- a/dev-util/apitrace/apitrace-6.1.ebuild
+++ b/dev-util/apitrace/apitrace-6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+cli egl qt4"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]

diff --git a/dev-util/apitrace/apitrace-7.1.ebuild 
b/dev-util/apitrace/apitrace-7.1.ebuild
index 5736288e679..d79578e64e0 100644
--- a/dev-util/apitrace/apitrace-7.1.ebuild
+++ b/dev-util/apitrace/apitrace-7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,6 +15,7 @@ LICENSE+=" 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}
>=sys-devel/gcc-4.7:*

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2016-05-06 Thread Michael Weber 
commit: b51cffc87a3fdc9c029d96a5610ddd1d779d375e
Author: Michael Weber  gentoo  org>
AuthorDate: Fri May  6 08:40:06 2016 +
Commit: Michael Weber  gentoo  org>
CommitDate: Fri May  6 08:40:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b51cffc8

dev-util/apitrace: Set EoD as proxy-maintainer.

Package-Manager: portage-2.2.28

 dev-util/apitrace/metadata.xml | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml
index 6ff1698..7e0a3f3 100644
--- a/dev-util/apitrace/metadata.xml
+++ b/dev-util/apitrace/metadata.xml
@@ -1,7 +1,20 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   e...@xmw.de
+   EoD
+   Maintainer. Assign bugs to him.
+   
+   
+   x...@gentoo.org
+   Michael Weber
+   Proxy maintainer. CC him on bugs.
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

Enable command line interface
Enable EGL support

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/files/, dev-util/apitrace/

2016-05-06 Thread Michael Weber 
commit: 4eec892b2e50ceabc5b6370e122ee8387f739696
Author: Michael Weber  gentoo  org>
AuthorDate: Fri May  6 08:36:36 2016 +
Commit: Michael Weber  gentoo  org>
CommitDate: Fri May  6 08:40:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eec892b

dev-util/apitrace: Version bump by EoD (bug 559566).

Package-Manager: portage-2.2.28

 dev-util/apitrace/Manifest |  1 +
 dev-util/apitrace/apitrace-7.1.ebuild  | 99 ++
 .../files/apitrace-7.1-disable-multiarch.patch | 35 
 .../apitrace/files/apitrace-7.1-docs-install.patch | 23 +
 .../files/apitrace-7.1-glxtrace-only.patch | 32 +++
 .../files/apitrace-7.1-snappy-license.patch| 11 +++
 dev-util/apitrace/metadata.xml |  1 +
 7 files changed, 202 insertions(+)

diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 77da9dd..80ca682 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -2,3 +2,4 @@ DIST apitrace-4.0.tar.gz 1736912 SHA256 
078cfe09a5a021559326e8ee92ce863dd99d48c3
 DIST apitrace-5.0.tar.gz 1868044 SHA256 
c11e97452b3b74533b82af28951382c77e3d639bd434cbc4e1dc43bc799c8ea6 SHA512 
af83860c8bfd49a2a2b1483fe13a83f2e1aa93ca474f1efb12cb311a99f2ca29ce4c39831a941efdde80fe2ae76b11cdfc6fde3349d325c71fc2a3ecae6b1424
 WHIRLPOOL 
ba6fe7c354db3e6ba8edd46675631ef6d2edfc01c9201ffd951fc48110d0120463d52b4778984b01ae766d662edfc386a1965240377bcd2b2bae71936e94d42a
 DIST apitrace-6.0.tar.gz 1738830 SHA256 
4ac99fbd5076c9e4db9d09ef22fb1958f28115f162b6ee40a23130aacc1e2acb SHA512 
e937ca8ddece11d180ed306083788fc7e5fa5d4ceeef0ae69ab5a8140e4169c583b281f6f4806b5c4d71c72fb79ac8399e2f0f49fa1052b90f14306247a4091c
 WHIRLPOOL 
1d5f43f5576a4f258f249f3d2777ad221dce3d7dc9489db924568c5c26af3542d016d722ef9c9be7ae50e380684c597840cc869c4d11cf3f3dcb96f952cc4ee0
 DIST apitrace-6.1.tar.gz 1741041 SHA256 
0285610a6afbe9fbc47c0ecb80cafabb34dc1998c1c8308bacb7fdd15817930b SHA512 
218fc8e59bc6cff6733c98f53c57b0e793d2f7aa530560f8da0dff83c4fa255c5fd5db97a9a43c364490c355ddb1ea6557ced64eae3e6c5e0c6f4504b9299bcd
 WHIRLPOOL 
6334a96a0d70fce927faed0923efe1e320d4a52909ab01223f0486774a13e3cef53d2920933bc3167d9d766d647da6ab36b95ccbbcf78a0af55d16775000f2ea
+DIST apitrace-7.1.tar.gz 2343156 SHA256 
2103386d747d34f3d6fb1d01fde9078a45ad2e9976afab3a7489c95b08dde0a2 SHA512 
b4ebe4eb0b16770a156cffe7cff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84
 WHIRLPOOL 
d61aa9470faf61d4ffa3cd12a24fa13f993f9e21fc0bfcf0f2b9bf3d15803bc1c2120a1ed7e8c43668082dfe61f86434d5e297c5e21e4f2bbb1b88bf80b9bbe3

diff --git a/dev-util/apitrace/apitrace-7.1.ebuild 
b/dev-util/apitrace/apitrace-7.1.ebuild
new file mode 100644
index 000..47c58bf
--- /dev/null
+++ b/dev-util/apitrace/apitrace-7.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-multilib eutils python-single-r1
+
+DESCRIPTION="A 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
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+cli egl qt5 system-snappy"
+
+RDEPEND="${PYTHON_DEPS}
+   >=sys-devel/gcc-4.7:*
+   system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
+   >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+   >=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
+   egl? ( || (
+   >=media-libs/mesa-8.0[gles1,gles2]
+
${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
new file mode 100644
index 000..2b211dc
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-7.1-snappy-license.patch
@@ -0,0 +1,11 @@
+--- 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/metadata.xml b/dev-util/apitrace/metadata.xml
index 7fe2270..6ff1698 100644
--- a/dev-util/apitrace/metadata.xml
+++ b/dev-util/apitrace/metadata.xml
@@ -5,6 +5,7 @@

Enable command line interface
Enable EGL support
+   Link dynamic against 
app-arch/snappy


apitrace/apitrace

[gentoo-commits] repo/gentoo:master commit in: dev-util/apitrace/

2016-04-11 Thread Tim Harder 
commit: 0ed6a5052614ea50d9b82e9fb1b62521de2ac110
Author: Tim Harder  gentoo  org>
AuthorDate: Tue Apr 12 05:47:00 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Tue Apr 12 05:47:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ed6a505

dev-util/apitrace: drop myself as maintainer

 dev-util/apitrace/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml
index e19b15b..7fe2270 100644
--- a/dev-util/apitrace/metadata.xml
+++ b/dev-util/apitrace/metadata.xml
@@ -1,10 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   radher...@gentoo.org
-   Tim Harder
-   
+   

Enable command line interface
Enable EGL support