| 1 |
commit: 3405eb86bb13f5d650d9aadb8ec535b866611bdd |
| 2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 12 08:21:23 2019 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 9 05:52:53 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3405eb86 |
| 7 |
|
| 8 |
sys-libs/libselinux: cleanup of ruby23-only versions |
| 9 |
|
| 10 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
sys-libs/libselinux/Manifest | 1 - |
| 14 |
sys-libs/libselinux/libselinux-2.7.ebuild | 149 ----------------------------- |
| 15 |
sys-libs/libselinux/libselinux-2.8.ebuild | 153 ------------------------------ |
| 16 |
3 files changed, 303 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest |
| 19 |
index 1a036e296ea..33ec840d9b9 100644 |
| 20 |
--- a/sys-libs/libselinux/Manifest |
| 21 |
+++ b/sys-libs/libselinux/Manifest |
| 22 |
@@ -1,4 +1,3 @@ |
| 23 |
-DIST libselinux-2.7.tar.gz 187574 BLAKE2B cc6ee51d5015943dd73fe16efb2ce2478616f43eaf7da55655de50502010e69973c2de13c8a562c8814a31211a8dbd7200fa2f22761f3d0f81fa3a1d3cd1e998 SHA512 415d10306692d4323455b61fb61d7e56e53b9144276ff206d72760e1df9b04ab07c62a4d6f04bf4e5fa708f9f14b21a9801069b16ece0a0aade886950941ab8d |
| 24 |
DIST libselinux-2.8.tar.gz 187759 BLAKE2B 1e0e1a5aa2230fd6080e921efe871e97fa9412176b72a0c9721f60c6190459e508644fa3370f3b5f513f088428844c7c615cda4567990ddee91c13e1ee88f9ed SHA512 2f15d08888fbef9b0cf7bf01893b513edc6738974e2d0eab7e3f79cef9be79cf966742b0d2693b5d2ec7defddb5f4d6c6f6280be9d4158ed41f7a18d50b9f019 |
| 25 |
DIST libselinux-2.9-rc1.tar.gz 187984 BLAKE2B e1940ca839d73477593c5e530124f856db518ba682495889e9aac595d8bb0b4e5bff714c654ce896111648159e79cca7f449e94b05fe8cc40bf73180a2c03efd SHA512 15c068b7ad2852a3b6db9a5e192981de8f8257ae4e7f8b57c92755e74c0b5b03ad5489505a84d483fda16b879a20839914eb6a2ee563e37f01f6b3a9ac9c596d |
| 26 |
DIST libselinux-2.9.tar.gz 211546 BLAKE2B 5b06b922690e48924865c98ed34ebfc1ce5e30e78dbeaccb6b9c931a35bed113c030f8f8575084429fe13b91aeafc73abaa24fe609a17ba54c8472d783f6ac61 SHA512 727b211d09f374d45aa3fa4dec7fd5463dfdcf5aaa47f7fcaccee51fb74896c3aa1a6f0bac9cdd47ebe4929effff13f66f5f70447b27b783dca5f7b1576d30d0 |
| 27 |
|
| 28 |
diff --git a/sys-libs/libselinux/libselinux-2.7.ebuild b/sys-libs/libselinux/libselinux-2.7.ebuild |
| 29 |
deleted file mode 100644 |
| 30 |
index 569190768a0..00000000000 |
| 31 |
--- a/sys-libs/libselinux/libselinux-2.7.ebuild |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,149 +0,0 @@ |
| 34 |
-# Copyright 1999-2018 Gentoo Foundation |
| 35 |
-# Distributed under the terms of the GNU General Public License v2 |
| 36 |
- |
| 37 |
-EAPI="6" |
| 38 |
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 ) |
| 39 |
-USE_RUBY="ruby23" |
| 40 |
- |
| 41 |
-# No, I am not calling ruby-ng |
| 42 |
-inherit multilib python-r1 toolchain-funcs multilib-minimal |
| 43 |
- |
| 44 |
-MY_P="${P//_/-}" |
| 45 |
-SEPOL_VER="${PV}" |
| 46 |
-MY_RELEASEDATE="20170804" |
| 47 |
- |
| 48 |
-DESCRIPTION="SELinux userland library" |
| 49 |
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" |
| 50 |
- |
| 51 |
-if [[ ${PV} == 9999 ]] ; then |
| 52 |
- inherit git-r3 |
| 53 |
- EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" |
| 54 |
- S="${WORKDIR}/${MY_P}/${PN}" |
| 55 |
-else |
| 56 |
- SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz" |
| 57 |
- KEYWORDS="amd64 ~arm ~arm64 ~mips x86" |
| 58 |
- S="${WORKDIR}/${MY_P}" |
| 59 |
-fi |
| 60 |
- |
| 61 |
-LICENSE="public-domain" |
| 62 |
-SLOT="0" |
| 63 |
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby23" |
| 64 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 65 |
- |
| 66 |
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}] |
| 67 |
- !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] ) |
| 68 |
- pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] ) |
| 69 |
- python? ( ${PYTHON_DEPS} ) |
| 70 |
- ruby? ( |
| 71 |
- ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) |
| 72 |
- )" |
| 73 |
-DEPEND="${RDEPEND} |
| 74 |
- virtual/pkgconfig |
| 75 |
- python? ( >=dev-lang/swig-2.0.9 )" |
| 76 |
- |
| 77 |
-src_prepare() { |
| 78 |
- eapply_user |
| 79 |
- |
| 80 |
- multilib_copy_sources |
| 81 |
-} |
| 82 |
- |
| 83 |
-multilib_src_compile() { |
| 84 |
- tc-export AR CC PKG_CONFIG RANLIB |
| 85 |
- |
| 86 |
- emake \ |
| 87 |
- LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 88 |
- SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ |
| 89 |
- LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ |
| 90 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 91 |
- all |
| 92 |
- |
| 93 |
- if multilib_is_native_abi && use python; then |
| 94 |
- building() { |
| 95 |
- emake \ |
| 96 |
- LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ |
| 97 |
- LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 98 |
- SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ |
| 99 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 100 |
- pywrap |
| 101 |
- } |
| 102 |
- python_foreach_impl building |
| 103 |
- fi |
| 104 |
- |
| 105 |
- if multilib_is_native_abi && use ruby; then |
| 106 |
- building() { |
| 107 |
- einfo "Calling rubywrap for ${1}" |
| 108 |
- # Clean up .lo file to force rebuild |
| 109 |
- rm -f src/selinuxswig_ruby_wrap.lo || die |
| 110 |
- emake \ |
| 111 |
- RUBY=${1} \ |
| 112 |
- LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ |
| 113 |
- LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 114 |
- SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ |
| 115 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 116 |
- rubywrap |
| 117 |
- } |
| 118 |
- for RUBYTARGET in ${USE_RUBY}; do |
| 119 |
- use ruby_targets_${RUBYTARGET} || continue |
| 120 |
- |
| 121 |
- building ${RUBYTARGET} |
| 122 |
- done |
| 123 |
- fi |
| 124 |
-} |
| 125 |
- |
| 126 |
-multilib_src_install() { |
| 127 |
- emake DESTDIR="${D}" \ |
| 128 |
- LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 129 |
- SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ |
| 130 |
- LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \ |
| 131 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 132 |
- install |
| 133 |
- |
| 134 |
- if multilib_is_native_abi && use python; then |
| 135 |
- installation() { |
| 136 |
- emake DESTDIR="${D}" \ |
| 137 |
- LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 138 |
- LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \ |
| 139 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 140 |
- install-pywrap |
| 141 |
- python_optimize # bug 531638 |
| 142 |
- } |
| 143 |
- python_foreach_impl installation |
| 144 |
- fi |
| 145 |
- |
| 146 |
- if multilib_is_native_abi && use ruby; then |
| 147 |
- installation() { |
| 148 |
- einfo "Calling install-rubywrap for ${1}" |
| 149 |
- # Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions |
| 150 |
- rm src/selinuxswig_ruby_wrap.lo |
| 151 |
- emake DESTDIR="${D}" \ |
| 152 |
- LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 153 |
- LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \ |
| 154 |
- RUBY=${1} \ |
| 155 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 156 |
- install-rubywrap |
| 157 |
- } |
| 158 |
- for RUBYTARGET in ${USE_RUBY}; do |
| 159 |
- use ruby_targets_${RUBYTARGET} || continue |
| 160 |
- |
| 161 |
- installation ${RUBYTARGET} |
| 162 |
- done |
| 163 |
- fi |
| 164 |
- |
| 165 |
- use static-libs || rm "${D}"/usr/lib*/*.a || die |
| 166 |
-} |
| 167 |
- |
| 168 |
-pkg_postinst() { |
| 169 |
- # Fix bug 473502 |
| 170 |
- for POLTYPE in ${POLICY_TYPES}; |
| 171 |
- do |
| 172 |
- mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die |
| 173 |
- touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die |
| 174 |
- # Fix bug 516608 |
| 175 |
- for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do |
| 176 |
- if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then |
| 177 |
- sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \ |
| 178 |
- || die "Failed to recompile contexts" |
| 179 |
- fi |
| 180 |
- done |
| 181 |
- done |
| 182 |
-} |
| 183 |
|
| 184 |
diff --git a/sys-libs/libselinux/libselinux-2.8.ebuild b/sys-libs/libselinux/libselinux-2.8.ebuild |
| 185 |
deleted file mode 100644 |
| 186 |
index 12ccf11dfba..00000000000 |
| 187 |
--- a/sys-libs/libselinux/libselinux-2.8.ebuild |
| 188 |
+++ /dev/null |
| 189 |
@@ -1,153 +0,0 @@ |
| 190 |
-# Copyright 1999-2018 Gentoo Foundation |
| 191 |
-# Distributed under the terms of the GNU General Public License v2 |
| 192 |
- |
| 193 |
-EAPI="6" |
| 194 |
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 python3_7 ) |
| 195 |
-USE_RUBY="ruby23" |
| 196 |
- |
| 197 |
-# No, I am not calling ruby-ng |
| 198 |
-inherit multilib python-r1 toolchain-funcs multilib-minimal |
| 199 |
- |
| 200 |
-MY_P="${P//_/-}" |
| 201 |
-SEPOL_VER="${PV}" |
| 202 |
-MY_RELEASEDATE="20180524" |
| 203 |
- |
| 204 |
-DESCRIPTION="SELinux userland library" |
| 205 |
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" |
| 206 |
- |
| 207 |
-if [[ ${PV} == 9999 ]] ; then |
| 208 |
- inherit git-r3 |
| 209 |
- EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" |
| 210 |
- S="${WORKDIR}/${MY_P}/${PN}" |
| 211 |
-else |
| 212 |
- SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz" |
| 213 |
- KEYWORDS="amd64 ~arm ~arm64 ~mips x86" |
| 214 |
- S="${WORKDIR}/${MY_P}" |
| 215 |
-fi |
| 216 |
- |
| 217 |
-LICENSE="public-domain" |
| 218 |
-SLOT="0" |
| 219 |
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby23" |
| 220 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 221 |
- |
| 222 |
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}] |
| 223 |
- !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] ) |
| 224 |
- pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] ) |
| 225 |
- python? ( ${PYTHON_DEPS} ) |
| 226 |
- ruby? ( |
| 227 |
- ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) |
| 228 |
- ) |
| 229 |
- elibc_musl? ( sys-libs/fts-standalone )" |
| 230 |
-DEPEND="${RDEPEND} |
| 231 |
- virtual/pkgconfig |
| 232 |
- python? ( >=dev-lang/swig-2.0.9 ) |
| 233 |
- ruby? ( >=dev-lang/swig-2.0.9 )" |
| 234 |
- |
| 235 |
-src_prepare() { |
| 236 |
- eapply_user |
| 237 |
- |
| 238 |
- multilib_copy_sources |
| 239 |
-} |
| 240 |
- |
| 241 |
-multilib_src_compile() { |
| 242 |
- tc-export AR CC PKG_CONFIG RANLIB |
| 243 |
- |
| 244 |
- emake \ |
| 245 |
- LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 246 |
- SHLIBDIR="/$(get_libdir)" \ |
| 247 |
- LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ |
| 248 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 249 |
- FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ |
| 250 |
- all |
| 251 |
- |
| 252 |
- if multilib_is_native_abi && use python; then |
| 253 |
- building() { |
| 254 |
- emake \ |
| 255 |
- LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ |
| 256 |
- LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 257 |
- SHLIBDIR="/$(get_libdir)" \ |
| 258 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 259 |
- FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ |
| 260 |
- pywrap |
| 261 |
- } |
| 262 |
- python_foreach_impl building |
| 263 |
- fi |
| 264 |
- |
| 265 |
- if multilib_is_native_abi && use ruby; then |
| 266 |
- building() { |
| 267 |
- einfo "Calling rubywrap for ${1}" |
| 268 |
- # Clean up .lo file to force rebuild |
| 269 |
- rm -f src/selinuxswig_ruby_wrap.lo || die |
| 270 |
- emake \ |
| 271 |
- RUBY=${1} \ |
| 272 |
- LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ |
| 273 |
- LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 274 |
- SHLIBDIR="/$(get_libdir)" \ |
| 275 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 276 |
- FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ |
| 277 |
- rubywrap |
| 278 |
- } |
| 279 |
- for RUBYTARGET in ${USE_RUBY}; do |
| 280 |
- use ruby_targets_${RUBYTARGET} || continue |
| 281 |
- |
| 282 |
- building ${RUBYTARGET} |
| 283 |
- done |
| 284 |
- fi |
| 285 |
-} |
| 286 |
- |
| 287 |
-multilib_src_install() { |
| 288 |
- emake DESTDIR="${D}" \ |
| 289 |
- LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 290 |
- SHLIBDIR="/$(get_libdir)" \ |
| 291 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 292 |
- install |
| 293 |
- |
| 294 |
- if multilib_is_native_abi && use python; then |
| 295 |
- installation() { |
| 296 |
- emake DESTDIR="${D}" \ |
| 297 |
- LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 298 |
- SHLIBDIR="/$(get_libdir)" \ |
| 299 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 300 |
- install-pywrap |
| 301 |
- python_optimize # bug 531638 |
| 302 |
- } |
| 303 |
- python_foreach_impl installation |
| 304 |
- fi |
| 305 |
- |
| 306 |
- if multilib_is_native_abi && use ruby; then |
| 307 |
- installation() { |
| 308 |
- einfo "Calling install-rubywrap for ${1}" |
| 309 |
- # Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions |
| 310 |
- rm src/selinuxswig_ruby_wrap.lo |
| 311 |
- emake DESTDIR="${D}" \ |
| 312 |
- LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 313 |
- SHLIBDIR="/$(get_libdir)" \ |
| 314 |
- RUBY=${1} \ |
| 315 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 316 |
- install-rubywrap |
| 317 |
- } |
| 318 |
- for RUBYTARGET in ${USE_RUBY}; do |
| 319 |
- use ruby_targets_${RUBYTARGET} || continue |
| 320 |
- |
| 321 |
- installation ${RUBYTARGET} |
| 322 |
- done |
| 323 |
- fi |
| 324 |
- |
| 325 |
- use static-libs || rm "${D}"/usr/lib*/*.a || die |
| 326 |
-} |
| 327 |
- |
| 328 |
-pkg_postinst() { |
| 329 |
- # Fix bug 473502 |
| 330 |
- for POLTYPE in ${POLICY_TYPES}; |
| 331 |
- do |
| 332 |
- mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die |
| 333 |
- touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die |
| 334 |
- # Fix bug 516608 |
| 335 |
- for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do |
| 336 |
- if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then |
| 337 |
- sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \ |
| 338 |
- || die "Failed to recompile contexts" |
| 339 |
- fi |
| 340 |
- done |
| 341 |
- done |
| 342 |
-} |
Archives