1 |
commit: cbcbfee63a0734ad02c17b9bc12a0680986024f7 |
2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 2 12:25:25 2022 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 2 12:26:16 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbcbfee6 |
7 |
|
8 |
dev-python/python-slip: treeclean |
9 |
|
10 |
Closes: https://bugs.gentoo.org/832366 |
11 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
12 |
|
13 |
dev-python/python-slip/Manifest | 1 - |
14 |
.../files/python-slip-0.6.5-no-selinux.patch | 93 ---------------------- |
15 |
dev-python/python-slip/metadata.xml | 8 -- |
16 |
dev-python/python-slip/python-slip-0.6.5-r1.ebuild | 45 ----------- |
17 |
profiles/package.mask | 6 -- |
18 |
5 files changed, 153 deletions(-) |
19 |
|
20 |
diff --git a/dev-python/python-slip/Manifest b/dev-python/python-slip/Manifest |
21 |
deleted file mode 100644 |
22 |
index 73a66ea55073..000000000000 |
23 |
--- a/dev-python/python-slip/Manifest |
24 |
+++ /dev/null |
25 |
@@ -1 +0,0 @@ |
26 |
-DIST python-slip-0.6.5.tar.bz2 25996 BLAKE2B f2c512274c35a451aa5a97f8c8b16d117edc34901cb2cc51d7d99314eec9c2e90c95019290ef9a35511b62a822471f40eac8c4228c0094bd72c71bd579bbe0c5 SHA512 84dfd4d74602e996797261aa4021fc1579a6aba554d2b3d497c0a7b8618366a9c0a6f12051b00c5653845dda923eedb58afdded37f2a1f31b5b0ce1a0532ccff |
27 |
|
28 |
diff --git a/dev-python/python-slip/files/python-slip-0.6.5-no-selinux.patch b/dev-python/python-slip/files/python-slip-0.6.5-no-selinux.patch |
29 |
deleted file mode 100644 |
30 |
index b957625f7ecd..000000000000 |
31 |
--- a/dev-python/python-slip/files/python-slip-0.6.5-no-selinux.patch |
32 |
+++ /dev/null |
33 |
@@ -1,93 +0,0 @@ |
34 |
-From 66480a1ee0222d9944f58af945959183b23c26f6 Mon Sep 17 00:00:00 2001 |
35 |
-From: Alexandre Rostovtsev <tetromino@g.o> |
36 |
-Date: Wed, 16 Aug 2017 10:49:43 +0200 |
37 |
-Subject: [PATCH] Disable selinux |
38 |
- |
39 |
-Signed-off-by: Gilles Dartiguelongue <eva@g.o> |
40 |
---- |
41 |
- setup.py.in | 2 +- |
42 |
- slip/util/files.py | 27 ++++++++++++++------------- |
43 |
- 2 files changed, 15 insertions(+), 14 deletions(-) |
44 |
- |
45 |
-diff --git a/setup.py.in b/setup.py.in |
46 |
-index 9e7644b..fb276a7 100644 |
47 |
---- a/setup.py.in |
48 |
-+++ b/setup.py.in |
49 |
-@@ -8,7 +8,7 @@ setup(name="slip", version="@VERSION@", |
50 |
- py_modules=["slip.__init__", "slip.util.__init__", |
51 |
- "slip.util.hookable", "slip.util.files", |
52 |
- "slip._wrappers.__init__", "slip._wrappers._glib"], |
53 |
-- requires=["selinux"]) |
54 |
-+ requires=[]) |
55 |
- |
56 |
- setup(name="slip.dbus", version="@VERSION@", |
57 |
- py_modules=["slip.dbus.__init__", "slip.dbus.bus", |
58 |
-diff --git a/slip/util/files.py b/slip/util/files.py |
59 |
-index 98faa7c..a0a3768 100644 |
60 |
---- a/slip/util/files.py |
61 |
-+++ b/slip/util/files.py |
62 |
-@@ -33,6 +33,7 @@ __all__ = ["issamefile", "linkfile", "copyfile", "linkorcopyfile", |
63 |
- |
64 |
- import os |
65 |
- import selinux |
66 |
-+# import selinux |
67 |
- import tempfile |
68 |
- import errno |
69 |
- import stat |
70 |
-@@ -140,8 +141,8 @@ def copyfile(srcpath, dstpath, copy_mode_from_dst=True, run_restorecon=True): |
71 |
- |
72 |
- os.rename(dsttmpfile.name, dstpath) |
73 |
- |
74 |
-- if run_restorecon and selinux.is_selinux_enabled() > 0: |
75 |
-- selinux.restorecon(dstpath) |
76 |
-+# if run_restorecon and selinux.is_selinux_enabled() > 0: |
77 |
-+# selinux.restorecon(dstpath) |
78 |
- |
79 |
- |
80 |
- def linkorcopyfile( |
81 |
-@@ -247,8 +248,8 @@ def overwrite_safely( |
82 |
- |
83 |
- exists = os.path.exists(path) |
84 |
- |
85 |
-- if preserve_context and selinux.is_selinux_enabled() <= 0: |
86 |
-- preserve_context = False |
87 |
-+# if preserve_context and selinux.is_selinux_enabled() <= 0: |
88 |
-+# preserve_context = False |
89 |
- |
90 |
- try: |
91 |
- fd, tmpname = tempfile.mkstemp(prefix=base + os.path.extsep, |
92 |
-@@ -263,10 +264,10 @@ def overwrite_safely( |
93 |
- if preserve_mode: |
94 |
- os.fchmod(fd, stat.S_IMODE(s.st_mode)) |
95 |
- |
96 |
-- if preserve_context: |
97 |
-- ret, ctx = selinux.getfilecon(path) |
98 |
-- if ret < 0: |
99 |
-- raise RuntimeError("getfilecon(%r) failed" % path) |
100 |
-+# if preserve_context: |
101 |
-+# ret, ctx = selinux.getfilecon(path) |
102 |
-+# if ret < 0: |
103 |
-+# raise RuntimeError("getfilecon(%r) failed" % path) |
104 |
- |
105 |
- f = os.fdopen(fd, "w") |
106 |
- fd = None |
107 |
-@@ -278,11 +279,11 @@ def overwrite_safely( |
108 |
- |
109 |
- os.rename(tmpname, path) |
110 |
- |
111 |
-- if preserve_context: |
112 |
-- if exists: |
113 |
-- selinux.setfilecon(path, ctx) |
114 |
-- else: |
115 |
-- selinux.restorecon(path) |
116 |
-+# if preserve_context: |
117 |
-+# if exists: |
118 |
-+# selinux.setfilecon(path, ctx) |
119 |
-+# else: |
120 |
-+# selinux.restorecon(path) |
121 |
- |
122 |
- finally: |
123 |
- if f: |
124 |
--- |
125 |
-2.14.0 |
126 |
- |
127 |
|
128 |
diff --git a/dev-python/python-slip/metadata.xml b/dev-python/python-slip/metadata.xml |
129 |
deleted file mode 100644 |
130 |
index 5d32dd6c55b4..000000000000 |
131 |
--- a/dev-python/python-slip/metadata.xml |
132 |
+++ /dev/null |
133 |
@@ -1,8 +0,0 @@ |
134 |
-<?xml version="1.0" encoding="UTF-8"?> |
135 |
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
136 |
-<pkgmetadata> |
137 |
- <maintainer type="project"> |
138 |
- <email>virtualization@g.o</email> |
139 |
- <name>Gentoo Virtualization Project</name> |
140 |
- </maintainer> |
141 |
-</pkgmetadata> |
142 |
|
143 |
diff --git a/dev-python/python-slip/python-slip-0.6.5-r1.ebuild b/dev-python/python-slip/python-slip-0.6.5-r1.ebuild |
144 |
deleted file mode 100644 |
145 |
index 36a8e2b4a6ad..000000000000 |
146 |
--- a/dev-python/python-slip/python-slip-0.6.5-r1.ebuild |
147 |
+++ /dev/null |
148 |
@@ -1,45 +0,0 @@ |
149 |
-# Copyright 1999-2021 Gentoo Authors |
150 |
-# Distributed under the terms of the GNU General Public License v2 |
151 |
- |
152 |
-EAPI=7 |
153 |
- |
154 |
-DISTUTILS_USE_SETUPTOOLS=no |
155 |
-PYTHON_REQ_USE="xml" |
156 |
-PYTHON_COMPAT=( python3_{8,9} ) |
157 |
- |
158 |
-inherit distutils-r1 |
159 |
- |
160 |
-DESCRIPTION="Miscellaneous convenience, extension and workaround code for Python" |
161 |
-HOMEPAGE="https://github.com/nphilipp/python-slip" |
162 |
-SRC_URI="https://github.com/nphilipp/${PN}/releases/download/${P}/${P}.tar.bz2" |
163 |
- |
164 |
-LICENSE="GPL-2+" |
165 |
-SLOT="0" |
166 |
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" |
167 |
-IUSE="dbus selinux" |
168 |
- |
169 |
-RDEPEND=" |
170 |
- dbus? ( |
171 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
172 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
173 |
- dev-python/six[${PYTHON_USEDEP}] |
174 |
- sys-auth/polkit |
175 |
- ) |
176 |
-" |
177 |
- |
178 |
-python_prepare_all() { |
179 |
- use selinux || eapply -p1 "${FILESDIR}"/${PN}-0.6.5-no-selinux.patch |
180 |
- |
181 |
- # Disable gtk interface since it's gtk-2. |
182 |
- sed \ |
183 |
- -e 's|sys.version_info.major == 2|False|' \ |
184 |
- -e "s:@VERSION@:${PV}:" setup.py.in > setup.py || die |
185 |
- |
186 |
- # Enable / disable dbus support by user choice. |
187 |
- if ! use dbus; then |
188 |
- sed -e '/name="slip.dbus"/ s/\(.*\)/if 0:\n \1/' \ |
189 |
- -i setup.py || die |
190 |
- fi |
191 |
- |
192 |
- distutils-r1_python_prepare_all |
193 |
-} |
194 |
|
195 |
diff --git a/profiles/package.mask b/profiles/package.mask |
196 |
index 7c818c369d50..2291d9a9db87 100644 |
197 |
--- a/profiles/package.mask |
198 |
+++ b/profiles/package.mask |
199 |
@@ -195,12 +195,6 @@ app-misc/emelfm2 |
200 |
# Removal on 2022-02-31. bug #668708. |
201 |
media-video/atomicparsley-wez |
202 |
|
203 |
-# Michał Górny <mgorny@g.o> (2022-01-30) |
204 |
-# NIH package with no revdeps and an awful build system that can't work |
205 |
-# with PEP 517 builders. Last release in 2017. |
206 |
-# Removal on 2022-03-01. Bug #832366. |
207 |
-dev-python/python-slip |
208 |
- |
209 |
# Eray Aslan <eras@g.o> (2022-01-24) |
210 |
# Mask experimental software |
211 |
=mail-mta/postfix-3.8* |