Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor-utils/
Date: Mon, 31 May 2021 21:00:37
Message-Id: 1622494694.ec869a63b8e6e13de8923de410c7403a1332bbd3.mgorny@gentoo
1 commit: ec869a63b8e6e13de8923de410c7403a1332bbd3
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 31 20:58:14 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon May 31 20:58:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec869a63
7
8 sys-apps/apparmor-utils: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-apps/apparmor-utils/Manifest | 2 -
13 .../apparmor-utils/apparmor-utils-2.13.4-r1.ebuild | 86 ---------------------
14 .../apparmor-utils/apparmor-utils-3.0.0-r1.ebuild | 88 ----------------------
15 3 files changed, 176 deletions(-)
16
17 diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
18 index db15b30fede..38571173391 100644
19 --- a/sys-apps/apparmor-utils/Manifest
20 +++ b/sys-apps/apparmor-utils/Manifest
21 @@ -1,3 +1 @@
22 -DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
23 -DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
24 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
25
26 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
27 deleted file mode 100644
28 index 7e3b4f75a91..00000000000
29 --- a/sys-apps/apparmor-utils/apparmor-utils-2.13.4-r1.ebuild
30 +++ /dev/null
31 @@ -1,86 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -PYTHON_COMPAT=( python3_7 )
38 -inherit eapi7-ver perl-module python-r1 toolchain-funcs
39 -
40 -MY_PV="$(ver_cut 1-2)"
41 -
42 -DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
43 -HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
44 -SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
45 -
46 -LICENSE="GPL-2"
47 -SLOT="0"
48 -KEYWORDS="~amd64"
49 -IUSE=""
50 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
51 -
52 -RESTRICT="test"
53 -
54 -COMMON_DEPEND="
55 - dev-lang/perl
56 - ~sys-libs/libapparmor-${PV}
57 - ${PYTHON_DEPS}"
58 -DEPEND="${COMMON_DEPEND}
59 - sys-devel/gettext
60 -"
61 -RDEPEND="${COMMON_DEPEND}
62 - ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
63 - ~sys-apps/apparmor-${PV}
64 - dev-perl/Locale-gettext
65 - dev-perl/RPC-XML
66 - dev-perl/TermReadKey
67 - virtual/perl-Data-Dumper
68 - virtual/perl-Getopt-Long"
69 -
70 -S=${WORKDIR}/apparmor-${PV}
71 -
72 -src_prepare() {
73 - default
74 -
75 - sed -i binutils/Makefile \
76 - -e 's/Bstatic/Bdynamic/g' || die
77 -
78 - sed -i utils/aa-remove-unknown \
79 - -e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
80 -}
81 -
82 -src_compile() {
83 - python_setup
84 -
85 - pushd utils > /dev/null || die
86 - # launches non-make subprocesses causing "make jobserver unavailable"
87 - # error messages to appear in generated code
88 - emake -j1
89 - popd > /dev/null || die
90 -
91 - pushd binutils > /dev/null || die
92 - export EXTRA_CFLAGS="${CFLAGS}"
93 - emake CC="$(tc-getCC)" USE_SYSTEM=1
94 - popd > /dev/null || die
95 -}
96 -
97 -src_install() {
98 - pushd utils > /dev/null || die
99 - perl_set_version
100 - emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
101 - VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
102 -
103 - install_python() {
104 - local -x PYTHONDONTWRITEBYTECODE=
105 - "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
106 - --root="${D}" --optimize 2
107 - }
108 -
109 - python_foreach_impl install_python
110 - python_replicate_script "${D}"/usr/bin/aa-easyprof "${D}"/usr/sbin/apparmor_status \
111 - "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
112 - popd > /dev/null || die
113 -
114 - pushd binutils > /dev/null || die
115 - emake install DESTDIR="${D}" USE_SYSTEM=1
116 - popd > /dev/null || die
117 -}
118
119 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
120 deleted file mode 100644
121 index 80e6fd6100d..00000000000
122 --- a/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild
123 +++ /dev/null
124 @@ -1,88 +0,0 @@
125 -# Copyright 1999-2020 Gentoo Authors
126 -# Distributed under the terms of the GNU General Public License v2
127 -
128 -EAPI=6
129 -
130 -PYTHON_COMPAT=( python{3_7,3_8} )
131 -inherit eapi7-ver perl-module python-r1 toolchain-funcs
132 -
133 -MY_PV="$(ver_cut 1-2)"
134 -
135 -DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
136 -HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
137 -SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz"
138 -
139 -LICENSE="GPL-2"
140 -SLOT="0"
141 -KEYWORDS="~amd64"
142 -IUSE=""
143 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
144 -
145 -RESTRICT="test"
146 -
147 -COMMON_DEPEND="
148 - dev-lang/perl
149 - ~sys-libs/libapparmor-${PV}
150 - ${PYTHON_DEPS}"
151 -DEPEND="${COMMON_DEPEND}
152 - sys-devel/gettext
153 -"
154 -RDEPEND="${COMMON_DEPEND}
155 - ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
156 - ~sys-apps/apparmor-${PV}
157 - dev-perl/Locale-gettext
158 - dev-perl/RPC-XML
159 - dev-perl/TermReadKey
160 - dev-python/notify2[${PYTHON_USEDEP}]
161 - dev-python/psutil[${PYTHON_USEDEP}]
162 - virtual/perl-Data-Dumper
163 - virtual/perl-Getopt-Long"
164 -
165 -S=${WORKDIR}/apparmor-${PV}
166 -
167 -src_prepare() {
168 - default
169 -
170 - sed -i binutils/Makefile \
171 - -e 's/Bstatic/Bdynamic/g' || die
172 -
173 - sed -i utils/aa-remove-unknown \
174 - -e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
175 -}
176 -
177 -src_compile() {
178 - python_setup
179 -
180 - pushd utils > /dev/null || die
181 - # launches non-make subprocesses causing "make jobserver unavailable"
182 - # error messages to appear in generated code
183 - emake -j1
184 - popd > /dev/null || die
185 -
186 - pushd binutils > /dev/null || die
187 - export EXTRA_CFLAGS="${CFLAGS}"
188 - emake CC="$(tc-getCC)" USE_SYSTEM=1
189 - popd > /dev/null || die
190 -}
191 -
192 -src_install() {
193 - pushd utils > /dev/null || die
194 - perl_set_version
195 - emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
196 - VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
197 -
198 - install_python() {
199 - local -x PYTHONDONTWRITEBYTECODE=
200 - "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
201 - --root="${D}" --optimize 2
202 - }
203 -
204 - python_foreach_impl install_python
205 - python_replicate_script "${D}"/usr/bin/aa-easyprof \
206 - "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
207 - popd > /dev/null || die
208 -
209 - pushd binutils > /dev/null || die
210 - emake install DESTDIR="${D}" USE_SYSTEM=1
211 - popd > /dev/null || die
212 -}