gentoo new year resync : 01.01.2021

3 files changed, 48 insertions, 21 deletions

diff --git a/app-laptop/pommed/Manifest b/app-laptop/pommed/Manifest
index ff712b64bb49..b9222edfcfa8 100644
--- a/app-laptop/pommed/Manifest
+++ b/app-laptop/pommed/Manifest
@@ -1,6 +1,7 @@
+AUX pommed-1.39-fno-common.patch 496 BLAKE2B 5eecd8303fcbddccd12c2dd4ae24f8e46dbba5d1788fccae2ca47b8d3a7a680092460ec6e25422ad0332d1ac7b6ad249fe9ac75f33b57d83d57fc94f1c609f5a SHA512 b61449c21e73f42ff1487d9fff662f959e0707bed79826733a6cd4327cc92151caf974dc46c787b91934776461d7f1af83b5fc9574f902d9e2839159bf6f56fb
 AUX pommed-1.39.patch 3024 BLAKE2B 44ba221b8ba8e328ca322ecb9cf53dd8c10d9cfc82575d74d95cff929570086af0d4cb5d81532bf182f750615b59b05369ced1205cf8a7f0d6ca86a7606dcc21 SHA512 c048643afe0de01a161515963fc11fa330b39cd6304f139ab831032f51e2722d30c7e9b93e1de7d1150283bef570e44772e226f8c13e512d66b1ebe08a7892be
 AUX pommed.rc 383 BLAKE2B 96e43ba7a0d6e78ced0546f2d947cd2e150629ce9a9260029e97267ecf2c0012b6427b92dd8a3edee57f790ace13dc0688131544a50f9e3d315d1b2918693fca SHA512 54c3ee9242ab68f7a162e5892f4b5ee1064328f4b23c9da05f75acdb5c8c93245533af1320b6fa20f026f62060b5a0558eab1215c9c8491086545b7733c6c87b
 AUX pommed.service 155 BLAKE2B 5c99ee7f519f01c43a9cc4513b6a474aa5179482f48f687a796f5f8d49e71b3b67275de270decadfe1566a4b31f7f52ab59579e2d79e51de919064e6ec8c251d SHA512 00cfd3417ec09cef62e478ac7b5483b1857de2061106c8ae368dbaf0ff5c7b06e974ea85bba411601e76e5bbef53e4ab5b743aa7366c9d717d865a7fd3cd604d
 DIST pommed-1.39.tar.gz 995020 BLAKE2B b96169b3fa3f3f8cd8ce122af07ba6e13f2bd0969cd6f3aff8b2755dd1295ec581746ac3a5f692710bf8ad25ec1ca76819dcaa2d26681f5299548eb9693334f3 SHA512 26568e359d8ef853710b1d86f397981e87245a84b2ff006964035ea8643e97df44fe52b01841d085eb8dd1aee586e1c8b60c44089f463e2a64b2b95c010a9d10
-EBUILD pommed-1.39-r1.ebuild 2218 BLAKE2B 5dc81641c6cf4f3cc587094232f2b02d1405498810bb8bcb0756542399222a8fe39aa16a29c90e24c7a4deb10b2d88769bb57759f45e7a52953b14d0812c3e89 SHA512 1cda9305cb642b45e2b960fc1b911884c178ac955245577b8113bda822069682aa45d8c2c08a7b62c993f185fb4447df6de1d879dc67d881a04264a3bfe0fa0c
+EBUILD pommed-1.39-r1.ebuild 2213 BLAKE2B 53f54e2565e8402bc7e04015473aad84626bb2ba8bf3b38c898f4291686758d23106466a2ea2412c7017c523634626e1777464f2c1ded1acbe7bf103fb9f992b SHA512 63648ba2b981ccf10954fe88bf26a917dda187c00b909830a96d29d7d8d9006dbc4a2febae9838597d53a040bb14aef51aa41417396e43a868b24f340c2386fa
 MISC metadata.xml 644 BLAKE2B e8639125013d5f7024f9e49cbfef306ead9a8c7c3486fe2538a79de4394d01e122c5b6af241b98405491299d00a48fd683fb94fd4795294ea5f96ba56b434784 SHA512 3e31c0588847153aa548d8b09eb5a896f372f6c2c70deb5ac5efbd0f6401877fcf38fb8d04d5cfc718ec228157da86229eefb8101be5bdca0c6e5e540e48aa01
