Rename hdepend->bdepend (EAPI=7)

ChangeLog

@@ -2,10 +2,11 @@
 
 *eix-0.33.3
 	Martin Väth <martin at mvath.de>:
+	- Rename hdepend->bdepend (EAPI=7)
 	- Add configure options --with-eix-{user,group,uid,gid}
 	- Add contrib/iwyu.sh experimentally
 	- Include README.md, eix.png into distribution
-	- ./configure test for diagnostics suggest-final-methods
+	- Add configure test for diagnostics suggest-final-methods
 	- Until a good test is known, do not add -fno-plt: it breaks with clang
 	- Prepend (not append) dialect flags when testing, for consistency with
 	  later usage, see https://bugs.gentoo.org/show_bug.cgi?id=649558

doc/eix-db.txt.in

@@ -265,7 +265,7 @@ HashedWords  DEPEND of this version; the quotation symbol means
 HashedWords  RDEPEND of this version; the quotation symbol means
              the content of DEPEND (it occurs only as separate word)
 HashedWords  PDEPEND of this version
-HashedWords  HDEPEND of this version
+HashedWords  BDEPEND of this version
 ============ ========================================================
 
 

doc/eix-xml.txt.in

@@ -224,7 +224,7 @@ depending on the configuration and the version data.
 
   The PDEPEND string
 
-- **<hdepend>** [..] **</hdepend>**
+- **<bdepend>** [..] **</bdepend>**
 
-  The HDEPEND string
+  The BDEPEND string
 

doc/eix-xml.xsd.in

@@ -213,10 +213,10 @@
 				</xsd:documentation>
 			</xsd:annotation>
 		</xsd:element>
-		<xsd:element name="hdepend" type="StringList" minOccurs="0" maxOccurs="1">
+		<xsd:element name="bdepend" type="StringList" minOccurs="0" maxOccurs="1">
 			<xsd:annotation>
 				<xsd:documentation xml:lang="en">
-					The HDEPEND data of the ebuild.
+					The BDEPEND data of the ebuild.
 				</xsd:documentation>
 			</xsd:annotation>
 		</xsd:element>

manpage/de-eix.1.in

@@ -349,7 +349,7 @@ Gibt die vorhandenen Versionen in einer (vertikalen) Liste aus.
 Nur in diesem Modus werden gewisse Zusatzinformationen für jede Version ausgegeben.
 Genauer, je nachdem ob B<--verbose> benutzt wird und abhängig vom Status der
 Konfigurationsvariablen B<VERSION_{IUSE,KEYWORDS,DEPS}_{NORMAL,VERBOSE}>
-kann dies B<KEYWORDS>, B<IUSE>, B<DEPEND>, B<RDEPEND>, B<PDEPEND>, B<HDEPEND> sein.
+kann dies B<KEYWORDS>, B<IUSE>, B<DEPEND>, B<RDEPEND>, B<PDEPEND>, B<BDEPEND> sein.
 Beachten Sie: Falls B<IUSE> nicht für jede Version ausgegeben wird, so wird es
 nur gesammelt für das gesamte Paket ausgegeben, was einen falschen Eindruck geben kann,
 da sich B<IUSE> von Version zu Version zuweilen dramatisch ändert.
@@ -856,12 +856,12 @@ z.B. "@PACKAGE_URL@"
 .BR -L ", " --license
 z.B. "GPL-2"
 .TP
-.BR --deps ", " --depend ", " --rdepend ", " --pdepend ", " --hdepend
+.BR --deps ", " --depend ", " --rdepend ", " --pdepend ", " --bdepend
 Dieser Test kann nur dann etwas finden, wenn B<DEP=true> benutzt wird
 (und B<DEP=true> bei der Erzeugung des Cachedatei benutzt wurde).
-Er tested gegen B<DEPEND>, B<RDEPEND>, B<PDEPEND> bzw. B<HDEPEND>
+Er tested gegen B<DEPEND>, B<RDEPEND>, B<PDEPEND> bzw. B<BDEPEND>
 (oder mit B<--deps> gegen irgendeines davon) für irgendeine Version des Pakets.
-B<--deps> ist das gleiche wie B<--depend> B<--rdepend> B<--pdepend> B<--hdepend>.
+B<--deps> ist das gleiche wie B<--depend> B<--rdepend> B<--pdepend> B<--bdepend>.
 Beachten Sie, dass gegen den String ohne irgendwelche Interpretatino oder
 Modifikation getestet wird; nur Wort-Trenner werden einzelne Leerzeichen.
 Insbesondere kann der String, gegen den getestet wird, so aussehen:
