diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
| commit | 536c3711867ec947c1738f2c4b96f22e4863322d (patch) | |
| tree | 697733f5cb713908dcf378e13fd15a798a906a91 /sys-apps/apparmor-utils | |
| parent | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff) | |
gentoo resync : 18.11.2018
Diffstat (limited to 'sys-apps/apparmor-utils')
| -rw-r--r-- | sys-apps/apparmor-utils/Manifest | 5 | ||||
| -rw-r--r-- | sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild (renamed from sys-apps/apparmor-utils/apparmor-utils-2.11.1.ebuild) | 19 | ||||
| -rw-r--r-- | sys-apps/apparmor-utils/files/apparmor-utils-2.11-shebang.patch | 16 |
3 files changed, 10 insertions, 30 deletions
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest index bac2ce2aa320..58ecba8062d1 100644 --- a/sys-apps/apparmor-utils/Manifest +++ b/sys-apps/apparmor-utils/Manifest @@ -1,6 +1,5 @@ -AUX apparmor-utils-2.11-shebang.patch 613 BLAKE2B b88988d12772003eaea7643644f3a3de69feaa0ef1a874df13ea775ce976980a59d8a22b204c34145657699c9b9a612fc9ffa54eafc063f381f6d47c062efc96 SHA512 6e94b4a48dee68dc2c321115744fa2ba6be33cd1f6f13cf3c97a4bb1f206d8c990e8dded7c81e8cf53107fdc2afcf208ab664f6438725d17ef652f5accb8cc76 -DIST apparmor-2.11.1.tar.gz 5017646 BLAKE2B ee0176c87b2800eb562c136ff324f08e444c412117c4593ff97c4b0e4c63db2aea0721c6ed38f3c733e3c95024165f329e520acf838c4798a8285b8dedf0d51e SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c DIST apparmor-2.12.tar.gz 7258450 BLAKE2B c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c SHA512 d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a -EBUILD apparmor-utils-2.11.1.ebuild 2067 BLAKE2B 22a55213dd55eec4465f8f356cdc961341052f1ea93a5dbf590ad4ea71f48f7981d8b35d03edbbbdb93cd7c9e43b94600bc55947e20a4725d6f32ea8b5362de4 SHA512 ec3310c097fc265f6913e79727b4d92d4a4d669a4e72f545158b9aed10190f42a8aba25ef428a0c9678018e5e1550a49e18c8c992a5fed721380ade94e14aee8 +DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7 EBUILD apparmor-utils-2.12.0.ebuild 1980 BLAKE2B cd4a19c4d0c4dbead6e7e1fd85b2cfca81d03a2e04aaf2a0af0b938f6bac6a27d212df3ec8124c94128310f74a26a6877327547d5ff1b919cfe6711b4bef0bb9 SHA512 ce041d5d660332573344ff275b0065bc6deb19cdbb22bf2a4e6079765aedcfd22aa163196bf5d91053ca4ead09b855df8f2506a00fba44ef90859380cce70622 +EBUILD apparmor-utils-2.13.1.ebuild 2007 BLAKE2B 3656ea0681e8664dc5829db0b221ca9479890663e8aabf45eecef60d0668023e5587505b5a7ed0383a16939d2bb8793014b6e85704118ac4de7702c23ea94a5e SHA512 af53cfeb38a9288b81254b49449c57ac132888fb9037d1496f8fd87155bce9390b980212818b4a0ee3d19323307f007126da97a3bba6466e4e27629ccfe6adca MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8 diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.11.1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild index 310ca84e60ed..0407708f4d80 100644 --- a/sys-apps/apparmor-utils/apparmor-utils-2.11.1.ebuild +++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python3_{4,5,6} ) -inherit perl-module python-r1 toolchain-funcs versionator +inherit eapi7-ver perl-module python-r1 toolchain-funcs -MY_PV="$(get_version_component_range 1-2)" +MY_PV="$(ver_cut 1-2)" DESCRIPTION="Additional userspace utils to assist with AppArmor profile management" -HOMEPAGE="http://apparmor.net/" +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" @@ -20,7 +20,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" -DEPEND="dev-lang/perl +DEPEND=" + dev-lang/perl + ~sys-libs/libapparmor-${PV} ${PYTHON_DEPS}" RDEPEND="${DEPEND} ~sys-libs/libapparmor-${PV}[perl,python] @@ -33,16 +35,11 @@ RDEPEND="${DEPEND} S=${WORKDIR}/apparmor-${PV} -PATCHES=( - "${FILESDIR}/${PN}-2.11-shebang.patch" -) - src_prepare() { default sed -i binutils/Makefile \ - -e 's/Bstatic/Bdynamic/g' \ - -e 's/EXTRA_CFLAGS = /& ${CFLAGS}/' || die + -e 's/Bstatic/Bdynamic/g' || die } src_compile() { diff --git a/sys-apps/apparmor-utils/files/apparmor-utils-2.11-shebang.patch b/sys-apps/apparmor-utils/files/apparmor-utils-2.11-shebang.patch deleted file mode 100644 index 3dce7c261688..000000000000 --- a/sys-apps/apparmor-utils/files/apparmor-utils-2.11-shebang.patch +++ /dev/null @@ -1,16 +0,0 @@ -Avoid rewriting the shebang. - -The ebuild will take care of this when replicating the script for each of the -supported python implementations. - ---- a/utils/python-tools-setup.py -+++ b/utils/python-tools-setup.py -@@ -43,7 +43,7 @@ - f = prefix + s - # If we have a defined python version, use it instead of the system - # default -- if 'PYTHON' in os.environ: -+ if False: - lines = open(os.path.basename(s)).readlines() - lines[0] = '#! /usr/bin/env %s\n' % os.environ['PYTHON'] - open(f, 'w').write("".join(lines)) |