From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 715401396D0 for ; Thu, 10 Aug 2017 08:41:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B934B1FC006; Thu, 10 Aug 2017 08:41:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 920601FC006 for ; Thu, 10 Aug 2017 08:41:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C975341941 for ; Thu, 10 Aug 2017 08:41:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA13975EA for ; Thu, 10 Aug 2017 08:41:33 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1502354309.20646c92bf82660eae521dfcad1284eebb2fbf7c.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/setools/files/setools-4.1.1-remove-gui.patch app-admin/setools/setools-4.1.1.ebuild X-VCS-Directories: app-admin/setools/ app-admin/setools/files/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 20646c92bf82660eae521dfcad1284eebb2fbf7c X-VCS-Branch: master Date: Thu, 10 Aug 2017 08:41:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4aa3bdde-7843-4639-b866-4fc8329ad044 X-Archives-Hash: 5cbf4ab279a85cafd63701e85ce7545d commit: 20646c92bf82660eae521dfcad1284eebb2fbf7c Author: Jason Zaman gentoo org> AuthorDate: Thu Aug 10 08:37:12 2017 +0000 Commit: Jason Zaman gentoo org> CommitDate: Thu Aug 10 08:38:29 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20646c92 app-admin/setools: fix remove gui 4.1.1 patch Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-admin/setools/files/setools-4.1.1-remove-gui.patch | 18 ++++++++++++++++++ app-admin/setools/setools-4.1.1.ebuild | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app-admin/setools/files/setools-4.1.1-remove-gui.patch b/app-admin/setools/files/setools-4.1.1-remove-gui.patch new file mode 100644 index 00000000000..1bb78f5fd96 --- /dev/null +++ b/app-admin/setools/files/setools-4.1.1-remove-gui.patch @@ -0,0 +1,18 @@ +diff --git a/setup.py b/setup.py +index 2ca44c9..0c8a0d9 100644 +--- a/setup.py ++++ b/setup.py +@@ -180,10 +180,10 @@ setup(name='setools', + 'build_lex': LexCommand, + 'build_ext': BuildExtCommand, + 'build_qhc': QtHelpCommand}, +- packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'], +- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], ++ packages=['setools', 'setools.diff', 'setools.policyrep'], ++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], + data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))], +- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']}, ++ package_data={'setools': ['perm_map']}, + ext_modules=ext_py_mods, + test_suite='tests', + license='GPLv2+, LGPLv2.1+', diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild index f1e79d0d936..708c8a7e7d6 100644 --- a/app-admin/setools/setools-4.1.1.ebuild +++ b/app-admin/setools/setools-4.1.1.ebuild @@ -44,7 +44,7 @@ DEPEND="${RDEPEND} python_prepare_all() { sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror" - use X || local PATCHES=( "${FILESDIR}"/setools-4.1.0-remove-gui.patch ) + use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch ) distutils-r1_python_prepare_all }