gentoo resync : 11.05.2021

7 files changed, 70 insertions, 34 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index f903c99b0bfb..3d92236a1799 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest
index 88be0997db9a..0ee41943244c 100644
--- a/games-util/grfcodec/Manifest
+++ b/games-util/grfcodec/Manifest
@@ -2,5 +2,5 @@ AUX grfcodec-6.0.6-gcc10.patch 507 BLAKE2B 7f09d9e6468f059780e1253a32431c88b8a98
 DIST grfcodec-6.0.6-source.tar.xz 166820 BLAKE2B ba81e31477fb15bb5273add4d993ee7de88cfd47fd8300743e97c4abd19b0daf736d78b5bafc82569ff110757131501c07d7365a4e7ffde8d3a7fcc2e277bada SHA512 543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480
 DIST grfcodec-6.0.6_p20210310.tar.gz 205795 BLAKE2B 24d803e208b2fc465ae71611c0c0fb2737bfa8c5a28375bc08a6220581d7b07bb2f2a390e2ddb7f4beb8a80951862473919d41bce83364af70b6dc646f0f3f8e SHA512 10f4ec28c69d87e397f0fb5b497dbefce8fcd826731d3a0a864cbbd333b7df188ab0087445644ad245aeff65a8b6563dfdfa657ac1a2248e56e296c01f7d58a8
 EBUILD grfcodec-6.0.6.ebuild 1124 BLAKE2B ccf5665273b0727d1223b1c4e645b6e2bdac0a6fd55641d2db4e530345f3f059fc1774ac0915392819c52dd3402e3c57e7cdce1602ad4afbc870362682b56085 SHA512 33a61952110c28c6d93c4aaee794d7fa417b97b16f435ee84df5641b631b964ab15f4bb798a4880119816dc917ba3f59a67b341067994d63ee22afeb29917d02
-EBUILD grfcodec-6.0.6_p20210310.ebuild 734 BLAKE2B 0752e8b183a527e07b441ad73f0aa75df4267eb6552152e42303b03646187a32b51caf71d0759533e3aa01ae661a15554b0a2c595214304b8c2db883954f11a7 SHA512 eb3fa0739ec6a6e8907609db9f5c7427fadda001d5e63aca0c26dc557933e34a7b199475217f9c392d93db7ada7f3f0250cb085be84a897bf85f9c6ea0c0ea67
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+EBUILD grfcodec-6.0.6_p20210310.ebuild 1018 BLAKE2B edd3adf61744987690a3eedf7ef0ced8b24335184d8d8a9ce75236f1b32a21c847d51245489ae4a55de5501f399ed1bbc8297d45fb40ac77a160f9b6ad7a9c0d SHA512 14bdda3732229d7f65d49e1b9cb0a4cdc243a91671a869d06338de28940f236984d3b741cb3fa5a640c1326bae8fbf9c1eceef5fe0e78f539b46ca1cfa2549e8
+MISC metadata.xml 334 BLAKE2B 6aac57d4c64ff83b34ab382ba81351f74e87457333e01ff7de2859ded4748d644d034eba6e1a213dc7f14102e818f176d85e4a31b094e216dd41a7bcd3c0b5e0 SHA512 659659be9dc501963eec44e09b087b454049ba509ab24ad82f825155e3b34fea276eefc467c7b292e0396cebe39d57886e703a5e905516cddd0eeff566047bc1
diff --git a/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild b/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild
index d4fd24bff446..29b89e829a39 100644
--- a/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild
+++ b/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild
@@ -25,6 +25,18 @@ DEPEND="
 
 S="${WORKDIR}/grfcodec-${COMMIT}"
 
