| 1 |
commit: 1accd9e118f772c3034d56ecdef10631d8af564a |
| 2 |
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 4 17:36:41 2016 +0000 |
| 4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 4 17:37:28 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1accd9e1 |
| 7 |
|
| 8 |
app-admin/setools: bump to 4.0.0 and drop keywords for testing |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
app-admin/setools/Manifest | 1 + |
| 13 |
.../setools/files/setools-4.0.0-remove-gui.patch | 18 +++++++++++++++++ |
| 14 |
.../{setools-9999.ebuild => setools-4.0.0.ebuild} | 23 +++++++++++++++------- |
| 15 |
app-admin/setools/setools-9999.ebuild | 21 ++++++++++++++------ |
| 16 |
4 files changed, 50 insertions(+), 13 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest |
| 19 |
index 6aeaf2f..a41736e 100644 |
| 20 |
--- a/app-admin/setools/Manifest |
| 21 |
+++ b/app-admin/setools/Manifest |
| 22 |
@@ -2,3 +2,4 @@ DIST setools-3.3.8-01-fedora-patches.tar.gz 1128 SHA256 420b852d4209d07b73cec845 |
| 23 |
DIST setools-3.3.8-03-gentoo-patches.tar.gz 6584 SHA256 8eac460b7dc2ee5e2f23148cdbf187316edd78ce0ec7ebbb6b0f68d6ad33d86a SHA512 5458dab5775b558e287f946c299753be5cb5eb6c1c2b9df0e32c7cfa758bb5316d142aa6338d3019f5f1eeb72876e4d5ed4939b0dbfe7b7e01c08a19a086bacc WHIRLPOOL e1afa6bb28f3aee2f3acdc66efd8ca02548c4f8e5707052ea455f1db558126f069d63278251630ee68bf4987157279161006975cb14d44055492228fa476cd72 |
| 24 |
DIST setools-3.3.8-04-gentoo-patches.tar.bz2 94986 SHA256 9a8a43ac97606fde9b2610ceed65f640638929853f871ce530982bedfd919b64 SHA512 39bf00b6aaf31821c6e2e2fb4c460dd1914fba4bf8385acebedf88f1533da990f1fb925dd49d75827aebef3f394a50a1edea46a07204193b58c65a066a064e6a WHIRLPOOL 4a92e4cf6930584de931c5d0805815aacd1c1af4434ca8e73414eda33588a55ef8d7bdfe4195be642889eee480128cbe12d1c5612e07ea304021b230e0b74816 |
| 25 |
DIST setools-3.3.8.tar.bz2 951428 SHA256 44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999 SHA512 2c42ee9904174ed6c6fc129e374ec3591925094ab0ef65001b0104e365c5634bf4a79f28369608c80199d8f59fafaa5f274107c04c129c380eeef7adb0c32667 WHIRLPOOL 11c4065809909764f4364b78df1a8030d189315601b882919ccacb5fb147c1b3a061c5bbf9ced3c243d4615ab7727e9db0c89e931a884ae8b317ae3a879e5371 |
| 26 |
+DIST setools-4.0.0.tar.gz 408231 SHA256 6946e725ec7163f4017ffcb0cd4c39056fc41309857a86383c0f34912726125b SHA512 5eb3ddc00ef7878f39eb7afb379ec441ab33210ceec1457db3412a0f5d6939952cc66031e998f9c3df1da874b781f355d7442a2c505aa636b4aa7b486f8c7826 WHIRLPOOL 1bdaaf1a323a51df4b8eadea70a251d22c78c53b552f8f24bb2441c939f6a06b536be30609da4a086beaa66434a425d890ff111d763b1f65fe49649452d70d2a |
| 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 |
new file mode 100644 |
| 30 |
index 0000000..e8cd6f5 |
| 31 |
--- /dev/null |
| 32 |
+++ b/app-admin/setools/files/setools-4.0.0-remove-gui.patch |
| 33 |
@@ -0,0 +1,18 @@ |
| 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-9999.ebuild b/app-admin/setools/setools-4.0.0.ebuild |
| 54 |
similarity index 69% |
| 55 |
copy from app-admin/setools/setools-9999.ebuild |
| 56 |
copy to app-admin/setools/setools-4.0.0.ebuild |
| 57 |
index 5019032..231ba7f 100644 |
| 58 |
--- a/app-admin/setools/setools-9999.ebuild |
| 59 |
+++ b/app-admin/setools/setools-4.0.0.ebuild |
| 60 |
@@ -1,9 +1,9 @@ |
| 61 |
-# Copyright 1999-2015 Gentoo Foundation |
| 62 |
+# Copyright 1999-2016 Gentoo Foundation |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
# $Id$ |
| 65 |
|
| 66 |
-EAPI="5" |
| 67 |
-PYTHON_COMPAT=( python2_7 python3_4 ) |
| 68 |
+EAPI="6" |
| 69 |
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) |
| 70 |
|
| 71 |
inherit distutils-r1 |
| 72 |
|
| 73 |
@@ -14,20 +14,23 @@ if [[ ${PV} == 9999 ]] ; then |
| 74 |
inherit git-r3 |
| 75 |
EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git" |
| 76 |
else |
| 77 |
- #SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 78 |
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" |
| 79 |
+ SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 80 |
+ KEYWORDS="" |
| 81 |
fi |
| 82 |
|
| 83 |
LICENSE="GPL-2 LGPL-2.1" |
| 84 |
SLOT="0" |
| 85 |
-IUSE="debug test" |
| 86 |
+IUSE="X debug test" |
| 87 |
|
| 88 |
RDEPEND="${PYTHON_DEPS} |
| 89 |
>=sys-libs/libselinux-2.4:=[${PYTHON_USEDEP}] |
| 90 |
>=dev-python/networkx-1.8[${PYTHON_USEDEP}] |
| 91 |
app-arch/bzip2:= |
| 92 |
dev-libs/libpcre:= |
| 93 |
- " |
| 94 |
+ X? ( |
| 95 |
+ dev-python/PyQt5 |
| 96 |
+ dev-qt/qtchooser |
| 97 |
+ )" |
| 98 |
|
| 99 |
DEPEND="${RDEPEND} |
| 100 |
>=dev-lang/swig-2.0.12:0 |
| 101 |
@@ -41,5 +44,11 @@ DEPEND="${RDEPEND} |
| 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 |
+} |
| 113 |
|
| 114 |
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild |
| 115 |
index 5019032..4a0694a 100644 |
| 116 |
--- a/app-admin/setools/setools-9999.ebuild |
| 117 |
+++ b/app-admin/setools/setools-9999.ebuild |
| 118 |
@@ -1,9 +1,9 @@ |
| 119 |
-# Copyright 1999-2015 Gentoo Foundation |
| 120 |
+# Copyright 1999-2016 Gentoo Foundation |
| 121 |
# Distributed under the terms of the GNU General Public License v2 |
| 122 |
# $Id$ |
| 123 |
|
| 124 |
-EAPI="5" |
| 125 |
-PYTHON_COMPAT=( python2_7 python3_4 ) |
| 126 |
+EAPI="6" |
| 127 |
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) |
| 128 |
|
| 129 |
inherit distutils-r1 |
| 130 |
|
| 131 |
@@ -14,20 +14,23 @@ if [[ ${PV} == 9999 ]] ; then |
| 132 |
inherit git-r3 |
| 133 |
EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git" |
| 134 |
else |
| 135 |
- #SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 136 |
+ SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 137 |
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" |
| 138 |
fi |
| 139 |
|
| 140 |
LICENSE="GPL-2 LGPL-2.1" |
| 141 |
SLOT="0" |
| 142 |
-IUSE="debug test" |
| 143 |
+IUSE="X debug test" |
| 144 |
|
| 145 |
RDEPEND="${PYTHON_DEPS} |
| 146 |
>=sys-libs/libselinux-2.4:=[${PYTHON_USEDEP}] |
| 147 |
>=dev-python/networkx-1.8[${PYTHON_USEDEP}] |
| 148 |
app-arch/bzip2:= |
| 149 |
dev-libs/libpcre:= |
| 150 |
- " |
| 151 |
+ X? ( |
| 152 |
+ dev-python/PyQt5 |
| 153 |
+ dev-qt/qtchooser |
| 154 |
+ )" |
| 155 |
|
| 156 |
DEPEND="${RDEPEND} |
| 157 |
>=dev-lang/swig-2.0.12:0 |
| 158 |
@@ -41,5 +44,11 @@ DEPEND="${RDEPEND} |
| 159 |
|
| 160 |
python_prepare_all() { |
| 161 |
sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror" |
| 162 |
+ |
| 163 |
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.0.0-remove-gui.patch ) |
| 164 |
distutils-r1_python_prepare_all |
| 165 |
} |
| 166 |
+ |
| 167 |
+python_test() { |
| 168 |
+ esetup.py test |
| 169 |
+} |
Archives