[gentoo-portage-dev] [PATCH] Enable FEATURES=strict-keepdir behavior for new EAPIs
Suggested-by: Pacho Ramos
Bug: https://bugs.gentoo.org/651678
Signed-off-by: Zac Medico
---
bin/eapi.sh | 4
bin/install-qa-check.d/95empty-dirs | 4 +++-
man/make.conf.5 | 1 +
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/bin/eapi.sh b/bin/eapi.sh
index 455bc9b0d..4eafc1c87 100644
--- a/bin/eapi.sh
+++ b/bin/eapi.sh
@@ -247,3 +247,7 @@ ___eapi_bash_4_2() {
___eapi_has_ENV_UNSET() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$
]]
}
+
+___eapi_has_strict_keepdir() {
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|5|5-progress|6|7)$ ]]
+}
diff --git a/bin/install-qa-check.d/95empty-dirs
b/bin/install-qa-check.d/95empty-dirs
index 8599db395..34a1daf21 100644
--- a/bin/install-qa-check.d/95empty-dirs
+++ b/bin/install-qa-check.d/95empty-dirs
@@ -17,7 +17,9 @@ find_empty_dirs() {
local warn_dirs=()
local d striparg=
- [[ ${FEATURES} == *strict-keepdir* ]] && striparg=-delete
+ if ___eapi_has_strict_keepdir || [[ ${FEATURES} == *strict-keepdir* ]];
then
+ striparg=-delete
+ fi
while IFS= read -r -d $'\0' d; do
[[ ${d} == ${ED%/}/var/* ]] && warn_dirs+=( "${d}" )
diff --git a/man/make.conf.5 b/man/make.conf.5
index 0ad3e2f7d..4c9f00675 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -649,6 +649,7 @@ dangerous (like missing or incorrect digests for ebuilds).
.B strict-keepdir
Have portage strictly require keepdir calls in ebuilds. Empty
directories installed without explicit keepdir will be removed.
+This feature is automatically enabled for \fBEAPI 8\fR and later.
.TP
.B stricter
Have portage react strongly to conditions that may conflict with system
--
2.21.0
[gentoo-dev] Last rites: media-libs/gstreamer:0.10 and co old slots
# Mart Raudsepp (27 Apr 2019) # Old gstreamer 0.10 versions. Use gstreamer:1.0 and co instead. # Masked for removal in 30 days. Bug #550648 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 media-libs/gst-plugins-good:0.10 media-libs/gst-plugins-ugly:0.10 media-libs/gst-plugins-bad:0.10 media-libs/gst-rtsp-server:0.10 media-plugins/gst-plugins-a52dec:0.10 media-plugins/gst-plugins-alsa:0.10 media-plugins/gst-plugins-amr:0.10 media-plugins/gst-plugins-annodex:0.10 media-plugins/gst-plugins-assrender:0.10 media-plugins/gst-plugins-cdio:0.10 media-plugins/gst-plugins-cdparanoia:0.10 media-plugins/gst-plugins-dts:0.10 media-plugins/gst-plugins-dv:0.10 media-plugins/gst-plugins-dvb:0.10 media-plugins/gst-plugins-dvdread:0.10 media-plugins/gst-plugins-faac:0.10 media-plugins/gst-plugins-faad:0.10 media-plugins/gst-plugins-flac:0.10 media-plugins/gst-plugins-gconf:0.10 media-plugins/gst-plugins-gdkpixbuf:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-gl media-plugins/gst-plugins-gnomevfs:0.10 media-plugins/gst-plugins-gsm:0.10 media-plugins/gst-plugins-ivorbis:0.10 media-plugins/gst-plugins-jack:0.10 media-plugins/gst-plugins-jpeg:0.10 media-plugins/gst-plugins-ladspa:0.10 media-plugins/gst-plugins-lame:0.10 media-plugins/gst-plugins-libmms:0.10 media-plugins/gst-plugins-libnice:0.10 media-plugins/gst-plugins-libpng:0.10 media-plugins/gst-plugins-libvisual:0.10 media-plugins/gst-plugins-mad:0.10 media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-modplug:0.10 media-plugins/gst-plugins-mpeg2dec:0.10 media-plugins/gst-plugins-mpeg2enc:0.10 media-plugins/gst-plugins-mplex:0.10 media-plugins/gst-plugins-musepack:0.10 media-plugins/gst-plugins-neon:0.10 media-plugins/gst-plugins-ofa:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-opus:0.10 media-plugins/gst-plugins-oss:0.10 media-plugins/gst-plugins-pango:0.10 media-plugins/gst-plugins-pulse:0.10 media-plugins/gst-plugins-raw1394:0.10 media-plugins/gst-plugins-resindvd:0.10 media-plugins/gst-plugins-rtmp:0.10 media-plugins/gst-plugins-schroedinger:0.10 media-plugins/gst-plugins-shout2:0.10 media-plugins/gst-plugins-sidplay:0.10 media-plugins/gst-plugins-soundtouch:0.10 media-plugins/gst-plugins-soup:0.10 media-plugins/gst-plugins-speex:0.10 media-plugins/gst-plugins-taglib:0.10 media-plugins/gst-plugins-theora:0.10 media-plugins/gst-plugins-twolame:0.10 media-plugins/gst-plugins-v4l2:0.10 media-plugins/gst-plugins-wavpack:0.10 media-plugins/gst-plugins-vorbis:0.10 media-plugins/gst-plugins-vp8:0.10 media-plugins/gst-plugins-x:0.10 media-plugins/gst-plugins-x264:0.10 media-plugins/gst-plugins-ximagesrc:0.10 media-plugins/gst-plugins-xvid:0.10 media-plugins/gst-plugins-xvideo:0.10 dev-cpp/gstreamermm:0.10 dev-python/gst-python:0.10 media-libs/gnonlin:0.10 net-libs/farstream:0.1 signature.asc Description: This is a digitally signed message part
