gentoo resync : 01.10.2021

4 files changed, 37 insertions, 63 deletions

diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 589b92a76b33..e6bd1cccae66 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,8 +1,6 @@
-DIST iwdevtools-0.5.3.tar.gz 42845 BLAKE2B 9e6b634e8409cffc57fde36157be0186943d4df07c47f0b07eeb0dd5071bc3e4c7b84e543a46cd2ff4e49d9b9b34b9121b3583bd227479f1485ec5957dee4780 SHA512 8458abba687135caaefd1cb0adb8af079a2cf94ca484a4bb95ef2b32e00eea46a2c8df7d305d4b0bf7121f46a92ac3a25cd9067e22ad9a314f289f77379a1684
-DIST iwdevtools-0.6.0.tar.gz 51788 BLAKE2B 1b37e3097cd77201398959272c09d6391746036530c6341b7b2ccfccc4361067dc46c6e3b2c729717855e346a7ebf7279f8d0fc0a760203527a1431e2366dad0 SHA512 0c192c9a6b52eca99574eda8da8d41b051a502cbbf891188e323f376f43472aaa72c2f8ac78f4790c4f41d610aa0927180a3fbe290ac2964ccb9f257b7f508fc
 DIST iwdevtools-0.7.0.tar.gz 56208 BLAKE2B 205bb9bc1e894b9cc6a9c3abb4f902c9c3f8337fff8618df162f4dc5d78416fe8e2852cb513d4153d8acf2a0d918e43352714502e1f40faffc777e19ad81ab55 SHA512 ec528901229066d333fcd8f53060601628b682a93c3e07a89826ff0fd2e406a4dffe76397883d4c50b459588cc6364873c43e5129bd172049c30aea039ae36d5
-EBUILD iwdevtools-0.5.3.ebuild 1309 BLAKE2B 6df9178a5a77696e9a72db562288fe3ab90827971d70337edd598403e5acdabc4e70af3e47a87acaef486b32273c20db7061bee58a108a7b86bbbcc137bc01c5 SHA512 0a528e9ec0a5164a638ad119c79f514d40804d1fde8e58a0c6cfba3449df3158fb62c3dcabca0602958735c72e3c0a1f9146e2ee0a4eb6d21bed82c7012d9546
-EBUILD iwdevtools-0.6.0.ebuild 1309 BLAKE2B 6df9178a5a77696e9a72db562288fe3ab90827971d70337edd598403e5acdabc4e70af3e47a87acaef486b32273c20db7061bee58a108a7b86bbbcc137bc01c5 SHA512 0a528e9ec0a5164a638ad119c79f514d40804d1fde8e58a0c6cfba3449df3158fb62c3dcabca0602958735c72e3c0a1f9146e2ee0a4eb6d21bed82c7012d9546
+DIST iwdevtools-0.8.0.tar.gz 57529 BLAKE2B b8068c7781b8b164b9b5d191f8a33a4a89854edb7c78c56d4f1312dd0d051d0b033f21611066303acb7efdf8403d6869458db98e7b1b2a293c779cca2bdcdd36 SHA512 df39fa02d7f4f72334286305bfa9c2db6d5db90bddc47194e3383a99492366796c7ae2e751bcf8af01d14cfa0bac88ea8d9c8678b7891f85aaa1b20e4a9e91cb
 EBUILD iwdevtools-0.7.0.ebuild 1309 BLAKE2B 6df9178a5a77696e9a72db562288fe3ab90827971d70337edd598403e5acdabc4e70af3e47a87acaef486b32273c20db7061bee58a108a7b86bbbcc137bc01c5 SHA512 0a528e9ec0a5164a638ad119c79f514d40804d1fde8e58a0c6cfba3449df3158fb62c3dcabca0602958735c72e3c0a1f9146e2ee0a4eb6d21bed82c7012d9546