+src_configure() {
+	local mycmakeargs=(
+		# Make sure we don't use git by accident.
+		# Build system does not care much if it's
+		# executed successfully and populates
+		# YEARS / VERSION with empty values.
+		-DGIT_EXECUTABLE=/bin/do-not-use-git-executable
+	)
+
+	cmake_src_configure
+}
+
 src_install() {
 	dobin "${BUILD_DIR}"/{grfcodec,grfid,grfstrip,nforenum}
 	doman docs/*.1
diff --git a/games-util/grfcodec/metadata.xml b/games-util/grfcodec/metadata.xml
index 78274e0fa550..bf0122803280 100644
--- a/games-util/grfcodec/metadata.xml
+++ b/games-util/grfcodec/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">OpenTTD/grfcodec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-util/xpadneo/Manifest b/games-util/xpadneo/Manifest
index 4da7ce491fcb..bc13258c82aa 100644
--- a/games-util/xpadneo/Manifest
+++ b/games-util/xpadneo/Manifest
@@ -1,4 +1,4 @@
 DIST xpadneo-0.9.1.tar.gz 1353080 BLAKE2B fc2207e005cae629da50048330cbaa7d27183b0bbb083d35c3c144e91470273b8c7006c4b62d10b947dbe4fd003ca39623630923e477aa4eff3c243405d876bd SHA512 51063d104f165018b8430e26d2ab5a622c214efaaba3f7706cc99892b2054f57667b419672de5c2696189d389401b07024658c36a88343d980de9802789bcb10
-EBUILD xpadneo-0.9.1.ebuild 1765 BLAKE2B 91965729167f626fe1e0b6ac5093b1bf94e436f5f518b8b1a84eacd0c90bfbef7e70bbefb48e85484cf03aceccc026b64e3c3c518ab514539f0088f3047ef131 SHA512 bf67407c56cc8ce7906fe4b45129173e6e8b2692e6c3cc26405cc1988917de734f95079364c325e7f131071cd56d7f2d8aeea3856e327be27692188ab8f04bce
-EBUILD xpadneo-9999.ebuild 1765 BLAKE2B 91965729167f626fe1e0b6ac5093b1bf94e436f5f518b8b1a84eacd0c90bfbef7e70bbefb48e85484cf03aceccc026b64e3c3c518ab514539f0088f3047ef131 SHA512 bf67407c56cc8ce7906fe4b45129173e6e8b2692e6c3cc26405cc1988917de734f95079364c325e7f131071cd56d7f2d8aeea3856e327be27692188ab8f04bce
+EBUILD xpadneo-0.9.1.ebuild 2423 BLAKE2B c1cb53c426940bc3b079c21cb54f5e33a67094bc36dd83ce14063ca1c20f804ebe32640b8670f0542c234d1dea3330c530ae817da12a99482dbb236002e9efe4 SHA512 09792a7fc3eea09162f9facfe85821855840001339ffe366032c988d6a45e6e1dfc837a59b8b8018b4056edf2894bec0978f1bcf92946e81bcc4ac0117c8bc76
+EBUILD xpadneo-9999.ebuild 2253 BLAKE2B 217187d9a9dbde2bff73d2115da5e7057f60bdfc9569cab7f37bce0f6dad3e643e34d8d00fa01a380e4383dafdd6fda53fa3bf7cc3ba3b2345ac975386dae218 SHA512 4e55be1b24232651d10bbf89a523081d1ce79521a58ffc83c95435577dbc79dc52671b1354fcaf663ceff0cdb305aa8c24caf04128f26bde1c06ea415fd3409b
 MISC metadata.xml 476 BLAKE2B 88a9a4d49f902c50d87fe36c98f6f4f2c553c6cb6882966f0d4858413ed8b603f428c7b3b43d157a6ff25fb1ab26231657119e14b4a0260a159a372501593391 SHA512 9f3a4e2063cb3e30b8ba428930715533c0c3fe7defda881d1a86f5f652fc736938e88ce21e4f028f57f9edc14f6528c8a731a6689242c0d369f44a2606425fd7
diff --git a/games-util/xpadneo/xpadneo-0.9.1.ebuild b/games-util/xpadneo/xpadneo-0.9.1.ebuild
index 75edf29d3954..bf7685af800c 100644
--- a/games-util/xpadneo/xpadneo-0.9.1.ebuild
+++ b/games-util/xpadneo/xpadneo-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-mod toolchain-funcs udev
+inherit linux-info linux-mod toolchain-funcs udev
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -36,25 +36,37 @@ src_install() {
 	udev_dorules etc-udev-rules.d/60-${PN}.rules
 
 	dodoc -r ../docs/{[^i]*.md,descriptors,reports} ../NEWS.md
+	newdoc ../misc/kernel_patches/0001-fix_bluetooth_reconnect.patch \
+		L2CAP-fix-for-kernel-5.11-or-older.patch
 }
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
 	udev_reload
 
-	local ertm=/sys/module/bluetooth/parameters/disable_ertm
-	if ! [[ ${REPLACING_VERSIONS} && $(<${ertm}) == Y ]]; then
+	local disable_ertm=/sys/module/bluetooth/parameters/disable_ertm
+	if kernel_is -ge 5 12; then
+		if [[ $(<${disable_ertm}) == Y ]]; then
+			elog "Warning: bluetooth ERTM (Enhanced ReTransmission Mode) is disabled."
+			elog "This is no longer recommended with kernel >=5.12 to use ${PN}."
+			elog "Can remove ${EROOT}/etc/modprobe.d/no-ertm.conf if it exists, and run:"
+			elog "  echo N > ${disable_ertm}"
+			elog "After changing, may need to re-pair the gamepad with bluetooth."
+		fi
+	elif [[ $(<${disable_ertm}) == N ]]; then
+		elog "Warning: bluetooth ERTM (Enhanced ReTransmission Mode) is enabled."
+		elog "While keeping enabled is recommended for rumble usage stability, it can"
+		elog "cause connection issues without kernel >=5.12 or the L2CAP kernel patch"
+		elog "provided in ${EROOT}/usr/share/doc/${PF}/"
+		elog "If needed, this mode can be disabled by running:"
+		elog "  echo Y > ${disable_ertm}"
+		elog "  echo 'options bluetooth disable_ertm=y' > ${EROOT}/etc/modprobe.d/no-ertm.conf"
+		elog "After changing, may need to re-pair the gamepad with bluetooth."
+	fi
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog "To pair the gamepad and view module options, see documentation in:"
-		elog "  ${EROOT}/usr/share/doc/${PF}"
-		elog
-		elog "Be warned that bluetooth's ERTM (Enhanced ReTransmission Mode) can"
-		elog "cause the gamepad to enter a re-connection loop."
-		elog "- To disable immediately:"
-		elog "    echo Y > ${ertm}"
-		elog "- To disable for next and subsequent boot:"
-		elog "    echo 'options bluetooth disable_ertm=y' > ${EROOT}/etc/modprobe.d/no-ertm.conf"
-		elog "- Or, if bluetooth isn't a module, add to the kernel's command line:"
-		elog "    bluetooth.disable_ertm=y"
+		elog "  ${EROOT}/usr/share/doc/${PF}/"
 	fi
 }
 
diff --git a/games-util/xpadneo/xpadneo-9999.ebuild b/games-util/xpadneo/xpadneo-9999.ebuild
index 75edf29d3954..6ee1277444a5 100644
--- a/games-util/xpadneo/xpadneo-9999.ebuild
+++ b/games-util/xpadneo/xpadneo-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-mod toolchain-funcs udev
+inherit linux-info linux-mod toolchain-funcs udev
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -42,19 +42,28 @@ pkg_postinst() {
 	linux-mod_pkg_postinst
 	udev_reload
 
-	local ertm=/sys/module/bluetooth/parameters/disable_ertm
-	if ! [[ ${REPLACING_VERSIONS} && $(<${ertm}) == Y ]]; then
+	local disable_ertm=/sys/module/bluetooth/parameters/disable_ertm
+	if kernel_is -ge 5 12; then
+		if [[ $(<${disable_ertm}) == Y ]]; then
+			elog "Warning: bluetooth ERTM (Enhanced ReTransmission Mode) is disabled."
+			elog "This is no longer recommended with kernel >=5.12 to use ${PN}."
+			elog "Can remove ${EROOT}/etc/modprobe.d/no-ertm.conf if it exists, and run:"
+			elog "  echo N > ${disable_ertm}"
+			elog "After changing, may need to re-pair the gamepad with bluetooth."
+		fi
+	elif [[ $(<${disable_ertm}) == N ]]; then
+		elog "Warning: bluetooth ERTM (Enhanced ReTransmission Mode) is enabled."
+		elog "While keeping enabled is recommended for rumble usage stability, it can"
+		elog "cause connection issues without a fix included in kernel >=5.12"
+		elog "If needed, this mode can be disabled by running:"
+		elog "  echo Y > ${disable_ertm}"
+		elog "  echo 'options bluetooth disable_ertm=y' > ${EROOT}/etc/modprobe.d/no-ertm.conf"
+		elog "After changing, may need to re-pair the gamepad with bluetooth."
+	fi
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog "To pair the gamepad and view module options, see documentation in:"
-		elog "  ${EROOT}/usr/share/doc/${PF}"
-		elog
-		elog "Be warned that bluetooth's ERTM (Enhanced ReTransmission Mode) can"
-		elog "cause the gamepad to enter a re-connection loop."
-		elog "- To disable immediately:"
-		elog "    echo Y > ${ertm}"
-		elog "- To disable for next and subsequent boot:"
-		elog "    echo 'options bluetooth disable_ertm=y' > ${EROOT}/etc/modprobe.d/no-ertm.conf"
-		elog "- Or, if bluetooth isn't a module, add to the kernel's command line:"
-		elog "    bluetooth.disable_ertm=y"
+		elog "  ${EROOT}/usr/share/doc/${PF}/"
 	fi
 }