@@ -1382,13 +1382,13 @@ Dies ist 1 oder leer, je nachdem ob eine entsprechendes B<RESTRICT>-Attribut fü
 Dies darf nur in I<VARIABLE> im Zusammenhang von Versionsausgaben benutzt werden.
 Dies ist 1 oder leer, je nachdem ob eine entsprechendes B<PROPERTIES>-Attribut für die Version gesetzt ist.
 .TP
-.BR depend ", " rdepend ", " pdepend ", " hdepend ", " depend* ", " rdepend* ", " pdepend* ", " hdepend*
+.BR depend ", " rdepend ", " pdepend ", " bdepend ", " depend* ", " rdepend* ", " pdepend* ", " bdepend*
 Dies darf nur in I<VARIABLE> im Zusammenhang von Versionsausgaben benutzt werden.
-Es expandiert zum B<DEPEND>, B<RDEPEND>, B<PDEPEND> bzw. B<HDEPEND> einer vorhandenen Version
+Es expandiert zum B<DEPEND>, B<RDEPEND>, B<PDEPEND> bzw. B<BDEPEND> einer vorhandenen Version
 (der String wird nach Möglichkeit abgekürzt, falls die Variante mit B<*> benutzt wird).
 Die Expansion ist leer, falls B<DEP=true> nicht gesetzt ist (oder bei der Erzeugung der Datenbank nicht gesetzt war).
 .TP
-.BR havedepend ", " haverdepend ", " havepdepend ", " havehdepend ", " havedeps
+.BR havedepend ", " haverdepend ", " havepdepend ", " havebdepend ", " havedeps
 Wie oben mit dem Unterschied, dass nur 1 ausgegeben wird, wenn der
 Wert des entsprechenden String bzw. mindestens eines davon nichtleer ist.
 .TP
@@ -2439,7 +2439,7 @@ Die Option B<--deps-installed> tut dasselbe.
 .TP
 .BR DEP " " (true / false)
 Dieser Wert entscheidet, ob die Werte der Variablen
-B<DEPEND>, B<RDEPEND>, B<PDEPEND>, B<HDEPEND> (die z.B. mit eix -lv gezeigt werden könnten)
+B<DEPEND>, B<RDEPEND>, B<PDEPEND>, B<BDEPEND> (die z.B. mit eix -lv gezeigt werden könnten)
 tatsächlich benutzt und gespeichert werden sollen.
 Im positiven Fall verdoppelt sich ungefähr der Disk- und Speicherbedarf von eix.
 
@@ -3209,7 +3209,7 @@ Die möglichen Werte für I<Operandenfeld> sind: B<name>, B<category>, B<categor
 (oder B<category-name>), B<description>, B<license>, B<homepage>, B<set>, B<eapi>, B<installed-eapi>,
 B<slot>, B<installed-slot>, B<use> (oder B<iuse>), B<with-use> (oder B<installed-with-use>),
 B<without-use> (oder B<installed-without-use>),
-B<deps>, B<depend>, B<rdepend>, B<pdepend>, B<hdepend> und B<error>.
+B<deps>, B<depend>, B<rdepend>, B<pdepend>, B<bdepend> und B<error>.
 Sie entsprechen den analogen Kommandozeilenoptionen für die Operandenwahl.
 Der spezielle Wert B<error> bedeutet, dass eix mit der Fehlermeldung abbricht,
 dass das Operandenfeld nicht automatisch erkannt werden kann und explizit
@@ -3255,20 +3255,20 @@ Die I<Operandenfeld_Spezifikation> passt, wenn die folgenden Bedingungen alle er
 
 3. Wenn die dritte Familie (B<!>) nicht leer ist, so sind höchststens Operandenfelder dieser Familie selektiert (man denke an ein logisches "nicht (... oder ... oder ...)").
 
-Um beispielsweise anzugeben, dass genau alle der Felder B<depend>, B<rdepend>, B<pdepend>, B<hdepend> selektiert sind
+Um beispielsweise anzugeben, dass genau alle der Felder B<depend>, B<rdepend>, B<pdepend>, B<bdepend> selektiert sind
 (also B<--deps>) und kein weiteres, kann man einen der Spezifikationen
 
 .B (&deps!deps)
 
