Gentoo Archives: gentoo-commits

From: Jason Zaman <perfinion@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/
Date: Wed, 01 Jun 2016 13:19:48
Message-Id: 1464787144.7518cf8e636099691658a2a9668a9ca21d9c7f4d.perfinion@gentoo
1 commit: 7518cf8e636099691658a2a9668a9ca21d9c7f4d
2 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 1 13:16:48 2016 +0000
4 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 1 13:19:04 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7518cf8e
7
8 app-admin/setools: drop 4.0.0
9
10 Package-Manager: portage-2.2.28
11
12 app-admin/setools/Manifest | 1 -
13 .../setools/files/setools-4.0.0-remove-gui.patch | 18 --------
14 app-admin/setools/setools-4.0.0.ebuild | 54 ----------------------
15 3 files changed, 73 deletions(-)
16
17 diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
18 index 491a828..c1d439d 100644
19 --- a/app-admin/setools/Manifest
20 +++ b/app-admin/setools/Manifest
21 @@ -2,5 +2,4 @@ DIST setools-3.3.8-01-fedora-patches.tar.gz 1128 SHA256 420b852d4209d07b73cec845
22 DIST setools-3.3.8-03-gentoo-patches.tar.gz 6584 SHA256 8eac460b7dc2ee5e2f23148cdbf187316edd78ce0ec7ebbb6b0f68d6ad33d86a SHA512 5458dab5775b558e287f946c299753be5cb5eb6c1c2b9df0e32c7cfa758bb5316d142aa6338d3019f5f1eeb72876e4d5ed4939b0dbfe7b7e01c08a19a086bacc WHIRLPOOL e1afa6bb28f3aee2f3acdc66efd8ca02548c4f8e5707052ea455f1db558126f069d63278251630ee68bf4987157279161006975cb14d44055492228fa476cd72
23 DIST setools-3.3.8-04-gentoo-patches.tar.bz2 94986 SHA256 9a8a43ac97606fde9b2610ceed65f640638929853f871ce530982bedfd919b64 SHA512 39bf00b6aaf31821c6e2e2fb4c460dd1914fba4bf8385acebedf88f1533da990f1fb925dd49d75827aebef3f394a50a1edea46a07204193b58c65a066a064e6a WHIRLPOOL 4a92e4cf6930584de931c5d0805815aacd1c1af4434ca8e73414eda33588a55ef8d7bdfe4195be642889eee480128cbe12d1c5612e07ea304021b230e0b74816
24 DIST setools-3.3.8.tar.bz2 951428 SHA256 44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999 SHA512 2c42ee9904174ed6c6fc129e374ec3591925094ab0ef65001b0104e365c5634bf4a79f28369608c80199d8f59fafaa5f274107c04c129c380eeef7adb0c32667 WHIRLPOOL 11c4065809909764f4364b78df1a8030d189315601b882919ccacb5fb147c1b3a061c5bbf9ced3c243d4615ab7727e9db0c89e931a884ae8b317ae3a879e5371
25 -DIST setools-4.0.0.tar.gz 408231 SHA256 6946e725ec7163f4017ffcb0cd4c39056fc41309857a86383c0f34912726125b SHA512 5eb3ddc00ef7878f39eb7afb379ec441ab33210ceec1457db3412a0f5d6939952cc66031e998f9c3df1da874b781f355d7442a2c505aa636b4aa7b486f8c7826 WHIRLPOOL 1bdaaf1a323a51df4b8eadea70a251d22c78c53b552f8f24bb2441c939f6a06b536be30609da4a086beaa66434a425d890ff111d763b1f65fe49649452d70d2a
26 DIST setools-4.0.1.tar.gz 399888 SHA256 4c2049877f2f68e4485b72bc280fe20127b49a019169a2cf1d8295c908bdcdfe SHA512 d0a36cfddc6a6f47ecaa8402141271558e97467b6c449d18b98bf6fe894189f29a32fb672e3ff573efdb44964bd361283c68c2906d02f8a9c1269b6b71903bc2 WHIRLPOOL 017e709c113b28175787249af8aa1dcc99a5034eadcc76e97a394f9f89afcc1e7fe3eeb8ec105c541a6260d8a2eb4b1aa8155ba2297ecdf6d640ba112857a442
27
28 diff --git a/app-admin/setools/files/setools-4.0.0-remove-gui.patch b/app-admin/setools/files/setools-4.0.0-remove-gui.patch
29 deleted file mode 100644
30 index e8cd6f5..0000000
31 --- a/app-admin/setools/files/setools-4.0.0-remove-gui.patch
32 +++ /dev/null
33 @@ -1,18 +0,0 @@
34 ---- setools-4.0.0/setup.py.orig 2016-05-05 01:11:19.204938821 +0800
35 -+++ setools-4.0.0/setup.py 2016-05-05 01:18:48.852004644 +0800
36 -@@ -162,12 +162,10 @@
37 - 'build_lex': LexCommand,
38 - 'build_ext': BuildExtCommand,
39 - 'build_qhc': QtHelpCommand},
40 -- packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'],
41 -- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
42 -+ packages=['setools', 'setools.diff', 'setools.policyrep'],
43 -+ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
44 - data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1") ),
45 -- (join(sys.prefix, 'share/setools'), glob.glob("data/*.ui") +
46 -- ["data/perm_map", "qhc/apol.qhc"] ),
47 -- (join(sys.prefix, 'share/setools/icons'), glob.glob("data/icons/*.png"))],
48 -+ (join(sys.prefix, 'share/setools'), ["data/perm_map"] ),],
49 - ext_modules=ext_py_mods,
50 - test_suite='tests',
51 - license='GPLv2+, LGPLv2.1+',
52
53 diff --git a/app-admin/setools/setools-4.0.0.ebuild b/app-admin/setools/setools-4.0.0.ebuild
54 deleted file mode 100644
55 index 231ba7f..0000000
56 --- a/app-admin/setools/setools-4.0.0.ebuild
57 +++ /dev/null
58 @@ -1,54 +0,0 @@
59 -# Copyright 1999-2016 Gentoo Foundation
60 -# Distributed under the terms of the GNU General Public License v2
61 -# $Id$
62 -
63 -EAPI="6"
64 -PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
65 -
66 -inherit distutils-r1
67 -
68 -DESCRIPTION="Policy Analysis Tools for SELinux"
69 -HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
70 -
71 -if [[ ${PV} == 9999 ]] ; then
72 - inherit git-r3
73 - EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
74 -else
75 - SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
76 - KEYWORDS=""
77 -fi
78 -
79 -LICENSE="GPL-2 LGPL-2.1"
80 -SLOT="0"
81 -IUSE="X debug test"
82 -
83 -RDEPEND="${PYTHON_DEPS}
84 - >=sys-libs/libselinux-2.4:=[${PYTHON_USEDEP}]
85 - >=dev-python/networkx-1.8[${PYTHON_USEDEP}]
86 - app-arch/bzip2:=
87 - dev-libs/libpcre:=
88 - X? (
89 - dev-python/PyQt5
90 - dev-qt/qtchooser
91 - )"
92 -
93 -DEPEND="${RDEPEND}
94 - >=dev-lang/swig-2.0.12:0
95 - sys-devel/bison
96 - sys-devel/flex
97 - >=sys-libs/libsepol-2.4
98 - test? (
99 - python_targets_python2_7? ( dev-python/mock[${PYTHON_USEDEP}] )
100 - dev-python/tox[${PYTHON_USEDEP}]
101 - )"
102 -
103 -python_prepare_all() {
104 - sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
105 -
106 - use X || local PATCHES=( "${FILESDIR}"/setools-4.0.0-remove-gui.patch )
107 - distutils-r1_python_prepare_all
108 -}
109 -
110 -python_test() {
111 - esetup.py test
112 -}