gentoo resync : 21.12.2017

3 files changed, 0 insertions, 140 deletions

diff --git a/dev-python/python-slip/Manifest b/dev-python/python-slip/Manifest
index 1de40a5c5cb3..824cdf1748be 100644
--- a/dev-python/python-slip/Manifest
+++ b/dev-python/python-slip/Manifest
@@ -1,7 +1,4 @@
-AUX python-slip-0.4.0-no-selinux.patch 3129 BLAKE2B 8e44d2bae256e71c3328ff6e77c15440196dac8dfcfe534c61f064791b2b9ddc00891fff43df6a178bcad4c1ca6040a79029e8f5ceadddad15310b0a751876ce SHA512 14ff496a0d27805eee2bb45ce73c799d5bcdfb12d5bc7a2b5bee0989c9c5d6d6b79bfeb41f06e2de132dcfae220176cc1fb13272e29ad2810e37083f030c4d8c
 AUX python-slip-0.6.5-no-selinux.patch 2942 BLAKE2B 87cb1fee6aba70228b78ffc8b8a63b6b3bc0b11aad8f5e38369919e6c5a33780a9f255c2c81cc9220fe02b11b8d6daf24278bdbc495a831af03c92f1f2bd25f1 SHA512 64a742f93a38a2ff15d98e9d22c30a821ecd2044457ac958bf34cd7fd8e333b16a5fd56e80b169cc67c9ab35d13298d0caf418ad7a693372539701bda56f123e
-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
-EBUILD python-slip-0.6.1.ebuild 1179 BLAKE2B a830e303164679de14bdb61217f56c7accfd6dbbec5d7f8fa72cc8383f6d1df59921d62a0073beb06643d8a662aa27788c90940439d0642421630a36f18994c4 SHA512 08b5d9f0ef54fe15bf02de1d8d732b8bc7bb0a010daf58fdf2c3dba7c568cc220eea01903d3e42fd3c281ffdad11e9a807e48d24a73c5fc0e36baebdc6a834d4
 EBUILD python-slip-0.6.5.ebuild 1196 BLAKE2B 051ad41d882849722c11c3c544151ab625b883d1eac05c6895b5dc389eb5619a791266a89c71d3b4b9bceb9bcecfd6be935b025f192256dedf4181c696ca7330 SHA512 cdc08711a657dd3e0bab568af7aed001794eae7fec5ad4b307f7a6146338b67996b4e3f9e61470812efeb3b17ab89f93f5a853b8838e9eac921a898c4bb5cd09
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
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 08a4fa80b880..000000000000
--- 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 <tetromino@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 7ec1e7fe6ee7..000000000000
--- 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
-}