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 62F63138330 for ; Thu, 1 Sep 2016 16:32:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B83C021C08B; Thu, 1 Sep 2016 16:32:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5E36521C0A9 for ; Thu, 1 Sep 2016 16:32:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CEE21340831 for ; Thu, 1 Sep 2016 16:32:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E97E42474 for ; Thu, 1 Sep 2016 16:31:58 +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: <1472747291.29dbf7b4f2b63f06ae36507ac36561fa301bbc3a.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/sepolgen/, dev-python/sepolgen/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/sepolgen/Manifest dev-python/sepolgen/files/0040-have-test-run-with-PYTHON-variable-python-bug-467264.patch dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild dev-python/sepolgen/sepolgen-1.2.2.ebuild X-VCS-Directories: dev-python/sepolgen/files/ dev-python/sepolgen/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 29dbf7b4f2b63f06ae36507ac36561fa301bbc3a X-VCS-Branch: master Date: Thu, 1 Sep 2016 16:31:58 +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: 43c49d4a-4953-4772-a612-e6dea39922bc X-Archives-Hash: 38496476bc57120929370840d6e2aeb4 commit: 29dbf7b4f2b63f06ae36507ac36561fa301bbc3a Author: Jason Zaman gentoo org> AuthorDate: Thu Sep 1 15:37:42 2016 +0000 Commit: Jason Zaman gentoo org> CommitDate: Thu Sep 1 16:28:11 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29dbf7b4 dev-python/sepolgen: Drop old Package-Manager: portage-2.2.28 dev-python/sepolgen/Manifest | 3 - ...un-with-PYTHON-variable-python-bug-467264.patch | 16 ----- dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild | 74 ---------------------- dev-python/sepolgen/sepolgen-1.2.2.ebuild | 73 --------------------- 4 files changed, 166 deletions(-) diff --git a/dev-python/sepolgen/Manifest b/dev-python/sepolgen/Manifest index 9a84282..a39b302 100644 --- a/dev-python/sepolgen/Manifest +++ b/dev-python/sepolgen/Manifest @@ -1,4 +1 @@ -DIST patchbundle-sepolgen-1.2.1-r1.tar.gz 762 SHA256 f6c83b003df65cd2a11c689cb8a1f37e519bb706de17383fa0d9ff79e80adc11 SHA512 1eb83c118b4c6611c868213b802358c32e6863f2fc68cfed92d32f9e119de1ee9d128c3994bb1b71da1e36f1925d2fb71523498afb63cc3b5d2dd7c9290ebb8d WHIRLPOOL 37dd39a4ef28d8df3d6f2c031df556997ff836d8aa9962d69417dae2dc1ca82bd0d12d21df774231ce28b9f1ec2ecdfff710c452e69ee5de6dc0322b0b24f458 -DIST sepolgen-1.2.1.tar.gz 366214 SHA256 438c246bdc6b3cf1b12116831f4c601aaae6e93decb007dddab212a3c88781b0 SHA512 ec71126eaf6ecb18d989821753c04f3325de2188bafe161deff5733ebb95c3589e06198666f0502169cfa7d3a2b8ec509ff62098dc11b66b4f0883e1d8703a6e WHIRLPOOL efdbbb9771f68921a5fd3824267c7716ca48ab1f40395aea5c27ac4f7f3b8bf71f718da5ada40eed6c1b2de5341f3d5f10c7ad6086b5ac017d4898136ded6fe0 -DIST sepolgen-1.2.2.tar.gz 366343 SHA256 bebda8eeb2d386d26823d724ea320508a02b50828d44aff47c3f907cf54c2324 SHA512 83d56c31a87da8e271d6f436878a61f21c508ed8e26fa71f57ef109f432b10e310520c45bdb027f89a1edae12568d827ce3159bd8b6b9cf07c572b9a7225acee WHIRLPOOL 449f540caf2aa653bf2b2638ef310d2b710503744e1387119a66d3039253f537ea7ba987b0e5887e004f76485b1ae2e4a84c192a2e0e3423c9c8e61d8bb0198b DIST sepolgen-1.2.3.tar.gz 367644 SHA256 3ee1745257fa55301070219c77978c7c9eeb9aa595ce0b6b29c3baa4687d5cf0 SHA512 5fe023f983dc0fe1855da24835cb9bb466ac6c44d07fa939416740ca64968c039be2febff79b2a4c593e54c5ae81448dd06020e9160e4f84eea95d8c0d2b910f WHIRLPOOL 65c663a3398f1ae64e8bf233828701481ac2ee68fa75f2271596628c7dcc80c1193166cfb950f8faa86988c0b309cfbb59f15f38131a9f1f2680b754518bba11 diff --git a/dev-python/sepolgen/files/0040-have-test-run-with-PYTHON-variable-python-bug-467264.patch b/dev-python/sepolgen/files/0040-have-test-run-with-PYTHON-variable-python-bug-467264.patch deleted file mode 100644 index a039236..00000000 --- a/dev-python/sepolgen/files/0040-have-test-run-with-PYTHON-variable-python-bug-467264.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -uNr sepolgen-1.2.1.orig/tests/Makefile sepolgen-1.2.1/tests/Makefile ---- sepolgen-1.2.1.orig/tests/Makefile 2013-11-04 22:25:44.704024216 +0100 -+++ sepolgen-1.2.1/tests/Makefile 2013-11-04 22:26:09.718024270 +0100 -@@ -1,3 +1,5 @@ -+PYTHON ?= /usr/bin/python -+ - clean: - rm -f *~ *.pyc - rm -f parser.out parsetab.py -@@ -6,4 +8,4 @@ - rm -f output - - test: -- python run-tests.py -\ No newline at end of file -+ $(PYTHON) run-tests.py diff --git a/dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild b/dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild deleted file mode 100644 index d186988..00000000 --- a/dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -inherit python-r1 eutils - -DESCRIPTION="SELinux policy generation library" -HOMEPAGE="http://userspace.selinuxproject.org" -SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/${P}.tar.gz - https://dev.gentoo.org/~swift/patches/sepolgen/patchbundle-${P}-r1.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~mips x86" -IUSE="" - -DEPEND=">=sys-libs/libselinux-2.0[python] - app-admin/setools[python] - ${PYTHON_DEPS}" -RDEPEND="${DEPEND}" - -src_prepare() { - EPATCH_MULTI_MSG="Applying sepolgen patches ... " \ - EPATCH_SUFFIX="patch" \ - EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \ - EPATCH_FORCE="yes" \ - epatch - - epatch_user - - python_copy_sources -} - -src_compile() { - : -} - -src_test() { - if has_version sec-policy/selinux-base-policy; then - invoke_sepolgen_test() { - emake test - } - python_foreach_impl invoke_sepolgen_test - else - ewarn "Sepolgen requires sec-policy/selinux-base-policy to run tests." - fi -} - -src_install() { - installation() { - emake DESTDIR="${D}" PYTHONLIBDIR="$(python_get_sitedir)" install - python_optimize - } - python_foreach_impl installation - - # Create sepolgen.conf with different devel location definition - if [[ -f /etc/selinux/config ]]; - then - local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; - else - local selinuxtype="${POLICY_TYPES%% *}"; - if [[ -n "${selinuxtype}" ]]; - then - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; - else - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf; - fi - fi -} diff --git a/dev-python/sepolgen/sepolgen-1.2.2.ebuild b/dev-python/sepolgen/sepolgen-1.2.2.ebuild deleted file mode 100644 index 9484ac3..00000000 --- a/dev-python/sepolgen/sepolgen-1.2.2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -inherit python-r1 eutils - -MY_P="${P//_/-}" - -DESCRIPTION="SELinux policy generation library" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" -SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=">=sys-libs/libselinux-2.0[python] - app-admin/setools[python] - ${PYTHON_DEPS}" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}/0030-default-path-for-tests-also-needed-bug-467264.patch" - - epatch_user - - python_copy_sources -} - -src_compile() { - : -} - -src_test() { - if has_version sec-policy/selinux-base-policy; then - invoke_sepolgen_test() { - emake test - } - python_foreach_impl invoke_sepolgen_test - else - ewarn "Sepolgen requires sec-policy/selinux-base-policy to run tests." - fi -} - -src_install() { - installation() { - emake DESTDIR="${D}" PYTHONLIBDIR="$(python_get_sitedir)" install - python_optimize - } - python_foreach_impl installation - - # Create sepolgen.conf with different devel location definition - if [[ -f /etc/selinux/config ]]; - then - local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; - else - local selinuxtype="${POLICY_TYPES%% *}"; - if [[ -n "${selinuxtype}" ]]; - then - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; - else - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf; - fi - fi -}