-EBUILD iwdevtools-9999.ebuild 1278 BLAKE2B 40589f722bb69c40f200eba9837f5957df7e3cbd7fa3aa579fed928567d28bb250ee61889954a3bbc0576100ce3d81b0e68819a24ba536fd15112df3c5a8e730 SHA512 ad5356ff5a5b8816d05394a17b16cba2397817c03629853f649617ed48867bf32673e288ac5d8ee7c078d4cd362231d90f52d22762a10c29cd3614fa8c080098
+EBUILD iwdevtools-0.8.0.ebuild 1879 BLAKE2B b2c2bf0f0cc6d1421f4660a9ecb121d2028d247716d988bd00d3e778a771ed3c0669325798ad25eaef444c4e5663f328b151aea3586ef5fc824a36d46d088b27 SHA512 a69df9aac24292a13bdef36be7416ab529d6fbf5a933cfa7568d01bff3aa57a02ec97dc37e4fffee0b3d42935834f30c5afdc93186df3e0f7b4eb5ea3b7d6d99
+EBUILD iwdevtools-9999.ebuild 1826 BLAKE2B d52e86df1f1b6f82c0e9d1de02e007715cb6c39e2b076d22d5316623261637e57a7aef582b55e56472afdaf1bfe48aae57ac9630416285bca0987ac4bf809db6 SHA512 5b32c64fe82629d8dd1ac504f377328ededb5e0c661b3fa3f3fa61bfb356c5b51e64ee3229152d52b27a08cbce51741c7cc30b7b37fd999ed7bf52d465ef9d1a
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/iwdevtools-0.6.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.6.0.ebuild
deleted file mode 100644
index 25cb8346209b..000000000000
--- a/app-portage/iwdevtools/iwdevtools-0.6.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature
-
-DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
-HOMEPAGE="https://github.com/ionenwks/iwdevtools"
-SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-misc/pax-utils
-	app-portage/portage-utils
-	sys-apps/diffutils
-	sys-apps/file
-	sys-apps/portage
-	sys-apps/util-linux"
-BDEPEND="
-	sys-apps/help2man
-	test? ( ${RDEPEND} )"
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir=${PF}
-		-Deprefix="${EPREFIX}"
-		$(meson_use test)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "To (optionally) integrate with portage, inspect the .bashrc files installed"
-		elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use"
-		elog "the example bashrc directly by creating a symlink:"
-		elog
-		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools."
-	fi
-}
diff --git a/app-portage/iwdevtools/iwdevtools-0.5.3.ebuild b/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild
index 25cb8346209b..c1c495dcafbf 100644
--- a/app-portage/iwdevtools/iwdevtools-0.5.3.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild
@@ -30,8 +30,10 @@ src_configure() {
 	local emesonargs=(
 		-Ddocdir=${PF}
 		-Deprefix="${EPREFIX}"
+		-Dshellcheck=false
 		$(meson_use test)
 	)
+
 	meson_src_configure
 }
 
@@ -39,12 +41,24 @@ pkg_postinst() {
 	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
 
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "To (optionally) integrate with portage, inspect the .bashrc files installed"
-		elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use"
-		elog "the example bashrc directly by creating a symlink:"
+		elog "Optional portage integration relies on using /etc/portage/bashrc."
+		elog "The example bashrc can be used as-is if not already using one:"
 		elog
 		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
 		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools."
+		elog "Otherwise, inspect the tools' --help output and the example to integrate"
+		elog "(if not defining the same phase functions, the example can be sourced)."
+		elog
+		elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
+		elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
+		elog
+		elog '    PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
+	fi
+
+	if ver_test ${REPLACING_VERSIONS} -le 0.7.0; then
+		elog "qa-* bashrcs now use \`eqawarn\` for portage output. If no longer"
+		elog "seeing messages post-emerge, ensure 'qa' is in PORTAGE_ELOG_CLASSES."
 	fi
 }
diff --git a/app-portage/iwdevtools/iwdevtools-9999.ebuild b/app-portage/iwdevtools/iwdevtools-9999.ebuild
index d18fac000b34..282831c8b50a 100644
--- a/app-portage/iwdevtools/iwdevtools-9999.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-9999.ebuild
@@ -41,12 +41,24 @@ pkg_postinst() {
 	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
 
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "To (optionally) integrate with portage, inspect the .bashrc files installed"
-		elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use"
-		elog "the example bashrc directly by creating a symlink:"
+		elog "Optional portage integration relies on using /etc/portage/bashrc."
+		elog "The example bashrc can be used as-is if not already using one:"
 		elog
 		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
 		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools."
+		elog "Otherwise, inspect the tools' --help output and the example to integrate"
+		elog "(if not defining the same phase functions, the example can be sourced)."
+		elog
+		elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
+		elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
+		elog
+		elog '    PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
+	fi
+
+	if ver_test ${REPLACING_VERSIONS} -le 0.7.0; then
+		elog "qa-* bashrcs now use \`eqawarn\` for portage output. If no longer"
+		elog "seeing messages post-emerge, ensure 'qa' is in PORTAGE_ELOG_CLASSES."
 	fi
 }