-.B (&depend&rdepend&pdepend&hdepend!depend!rdepend!pdepend!hdepend)
+.B (&depend&rdepend&pdepend&bdepend!depend!rdepend!pdepend!bdepend)
 
 benutzen.
-Will man andererseits spezifieren, dass mindestens eines von B<depend>, B<rdepend>, B<pdepend>, B<hdepend>
+Will man andererseits spezifieren, dass mindestens eines von B<depend>, B<rdepend>, B<pdepend>, B<bdepend>
 selektiert ist aber ansonsten nichts, kann man das wie folgt tun:
 
 .B (|deps!deps)
 
-.B (|depend|rdepend|pdepend|hdepend!depend!rdepend!pdepend!hdepend)
+.B (|depend|rdepend|pdepend|bdepend!depend!rdepend!pdepend!bdepend)
 
 Zum Testen von Skripten empfiehlt es sich, B<DEFAULT_MATCH_ALGORITHM=error> zu
 setzen, so dass sich Skripte nicht auf spezielle Vorgaben von

manpage/en-eix.1.in

@@ -340,7 +340,7 @@ Only in this mode some additional information for each version is output.
 More precisely, depending on whether you have chosen B<--verbose> and
 depending on the state of the configuration variables
 B<VERSION_{IUSE,KEYWORDS,DEPS}_{NORMAL,VERBOSE}>,
-this can be the B<KEYWORDS>, B<IUSE>, B<DEPEND>, B<RDEPEND>, B<PDEPEND>, B<HDEPEND> data.
+this can be the B<KEYWORDS>, B<IUSE>, B<DEPEND>, B<RDEPEND>, B<PDEPEND>, B<BDEPEND> data.
 Note that if B<IUSE> is not printed per version then it is only collected
 for the whole package which can give the wrong impression, since often
 B<IUSE> changes dramatically with versions.
@@ -836,13 +836,13 @@ e.g. "@PACKAGE_URL@"
 .BR -L ", " --license
 e.g. "GPL-2"
 .TP
-.BR --deps ", " --depend ", " --rdepend ", " --pdepend ", " --hdepend
+.BR --deps ", " --depend ", " --rdepend ", " --pdepend ", " --bdepend
 This test can only be successful if B<DEP=true> is used
 (and if B<DEP=true> was used when the cachefile was created).
-It matches against B<DEPEND>, B<RDEPEND>, B<PDEPEND>, or B<HDEPEND>
+It matches against B<DEPEND>, B<RDEPEND>, B<PDEPEND>, or B<BDEPEND>
 (or with B<--deps> any of those) of some version of the package.
 B<--deps> is the same as specifying all of
-B<--depend> B<--rdepend> B<--pdepend> B<--hdepend>.
+B<--depend> B<--rdepend> B<--pdepend> B<--bdepend>.
 Note that it is matched against the string without any interpretation or
 modification of the latter; only word separators become single spaces.
 In particular, the string to match against can look like
@@ -1355,13 +1355,13 @@ It returns 1 or empty depending on whether some or the corresponding B<RESTRICT>
 This must occur only in I<VARIABLE> in the context of version printing.
 It returns 1 or empty depending on whether some or the corresponding B<PROPERTIES> attribute is set for the version.
 .TP
-.BR depend ", " rdepend ", " pdepend ", " hdepend ", " depend* ", " rdepend* ", " pdepend* ", " hdepend*
+.BR depend ", " rdepend ", " pdepend ", " bdepend ", " depend* ", " rdepend* ", " pdepend* ", " bdepend*
 This must occur only in I<VARIABLE> in the context of version printing.
-It returns the respective B<DEPEND>, B<RDEPEND>, B<PDEPEND>, B<HDEPEND> string of an available package
+It returns the respective B<DEPEND>, B<RDEPEND>, B<PDEPEND>, B<BDEPEND> string of an available package
 (the string is shortened if possible if the variant with B<*> is used).
 This is empty unless B<DEP=true> is set (and was set when the cachefile was created).
 .TP
-.BR havedepend ", " haverdepend ", " havepdepend ", " havehdepend ", " havedeps
+.BR havedepend ", " haverdepend ", " havepdepend ", " havebdepend ", " havedeps
 This is like the above with the difference that only 1 is returned if the
 value of the corresponding string (resp. of at least one of these) is nonempty.
 .TP
@@ -2408,7 +2408,7 @@ The option B<--deps-installed> does the same.
 
 .TP
 .BR DEP " " (true / false)
