gentoo resync : 03.03.2021

3 files changed, 38 insertions, 28 deletions

diff --git a/app-laptop/pbbuttonsd/Manifest b/app-laptop/pbbuttonsd/Manifest
index 9a7a16378f56..e0e476bfb8ca 100644
--- a/app-laptop/pbbuttonsd/Manifest
+++ b/app-laptop/pbbuttonsd/Manifest
@@ -4,8 +4,9 @@ AUX pbbuttonsd-0.8.1-g++.patch 431 BLAKE2B c63ff011777c4fc35c3c96985727f07967fbd
 AUX pbbuttonsd-0.8.1-laptopmode.sh.patch 827 BLAKE2B c5153225d8c8f0dfdc380ea8a7030fb994f9893a201ee83692ef712d3ab345f4f5eca4057a36e9b45394f49d89a4a400e91fc4dd7ddb425ddbfe8243e6d49b7f SHA512 3ab0e2ce5b3fa050d7cc27c7e9d90fb3e7fdca46ba2de8e34cfd0a6338b5ba27dcb07204827ccaa8b228f37ae5941e5829b3cfe1a9c4aa3cc50754c7fcedc307
 AUX pbbuttonsd-0.8.1-lm.patch 419 BLAKE2B 2f982fb58e97f8a26970dae583c0c90e6b7be03d9fda2081a64db0f4e41e31f44e425403ccb81e4e2e17a236ac6171a7189a77fa7579752bddeaab97abc56598 SHA512 1ce79d85f9119d0d94b789557f8dc41ddcd8ca030c8b03c2399035e21115e2ff3bfb7c4284750450733ac5ad305fa2513041e65feeecd7dca81db4a23ae53e34
 AUX pbbuttonsd-0.8.1-lz.patch 920 BLAKE2B ab9a5cdf4b9ac2b1dd55229ab7dcfcf65bf4ff3b526f52705c366ec364131fcea31222837a910b37f5507600de6ed4e278bcf0f52cc96bfc5aae8a747cf69359 SHA512 17546f9b7e8b488a2ace5cab29da3738ff59c708aeaae1ef58e6240dba0876254f83f5df358d76af271c636d64c512d7d9fa550e377d4e57d92851a720441dea
+AUX pbbuttonsd-0.8.1a-fno-common.patch 341 BLAKE2B 78e119e11da8949563e74bb174b10f7cd0f263e40f34c6b297822bb06f3b27897a5a8857a5dcf9ca5e4e3d4879ce1525f5f219eef9b75530256d4d79860cc8a5 SHA512 e86dee824710beef07b69ba2abb7f33ac1f364fdf34a95b168bbd79344661ffefc129bb2e498420997274ee8a3d13ec2ef6deec4486a1ce2511bf2b3688a93f4
 AUX pbbuttonsd.rc6 355 BLAKE2B 41e646f547b684930949669760ffd7e09c6ef4591e6183b12d555dba45d100414cc5daa54ef26e2bba491841553961955cb0a29c9c5d6b37d4e13f9a3117a9fb SHA512 93165ce1d1c757e58b407656bf86084bb3fcfe0c55897fbb382f107ff9b3d69559255a11ac3017cf5741eb2923d753f5cc3f1b495e31e16b18b16757accfbdfb
 AUX wireless 235 BLAKE2B 1fdc5401c1bcc927cad521bb7e6d502fd072c6aae119e59d92c19431985cccaecad5ba55a27af888e63881d0305ee732dce9b1e777e4b2322a98efaad13de310 SHA512 58cbfb80ec32ba6868fea500bcf58bf649a0f468a017ec8c200fe0edd0fd7f1fe17efaafca3e67c20df9fc5a6c80b2941237a375f6e73349a83593dcfacf2816
 DIST pbbuttonsd-0.8.1a.tar.gz 589747 BLAKE2B a0410b7f165e8a0f5b6efa8fa86cc32a84e62da08141d285442d48f0e541d4d6d063e61a7e48aa7901135c4fc9640a7968be821619b3741ce30ba1497015aad4 SHA512 4aaf674872982925f7aa8e06a363f50830f13d9491f4a3b850c1852a8a6d4b2c72164f839c482eed059703dd25d900fe3bb774f78e7039ac2464ea7a1837bf99
