Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/trace-cmd/
Date: Wed, 13 Mar 2019 21:59:26
Message-Id: 1552514343.9aaf480d38509a312db8be7e81b39050c2b2a106.chutzpah@gentoo
1 commit: 9aaf480d38509a312db8be7e81b39050c2b2a106
2 Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
3 AuthorDate: Wed Mar 13 21:59:03 2019 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 13 21:59:03 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aaf480d
7
8 dev-util/trace-cmd: Revbump, drop "gtk" USE flag
9
10 It's broken, and no longer supported upstream. The latest kernelshark
11 has been rewritten in QT and will be a separate package soon.
12
13 Copyright: Sony Interactive Entertainment Inc.
14 Package-Manager: Portage-2.3.62, Repoman-2.3.12
15 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
16
17 .../{trace-cmd-2.7-r1.ebuild => trace-cmd-2.7-r2.ebuild} | 14 +++++---------
18 dev-util/trace-cmd/trace-cmd-9999.ebuild | 16 ++++++----------
19 2 files changed, 11 insertions(+), 19 deletions(-)
20
21 diff --git a/dev-util/trace-cmd/trace-cmd-2.7-r1.ebuild b/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
22 similarity index 87%
23 rename from dev-util/trace-cmd/trace-cmd-2.7-r1.ebuild
24 rename to dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
25 index 6fd69e83c23..d38e2e55b21 100644
26 --- a/dev-util/trace-cmd/trace-cmd-2.7-r1.ebuild
27 +++ b/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
28 @@ -20,23 +20,19 @@ fi
29
30 LICENSE="GPL-2+ LGPL-2.1+"
31 SLOT="0"
32 -IUSE="+audit doc gtk python udis86"
33 +IUSE="+audit doc python udis86"
34 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
35
36 RDEPEND="audit? ( sys-process/audit )
37 python? ( ${PYTHON_DEPS} )
38 - udis86? ( dev-libs/udis86 )
39 - gtk? (
40 - ${PYTHON_DEPS}
41 - dev-python/pygtk:2[${PYTHON_USEDEP}]
42 - )"
43 + udis86? ( dev-libs/udis86 )"
44 DEPEND="${RDEPEND}
45 sys-kernel/linux-headers
46 python? (
47 virtual/pkgconfig
48 dev-lang/swig
49 )
50 - gtk? ( virtual/pkgconfig )
51 +
52 doc? ( app-text/asciidoc )"
53
54 CONFIG_CHECK="
55 @@ -74,11 +70,11 @@ src_configure() {
56 src_compile() {
57 emake V=1 all_cmd libs
58 use doc && emake doc
59 - use gtk && emake -j1 gui
60 +
61 }
62
63 src_install() {
64 emake DESTDIR="${D}" V=1 install install_libs
65 use doc && emake DESTDIR="${D}" install_doc
66 - use gtk && emake DESTDIR="${D}" install_gui
67 +
68 }
69
70 diff --git a/dev-util/trace-cmd/trace-cmd-9999.ebuild b/dev-util/trace-cmd/trace-cmd-9999.ebuild
71 index f6463fe7257..d38e2e55b21 100644
72 --- a/dev-util/trace-cmd/trace-cmd-9999.ebuild
73 +++ b/dev-util/trace-cmd/trace-cmd-9999.ebuild
74 @@ -13,30 +13,26 @@ if [[ ${PV} == *9999 ]] ; then
75 EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git"
76 inherit git-r3
77 else
78 - SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
79 + SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git/snapshot/${PN}-v${PV}.tar.gz"
80 KEYWORDS="~amd64 ~x86"
81 S="${WORKDIR}/${PN}-v${PV}"
82 fi
83
84 LICENSE="GPL-2+ LGPL-2.1+"
85 SLOT="0"
86 -IUSE="+audit doc gtk python udis86"
87 +IUSE="+audit doc python udis86"
88 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
89
90 RDEPEND="audit? ( sys-process/audit )
91 python? ( ${PYTHON_DEPS} )
92 - udis86? ( dev-libs/udis86 )
93 - gtk? (
94 - ${PYTHON_DEPS}
95 - dev-python/pygtk:2[${PYTHON_USEDEP}]
96 - )"
97 + udis86? ( dev-libs/udis86 )"
98 DEPEND="${RDEPEND}
99 sys-kernel/linux-headers
100 python? (
101 virtual/pkgconfig
102 dev-lang/swig
103 )
104 - gtk? ( virtual/pkgconfig )
105 +
106 doc? ( app-text/asciidoc )"
107
108 CONFIG_CHECK="
109 @@ -74,11 +70,11 @@ src_configure() {
110 src_compile() {
111 emake V=1 all_cmd libs
112 use doc && emake doc
113 - use gtk && emake -j1 gui
114 +
115 }
116
117 src_install() {
118 emake DESTDIR="${D}" V=1 install install_libs
119 use doc && emake DESTDIR="${D}" install_doc
120 - use gtk && emake DESTDIR="${D}" install_gui
121 +
122 }