-If true, store/use B<DEPEND>, B<RDEPEND>, B<PDEPEND>, B<HDEPEND> (e.g. shown with eix -lv).
+If true, store/use B<DEPEND>, B<RDEPEND>, B<PDEPEND>, B<BDEPEND> (e.g. shown with eix -lv).
 Usage of B<DEP> roughly doubles disk resp. memory requirements.
 
 .TP
@@ -3141,7 +3141,7 @@ The possible values for I<match_field> are B<name>, B<category>, B<category/name
 (or B<category-name>), B<description>, B<license>, B<homepage>, B<set>, B<eapi>, B<installed-eapi>,
 B<slot>, B<installed-slot>, B<use> (or B<iuse>), B<with-use> (or B<installed-with-use>),
 B<without-use> (or B<installed-without-use>),
-B<deps>, B<depend>, B<rdepend>, B<pdepend>, B<hdepend>, or B<error>,
+B<deps>, B<depend>, B<rdepend>, B<pdepend>, B<bdepend>, or B<error>,
 corresponding to the analogous command line option for the match field.
 The special value B<error> means that eix stops with an error message claiming
 that a match field is not autodetected and must be specified explicitly.
@@ -3183,19 +3183,19 @@ Now I<match_field_specification> matches if all of the following holds:
 
 3. If the third family (B<!>) is nonempty, at most match fields from that family are selected (think of a logical "not (... or ... or ...)").
 
-Thus, for instance, to specify that exactly all of B<depend>, B<rdepend>, B<pdepend>, B<hdepend> are
+Thus, for instance, to specify that exactly all of B<depend>, B<rdepend>, B<pdepend>, B<bdepend> are
 selected (i.e. B<--deps>) and no other field is selected, you can use either of
 
 .B (&deps!deps)
 
-.B (&depend&rdepend&pdepend&hdepend!depend!rdepend!pdepend!hdepend)
+.B (&depend&rdepend&pdepend&bdepend!depend!rdepend!pdepend!bdepend)
 
-On the other hand, if you want to specify that at least one of B<depend>, B<rdepend>, B<pdepend>, B<hdepend> are selected
+On the other hand, if you want to specify that at least one of B<depend>, B<rdepend>, B<pdepend>, B<bdepend> are selected
 and no other than these fields are selected, you can use either of
 
 .B (|deps!deps)
 
-.B (|depend|rdepend|pdepend|hdepend!depend!rdepend!pdepend!hdepend)
+.B (|depend|rdepend|pdepend|bdepend!depend!rdepend!pdepend!bdepend)
 
 For testing scripts, it is recommended to use B<DEFAULT_MATCH_ALGORIRTHM=error>
 so that scripts do not rely on particular defaults of that variable: This default

manpage/ru-eix.1.in

@@ -337,7 +337,7 @@ Only in this mode some additional information for each version is output.
 More precisely, depending on whether you have chosen B<--verbose> and
 depending on the state of the configuration variables
 B<VERSION_{IUSE,KEYWORDS,DEPS}_{NORMAL,VERBOSE}>,
-this can be the B<KEYWORDS>, B<IUSE>, B<DEPEND>, B<RDEPEND>, B<PDEPEND>, B<HDEPEND> data.
+this can be the B<KEYWORDS>, B<IUSE>, B<DEPEND>, B<RDEPEND>, B<PDEPEND>, B<BDEPEND> data.
 Note that if B<IUSE> is not printed per version then it is only collected
 for the whole package which can give the wrong impression, since often
 B<IUSE> changes dramatically with versions.
@@ -833,13 +833,13 @@ e.g. "@PACKAGE_URL@"
 .BR -L ", " --license
 e.g. "GPL-2"
 .TP
-.BR --deps ", " --depend ", " --rdepend ", " --pdepend ", " --hdepend
+.BR --deps ", " --depend ", " --rdepend ", " --pdepend ", " --bdepend
 This test can only be successful if B<DEP=true> is used
 (and if B<DEP=true> was used when the cachefile was created).
-It matches against B<DEPEND>, B<RDEPEND>, B<PDEPEND>, or B<HDEPEND>
+It matches against B<DEPEND>, B<RDEPEND>, B<PDEPEND>, or B<BDEPEND>
 (or with B<--deps> any of those) of some version of the package.
 B<--deps> is the same as specifying all of
