aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-09-23 20:38:43 -0400
committerMike Frysinger <vapier@gentoo.org>2012-09-23 23:47:16 -0400
commit2211b72119817163dd28207b137590dc51bbe2f1 (patch)
tree5b79a2edcd16de0c4acdddaaf00a02a83dd8e035
parentuse `readlink -f` if it works (diff)
downloadportage-2211b72119817163dd28207b137590dc51bbe2f1.tar.gz
portage-2211b72119817163dd28207b137590dc51bbe2f1.tar.bz2
portage-2211b72119817163dd28207b137590dc51bbe2f1.zip
drop support for QA_DT_HASH/QA_STRICT_DT_HASH
These variables have been deprecated in favor of the new variables QA_STRICT_FLAGS_IGNORED/QA_FLAGS_IGNORED, and the tree has been converted over to the new ones, so drop the old vars. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rwxr-xr-xbin/misc-functions.sh25
-rw-r--r--man/ebuild.59
-rw-r--r--man/make.conf.55
3 files changed, 0 insertions, 39 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index c8b7cc8b0..55d37f29d 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -167,8 +167,6 @@ install_qa_check() {
cd "${ED}" || die "cd failed"
- # Merge QA_FLAGS_IGNORED and QA_DT_HASH into a single array, since
- # QA_DT_HASH is deprecated.
qa_var="QA_FLAGS_IGNORED_${ARCH/-/_}"
eval "[[ -n \${!qa_var} ]] && QA_FLAGS_IGNORED=(\"\${${qa_var}[@]}\")"
if [[ ${#QA_FLAGS_IGNORED[@]} -eq 1 ]] ; then
@@ -179,29 +177,6 @@ install_qa_check() {
set -${shopts}
fi
- qa_var="QA_DT_HASH_${ARCH/-/_}"
- eval "[[ -n \${!qa_var} ]] && QA_DT_HASH=(\"\${${qa_var}[@]}\")"
- if [[ ${#QA_DT_HASH[@]} -eq 1 ]] ; then
- local shopts=$-
- set -o noglob
- QA_DT_HASH=(${QA_DT_HASH})
- set +o noglob
- set -${shopts}
- fi
-
- if [[ -n ${QA_DT_HASH} ]] ; then
- QA_FLAGS_IGNORED=("${QA_FLAGS_IGNORED[@]}" "${QA_DT_HASH[@]}")
- unset QA_DT_HASH
- fi
-
- # Merge QA_STRICT_FLAGS_IGNORED and QA_STRICT_DT_HASH, since
- # QA_STRICT_DT_HASH is deprecated
- if [ "${QA_STRICT_FLAGS_IGNORED-unset}" = unset ] && \
- [ "${QA_STRICT_DT_HASH-unset}" != unset ] ; then
- QA_STRICT_FLAGS_IGNORED=1
- unset QA_STRICT_DT_HASH
- fi
-
# Check for files built without respecting *FLAGS. Note that
# -frecord-gcc-switches must be in all *FLAGS variables, in
# order to avoid false positive results here.
diff --git a/man/ebuild.5 b/man/ebuild.5
index d340c8587..45819d7a6 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -701,15 +701,6 @@ The paths may contain regular expressions with escape\-quoted special characters
This variable is intended to be used on files of binary packages which ignore
CFLAGS, CXXFLAGS, FFLAGS, FCFLAGS, and LDFLAGS variables.
.TP
-.B QA_DT_HASH
-This should contain a list of file paths, relative to the image directory, of
-files that contain .hash sections. The paths may contain regular expressions
-with escape\-quoted special characters. This variable is deprecated. Use
-\fBQA_FLAGS_IGNORED\fR instead.
-
-This variable is intended to be used on files of binary packages which ignore
-LDFLAGS variable.
-.TP
.B QA_PRESTRIPPED
This should contain a list of file paths, relative to the image directory, of
files that contain pre-stripped binaries. The paths may contain regular
diff --git a/man/make.conf.5 b/man/make.conf.5
index 483c08b15..b8ed47517 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -895,11 +895,6 @@ settings from ebuilds. See also \fBebuild\fR(5).
Set this to cause portage to ignore any \fIQA_FLAGS_IGNORED\fR override
settings from ebuilds. See also \fBebuild\fR(5).
.TP
-\fBQA_STRICT_DT_HASH = \fI"set"\fR
-Set this to cause portage to ignore any \fIQA_DT_HASH\fR override
-settings from ebuilds. This variable is deprecated. Use
-\fIQA_STRICT_FLAGS_IGNORED\fR instead.
-.TP
\fBQA_STRICT_PRESTRIPPED = \fI"set"\fR
Set this to cause portage to ignore any \fIQA_PRESTRIPPED\fR override
settings from ebuilds. See also \fBebuild\fR(5).