-EBUILD pbbuttonsd-0.8.1a.ebuild 3365 BLAKE2B 18e56b5a9b8ddbde4bf6ad9040d7398474ab95947c4955465ee961a4e11759df9a50b8b44937bcee9828b287570a256181486477058636332075dad1c6557793 SHA512 324df66a1b56cece0644a6b81a985028ab0273dba99beca9b1690c3bcc2a278948862ee01a451789da6171bb4d8d1236a6cc77fae89bb6f828937936707c6350
+EBUILD pbbuttonsd-0.8.1a.ebuild 3353 BLAKE2B eb987f7206e3653a7477d98d0ac25eb33f9078f0ce0cef1487d2b5ab88f36ee611badd31513c97cbbbb773a04c1a77803efbfa4f66f65b78129b6bfb83416a27 SHA512 0f60e3d4534dac117c5cf15699388f4713740cfee2b0f2187cb74d2a3848c32e6f87648ee412743ef90d51ff7a8e77dde2ab66f715986d6b487f3059ffa4e76d
 MISC metadata.xml 511 BLAKE2B 74e7a1939ef37f6fb312232b3df04de1ba6b0bb2e8bd476c0ebdeb2d7efcda0015204e4c003388194ac481f3fcb551949b4dba5515b770cd2d6ab78dd43ab72b SHA512 5a56b1fe175cd76fa23d90e4499f0a6bacfacdb9cb2fd647dbabec42030021c0b4f27eb04b523b9ae7bc44706ee9404abdf5ff16aa92655fab5d00ac187eca5b
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1a-fno-common.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1a-fno-common.patch
new file mode 100644
index 000000000000..5cb7e30ce021
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1a-fno-common.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/771093
+--- a/src/driver_mixer_alsa.c
++++ b/src/driver_mixer_alsa.c
+@@ -32,7 +32,7 @@
+ 
+ #define SECTION "MODULE MIXER ALSA"
+ 
+-struct driver_alsamixer {
++extern struct driver_alsamixer {
+ 	char *card;	 /* name of the soundcard (usually "default" is fine) */
+ 	GString *channels;	/* channel names to use */
+ 	struct {
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1a.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1a.ebuild
index f2e26d756df4..042a48b7bbfe 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1a.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1a.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Handles power management and special keys on laptops"
@@ -11,36 +12,31 @@ SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc ~x86"
-IUSE="acpi alsa doc ibam macbook oss static-libs"
+IUSE="acpi alsa doc ibam macbook oss"
 
 RDEPEND="
-	>=dev-libs/glib-2.6
-	alsa? ( >=media-libs/alsa-lib-1.0 )
+	dev-libs/glib
+	alsa? ( media-libs/alsa-lib )
 	macbook? (
 		sys-apps/pciutils
 		sys-libs/libsmbios
-	)
-"
-DEPEND="
-	 ${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 PATCHES=(
-	"${FILESDIR}/${PN}-0.8.1-cpufreq.patch"
-	"${FILESDIR}/${PN}-0.8.1-fnmode.patch"
-	"${FILESDIR}/${PN}-0.8.1-laptopmode.sh.patch"
-	"${FILESDIR}/${PN}-0.8.1-lm.patch"
-	"${FILESDIR}/${PN}-0.8.1-lz.patch"
+	"${FILESDIR}"/${PN}-0.8.1-cpufreq.patch
+	"${FILESDIR}"/${PN}-0.8.1-fnmode.patch
+	"${FILESDIR}"/${PN}-0.8.1-laptopmode.sh.patch
+	"${FILESDIR}"/${PN}-0.8.1-lm.patch
+	"${FILESDIR}"/${PN}-0.8.1-lz.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {
-	### Don't link with g++ if we don't use ibam
-	if ! use ibam; then
-		eapply "${FILESDIR}/${PN}-0.8.1-g++.patch"
-	fi
+	# Don't link with g++ if we don't use ibam
+	use ibam || eapply "${FILESDIR}"/${PN}-0.8.1-g++.patch
 
 	default
-
 	eautoconf
 }
 
@@ -48,6 +44,7 @@ src_configure() {
 	# Fix crash bug on some systems
 	replace-flags -O? -O1
 
+	local laptop
 	if use macbook; then
 		laptop=macbook
 	elif use x86 || use amd64; then
@@ -61,12 +58,12 @@ src_configure() {
 		laptop=powerbook
 	fi
 
-	laptop=$laptop \
-		econf \
+	econf \
 		$(use_with alsa) \
 		$(use_with doc doxygen_docs) \
 		$(use_with ibam) \
-		$(use_with oss)
+		$(use_with oss) \
+		laptop="${laptop}"
 
 }
 
@@ -89,9 +86,9 @@ src_install() {
 
 	default
 
-	use static-libs || rm "${D}"/usr/$(get_libdir)/libpbb.a
+	rm "${ED}"/usr/$(get_libdir)/libpbb.a || die
 
-	newinitd "${FILESDIR}/pbbuttonsd.rc6" pbbuttonsd
+	newinitd "${FILESDIR}"/pbbuttonsd.rc6 pbbuttonsd
 	dodoc README
 	use doc && dodoc -r doc/
 
@@ -101,7 +98,7 @@ src_install() {
 	keepdir /etc/power/suspend.d
 	exeinto /etc/power/scripts.d
 	doexe "${FILESDIR}"/wireless
-	ln -s "${D}"/etc/power/scripts.d/wireless "${D}"/etc/power/resume.d/wireless
+	dosym ../scripts.d/wireless /etc/power/resume.d/wireless
 }
 
 pkg_postinst() {