diff --git a/app-laptop/pommed/files/pommed-1.39-fno-common.patch b/app-laptop/pommed/files/pommed-1.39-fno-common.patch
new file mode 100644
index 000000000000..4cc66bcc60bf
--- /dev/null
+++ b/app-laptop/pommed/files/pommed-1.39-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/pommed/mactel/nv8600mgt_backlight.c
++++ b/pommed/mactel/nv8600mgt_backlight.c
+@@ -48,7 +48,7 @@
+ #include "../dbus.h"
+ 
+ 
+-struct _lcd_bck_info lcd_bck_info;
++extern struct _lcd_bck_info lcd_bck_info;
+ 
+ 
+ static int nv8600mgt_inited = 0;
+--- a/pommed/mactel/x1600_backlight.c
++++ b/pommed/mactel/x1600_backlight.c
+@@ -45,7 +45,7 @@
+ #include "../dbus.h"
+ 
+ 
+-struct _lcd_bck_info lcd_bck_info;
++extern struct _lcd_bck_info lcd_bck_info;
+ 
+ static int fd = -1;
+ static char *memory = NULL;
diff --git a/app-laptop/pommed/pommed-1.39-r1.ebuild b/app-laptop/pommed/pommed-1.39-r1.ebuild
index f1350763190b..21e31ee30528 100644
--- a/app-laptop/pommed/pommed-1.39-r1.ebuild
+++ b/app-laptop/pommed/pommed-1.39-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs linux-info systemd
+EAPI=7
+
+inherit desktop linux-info systemd
 
 DESCRIPTION="Manage screen and keyboard backlight on Apple MacBook Pro/PowerBook"
 HOMEPAGE="http://technologeek.org/projects/pommed/index.html"
@@ -14,23 +15,30 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="gtk X"
 
-COMMON_DEPEND="media-libs/alsa-lib
-	x86? ( sys-apps/pciutils )
-	amd64? (  sys-apps/pciutils )
+DEPEND="
+	media-libs/alsa-lib
+	media-libs/audiofile
 	dev-libs/confuse
-	>=sys-apps/dbus-1.1
 	dev-libs/dbus-glib
+	sys-apps/dbus
 	sys-libs/zlib
-	media-libs/audiofile
+	amd64? ( sys-apps/pciutils )
+	x86? ( sys-apps/pciutils )
 	gtk? ( x11-libs/gtk+:2 )
-	X? ( x11-libs/libX11
+	X? (
+		x11-libs/libX11
 		x11-libs/libXext
-		x11-libs/libXpm )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
+		x11-libs/libXpm
+	)"
+RDEPEND="${DEPEND}
 	media-sound/alsa-utils
 	virtual/eject"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 pkg_setup() {
 	if ! use ppc; then
@@ -41,16 +49,12 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}.patch"
-}
-
 src_compile() {
-	cd "${S}"/pommed
+	cd "${S}"/pommed || die
 	emake CC="$(tc-getCC)" OFLIB=1
 
 	if use gtk; then
-		cd "${S}"/gpomme
+		cd "${S}"/gpomme || die
 		local POFILES=""
 		for LANG in ${LINGUAS}; do
 			if [ -f po/${LANG}.po ]; then
@@ -60,7 +64,7 @@ src_compile() {
 		emake CC="$(tc-getCC)" POFILES="${POFILES}"
 	fi
 	if use X; then
-		cd "${S}"/wmpomme
+		cd "${S}"/wmpomme || die
 		emake CC="$(tc-getCC)"
 	fi
 }