summaryrefslogtreecommitdiff
path: root/app-laptop
diff options
context:
space:
mode:
Diffstat (limited to 'app-laptop')
-rw-r--r--app-laptop/Manifest.gzbin3244 -> 3242 bytes
-rw-r--r--app-laptop/pbbuttonsd/Manifest2
-rw-r--r--app-laptop/pbbuttonsd/pbbuttonsd-0.8.1a.ebuild16
-rw-r--r--app-laptop/pommed/Manifest3
-rw-r--r--app-laptop/pommed/files/pommed-1.39-fno-common.patch22
-rw-r--r--app-laptop/pommed/pommed-1.39-r1.ebuild44
6 files changed, 59 insertions, 28 deletions
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index cad52f6d359f..2de472fe62dd 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
Binary files differ
diff --git a/app-laptop/pbbuttonsd/Manifest b/app-laptop/pbbuttonsd/Manifest
index 8dec472ebd03..9a7a16378f56 100644
--- a/app-laptop/pbbuttonsd/Manifest
+++ b/app-laptop/pbbuttonsd/Manifest
@@ -7,5 +7,5 @@ AUX pbbuttonsd-0.8.1-lz.patch 920 BLAKE2B ab9a5cdf4b9ac2b1dd55229ab7dcfcf65bf4ff
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 3251 BLAKE2B f671bdbfde56131bd0fe73cb8fa6398c6479c7fa2697815ed0c116945f96aec4f0274e251781efee8c8c692505f85d55ae3b414d2d547fb1c64b25a5e20559d0 SHA512 05df1091b4f54a8797a756d87549a4a88075993a5f8f4027127041209b3f65956f457fa9e682b914b6565c47ba19994af1adb81a76ca8f5944e7317cfe161cb1
+EBUILD pbbuttonsd-0.8.1a.ebuild 3365 BLAKE2B 18e56b5a9b8ddbde4bf6ad9040d7398474ab95947c4955465ee961a4e11759df9a50b8b44937bcee9828b287570a256181486477058636332075dad1c6557793 SHA512 324df66a1b56cece0644a6b81a985028ab0273dba99beca9b1690c3bcc2a278948862ee01a451789da6171bb4d8d1236a6cc77fae89bb6f828937936707c6350
MISC metadata.xml 511 BLAKE2B 74e7a1939ef37f6fb312232b3df04de1ba6b0bb2e8bd476c0ebdeb2d7efcda0015204e4c003388194ac481f3fcb551949b4dba5515b770cd2d6ab78dd43ab72b SHA512 5a56b1fe175cd76fa23d90e4499f0a6bacfacdb9cb2fd647dbabec42030021c0b4f27eb04b523b9ae7bc44706ee9404abdf5ff16aa92655fab5d00ac187eca5b
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1a.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1a.ebuild
index 8a17130c0544..f2e26d756df4 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1a.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1a.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools flag-o-matic
+inherit autotools flag-o-matic toolchain-funcs
DESCRIPTION="Handles power management and special keys on laptops"
HOMEPAGE="http://pbbuttons.berlios.de"
@@ -74,15 +74,18 @@ src_compile() {
# Thanks to Stefan Bruda for this workaround
# Using -j1 fixes a parallel build issue with the docs
if use doc; then
- emake -j1
+ emake -j1 AR="$(tc-getAR)"
else
- emake
+ emake AR="$(tc-getAR)"
fi
}
src_install() {
dodir /etc/power
- use ibam && dodir /var/lib/ibam
+ if use ibam; then
+ dodir /var/lib/ibam
+ keepdir /var/lib/ibam
+ fi
default
@@ -93,8 +96,9 @@ src_install() {
use doc && dodoc -r doc/
dodir /etc/power/resume.d
+ keepdir /etc/power/resume.d
dodir /etc/power/suspend.d
- dodir /etc/power/scripts.d
+ 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
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
}