Gentoo Archives: gentoo-commits

From: "Vadim A. Misbakh-Soloviov" <mva@×××.name>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/virtualization:master commit in: app-emulation/firetools/, app-emulation/firejail/
Date: Sat, 31 Oct 2015 21:05:51
Message-Id: 1446325522.70121564ed53758c824bc569318919312a8e37cf.mva@gentoo
1 commit: 70121564ed53758c824bc569318919312a8e37cf
2 Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
3 AuthorDate: Sat Oct 31 21:05:22 2015 +0000
4 Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
5 CommitDate: Sat Oct 31 21:05:22 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/virtualization.git/commit/?id=70121564
7
8 firejail: bump
9
10 Signed-off-by: Vadim A. Misbakh-Soloviov <git <AT> mva.name>
11
12 app-emulation/firejail/Manifest | 2 +-
13 ...rejail-0.9.28.ebuild => firejail-0.9.32.ebuild} | 0
14 app-emulation/firetools/Manifest | 2 +-
15 ...ols-0.9.26.1.ebuild => firetools-0.9.30.ebuild} | 26 ++++++++++++++++------
16 4 files changed, 21 insertions(+), 9 deletions(-)
17
18 diff --git a/app-emulation/firejail/Manifest b/app-emulation/firejail/Manifest
19 index f3c87d7..71eadc6 100644
20 --- a/app-emulation/firejail/Manifest
21 +++ b/app-emulation/firejail/Manifest
22 @@ -1 +1 @@
23 -DIST firejail-0.9.28.tar.bz2 137390 SHA256 bd91888aff9abbfce0d2963c7d28bedf4362fd29976ca8ede80c6f59a3ac4cad SHA512 a0c6715cbaf1043f2ea92b33da5884b6ed0993b3e5d03a3edd181b6663a696a2a60a44e0ad39fc9fcfd50d79eb5acb2f0f33452467bf50912f558ec23ebfc125 WHIRLPOOL 84792b384d4e578347a859354d5639be24c3b370c3c6c07d245bbd35b7d6adcac8f5f382e92dec55a3a53cc68ea00fb7071be01aa390b37df5e0768f00efd90e
24 +DIST firejail-0.9.32.tar.bz2 156886 SHA256 0084728e1b65b87a7564520c2d1e978d4f47ea1bc9d769e0275dfd5bbb865c48 SHA512 02beec4771a0bb3ae75890162e2f5bbee6dbbf51dc972e31a2e133251127f4c6666f53b5f5100ad6133a20ad4e8d128a42a8899d0079820aa76c97b830fe07c3 WHIRLPOOL c87471107017d1b20dbaa97bcf4bdf9abc30cba4177d6db1738861cba38612d96b1cb4e9a0d3df0aaea869c745168de45332e0224a9c5e3b7453b457f7ad9b74
25
26 diff --git a/app-emulation/firejail/firejail-0.9.28.ebuild b/app-emulation/firejail/firejail-0.9.32.ebuild
27 similarity index 100%
28 rename from app-emulation/firejail/firejail-0.9.28.ebuild
29 rename to app-emulation/firejail/firejail-0.9.32.ebuild
30
31 diff --git a/app-emulation/firetools/Manifest b/app-emulation/firetools/Manifest
32 index 07306f0..685dfb3 100644
33 --- a/app-emulation/firetools/Manifest
34 +++ b/app-emulation/firetools/Manifest
35 @@ -1 +1 @@
36 -DIST firetools-0.9.26.1.tar.bz2 90516 SHA256 4a15fead967981e3737549f45ad0f358f2170d0ab317b9dd4f05c6a77f97b550 SHA512 c30c61e408b31450947f1cb71cb14bfe712e4b74905ab20ec50c9214f7853bf9cea38d5465c0a9db3dd527f34f4c98ec278c741bcf9d97aea30d6c117cac1dc3 WHIRLPOOL 4f649956669fbe122016d88b78471fa540a3990fbbc2a2f1984fd85e2d135f61400772cdc1a95dbf1793f84434b077952bfb62b88bd83253f46a4dc95653fc55
37 +DIST firetools-0.9.30.tar.bz2 93652 SHA256 600a5f2009e7797f47b1209eee0ae29fef24f3ee953b66f664fa6d6d695dfb35 SHA512 b1fc83542c4f090c35c353f8cdcfe88360918f40b24ebdf837cf021f6b9de5f03bc42cce241029c2223de00684d54b06ef808f1eae3a6773f73081ab78f1c137 WHIRLPOOL 4f9c91668cfb2e976e89a88c79086ee1deef066f5a1237852243e1a72b323bccec9beb22e5579fac534fd46b6424f9592b5e67a01a1a2e3d78ebe91aa17285c2
38
39 diff --git a/app-emulation/firetools/firetools-0.9.26.1.ebuild b/app-emulation/firetools/firetools-0.9.30.ebuild
40 similarity index 59%
41 rename from app-emulation/firetools/firetools-0.9.26.1.ebuild
42 rename to app-emulation/firetools/firetools-0.9.30.ebuild
43 index 86cfefa..13123fb 100644
44 --- a/app-emulation/firetools/firetools-0.9.26.1.ebuild
45 +++ b/app-emulation/firetools/firetools-0.9.30.ebuild
46 @@ -4,7 +4,7 @@
47
48 EAPI=5
49
50 -inherit qt4-r2
51 +inherit autotools
52
53 DESCRIPTION="Graphical user interface of app-emulation/firejail"
54 HOMEPAGE="https://l3net.wordpress.com/projects/firejail"
55 @@ -13,18 +13,30 @@ SRC_URI="mirror://sourceforge/${PN/tools/jail}/${P}.tar.bz2"
56 LICENSE="GPL-2"
57 SLOT="0"
58 KEYWORDS="~amd64 ~x86"
59 -IUSE=""
60 +IUSE="qt4 qt5"
61 +REQUIRED_USE="^^ ( qt4 qt5 )"
62
63 DEPEND="
64 - app-emulation/firejail
65 - dev-qt/qtcore:4
66 - dev-qt/qtgui:4
67 + app-emulation/firejai
68 + qt4? (
69 + dev-qt/qtcore:4
70 + dev-qt/qtgui:4
71 + )
72 + qt5? (
73 + dev-qt/qtcore:5
74 + dev-qt/qtgui:5
75 + dev-qt/qtsvg:5
76 + )
77 x11-terms/xterm
78 "
79 RDEPEND="${DEPEND}"
80
81 src_prepare() {
82 - sed \
83 + sed -i \
84 -e 's/ strip.*;//' \
85 - -i Makefile.in
86 + Makefile.in
87 + sed -r -i \
88 + -e 's#(/usr/lib/qt)(/plugins/.*/)#\15\2#' \
89 + configure.ac
90 + eautoreconf
91 }