From: "Jason Zaman" <perfinion@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/
Date: Mon, 19 Aug 2019 07:34:16 +0000 (UTC) [thread overview]
Message-ID: <1566200030.fdb745604c565aa304fb3f4f420c1b87689c96b4.perfinion@gentoo> (raw)
commit: fdb745604c565aa304fb3f4f420c1b87689c96b4
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 07:33:04 2019 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 07:33:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb74560
app-admin/setools: Fix patch for 4.2.1
Closes: https://bugs.gentoo.org/677560
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
app-admin/setools/files/setools-4.2.0-remove-gui.patch | 18 ------------------
app-admin/setools/setools-4.2.1.ebuild | 2 +-
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/app-admin/setools/files/setools-4.2.0-remove-gui.patch b/app-admin/setools/files/setools-4.2.0-remove-gui.patch
deleted file mode 100644
index 748b33c9a5d..00000000000
--- a/app-admin/setools/files/setools-4.2.0-remove-gui.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/setup.py b/setup.py
-index e075a00..3f8f959 100644
---- a/setup.py
-+++ b/setup.py
-@@ -134,10 +134,10 @@ setup(name='setools',
- author_email='pebenito@ieee.org',
- url='https://github.com/SELinuxProject/setools',
- cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
-- packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
-- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
-+ packages=['setools', 'setools.diff'],
-+ 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=cythonize(ext_py_mods, include_path=['setools/policyrep'],
- annotate=cython_annotate,
- compiler_directives={"language_level": 3,
diff --git a/app-admin/setools/setools-4.2.1.ebuild b/app-admin/setools/setools-4.2.1.ebuild
index b1bf0e666c9..3e80e5e19f6 100644
--- a/app-admin/setools/setools-4.2.1.ebuild
+++ b/app-admin/setools/setools-4.2.1.ebuild
@@ -40,7 +40,7 @@ python_prepare_all() {
sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
die "failed to set lib_dirs"
- use X || local PATCHES=( "${FILESDIR}"/setools-4.2.0-remove-gui.patch )
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch )
distutils-r1_python_prepare_all
}
next reply other threads:[~2019-08-19 7:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-19 7:34 Jason Zaman [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-01 15:26 [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/ Kenton Groombridge
2023-07-27 7:07 Sam James
2022-04-09 2:55 Jason Zaman
2021-09-19 13:24 Jason Zaman
2020-12-18 3:31 Jason Zaman
2020-09-15 3:41 Jason Zaman
2019-08-19 6:01 Jason Zaman
2017-08-10 8:41 Jason Zaman
2016-06-01 13:19 Jason Zaman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1566200030.fdb745604c565aa304fb3f4f420c1b87689c96b4.perfinion@gentoo \
--to=perfinion@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox