Gentoo Archives: gentoo-commits

From: Jason Zaman <perfinion@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/sepolgen/, dev-python/sepolgen/files/
Date: Thu, 01 Sep 2016 16:32:06
Message-Id: 1472747291.29dbf7b4f2b63f06ae36507ac36561fa301bbc3a.perfinion@gentoo
1 commit: 29dbf7b4f2b63f06ae36507ac36561fa301bbc3a
2 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 1 15:37:42 2016 +0000
4 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 1 16:28:11 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29dbf7b4
7
8 dev-python/sepolgen: Drop old
9
10 Package-Manager: portage-2.2.28
11
12 dev-python/sepolgen/Manifest | 3 -
13 ...un-with-PYTHON-variable-python-bug-467264.patch | 16 -----
14 dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild | 74 ----------------------
15 dev-python/sepolgen/sepolgen-1.2.2.ebuild | 73 ---------------------
16 4 files changed, 166 deletions(-)
17
18 diff --git a/dev-python/sepolgen/Manifest b/dev-python/sepolgen/Manifest
19 index 9a84282..a39b302 100644
20 --- a/dev-python/sepolgen/Manifest
21 +++ b/dev-python/sepolgen/Manifest
22 @@ -1,4 +1 @@
23 -DIST patchbundle-sepolgen-1.2.1-r1.tar.gz 762 SHA256 f6c83b003df65cd2a11c689cb8a1f37e519bb706de17383fa0d9ff79e80adc11 SHA512 1eb83c118b4c6611c868213b802358c32e6863f2fc68cfed92d32f9e119de1ee9d128c3994bb1b71da1e36f1925d2fb71523498afb63cc3b5d2dd7c9290ebb8d WHIRLPOOL 37dd39a4ef28d8df3d6f2c031df556997ff836d8aa9962d69417dae2dc1ca82bd0d12d21df774231ce28b9f1ec2ecdfff710c452e69ee5de6dc0322b0b24f458
24 -DIST sepolgen-1.2.1.tar.gz 366214 SHA256 438c246bdc6b3cf1b12116831f4c601aaae6e93decb007dddab212a3c88781b0 SHA512 ec71126eaf6ecb18d989821753c04f3325de2188bafe161deff5733ebb95c3589e06198666f0502169cfa7d3a2b8ec509ff62098dc11b66b4f0883e1d8703a6e WHIRLPOOL efdbbb9771f68921a5fd3824267c7716ca48ab1f40395aea5c27ac4f7f3b8bf71f718da5ada40eed6c1b2de5341f3d5f10c7ad6086b5ac017d4898136ded6fe0
25 -DIST sepolgen-1.2.2.tar.gz 366343 SHA256 bebda8eeb2d386d26823d724ea320508a02b50828d44aff47c3f907cf54c2324 SHA512 83d56c31a87da8e271d6f436878a61f21c508ed8e26fa71f57ef109f432b10e310520c45bdb027f89a1edae12568d827ce3159bd8b6b9cf07c572b9a7225acee WHIRLPOOL 449f540caf2aa653bf2b2638ef310d2b710503744e1387119a66d3039253f537ea7ba987b0e5887e004f76485b1ae2e4a84c192a2e0e3423c9c8e61d8bb0198b
26 DIST sepolgen-1.2.3.tar.gz 367644 SHA256 3ee1745257fa55301070219c77978c7c9eeb9aa595ce0b6b29c3baa4687d5cf0 SHA512 5fe023f983dc0fe1855da24835cb9bb466ac6c44d07fa939416740ca64968c039be2febff79b2a4c593e54c5ae81448dd06020e9160e4f84eea95d8c0d2b910f WHIRLPOOL 65c663a3398f1ae64e8bf233828701481ac2ee68fa75f2271596628c7dcc80c1193166cfb950f8faa86988c0b309cfbb59f15f38131a9f1f2680b754518bba11
27
28 diff --git a/dev-python/sepolgen/files/0040-have-test-run-with-PYTHON-variable-python-bug-467264.patch b/dev-python/sepolgen/files/0040-have-test-run-with-PYTHON-variable-python-bug-467264.patch
29 deleted file mode 100644
30 index a039236..00000000
31 --- a/dev-python/sepolgen/files/0040-have-test-run-with-PYTHON-variable-python-bug-467264.patch
32 +++ /dev/null
33 @@ -1,16 +0,0 @@
34 -diff -uNr sepolgen-1.2.1.orig/tests/Makefile sepolgen-1.2.1/tests/Makefile
35 ---- sepolgen-1.2.1.orig/tests/Makefile 2013-11-04 22:25:44.704024216 +0100
36 -+++ sepolgen-1.2.1/tests/Makefile 2013-11-04 22:26:09.718024270 +0100
37 -@@ -1,3 +1,5 @@
38 -+PYTHON ?= /usr/bin/python
39 -+
40 - clean:
41 - rm -f *~ *.pyc
42 - rm -f parser.out parsetab.py
43 -@@ -6,4 +8,4 @@
44 - rm -f output
45 -
46 - test:
47 -- python run-tests.py
48 -\ No newline at end of file
49 -+ $(PYTHON) run-tests.py
50
51 diff --git a/dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild b/dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild
52 deleted file mode 100644
53 index d186988..00000000
54 --- a/dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild
55 +++ /dev/null
56 @@ -1,74 +0,0 @@
57 -# Copyright 1999-2015 Gentoo Foundation
58 -# Distributed under the terms of the GNU General Public License v2
59 -# $Id$
60 -
61 -EAPI="5"
62 -PYTHON_COMPAT=( python2_7 )
63 -
64 -inherit python-r1 eutils
65 -
66 -DESCRIPTION="SELinux policy generation library"
67 -HOMEPAGE="http://userspace.selinuxproject.org"
68 -SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/${P}.tar.gz
69 - https://dev.gentoo.org/~swift/patches/sepolgen/patchbundle-${P}-r1.tar.gz"
70 -
71 -LICENSE="GPL-2"
72 -SLOT="0"
73 -KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
74 -IUSE=""
75 -
76 -DEPEND=">=sys-libs/libselinux-2.0[python]
77 - app-admin/setools[python]
78 - ${PYTHON_DEPS}"
79 -RDEPEND="${DEPEND}"
80 -
81 -src_prepare() {
82 - EPATCH_MULTI_MSG="Applying sepolgen patches ... " \
83 - EPATCH_SUFFIX="patch" \
84 - EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
85 - EPATCH_FORCE="yes" \
86 - epatch
87 -
88 - epatch_user
89 -
90 - python_copy_sources
91 -}
92 -
93 -src_compile() {
94 - :
95 -}
96 -
97 -src_test() {
98 - if has_version sec-policy/selinux-base-policy; then
99 - invoke_sepolgen_test() {
100 - emake test
101 - }
102 - python_foreach_impl invoke_sepolgen_test
103 - else
104 - ewarn "Sepolgen requires sec-policy/selinux-base-policy to run tests."
105 - fi
106 -}
107 -
108 -src_install() {
109 - installation() {
110 - emake DESTDIR="${D}" PYTHONLIBDIR="$(python_get_sitedir)" install
111 - python_optimize
112 - }
113 - python_foreach_impl installation
114 -
115 - # Create sepolgen.conf with different devel location definition
116 - if [[ -f /etc/selinux/config ]];
117 - then
118 - local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
119 - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
120 - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
121 - else
122 - local selinuxtype="${POLICY_TYPES%% *}";
123 - if [[ -n "${selinuxtype}" ]];
124 - then
125 - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
126 - else
127 - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
128 - fi
129 - fi
130 -}
131
132 diff --git a/dev-python/sepolgen/sepolgen-1.2.2.ebuild b/dev-python/sepolgen/sepolgen-1.2.2.ebuild
133 deleted file mode 100644
134 index 9484ac3..00000000
135 --- a/dev-python/sepolgen/sepolgen-1.2.2.ebuild
136 +++ /dev/null
137 @@ -1,73 +0,0 @@
138 -# Copyright 1999-2015 Gentoo Foundation
139 -# Distributed under the terms of the GNU General Public License v2
140 -# $Id$
141 -
142 -EAPI="5"
143 -PYTHON_COMPAT=( python2_7 )
144 -
145 -inherit python-r1 eutils
146 -
147 -MY_P="${P//_/-}"
148 -
149 -DESCRIPTION="SELinux policy generation library"
150 -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
151 -SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/${MY_P}.tar.gz"
152 -
153 -LICENSE="GPL-2"
154 -SLOT="0"
155 -KEYWORDS="amd64 x86"
156 -IUSE=""
157 -
158 -DEPEND=">=sys-libs/libselinux-2.0[python]
159 - app-admin/setools[python]
160 - ${PYTHON_DEPS}"
161 -RDEPEND="${DEPEND}"
162 -
163 -S="${WORKDIR}/${MY_P}"
164 -
165 -src_prepare() {
166 - epatch "${FILESDIR}/0030-default-path-for-tests-also-needed-bug-467264.patch"
167 -
168 - epatch_user
169 -
170 - python_copy_sources
171 -}
172 -
173 -src_compile() {
174 - :
175 -}
176 -
177 -src_test() {
178 - if has_version sec-policy/selinux-base-policy; then
179 - invoke_sepolgen_test() {
180 - emake test
181 - }
182 - python_foreach_impl invoke_sepolgen_test
183 - else
184 - ewarn "Sepolgen requires sec-policy/selinux-base-policy to run tests."
185 - fi
186 -}
187 -
188 -src_install() {
189 - installation() {
190 - emake DESTDIR="${D}" PYTHONLIBDIR="$(python_get_sitedir)" install
191 - python_optimize
192 - }
193 - python_foreach_impl installation
194 -
195 - # Create sepolgen.conf with different devel location definition
196 - if [[ -f /etc/selinux/config ]];
197 - then
198 - local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
199 - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
200 - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
201 - else
202 - local selinuxtype="${POLICY_TYPES%% *}";
203 - if [[ -n "${selinuxtype}" ]];
204 - then
205 - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
206 - else
207 - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
208 - fi
209 - fi
210 -}