-B<--depend> B<--rdepend> B<--pdepend> B<--hdepend>.
+B<--depend> B<--rdepend> B<--pdepend> B<--bdepend>.
 Note that it is matched against the string without any interpretation or
 modification of the latter; only word separators become single spaces.
 In particular, the string to match against can look like
@@ -1352,13 +1352,13 @@ It returns 1 or empty depending on whether some or the corresponding B<RESTRICT>
 This must occur only in I<VARIABLE> in the context of version printing.
 It returns 1 or empty depending on whether some or the corresponding B<PROPERTIES> attribute is set for the version.
 .TP
-.BR depend ", " rdepend ", " pdepend ", " hdepend ", " depend* ", " rdepend* ", " pdepend* ", " hdepend*
+.BR depend ", " rdepend ", " pdepend ", " bdepend ", " depend* ", " rdepend* ", " pdepend* ", " bdepend*
 This must occur only in I<VARIABLE> in the context of version printing.
-It returns the respective B<DEPEND>, B<RDEPEND>, B<PDEPEND>, B<HDEPEND> string of an available package
+It returns the respective B<DEPEND>, B<RDEPEND>, B<PDEPEND>, B<BDEPEND> string of an available package
 (the string is shortened if possible if the variant with B<*> is used).
 This is empty unless B<DEP=true> is set (and was set when the cachefile was created).
 .TP
-.BR havedepend ", " haverdepend ", " havepdepend ", " havehdepend ", " havedeps
+.BR havedepend ", " haverdepend ", " havepdepend ", " havebdepend ", " havedeps
 This is like the above with the difference that only 1 is returned if the
 value of the corresponding string (resp. of at least one of these) is nonempty.
 .TP
@@ -2405,7 +2405,7 @@ The option B<--deps-installed> does the same.
 
 .TP
 .BR DEP " " (true / false)
-If true, store/use B<DEPEND>, B<RDEPEND>, B<PDEPEND>, B<HDEPEND> (e.g. shown with eix -lv).
+If true, store/use B<DEPEND>, B<RDEPEND>, B<PDEPEND>, B<BDEPEND> (e.g. shown with eix -lv).
 Usage of B<DEP> roughly doubles disk resp. memory requirements.
 
 .TP
@@ -3138,7 +3138,7 @@ The possible values for I<match_field> are B<name>, B<category>, B<category/name
 (or B<category-name>), B<description>, B<license>, B<homepage>, B<set>, B<eapi>, B<installed-eapi>,
 B<slot>, B<installed-slot>, B<use> (or B<iuse>), B<with-use> (or B<installed-with-use>),
 B<without-use> (or B<installed-without-use>),
-B<deps>, B<depend>, B<rdepend>, B<pdepend>, B<hdepend>, or B<error>,
+B<deps>, B<depend>, B<rdepend>, B<pdepend>, B<bdepend>, or B<error>,
 corresponding to the analogous command line option for the match field.
 The special value B<error> means that eix stops with an error message claiming
 that a match field is not autodetected and must be specified explicitly.
@@ -3180,19 +3180,19 @@ Now I<match_field_specification> matches if all of the following holds:
 
 3. If the third family (B<!>) is nonempty, at most match fields from that family are selected (think of a logical "not (... or ... or ...)").
 
-Thus, for instance, to specify that exactly all of B<depend>, B<rdepend>, B<pdepend>, B<hdepend> are
+Thus, for instance, to specify that exactly all of B<depend>, B<rdepend>, B<pdepend>, B<bdepend> are
 selected (i.e. B<--deps>) and no other field is selected, you can use either of
 
 .B (&deps!deps)
 
-.B (&depend&rdepend&pdepend&hdepend!depend!rdepend!pdepend!hdepend)
+.B (&depend&rdepend&pdepend&bdepend!depend!rdepend!pdepend!bdepend)
 
-On the other hand, if you want to specify that at least one of B<depend>, B<rdepend>, B<pdepend>, B<hdepend> are selected
+On the other hand, if you want to specify that at least one of B<depend>, B<rdepend>, B<pdepend>, B<bdepend> are selected
 and no other than these fields are selected, you can use either of
 
 .B (|deps!deps)
 
-.B (|depend|rdepend|pdepend|hdepend!depend!rdepend!pdepend!hdepend)
+.B (|depend|rdepend|pdepend|bdepend!depend!rdepend!pdepend!bdepend)
 
 For testing scripts, it is recommended to use B<DEFAULT_MATCH_ALGORIRTHM=error>
 so that scripts do not rely on particular defaults of that variable: This default