commit: 25beab675bbb7db7ed9139baaa86e6d985b4693a
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 19:54:30 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 20:23:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25beab67
dev-python/python-slip: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-python/python-slip/Manifest | 1 -
.../files/python-slip-0.4.0-no-selinux.patch | 93 ----------------------
dev-python/python-slip/python-slip-0.6.1.ebuild | 44 ----------
3 files changed, 138 deletions(-)
diff --git a/dev-python/python-slip/Manifest b/dev-python/python-slip/Manifest
index 504379e3cf4..73a66ea5507 100644
--- a/dev-python/python-slip/Manifest
+++ b/dev-python/python-slip/Manifest
@@ -1,2 +1 @@
-DIST python-slip-0.6.1.tar.bz2 25000 BLAKE2B
7e34d83b9325cda7f51347c22e3d2ef49da9bf0ff6cad519ec79501e5ae247873048c5d48ea35f6784253169387a6bc2a20e46987b2d75c598cda1ba8af52fbb
SHA512
d7d79b8ee4468d3a3b5e2ff31dcc8af30f70591ba42f74af9787e5c883a137e85c39a6ffc7c36cd2383840aa4ca09cd1ca3d9e40fc4d266b37689a85f084a9ab
DIST python-slip-0.6.5.tar.bz2 25996 BLAKE2B
f2c512274c35a451aa5a97f8c8b16d117edc34901cb2cc51d7d99314eec9c2e90c95019290ef9a35511b62a822471f40eac8c4228c0094bd72c71bd579bbe0c5
SHA512
84dfd4d74602e996797261aa4021fc1579a6aba554d2b3d497c0a7b8618366a9c0a6f12051b00c5653845dda923eedb58afdded37f2a1f31b5b0ce1a0532ccff
diff --git a/dev-python/python-slip/files/python-slip-0.4.0-no-selinux.patch
b/dev-python/python-slip/files/python-slip-0.4.0-no-selinux.patch
deleted file mode 100644
index 08a4fa80b88..00000000000
--- a/dev-python/python-slip/files/python-slip-0.4.0-no-selinux.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From a7bfeeb479d28c9a880d2a08d0102978fa711237 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetrom...@gentoo.org>
-Date: Wed, 18 Jul 2012 20:07:01 -0400
-Subject: [PATCH] Disable selinux
-
----
- setup.py.in | 2 +-
- slip/util/files.py | 28 ++++++++++++++--------------
- 2 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/setup.py.in b/setup.py.in
-index d670ed5..d5b8db8 100644
---- a/setup.py.in
-+++ b/setup.py.in
-@@ -7,7 +7,7 @@ setup(name="slip", version="@VERSION@",
- py_modules=["slip.__init__", "slip.util.__init__",
- "slip.util.hookable", "slip.util.files",
- "slip._wrappers.__init__", "slip._wrappers._gobject"],
-- requires=["selinux"])
-+ requires=[ ])
-
- setup(name="slip.dbus", version="@VERSION@",
- py_modules=["slip.dbus.__init__", "slip.dbus.bus",
-diff --git a/slip/util/files.py b/slip/util/files.py
-index 27ba45c..53869f6 100644
---- a/slip/util/files.py
-+++ b/slip/util/files.py
-@@ -24,7 +24,7 @@ __all__ = ["issamefile", "linkfile", "copyfile",
"linkorcopyfile",
- "overwrite_safely"]
-
- import os
--import selinux
-+# import selinux
- import shutil
- import tempfile
- import errno
-@@ -134,8 +134,8 @@ def copyfile(srcpath, dstpath, copy_mode_from_dst=True,
run_restorecon=True):
-
- os.rename(dsttmpfile.name, dstpath)
-
-- if run_restorecon and selinux.is_selinux_enabled() > 0:
-- selinux.restorecon(dstpath)
-+# if run_restorecon and selinux.is_selinux_enabled() > 0:
-+# selinux.restorecon(dstpath)
-
-
- def linkorcopyfile(srcpath, dstpath, copy_mode_from_dst=True,
-@@ -234,8 +234,8 @@ def overwrite_safely(path, content, preserve_mode=True,
preserve_context=True):
-
- exists = os.path.exists(path)
-
-- if preserve_context and selinux.is_selinux_enabled() <= 0:
-- preserve_context = False
-+# if preserve_context and selinux.is_selinux_enabled() <= 0:
-+# preserve_context = False
-
- try:
- fd, tmpname = tempfile.mkstemp(prefix=base + os.path.extsep,
-@@ -244,10 +244,10 @@ def overwrite_safely(path, content, preserve_mode=True,
preserve_context=True):
- if exists and preserve_mode:
- shutil.copymode(path, tmpname)
-
-- if exists and preserve_context:
-- ret, ctx = selinux.getfilecon(path)
-- if ret < 0:
-- raise RuntimeError("getfilecon(%r) failed" % path)
-+# if exists and preserve_context:
-+# ret, ctx = selinux.getfilecon(path)
-+# if ret < 0:
-+# raise RuntimeError("getfilecon(%r) failed" % path)
-
- f = os.fdopen(fd, "w")
- fd = None
-@@ -259,11 +259,11 @@ def overwrite_safely(path, content, preserve_mode=True,
preserve_context=True):
-
- os.rename(tmpname, path)
-
-- if preserve_context:
-- if exists:
-- selinux.setfilecon(path, ctx)
-- else:
-- selinux.restorecon(path)
-+# if preserve_context:
-+# if exists:
-+# selinux.setfilecon(path, ctx)
-+# else:
-+# selinux.restorecon(path)
-
- finally:
- if f:
---
-1.8.3.2
-
diff --git a/dev-python/python-slip/python-slip-0.6.1.ebuild
b/dev-python/python-slip/python-slip-0.6.1.ebuild
deleted file mode 100644
index 7ec1e7fe6ee..00000000000
--- a/dev-python/python-slip/python-slip-0.6.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Miscellaneous convenience, extension and workaround code for
Python"
-HOMEPAGE="https://github.com/nphilipp/python-slip";
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.bz2";
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="dbus selinux"
-
-RDEPEND="
- dbus? (
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- sys-auth/polkit )
-"
-DEPEND=""
-
-python_prepare_all() {
- use selinux || epatch "${FILESDIR}/${PN}-0.4.0-no-selinux.patch"
-
- # hard-disable slip.gtk since it did not get ported to gtk3+ and the
only user
- # of slip (firewalld) does not use it (upstream disables it for py3
already)
- sed \
- -e 's|sys.version_info.major == 2|False|' \
- -e "s:@VERSION@:${PV}:" setup.py.in > setup.py || die "sed
failed"
-
- if ! use dbus; then
- sed -e '/name="slip.dbus"/ s/\(.*\)/if 0:\n \1/' \
- -i setup.py || die "sed 2 failed"
- fi
-
- distutils-r1_python_prepare_all
-}
