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 3A0A11382C5 for ; Mon, 31 May 2021 21:00:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 918FAE08EB; Mon, 31 May 2021 21:00: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 68150E08EB for ; Mon, 31 May 2021 21:00: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 38B48335D4B for ; Mon, 31 May 2021 21:00:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F0ED79F for ; Mon, 31 May 2021 21:00:32 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1622494694.ec869a63b8e6e13de8923de410c7403a1332bbd3.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/apparmor-utils/Manifest sys-apps/apparmor-utils/apparmor-utils-2.13.4-r1.ebuild sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild X-VCS-Directories: sys-apps/apparmor-utils/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ec869a63b8e6e13de8923de410c7403a1332bbd3 X-VCS-Branch: master Date: Mon, 31 May 2021 21:00:32 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b9102435-6ad8-4eec-b2f5-455ce213b991 X-Archives-Hash: 381e65173a3a942492a75e7a1bad6bd3 commit: ec869a63b8e6e13de8923de410c7403a1332bbd3 Author: Michał Górny gentoo org> AuthorDate: Mon May 31 20:58:14 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon May 31 20:58:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec869a63 sys-apps/apparmor-utils: Remove old Signed-off-by: Michał Górny gentoo.org> sys-apps/apparmor-utils/Manifest | 2 - .../apparmor-utils/apparmor-utils-2.13.4-r1.ebuild | 86 --------------------- .../apparmor-utils/apparmor-utils-3.0.0-r1.ebuild | 88 ---------------------- 3 files changed, 176 deletions(-) diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest index db15b30fede..38571173391 100644 --- a/sys-apps/apparmor-utils/Manifest +++ b/sys-apps/apparmor-utils/Manifest @@ -1,3 +1 @@ -DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651 -DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687 diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.4-r1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.4-r1.ebuild deleted file mode 100644 index 7e3b4f75a91..00000000000 --- a/sys-apps/apparmor-utils/apparmor-utils-2.13.4-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_7 ) -inherit eapi7-ver perl-module python-r1 toolchain-funcs - -MY_PV="$(ver_cut 1-2)" - -DESCRIPTION="Additional userspace utils to assist with AppArmor profile management" -HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" -SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="test" - -COMMON_DEPEND=" - dev-lang/perl - ~sys-libs/libapparmor-${PV} - ${PYTHON_DEPS}" -DEPEND="${COMMON_DEPEND} - sys-devel/gettext -" -RDEPEND="${COMMON_DEPEND} - ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}] - ~sys-apps/apparmor-${PV} - dev-perl/Locale-gettext - dev-perl/RPC-XML - dev-perl/TermReadKey - virtual/perl-Data-Dumper - virtual/perl-Getopt-Long" - -S=${WORKDIR}/apparmor-${PV} - -src_prepare() { - default - - sed -i binutils/Makefile \ - -e 's/Bstatic/Bdynamic/g' || die - - sed -i utils/aa-remove-unknown \ - -e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die -} - -src_compile() { - python_setup - - pushd utils > /dev/null || die - # launches non-make subprocesses causing "make jobserver unavailable" - # error messages to appear in generated code - emake -j1 - popd > /dev/null || die - - pushd binutils > /dev/null || die - export EXTRA_CFLAGS="${CFLAGS}" - emake CC="$(tc-getCC)" USE_SYSTEM=1 - popd > /dev/null || die -} - -src_install() { - pushd utils > /dev/null || die - perl_set_version - emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \ - VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install - - install_python() { - local -x PYTHONDONTWRITEBYTECODE= - "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \ - --root="${D}" --optimize 2 - } - - python_foreach_impl install_python - python_replicate_script "${D}"/usr/bin/aa-easyprof "${D}"/usr/sbin/apparmor_status \ - "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined} - popd > /dev/null || die - - pushd binutils > /dev/null || die - emake install DESTDIR="${D}" USE_SYSTEM=1 - popd > /dev/null || die -} diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild deleted file mode 100644 index 80e6fd6100d..00000000000 --- a/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{3_7,3_8} ) -inherit eapi7-ver perl-module python-r1 toolchain-funcs - -MY_PV="$(ver_cut 1-2)" - -DESCRIPTION="Additional userspace utils to assist with AppArmor profile management" -HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" -SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="test" - -COMMON_DEPEND=" - dev-lang/perl - ~sys-libs/libapparmor-${PV} - ${PYTHON_DEPS}" -DEPEND="${COMMON_DEPEND} - sys-devel/gettext -" -RDEPEND="${COMMON_DEPEND} - ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}] - ~sys-apps/apparmor-${PV} - dev-perl/Locale-gettext - dev-perl/RPC-XML - dev-perl/TermReadKey - dev-python/notify2[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - virtual/perl-Data-Dumper - virtual/perl-Getopt-Long" - -S=${WORKDIR}/apparmor-${PV} - -src_prepare() { - default - - sed -i binutils/Makefile \ - -e 's/Bstatic/Bdynamic/g' || die - - sed -i utils/aa-remove-unknown \ - -e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die -} - -src_compile() { - python_setup - - pushd utils > /dev/null || die - # launches non-make subprocesses causing "make jobserver unavailable" - # error messages to appear in generated code - emake -j1 - popd > /dev/null || die - - pushd binutils > /dev/null || die - export EXTRA_CFLAGS="${CFLAGS}" - emake CC="$(tc-getCC)" USE_SYSTEM=1 - popd > /dev/null || die -} - -src_install() { - pushd utils > /dev/null || die - perl_set_version - emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \ - VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install - - install_python() { - local -x PYTHONDONTWRITEBYTECODE= - "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \ - --root="${D}" --optimize 2 - } - - python_foreach_impl install_python - python_replicate_script "${D}"/usr/bin/aa-easyprof \ - "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined} - popd > /dev/null || die - - pushd binutils > /dev/null || die - emake install DESTDIR="${D}" USE_SYSTEM=1 - popd > /dev/null || die -}