gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
commit: 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree: 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-laptop
parent: 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
125 files changed, 2832 insertions, 350 deletions
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index ca67ada5f5f1..383357f067e1 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/batti-0.3.8-r4 b/app-laptop/batti-0.3.8-r4
deleted file mode 100644
index a50a64cf21bd..000000000000
--- a/app-laptop/batti-0.3.8-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
-DESCRIPTION=A upower based battery monitor for the system tray, similar to batterymon
-EAPI=6
-HOMEPAGE=https://code.google.com/p/batti-gtk/
-IUSE=libnotify python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( sys-power/upower sys-power/upower-pm-utils ) x11-themes/hicolor-icon-theme libnotify? ( x11-libs/libnotify ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://batti-gtk.googlecode.com/files/batti-0.3.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5fe800cd2912d9afaa0d82e86b3e126
diff --git a/app-laptop/batti/Manifest b/app-laptop/batti/Manifest
new file mode 100644
index 000000000000..688992daf679
--- /dev/null
+++ b/app-laptop/batti/Manifest
@@ -0,0 +1,5 @@
+AUX batti-0.3.8-upower-0.99.patch 1248 BLAKE2B e653700d3fd4fc07f1344809ae2f7ff7eee449b812d25fca502e573d320456a3a7b3bc018f710ec8fd9e32f480c6ccc0824eef58490a11a057b7e98bea06147e SHA512 172036b2d5f63c37d26a9542e9348b469c2df4e1380fa3ff4c13883e3a295963c569230b32a36eba14f70e37f87dfc2fcfe03e98406a335749f2d0234c5d30be
+AUX batti-0.3.8-upower-capital.patch 1409 BLAKE2B 30f3667c5927986b4dbd63d4beccc9b59506f51bfb1e8cefae5bb59adaae7994bd4a64b6939417b230859967b29ad525a27772979d4bf65d687d4887a9942b3e SHA512 6b0f0fafe7443338b9af69156476fdbe231054010ec1ac17dada5c9f68c23477f50bc32d450cf7b3af5c2d012d3264aff4a74630ea2543e500c1f5c95534f1b6
+DIST batti-0.3.8.tar.gz 59783 BLAKE2B cba35af1d8d3e5f2e44e27eb2727fc2115d89d5ff79bd54f263a25678c4a5d9d87da685905f85c3d47bdeeeba164bb0dce09082adb211acc51a02ec514e0122a SHA512 39e0085a13847359eb555eff80c3f3b166775558fba3c76ecb4315786e2ce4307d21dcac5fab38da4ee3cc2035356906eb1354ced56a1f007735029e0484a4de
+EBUILD batti-0.3.8-r4.ebuild 966 BLAKE2B aa126adc77a05530041fd12b01e7d2cd4b5c956c6f3e3b14f0649589644f2aad6d1352fdce3bedecc890fd18ef80dd645f2d8c0556cb6828b0e7016e47d7df3a SHA512 149e6aedf94fd886c93b1b31d4d52098d655d9b6566477de28f9c0d06b5269080caf74939f6cae7cf927d7ada6516b6d06e69ab90d644f27336b74e1ec6e87b5
+MISC metadata.xml 323 BLAKE2B 9a3aaf09e7b171dcf71d85c4ebd4249059d76a51bdeb036cb919c73fbecfb7aeb884857529ca6c8ba66746369f2113d4077371b28159a81c1d6339d3ff75c4a3 SHA512 7b3c4c3895e87916db14eb4d611dea5be29d2d1846ee9ec47f56abba20b31091c834f3d5562a57b4fb828e2866f9c6e64ba9f57d25bcf7a2195bca2f7363c5aa
diff --git a/app-laptop/batti/batti-0.3.8-r4.ebuild b/app-laptop/batti/batti-0.3.8-r4.ebuild
new file mode 100644
index 000000000000..f4824578587d
--- /dev/null
+++ b/app-laptop/batti/batti-0.3.8-r4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="A upower based battery monitor for the system tray, similar to batterymon"
+HOMEPAGE="https://code.google.com/p/batti-gtk/"
+SRC_URI="https://batti-gtk.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libnotify"
+
+RDEPEND="
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	|| ( sys-power/upower sys-power/upower-pm-utils )
+	x11-themes/hicolor-icon-theme
+	libnotify? ( x11-libs/libnotify )
+"
+DEPEND=""
+
+src_prepare() {
+	default
+	if has_version ">=sys-power/upower-0.99"; then
+		eapply "${FILESDIR}/${P}-upower-0.99.patch"
+		eapply "${FILESDIR}/${P}-upower-capital.patch"
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-laptop/batti/files/batti-0.3.8-upower-0.99.patch b/app-laptop/batti/files/batti-0.3.8-upower-0.99.patch
new file mode 100644
index 000000000000..6f313a594c94
--- /dev/null
+++ b/app-laptop/batti/files/batti-0.3.8-upower-0.99.patch
@@ -0,0 +1,34 @@
+diff -Naur batti-0.3.8.orig/src/PowerBackend.py batti-0.3.8/src/PowerBackend.py
+--- batti-0.3.8.orig/src/PowerBackend.py	2014-04-15 19:30:34.123260000 +0200
++++ batti-0.3.8/src/PowerBackend.py	2014-04-15 19:32:11.859168509 +0200
+@@ -180,17 +180,6 @@
+         
+         properties = dbus.Interface(iface, 'org.freedesktop.DBus.Properties')
+ 
+-        if properties.Get(self.dbus_interface, 'CanSuspend'):
+-            self.__can_suspend = True
+-        else:
+-            self.__can_suspend = False
+-        
+-        if properties.Get(self.dbus_interface, 'CanHibernate'):
+-            self.__can_hibernate = True
+-        else:
+-            self.__can_hibernate = False
+-    
+-    
+     def __get_interface(self):
+         dkit_obj = self.__bus.get_object(self.dbus_service, self.dbus_object)
+         return dbus.Interface(dkit_obj, self.dbus_interface)
+@@ -201,12 +190,6 @@
+             self.__mc_action(widget, event, data)
+             
+          
+-    def can_suspend(self):   
+-        return self.__can_suspend and self.__get_interface().SuspendAllowed()
+-
+-    def can_hibernate(self):
+-        return self.__can_hibernate and self.__get_interface().HibernateAllowed()
+-
+     def suspend(self):
+         self.__get_interface().Suspend()
+ 
diff --git a/app-laptop/batti/files/batti-0.3.8-upower-capital.patch b/app-laptop/batti/files/batti-0.3.8-upower-capital.patch
new file mode 100644
index 000000000000..e7f62761661c
--- /dev/null
+++ b/app-laptop/batti/files/batti-0.3.8-upower-capital.patch
@@ -0,0 +1,32 @@
+From 1e0fe57a93ed3996bad295e20eeda81f6af483af Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Wed, 20 Jul 2016 20:14:32 +0200
+Subject: [PATCH] The type property (in recent UPower at least) needs to have a
+ capital T - "Type"
+
+---
+ src/PowerBackend.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/PowerBackend.py b/src/PowerBackend.py
+index e020b98..56bcb61 100644
+--- a/src/PowerBackend.py
++++ b/src/PowerBackend.py
+@@ -165,7 +165,7 @@ def __init__(self):
+         self.__batteries = {}
+         for dev in devices:
+             (prop_iface, dev_iface) = self.__get_battery(dev)
+-            type = prop_iface.Get(self.device_interface, 'type')
++            type = prop_iface.Get(self.device_interface, 'Type')
+             if type == self.bat_type:
+                 power_bat = UPowerBattery(prop_iface, dev_iface)
+                 self.__batteries[dev] = power_bat
+@@ -228,7 +228,7 @@ def set_right_popup_menu_action(self, action):
+     def __device_added(self, udi):
+         (prop_iface, dev_iface) = self.__get_battery(udi)
+         try:
+-            type = prop_iface.Get(self.device_interface, 'type')
++            type = prop_iface.Get(self.device_interface, 'Type')
+             if type == self.bat_type:
+                 power_bat = UPowerBattery(prop_iface, dev_iface)
+                 power_bat.set_left_popup_menu_action(self.__mc_action)
diff --git a/app-laptop/batti/metadata.xml b/app-laptop/batti/metadata.xml
new file mode 100644
index 000000000000..c26d102ee702
--- /dev/null
+++ b/app-laptop/batti/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>naota@gentoo.org</email>
+		<name>Naohiro Aota</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">batti-gtk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-laptop/dispad-0.3.1-r1 b/app-laptop/dispad-0.3.1-r1
deleted file mode 100644
index 47c18d42a057..000000000000
--- a/app-laptop/dispad-0.3.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/confuse x11-libs/libX11 x11-libs/libXi >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Daemon to disable trackpads while typing
-EAPI=6
-HOMEPAGE=https://github.com/BlueDragonX/dispad
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/confuse x11-libs/libX11 x11-libs/libXi
-SLOT=0
-SRC_URI=https://github.com/BlueDragonX/dispad/tarball/v0.3.1 -> dispad-0.3.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ce9573cb8997e106629ebb7b49c43b5f
diff --git a/app-laptop/dispad/Manifest b/app-laptop/dispad/Manifest
new file mode 100644
index 000000000000..28a061514883
--- /dev/null
+++ b/app-laptop/dispad/Manifest
@@ -0,0 +1,3 @@
+DIST dispad-0.3.1.tar.gz 97952 BLAKE2B 87c9866a396e9319aca5b4b68db6be4f937412e09b444736fd27e0a0150b7a19c56b87b60fda83881b902dfba042ca3cede18226562996912d20147ad8e4069e SHA512 fa9666e79de31f79f3567ae3b529c6df3cf56c134c1fe30d62b7d863d623c89abd6b1153de972507a3795c20001f11caf1e49926a402d145a048014aa97cd400
+EBUILD dispad-0.3.1-r1.ebuild 547 BLAKE2B 5922ed255f1590a931fa7d42daa10b3115638653a38140c1421c696e3640c68153abbee8206d927e09c6b70fa2ae06a90342ba49f966d2cdd9ea76215b62bddf SHA512 5f28500868a7f2293b23f3cde6f84a40211147eb4536f0afbe659ba62334fb9c36727b6dc76856d0a86372c63b864b2c14cf0339febd03d2df4ce08cd661f8e0
+MISC metadata.xml 311 BLAKE2B f8f66bf0e47dd752b5ea040471d4f4ac065b6ecd0c11d371f3bd2b3240cf7dbd3b786e905a97f440c47a2f387bdfdc316e68b5993342ad1a7b04aa595173270e SHA512 7a28487c5bcdd8518abf28120e0f060c7b1c12d25c98759dd0d7254ae6c10ba0e7276cd240627aac07b5e462fa29ba2b8681f4cdb78cf8a465c6c928961293f1
diff --git a/app-laptop/dispad/dispad-0.3.1-r1.ebuild b/app-laptop/dispad/dispad-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..f2e739c0d3a1
--- /dev/null
+++ b/app-laptop/dispad/dispad-0.3.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Daemon to disable trackpads while typing"
+HOMEPAGE="https://github.com/BlueDragonX/dispad"
+SRC_URI="https://github.com/BlueDragonX/dispad/tarball/v${PV/_/-} -> ${P}.tar.gz"
+
+S="${WORKDIR}/BlueDragonX-dispad-dbb9be3"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="
+	dev-libs/confuse
+	x11-libs/libX11
+	x11-libs/libXi"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf -i
+}
diff --git a/app-laptop/dispad/metadata.xml b/app-laptop/dispad/metadata.xml
new file mode 100644
index 000000000000..9e74a51079ce
--- /dev/null
+++ b/app-laptop/dispad/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>jsbronder@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">BlueDragonX/dispad</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-laptop/hdaps-gl-0.0.5 b/app-laptop/hdaps-gl-0.0.5
deleted file mode 100644
index 7a638dee493f..000000000000
--- a/app-laptop/hdaps-gl-0.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=virtual/opengl media-libs/freeglut
-DESCRIPTION=OpenGL visualization for HDAPS data
-EAPI=4
-HOMEPAGE=http://hdaps.sourceforge.net
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl media-libs/freeglut
-SLOT=0
-SRC_URI=mirror://sourceforge/hdaps/hdaps-gl-0.0.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7677ddba24d947a5b58c6a7a4870a91d
diff --git a/app-laptop/hdaps-gl/Manifest b/app-laptop/hdaps-gl/Manifest
new file mode 100644
index 000000000000..a16009241ff9
--- /dev/null
+++ b/app-laptop/hdaps-gl/Manifest
@@ -0,0 +1,4 @@
+AUX hdaps-gl-0.0.5-as-needed.diff 346 BLAKE2B 475c8784ee192f632686177b3d4cf25be97260893621b9bfcff2e649d36cdcf1d4059c9c643cf3153daabb234d8520b51f033de471e2b62d9702db0720bc0782 SHA512 6128fb53c82485a7141d7bff95aea3ab6d20593a9c535bee841c22bcba9504bdf3913eff07fab0de3b58225cab60b3a41638b250d37f1a0f4f67d03c02a29716
+DIST hdaps-gl-0.0.5.tar.gz 2495 BLAKE2B 00b9b79b906e32b5671ae97c30fe0e3007da8ef809078b664befe46e472af39977f6947dfbde53afee30d42e5b104ba055d5e5412d76263d5741db75c663b308 SHA512 6ebef6324fcdfaf5c2ec6cc8382d376c711e5d957a4ffdd4ee150317649ea0a47552e421f8008a3498ac49487657dca2f49b1a50169d7ab02ee5bef856625d19
+EBUILD hdaps-gl-0.0.5.ebuild 604 BLAKE2B 99848773670133279f29304b88170ecdd66b8e2b5fd01fe41ea9730f577bda063ca513521957741cfd6a719c808e856f8ddd89f0e26445d59e8e1550d2566b69 SHA512 3338f31513e579b73e7ae97eacdcf906076745db0ad01e297114d4db78dcfa8f83a41dec409d77d8cb5d9de84c23b8af282ae62e64bcef0c14b3cf9d1db2c6b4
+MISC metadata.xml 242 BLAKE2B b0338d200d4eb439908bd1e4990832314acd6c02985f36736137c4d7a00e7552f0bd9bc97c20bc3980ceec2551b27278c163711f0af5c6af01bfc52a2cfb8831 SHA512 8376434ff91f5848064ea6c4e040d35ada37f295c0120b65ee9418f6d140ca98a8fb442bdb1e03b292cecc404f323cb9b28ed83da353e5e4dd5eb7f842f2df18
diff --git a/app-laptop/hdaps-gl/files/hdaps-gl-0.0.5-as-needed.diff b/app-laptop/hdaps-gl/files/hdaps-gl-0.0.5-as-needed.diff
new file mode 100644
index 000000000000..0d0214033252
--- /dev/null
+++ b/app-laptop/hdaps-gl/files/hdaps-gl-0.0.5-as-needed.diff
@@ -0,0 +1,11 @@
+--- hdaps-gl-0.0.5/Makefile	2005-08-30 20:06:53.000000000 +0200
++++ hdaps-gl-0.0.5-1/Makefile	2008-09-22 22:55:57.000000000 +0200
+@@ -10,7 +10,7 @@
+ all: hdaps-gl
+ 
+ hdaps-gl: hdaps-gl.c
+-	$(CC) $(CFLAGS) $(LIBDIR) $(LIBRARIES) -o hdaps-gl hdaps-gl.c
++	$(CC) $(CFLAGS) $(LIBDIR) -o hdaps-gl hdaps-gl.c $(LIBRARIES)
+ 
+ clean:
+ 	rm -f hdaps-gl *.o
diff --git a/app-laptop/hdaps-gl/hdaps-gl-0.0.5.ebuild b/app-laptop/hdaps-gl/hdaps-gl-0.0.5.ebuild
new file mode 100644
index 000000000000..7bc369635dc7
--- /dev/null
+++ b/app-laptop/hdaps-gl/hdaps-gl-0.0.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="OpenGL visualization for HDAPS data"
+HOMEPAGE="http://hdaps.sourceforge.net"
+SRC_URI="mirror://sourceforge/hdaps/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="virtual/opengl
+	media-libs/freeglut"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-as-needed.diff"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${LDFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-laptop/hdaps-gl/metadata.xml b/app-laptop/hdaps-gl/metadata.xml
new file mode 100644
index 000000000000..4d89b7be7780
--- /dev/null
+++ b/app-laptop/hdaps-gl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">hdaps</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-laptop/hdapsd-20141203 b/app-laptop/hdapsd-20141203
deleted file mode 100644
index 934cf9fa6872..000000000000
--- a/app-laptop/hdapsd-20141203
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=libconfig? ( dev-libs/libconfig ) virtual/pkgconfig
-DESCRIPTION=IBM ThinkPad Hard Drive Active Protection System (HDAPS) daemon
-EAPI=5
-HOMEPAGE=https://github.com/evgeni/hdapsd/
-IUSE=libconfig kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=libconfig? ( dev-libs/libconfig )
-SLOT=0
-SRC_URI=https://github.com/evgeni/hdapsd/releases/download/20141203/hdapsd-20141203.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a60284b23589bb146d0a4dfd168096c4
diff --git a/app-laptop/hdapsd/Manifest b/app-laptop/hdapsd/Manifest
new file mode 100644
index 000000000000..f478ce434af0
--- /dev/null
+++ b/app-laptop/hdapsd/Manifest
@@ -0,0 +1,5 @@
+AUX hdapsd.conf-20141024 739 BLAKE2B ebd52e9bc5d4849b842cb579ca4ea0892227c94c483d9ec0b9b1dbcf975bfdfb0079460a29dedb6e60236cf9a37814efdd900c6e8c8d4791deb2e81f37dfbbd6 SHA512 e03c7f02af2789a784284f10eed10e10edb82e2ad16d3794299cc9622c00a047f30df7f7d553ef572e265815684d1e783932e0f3b219cca44f0e1f74dc045944
+AUX hdapsd.init-20141024 2177 BLAKE2B c790b9899ca67ecee13a3af54dc821020f551ec35e94866328e28b00ea79eb2f8ba88e618d6b1d854add6024abb75f7fdc1393bfff853f16e2ab4bfb16e03799 SHA512 e45b7e6fafd047c6fe7b172ad552c23b0000b90099a9a12e5a09133258e90d5f121bfa5e8a638f1dcd35110e54fc1da2462cdd501ebb65878286f623c7baa6dc
+DIST hdapsd-20141203.tar.gz 128818 BLAKE2B 0219e30e032032dfd729e97f526eb7402fe4cb72245589ef03cca28f75a6e1f2cbfa55c5aa5599b24f496bbe662467077415fbec47caa1db17d6108e07292daa SHA512 19c1a8b362f15864b71f4fb221c0993b43b3b2d965d5826af06fb9f6b0e345e5da99181493e13e230c7fe77060ae5b373027e8ec90a511566a6ccaef43998178
+EBUILD hdapsd-20141203.ebuild 2159 BLAKE2B 19848e3eedba19f42a9e0991527767fdbf6bdc638a83976fdb1ae390fa2ca03ed6b416dfa4543a9759773e5a3867d8515ad7c74e46e9c1947402b4fa3402740b SHA512 f2386ff6d0d1d6a4f09f0c314649b5e0fb93f888da3a0dba6f11c1c436e1997d3a97bc43f138c0369bf9f2e8dd7d4901b3932ed3846999930d6a85486e384275
+MISC metadata.xml 673 BLAKE2B d0dd1b8ff7d65cf628b0bd9841072a578953fec9d343a87ff91666de3f74079e911ce578a732b32cd6a3709c92ae6dcf13ac899d635f84e67c770af6212a315a SHA512 296b864ed6a816faa8dd2e65471cb74a0b8a99b29dcf315bc4d31cb81f77a1c7982cc1f1929b2331ae57d0bef3a73273793b0b8da04142d0df13d364c3ab6545
diff --git a/app-laptop/hdapsd/files/hdapsd.conf-20141024 b/app-laptop/hdapsd/files/hdapsd.conf-20141024
new file mode 100644
index 000000000000..a83d8bb181ac
--- /dev/null
+++ b/app-laptop/hdapsd/files/hdapsd.conf-20141024
@@ -0,0 +1,24 @@
+# Configuration for the HDAPS daemon (hdapsd). All settings here are
+# optional and will override those set in /etc/hdapsd.conf (if hdapsd
+# was built with libconfig support).
+
+# The list of the disk devices that hdapsd should monitor. Usually
+# this is "hda", "sda", or "hda sda". The hdaps daemon will attempt to
+# auto-detect your drive if this is left empty. Empty by default.
+#
+#DISKLIST="sda"
+
+# Hdapsd sensitivity. The lower the threshold, the earlier the heads
+# are parked when movement is detected. The default is determined by
+# hdapsd, and is currently 15.
+#
+#THRESHOLD="10"
+
+# Log to syslog? Disabled by default.
+#
+#SYSLOG="true"
+
+# Set any extra options here, like -a for "adaptive mode". Empty by
+# default.
+#
+#OPTIONS="-a"
diff --git a/app-laptop/hdapsd/files/hdapsd.init-20141024 b/app-laptop/hdapsd/files/hdapsd.init-20141024
new file mode 100644
index 000000000000..6113b60b7d7c
--- /dev/null
+++ b/app-laptop/hdapsd/files/hdapsd.init-20141024
@@ -0,0 +1,76 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+
+description="Hard Drive Active Protection System daemon"
+command="/usr/sbin/hdapsd"
+pidfile="/run/hdapsd.pid"
+
+# Always daemonize when started by OpenRC, and don't make the pidfile
+# configurable. Even if the user sets something dumb for the pidfile
+# in /etc/hdapsd.conf, we want it to work! Fortunately the settings
+# passed on the command-line override the config file.
+command_args="--background --pidfile=${pidfile}"
+
+
+depend() {
+    need localmount
+}
+
+checkconfig() {
+    # An empty DISKLIST is allowed because the disk will be
+    # auto-detected.
+    for DISK in ${DISKLIST}; do
+        if [ ! -b /dev/${DISK} ]; then
+            eerror "Could not find disk /dev/${DISK}!"
+            eerror "Adjust the DISK setting in /etc/conf.d/hdapsd"
+            return 1
+        fi
+
+        if [ ! -e /sys/block/${DISK}/queue/protect ] && \
+	    [ ! -e /sys/block/${DISK}/device/unload_heads ] ; then
+            eerror "No protect entry for ${DISK}!"
+            eerror "Make sure your kernel is patched with the blk_freeze patch"
+            return 1
+        fi
+    done
+
+    # Load the tp_smapi module first. This is not a requirement, but
+    # it helps hdapsd's adaptive mode.
+    if [ ! -e /sys/devices/platform/smapi ] ; then
+	modprobe tp_smapi 2>/dev/null
+    fi
+
+    if [ ! -d /sys/devices/platform/hdaps ] ; then
+	ebegin "Loading hdaps module"
+        modprobe hdaps
+	eend $? || return 1
+    fi
+}
+
+start() {
+    checkconfig || return 1
+
+    for DISK in ${DISKLIST}; do
+	command_args="${command_args} -d ${DISK}"
+    done
+
+    # Since all of these settings are now optional, we append them
+    # only if we need to.
+    if [ ! -z "${THRESHOLD}" ] ; then
+	command_args="${command_args} --sensitivity ${THRESHOLD}"
+    fi
+
+    if [ ! -z "${SYSLOG}" ] ; then
+	command_args="${command_args} --syslog"
+    fi
+
+    if [ ! -z "${OPTIONS}" ] ; then
+	command_args="${command_args} ${OPTIONS}"
+    fi
+
+    ebegin "Starting the ${description}"
+    start-stop-daemon --start --exec "${command}" --pidfile "${pidfile}" \
+	-- ${command_args}
+    eend $?
+}
diff --git a/app-laptop/hdapsd/hdapsd-20141203.ebuild b/app-laptop/hdapsd/hdapsd-20141203.ebuild
new file mode 100644
index 000000000000..6edd851d9605
--- /dev/null
+++ b/app-laptop/hdapsd/hdapsd-20141203.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info readme.gentoo systemd
+
+DESCRIPTION="IBM ThinkPad Hard Drive Active Protection System (HDAPS) daemon"
+HOMEPAGE="https://github.com/evgeni/${PN}/"
+SRC_URI="https://github.com/evgeni/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libconfig"
+
+DEPEND="libconfig? ( dev-libs/libconfig )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	# We require the hdaps module which can either come from either the
+	# kernel itself (CONFIG_SENSORS_HDAPS) or from the tp_smapi package.
+	if ! has_version app-laptop/tp_smapi[hdaps]; then
+		CONFIG_CHECK="~SENSORS_HDAPS"
+		ERROR_SENSORS_HDAPS="${P} requires app-laptop/tp_smapi[hdaps] or "
+		ERROR_SENSORS_HDAPS+="kernel support for CONFIG_SENSORS_HDAPS enabled"
+		linux-info_pkg_setup
+	fi
+}
+
+src_configure(){
+	econf \
+		$(use_enable libconfig) \
+		--with-systemdsystemunitdir=$(systemd_get_unitdir) \
+		--docdir="/usr/share/doc/${PF}"
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}/hdapsd.conf-20141024" hdapsd
+	newinitd "${FILESDIR}/hdapsd.init-20141024" hdapsd
+	readme.gentoo_create_doc
+}
+
+pkg_postinst(){
+	[[ -z $(ls "${ROOT}"sys/block/*/queue/protect 2>/dev/null) ]] && \
+	[[ -z $(ls "${ROOT}"sys/block/*/device/unload_heads 2>/dev/null) ]] && \
+		ewarn "Your kernel does NOT support shock protection."
+
+	readme.gentoo_print_elog
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+${PN} requires a kernel module to function properly. The recommended
+approach is to install app-laptop/tp_smapi[hdaps], but the in-tree
+module provided by CONFIG_SENSORS_HDAPS may work as well.
+
+Common daemon parameters can be set in ${EROOT}etc/conf.d/${PN}. If the
+package was installed with USE=libconfig, then the parameters can also
+be set in ${EROOT}etc/${PN}.conf, although the former will take
+precedence over the latter if both are used.
+
+You can change the default sampling rate by modifing
+
+  /sys/devices/platform/hdaps/sampling_rate
+
+and you may need to enable shock protection manually by running
+
+  # echo -1 > /sys/block/<disk>/device/unload_heads
+
+as root.
+"
diff --git a/app-laptop/hdapsd/metadata.xml b/app-laptop/hdapsd/metadata.xml
new file mode 100644
index 000000000000..ab39df1369a0
--- /dev/null
+++ b/app-laptop/hdapsd/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>junghans@gentoo.org</email>
+    <name>Christoph Junghans</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+  <use>
+    <flag name="libconfig">
+      Require <pkg>dev-libs/libconfig</pkg> to allow the daemon to
+      read a configuration file at startup
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">evgeni/hdapsd</remote-id>
+    <remote-id type="sourceforge">hdaps</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-laptop/i8kutils-1.33-r1 b/app-laptop/i8kutils-1.33-r1
deleted file mode 100644
index 14c2920d247e..000000000000
--- a/app-laptop/i8kutils-1.33-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=tk? ( dev-lang/tk ) virtual/pkgconfig
-DESCRIPTION=Dell Inspiron and Latitude utilities
-EAPI=4
-HOMEPAGE=http://packages.debian.org/sid/i8kutils
-IUSE=examples tk
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-3
-RDEPEND=tk? ( dev-lang/tk )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/i/i8kutils/i8kutils_1.33.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d2480ec19c2f931940319f51b02a44a3
diff --git a/app-laptop/i8kutils-1.42 b/app-laptop/i8kutils-1.42
deleted file mode 100644
index 3db57dba1282..000000000000
--- a/app-laptop/i8kutils-1.42
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=tk? ( dev-lang/tk:0 ) virtual/pkgconfig
-DESCRIPTION=Dell Inspiron and Latitude utilities
-EAPI=5
-HOMEPAGE=https://launchpad.net/i8kutils
-IUSE=tk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=tk? ( dev-lang/tk:0 ) sys-power/acpi
-SLOT=0
-SRC_URI=https://launchpad.net/i8kutils/trunk/1.42/+download/i8kutils_1.42.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=caebd3a5b09ab3b5c17f80b0d92e992a
diff --git a/app-laptop/i8kutils/Manifest b/app-laptop/i8kutils/Manifest
new file mode 100644
index 000000000000..edbafe95aea3
--- /dev/null
+++ b/app-laptop/i8kutils/Manifest
@@ -0,0 +1,10 @@
+AUX i8k.conf 891 BLAKE2B 734a958f641396e103b6a018d983638d91c540267325b8057f23091e614b88e5eb45b9cf154e32a8aa00f219904227eaed3887f87c379e18d6475a945a065f19 SHA512 bc262f0014237abfc87efc60dabbb37e86c459077831b68c07ea13608d1174bd32cb695e74ca4597839f7b128cfc1b4860874cce0c6f511972569e5f0948526d
+AUX i8k.init-r1 1216 BLAKE2B b8e2dbb0cb343b751deaacda9a7f57646c27fc501669980e20e3b42302e87fb89001b48dcecb3d5866a06dd5cf538044ab3ff356c9dba18a7b57ebd3dc408fc1 SHA512 39282605172dac48c12819e5adeb080d3c73257d775fb8e53d2bdcf26e0510dd10055d8a51e17043f2a5d49da3ffb73f28a767fbfb44c0bb77feb621e25867cb
+AUX i8kmon.service 158 BLAKE2B e567398b719557fffc6b4a244e4528d6147e8406db59d4cca39d531e88a04be5e4154971f15ed9db24d7f8ebfef103ea78cdaa4aeae356823045f7012782cf39 SHA512 77cbed13d4c1982a491faafe7e45da7a4fc06ea94e6b126405211f54a4bb5b4c794d94f6ca56d6d16ad0e0e62d8311bf90e0e6c60c74147ea12963c530c69529
+AUX i8kutils-1.42-Makefile.patch 1296 BLAKE2B cbcc827c1c93ebb4a597c642ed14110c92de701b7b094228924442c75806ecf2e35b43a65c7a39f412e9d10d24ea97c726c76cd9653ea090a0215a795ac47905 SHA512 3dd548cff896d3b14df0e55059f842cf3e04c0a9057f2c16eea7fb160882ceab4dc91782012d2243a4a78f9271c2effdb09109ffe889c27149a65940b69785d9
+AUX i8kutils-gcc5.patch 1161 BLAKE2B 12705e687c801a2863f2b8908473b1268bb3af474004ec1b317d03cb9ffb100dc4c4b2b5afeaeea76d047037b5ba5586a8629a1bbf5313b99e76dd7728679e1b SHA512 c789ef70244c59041308c5ff692c2bec6cf4fa5e673deeea9ec59cd1b6036e60f6ca4036dea04eaaa1b8172e3388b2f5e02227311e032c9c552e04ac50276616
+DIST i8kutils_1.33.tar.gz 50378 BLAKE2B 648d5dca57a407b1239b5a8d51dbe44214140368eefa71d72ef31b0cac3c0e7af2cb0ce44eb7ee429f555ef6503025ffa7543d9d17d2c42db98b67865fac0a03 SHA512 a7b9277b8c9bc2642a65122dda31cfa7cc0c4fa780ba980364c0a4e0e4599502c6557871464ff256c5911370d98944826d0e29d4d3621605d5e8c1c8a23e5578
+DIST i8kutils_1.42.tar.xz 37544 BLAKE2B ca8ec63252f43b269ba2a5565fce275aaa6542ebe6f4824d12b194cb0ae8b09dbe354c743ad78af8bcb897e411f1739df464e6c5603d470842de4b59be753984 SHA512 148e8788c50cbaa22f1dd3b72867839f5bc2d91cda70aee74f7c9a3d8542386a44652c5eb8dd9eba0e30400fc6bb72855d3cc7f2dc4284c2529b9cba2eac485b
+EBUILD i8kutils-1.33-r1.ebuild 1063 BLAKE2B 6700e2387d61a8f8ed4bceb041ba21216914998d59dcfb6c43cb6b1976df812bb6ce72e9093263f7c9ad8d833040000fc38df490cb4e1dd0832046745653b33b SHA512 62664f2355a3e6603cb462e38d5e5503af27e746e16fcddffa9b60671039fce01edefe433f2af044b65580a4b6bfcbe974ecab53394428e39071bd1002d48d31
+EBUILD i8kutils-1.42.ebuild 1027 BLAKE2B 80ec3999adf84113e7be00c5ba56d4bc9ee12b926a6d04ec27038936ccd1c0ebd9aa95e1586b8688839137d94621f07c3e5d64df496de30888d0aed66867d358 SHA512 40edad83ee0c8f0b348a0a0117b2a1476a095b992744e9edba15cf85b0dd603be0f1848228b8b166652e0b3248a2bf72d3ab7535fdd73126f8d26c9a4bc40399
+MISC metadata.xml 440 BLAKE2B ef848635f744a68b02e5a51fd42484c0e62547a59f5361e2cf36b7ae70d3c8ef93f6f9d2a156ef7df77ee7140d1ae5a045b74ff2931e39dbca14e27de0ec4559 SHA512 9e56ccb489ffacafec5d8d882a9e7efb5a5213c36735b245127915649f29663c7686c3d4b590aa678ee8afd7b5c47f658fb65a37c7a51e7c6474ae42f6f42b55
diff --git a/app-laptop/i8kutils/files/i8k.conf b/app-laptop/i8kutils/files/i8k.conf
new file mode 100644
index 000000000000..c5bd389b294a
--- /dev/null
+++ b/app-laptop/i8kutils/files/i8k.conf
@@ -0,0 +1,31 @@
+# Config file for /etc/init.d/i8k
+
+# Parameters:
+#
+# i8kbuttons Parameters
+# =====================
+# VOLUME_UP : command for i8kbuttons to run on volume up key
+# VOLUME_DOWN : command for i8kbuttons to run on volume down key
+# VOLUME_MUTE : command for i8kbuttons to run on mute key
+# BUTTON_REPEAT : repeat rate, in milliseconds, for i8kbuttons keypresses
+#
+# If VOLUME_* commands are not defined, i8kbuttons will not be started
+#
+# i8kmon Parameters
+# =================
+# NOMON : if set, i8kmon will not be started
+# NOAUTO : if set, i8kmon will not control the fans
+# TIMEOUT : timeout, in seconds, at which i8kmon will check/update status
+#			(default is 2)
+
+# for ALSA
+MIXER="/usr/bin/amixer -q set Master"
+VOLUME_UP="$MIXER 1+" 
+VOLUME_DOWN="$MIXER 1-" 
+VOLUME_MUTE="$MIXER toggle" 
+
+# for aumix (no mute support)
+#VOLUME_UP="aumix -v +4"
+#VOLUME_DOWN="aumix -v -4"
+
+BUTTON_REPEAT=100
diff --git a/app-laptop/i8kutils/files/i8k.init-r1 b/app-laptop/i8kutils/files/i8k.init-r1
new file mode 100644
index 000000000000..1e1cb7ca0c94
--- /dev/null
+++ b/app-laptop/i8kutils/files/i8k.init-r1
@@ -0,0 +1,50 @@
+#!/sbin/openrc-run
+
+depend() {
+	after alsasound
+	after modules
+}
+
+checkconfig() {
+	if [ ! -e /proc/i8k ] ; then
+		eerror "The i8k driver is not installed"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	if [ -n "$VOLUME_UP$VOLUME_DOWN$VOLUME_MUTE" ] ; then
+		ebegin "Starting i8kbuttons"
+		start-stop-daemon --start --quiet --pidfile /var/run/i8kbuttons.pid \
+			--make-pidfile --exec /usr/bin/i8kbuttons --background \
+			-- ${VOLUME_UP:+-u "${VOLUME_UP}"} \
+			   ${VOLUME_DOWN:+-d "$VOLUME_DOWN"} \
+			   ${VOLUME_MUTE:+-m "$VOLUME_MUTE"} \
+			   ${BUTTON_REPEAT:+-r "$BUTTON_REPEAT"}
+		eend $?
+	fi
+	if [ ! -n "$NOMON" ]; then
+		ebegin "Starting i8kmon"
+		start-stop-daemon --start -b --quiet  \
+			--pidfile /var/run/i8kmon.pid \
+			--make-pidfile \
+			--exec /usr/bin/i8kmon --background \
+			--name "tclsh /usr/bin/i8kmon" \
+			-- -d ${NOAUTO:+-na} ${TIMEOUT:+-t $TIMEOUT}
+		eend $?
+	fi
+}
+
+stop() {
+	if [ -n "$VOLUME_UP$VOLUME_DOWN$VOLUME_MUTE" ] ; then
+		ebegin "Stopping i8kbuttons"
+		start-stop-daemon --stop --quiet --pidfile /var/run/i8kbuttons.pid
+		eend $?
+	fi
+	if [ ! -n "$NOMON" ]; then
+		ebegin "Stopping i8kmon"
+		start-stop-daemon --stop --quiet --pidfile /var/run/i8kmon.pid
+		eend $?
+	fi
+}
diff --git a/app-laptop/i8kutils/files/i8kmon.service b/app-laptop/i8kutils/files/i8kmon.service
new file mode 100644
index 000000000000..3b80f46334af
--- /dev/null
+++ b/app-laptop/i8kutils/files/i8kmon.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Dell laptop thermal monitoring
+ConditionPathExists=/proc/i8k
+
+[Service]
+ExecStart=/usr/bin/i8kmon -d
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-laptop/i8kutils/files/i8kutils-1.42-Makefile.patch b/app-laptop/i8kutils/files/i8kutils-1.42-Makefile.patch
new file mode 100644
index 000000000000..7dc56d91aa3e
--- /dev/null
+++ b/app-laptop/i8kutils/files/i8kutils-1.42-Makefile.patch
@@ -0,0 +1,34 @@
+Fix a race condition causing parallel builds to sometimes fail.
+
+Both probe_i8k_calls_time and i8kctl contain a main() function, though
+i8kctl's is omitted when built with -DLIB so they can link without a
+conflict.  i8kctl is also a standalone exe so it is built twice, with
+and without -DLIB.  When building in parallel you can get into a 
+situation where the object file created by the probe_i8k_calls_time
+target gets overwritten with the one from i8kctl and bad things happen.
+Nothing actually uses the i8kctl.o that has main() so we can just not
+build it.
+
+Also move CFLAGS, CC, LDFLAGS respect out of the ebuild.
+
+--- a/Makefile
++++ b/Makefile
+@@ -17,13 +17,13 @@ ccflags-y = -Wall
+ 
+ all: i8kctl probe_i8k_calls_time
+ 
+-i8kctl: i8kctl.c i8kctl.o
+-	gcc -Wall i8kctl.c -o i8kctl
++i8kctl: i8kctl.c
++	$(CC) -Wall ${CFLAGS} -o i8kctl i8kctl.c
+ 
+ probe_i8k_calls_time: probe_i8k_calls_time.c
+-	gcc -Wall -c -g -DLIB i8kctl.c
+-	gcc -Wall -c -g -DLIB probe_i8k_calls_time.c
+-	gcc -o probe_i8k_calls_time i8kctl.o probe_i8k_calls_time.o
++	$(CC) -Wall ${CFLAGS} -c -DLIB i8kctl.c
++	$(CC) -Wall ${CFLAGS} -c -DLIB probe_i8k_calls_time.c
++	$(CC) -Wall ${CFLAGS} ${LDFLAGS} -o probe_i8k_calls_time i8kctl.o probe_i8k_calls_time.o
+ 
+ i8k:
+ 	make -C /lib/modules/$(shell uname -r)/build M=$(PWD) modules
diff --git a/app-laptop/i8kutils/files/i8kutils-gcc5.patch b/app-laptop/i8kutils/files/i8kutils-gcc5.patch
new file mode 100644
index 000000000000..258b95f595f6
--- /dev/null
+++ b/app-laptop/i8kutils/files/i8kutils-gcc5.patch
@@ -0,0 +1,28 @@
+Fix build with GCC 5.
+
+x86_64-pc-linux-gnu-gcc -O2 -march=native -g -pipe   -c -o i8kctl.o i8kctl.c
+gcc -Wall -c -Wl,--hash-style=gnu -Wl,-O1 -Wl,--as-needed -DLIB i8kctl.c
+gcc -Wall -c -Wl,--hash-style=gnu -Wl,-O1 -Wl,--as-needed -DLIB probe_i8k_calls_time.c
+gcc -o probe_i8k_calls_time i8kctl.o probe_i8k_calls_time.o
+probe_i8k_calls_time.o: In function `main':
+probe_i8k_calls_time.c:(.text+0x62): undefined reference to `timestamp'
+probe_i8k_calls_time.c:(.text+0x82): undefined reference to `timestamp'
+probe_i8k_calls_time.c:(.text+0xa2): undefined reference to `timestamp'
+probe_i8k_calls_time.c:(.text+0xbf): undefined reference to `timestamp'
+probe_i8k_calls_time.c:(.text+0xdc): undefined reference to `timestamp'
+probe_i8k_calls_time.o:probe_i8k_calls_time.c:(.text+0xf9): more undefined references to `timestamp' follow
+collect2: error: ld returned 1 exit status
+Makefile:24: recipe for target 'probe_i8k_calls_time' failed
+
+
+--- a/probe_i8k_calls_time.c
++++ b/probe_i8k_calls_time.c
+@@ -13,7 +13,7 @@ double t;
+ 
+ struct timespec tmst;
+ 
+-inline double timestamp()
++double timestamp()
+ {
+ 	clock_gettime(CLOCK_REALTIME, &tmst);
+ 	t = tmst.tv_nsec;
diff --git a/app-laptop/i8kutils/i8kutils-1.33-r1.ebuild b/app-laptop/i8kutils/i8kutils-1.33-r1.ebuild
new file mode 100644
index 000000000000..cf870ed7fd3b
--- /dev/null
+++ b/app-laptop/i8kutils/i8kutils-1.33-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Dell Inspiron and Latitude utilities"
+HOMEPAGE="http://packages.debian.org/sid/i8kutils"
+SRC_URI="mirror://debian/pool/main/i/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="examples tk"
+
+DEPEND="tk? ( dev-lang/tk )"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.i8kutils )
+
+src_prepare() {
+	sed \
+		-e '/^CC/d' \
+		-e '/^CFLAGS/d' \
+		-e 's: -g : $(LDFLAGS) :g' \
+		-i Makefile || die
+
+	tc-export CC
+}
+
+src_install() {
+	dobin i8kbuttons i8kctl
+	doman i8kbuttons.1 i8kctl.1
+	dosym /usr/bin/i8kctl /usr/bin/i8kfan
+
+	use examples && dodoc -r examples
+
+	newinitd "${FILESDIR}"/i8k.init-r1 i8k
+	newconfd "${FILESDIR}"/i8k.conf i8k
+
+	if use tk; then
+		dobin i8kmon
+		doman i8kmon.1
+		dodoc i8kmon.conf
+		systemd_dounit "${FILESDIR}"/i8kmon.service
+	else
+		cat >> "${ED}"/etc/conf.d/i8k <<- EOF
+		# i8kmon disabled because the package was installed without USE=tk
+		NOMON=1
+		EOF
+	fi
+
+}
diff --git a/app-laptop/i8kutils/i8kutils-1.42.ebuild b/app-laptop/i8kutils/i8kutils-1.42.ebuild
new file mode 100644
index 000000000000..a02cb3a89a8a
--- /dev/null
+++ b/app-laptop/i8kutils/i8kutils-1.42.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="Dell Inspiron and Latitude utilities"
+HOMEPAGE="https://launchpad.net/i8kutils"
+SRC_URI="https://launchpad.net/i8kutils/trunk/${PV}/+download/${P/-/_}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tk"
+
+DEPEND="tk? ( dev-lang/tk:0 )"
+RDEPEND="${DEPEND}
+	sys-power/acpi"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( README.i8kutils )
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-gcc5.patch"
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+
+	tc-export CC
+}
+
+src_install() {
+	dobin i8kctl i8kfan
+	doman i8kctl.1
+	dodoc README.i8kutils
+
+	newinitd "${FILESDIR}"/i8k.init-r1 i8k
+	newconfd "${FILESDIR}"/i8k.conf i8k
+
+	if use tk; then
+		dobin i8kmon
+		doman i8kmon.1
+		dodoc i8kmon.conf
+		systemd_dounit "${FILESDIR}"/i8kmon.service
+	else
+		cat >> "${ED}"/etc/conf.d/i8k <<- EOF
+
+		# i8kmon disabled because the package was installed without USE=tk
+		NOMON=1
+		EOF
+	fi
+}
diff --git a/app-laptop/i8kutils/metadata.xml b/app-laptop/i8kutils/metadata.xml
new file mode 100644
index 000000000000..a365634fd545
--- /dev/null
+++ b/app-laptop/i8kutils/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>adi@adirat.com</email>
+		<name>Ioan-Adrian Ratiu</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">i8kutils</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-laptop/ibam-0.5.2-r4 b/app-laptop/ibam-0.5.2-r4
deleted file mode 100644
index d3d38f45be9a..000000000000
--- a/app-laptop/ibam-0.5.2-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=gkrellm? ( app-admin/gkrellm x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) gkrellm? ( virtual/pkgconfig )
-DESCRIPTION=Intelligent Battery Monitor
-EAPI=6
-HOMEPAGE=http://ibam.sourceforge.net/
-IUSE=gkrellm
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=gkrellm? ( app-admin/gkrellm x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
-SLOT=0
-SRC_URI=mirror://sourceforge/ibam/ibam-0.5.2.tar.gz mirror://debian/pool/main/i/ibam/ibam_0.5.2-2.1.diff.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=38c1dfc0781a42694775b0af1948f360
diff --git a/app-laptop/ibam/Manifest b/app-laptop/ibam/Manifest
new file mode 100644
index 000000000000..aa4d3c425687
--- /dev/null
+++ b/app-laptop/ibam/Manifest
@@ -0,0 +1,5 @@
+AUX ibam-0.5.2-build.patch 1311 BLAKE2B 3e58e55331cf21e1f9bf7825d89c7c72a7fdb83decc1ba4942019de347facab1ef19534dadb079c13b7c9761ef864b7e3611e5f17d5e1c3411eda23ff1a8d3be SHA512 415d36b8d9b212ccc84728e83ce11ffea439542766d9ad6f53659618194a144dff491589a4ed49c0f3707ac37199773925eb357166915193c55e77e246e2d00e
+DIST ibam-0.5.2.tar.gz 22149 BLAKE2B a3d9398dc34004203643d3198a3994ef3b432b909bdf9713a91a1d938a19ab9d0345105a60f3357288c2f3d2a325498a0787138e50fb445f1ea11851f1d7de1c SHA512 c70d728a2f1250ed291e663bd9f4e9ba01308fce14edf1ffd1902057de7e5527548bd06e2e3caaaeabc064d0ee123f536a626fd50b84092f6fc9201fc6bdba58
+DIST ibam_0.5.2-2.1.diff.gz 6115 BLAKE2B 8a1ada53ed39a379f11158583b337166d74d17de808a44e3d3fb225eecef5e3f3b782088072f94dbad387b258254ccbe3fdce7d5655ff201c41d66dbeb7c6d61 SHA512 f6707e42626891aa87697bc28f124345f9f1d0dfb35620f6386dc1dca6b9c5e3a73571bf04e933091c1995d1156925029c0199c5caace497ff891c93f9011ac3
+EBUILD ibam-0.5.2-r4.ebuild 1175 BLAKE2B 4d2e45f591d7b7e713e4e8999fc28f4772d7cd9baa60b014d6630b70964c9f723c1bdd937aa54583a35679d929f08b4858912e95fe56e50ca025890381fdeebc SHA512 6056a58fdaa44212b2dac5e93281a2864d5586ddee4c970715281a69135364e33dae65c68bcc90c693cfc0d19bf632cf91bfa65f164fdb3b7aa149d50087128c
+MISC metadata.xml 330 BLAKE2B 23b7606f4008dab2d8de06938cd2c36bda69bbc025bca0d2234224d37242359299a65b17b5c55b3080d7fcea4ac7a9e4c2359437e355f960b6c217b0931bccd6 SHA512 bc1e4eee7bc08f8e90b37ca0401fd7ad68645a6c50d22d22816ea944c50e47b1b00bc7da95eea38bd0e77f7c1c8baaea0a63c26cfbc9b6941a96612f145a9059
diff --git a/app-laptop/ibam/files/ibam-0.5.2-build.patch b/app-laptop/ibam/files/ibam-0.5.2-build.patch
new file mode 100644
index 000000000000..665e50798b18
--- /dev/null
+++ b/app-laptop/ibam/files/ibam-0.5.2-build.patch
@@ -0,0 +1,42 @@
+--- /Makefile
++++ /Makefile
+@@ -17,8 +17,8 @@
+ #
+ IBAM_VERSION=0.5.2
+ 
+-CC=g++
+-CFLAGS=-O3 -DIBAM_VERSION=\"$(IBAM_VERSION)\" -Wall
++CXX?=g++
++CXXFLAGS+=-DIBAM_VERSION=\"$(IBAM_VERSION)\" -Wall
+ 
+ PREFIX=/usr
+ 
+@@ -30,23 +30,23 @@
+ all:    ibam
+ 
+ ibam:	ibam.cpp ibam.inl ibam.hpp
+-	$(CC) $(CFLAGS) ibam.cpp -o ibam
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) ibam.cpp -o ibam
+ 
+ krell:	ibam-krell.so
+ 
+ ibam-krell.so: ibam-krell.o
+-	$(CC) $(CFLAGS) -fPIC -shared -Wl -o ibam-krell.so ibam-krell.o
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) -fPIC -shared -o ibam-krell.so ibam-krell.o
+ 
+ ibam-krell.o: ibam-krell.cpp ibam.hpp ibam.inl
+-	$(CC) $(CFLAGS) -fPIC `pkg-config gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp
++	$(CXX) $(CXXFLAGS) -fPIC `pkg-config gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp
+ 
+ krell1:	ibam-krell1.so
+ 
+ ibam-krell1.so: ibam-krell1.o
+-	$(CC) $(CFLAGS) -shared -Wl -o ibam-krell1.so ibam-krell1.o
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) -shared -o ibam-krell1.so ibam-krell1.o
+ 
+ ibam-krell1.o: ibam-krell1.cpp ibam.hpp ibam.inl
+-	$(CC) $(CFLAGS) -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` -c ibam-krell1.cpp
++	$(CXX) $(CXXFLAGS) -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` -c ibam-krell1.cpp
+ 
+ install: ibam
+ 	$(INSTALL) ./ibam $(PREFIX)/local/bin/
diff --git a/app-laptop/ibam/ibam-0.5.2-r4.ebuild b/app-laptop/ibam/ibam-0.5.2-r4.ebuild
new file mode 100644
index 000000000000..2076603b9f60
--- /dev/null
+++ b/app-laptop/ibam/ibam-0.5.2-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PATCH_LEVEL="2.1"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Intelligent Battery Monitor"
+HOMEPAGE="http://ibam.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${PATCH_LEVEL}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gkrellm"
+
+RDEPEND="
+	gkrellm? (
+		app-admin/gkrellm
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+	)"
+DEPEND="
+	${RDEPEND}
+	gkrellm? ( virtual/pkgconfig )"
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}"/${P}-build.patch \
+		"${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
+
+	eapply debian/patches/02*.dpatch
+	eapply debian/patches/03*.dpatch
+	eapply debian/patches/05*.dpatch
+
+	eapply_user
+}
+
+src_compile() {
+	tc-export CXX
+	emake
+	use gkrellm && emake krell
+}
+
+src_install() {
+	dobin ibam
+	dodoc CHANGES README REPORT
+
+	if use gkrellm; then
+		insinto /usr/$(get_libdir)/gkrellm2/plugins
+		doins ibam-krell.so
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "You will need to install sci-visualization/gnuplot if you wish to use"
+	elog "the --plot argument to ibam."
+	elog
+}
diff --git a/app-laptop/ibam/metadata.xml b/app-laptop/ibam/metadata.xml
new file mode 100644
index 000000000000..af7ac1137229
--- /dev/null
+++ b/app-laptop/ibam/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="gkrellm">Enable building of app-admin/gkrellm module</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">ibam</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-laptop/laptop-mode-tools-1.72.2 b/app-laptop/laptop-mode-tools-1.72.2
deleted file mode 100644
index 6fa3c9f77ba7..000000000000
--- a/app-laptop/laptop-mode-tools-1.72.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Linux kernel laptop_mode user-space utilities
-EAPI=6
-HOMEPAGE=https://github.com/rickysarraf/laptop-mode-tools/wiki
-IUSE=+acpi apm bluetooth
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/iproute2 sys-apps/ethtool sys-apps/which acpi? ( sys-power/acpid ) apm? ( sys-apps/apmd ) bluetooth? ( net-wireless/bluez:= )
-SLOT=0
-SRC_URI=https://github.com/rickysarraf/laptop-mode-tools/releases/download/1.72.2/laptop-mode-tools_1.72.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
-_md5_=cb99138b2565fb1459746ba0863c0982
diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
new file mode 100644
index 000000000000..bd03422417d9
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -0,0 +1,4 @@
+AUX laptop_mode.init-1.4 1059 BLAKE2B 24dcf91d75df6cffe13cda1c8b9c85c016dae393f79f14ac0bc37c293e0d40e7e7cb34bc31b1c387c10ee74978d1c030fafad60f4e2428a8fcadf03163d5e48a SHA512 4242cda1df6b55cd0bee66dfb9137b6f63118bc31c5f703ed44c42738f47dc794d7f1ed6dd9ba5696b606c4bf624428e8f21e1683cb698d8dda249833a4c5f68
+DIST laptop-mode-tools_1.72.2.tar.gz 121437 BLAKE2B 1fdcdb88183156e4983b4561218164df5dde9fc91e85ab0ec1e6a401d3e5c5e70597a97e16c476949e80a674c34683eac6429e64e76c7921bd28f560e4ffe3cb SHA512 9a3960bad518aa73350b72ce30aeb80f3cbb1bf0fd6a11d5afe396b25c2b73f3b3d2fe7de0741eb94c9e3467c85a99741dc7acfd85339b9eb1daca09d3f8c56a
+EBUILD laptop-mode-tools-1.72.2.ebuild 2545 BLAKE2B 18236618b9cd046ab1fe0756fed68ca19894d185f9cdc90fd871f469c924b218f6b0d3f99c03df3c4eee5aa70d0df017a1f993008990c1b0e28c02b66c3aceb9 SHA512 e88adf5504a0a22a7490b84a4ff102f55771d341910e32a62e42d86a6502f38de02978c9a521361602a6629635e17ff28e80db4055aedfec4c94cde056bf223a
+MISC metadata.xml 436 BLAKE2B f89deae094b0a595dfc688ce45461a20a8b4b66191de36b3a40d01ee570c34ef59dbfae2fd14b6e4e7c76de4277907a74c21e7139d2f0c56d4eae50d4fcde32c SHA512 869ee9290fada409da987a2ecdd962591a425e43f89403046a208dee46802f3b0071c099590b486e4fe09a60dcf6de802088f153cedf44a361a58e7d9395d193
diff --git a/app-laptop/laptop-mode-tools/files/laptop_mode.init-1.4 b/app-laptop/laptop-mode-tools/files/laptop_mode.init-1.4
new file mode 100644
index 000000000000..eef819913cc6
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/files/laptop_mode.init-1.4
@@ -0,0 +1,52 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+depend() {
+	need localmount
+	use acpid hald
+	after bootmisc
+}
+
+checkconfig() {
+	if [ ! -f /proc/sys/vm/laptop_mode ] ; then
+		eerror "Kernel does not support laptop_mode"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting laptop_mode"
+	# bug #342049 fix
+	# check if dir exists and creates if it doesn't
+	checkpath -q -d -m 755 /var/run/laptop-mode-tools
+	touch /var/run/laptop-mode-tools/enabled
+	/usr/sbin/laptop_mode auto >/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping laptop_mode"
+	rm -f /var/run/laptop-mode-tools/enabled
+	/usr/sbin/laptop_mode stop >/dev/null
+	eend $?
+}
+
+reload() {
+	if ! service_started "${SVCNAME}" ; then
+		eerror "${SVCNAME} has not yet been started"
+		return 1
+	fi
+
+	ebegin "Reloading laptop_mode"
+	/usr/sbin/laptop_mode stop >/dev/null
+	rm -f /var/run/laptop-mode-tools/*
+	/usr/sbin/laptop_mode auto force >/dev/null
+	eend $?
+}
+
+# vim: set ts=4 :
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2.ebuild
new file mode 100644
index 000000000000..71d914c0703a
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib systemd udev
+
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="Linux kernel laptop_mode user-space utilities"
+HOMEPAGE="https://github.com/rickysarraf/laptop-mode-tools/wiki"
+SRC_URI="https://github.com/rickysarraf/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="+acpi apm bluetooth"
+
+RDEPEND="sys-apps/iproute2
+	sys-apps/ethtool
+	sys-apps/which
+	acpi? ( sys-power/acpid )
+	apm? ( sys-apps/apmd )
+	bluetooth? ( net-wireless/bluez:= )"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	# This should avoid conflict with pm-powersave wrt #327443 and #396703
+	cat <<-EOF > "${T}"/${PN}
+	HOOK_BLACKLIST="00powersave"
+	EOF
+}
+
+src_compile() { :; }
+
+src_install() {
+	DESTDIR="${D}" \
+		INIT_D="none" \
+		MAN_D="/usr/share/man" \
+		LIB_D="/usr/$(get_libdir)" \
+		UDEV_D="$(get_udevdir)" \
+		SYSTEMD_UNIT_D="$(systemd_get_systemunitdir)" \
+		TMPFILES_D="/usr/lib/tmpfiles.d" \
+		ACPI="$(use acpi && echo force || echo disabled)" \
+		PMU="$(false && echo force || echo disabled)" \
+		APM="$(use apm && echo force || echo disabled)" \
+		SYSTEMD=yes \
+		sh ./install.sh || die
+
+	dodoc Documentation/*.txt README.md
+	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
+
+	# See src_prepare()
+	insinto /etc/pm/config.d
+	doins "${T}"/${PN}
+}
+
+pkg_postinst() {
+	if use acpi || use apm; then
+		if use acpi; then
+			daemon_name="acpid"
+		elif use apm; then
+			deamon_name="apmd"
+		fi
+		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+			ewarn "To enable automatic power state event handling,"
+			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
+			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
+			ewarn "added to default runlevel:"
+			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
+				ewarn "# rc-update add laptop_mode default"
+			fi
+			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+				ewarn "# rc-update add ${daemon_name} default"
+			fi
+		fi
+	else
+		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
+		ewarn "automatically disable laptop_mode on low battery."
+		ewarn
+		ewarn "This means you can lose up to 10 minutes of work if running"
+		ewarn "out of battery while laptop_mode is enabled."
+		ewarn
+		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
+		ewarn "information."
+		ewarn
+	fi
+}
diff --git a/app-laptop/laptop-mode-tools/metadata.xml b/app-laptop/laptop-mode-tools/metadata.xml
new file mode 100644
index 000000000000..2ce8528b0310
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alonbl@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>gentoo-lmt@researchut.com</email>
+			<name>Ritesh Raj Sarraf</name>
+		</maintainer>
+		<remote-id type="github">rickysarraf/laptop-mode-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-laptop/mbpfan-1.9.1 b/app-laptop/mbpfan-1.9.1
deleted file mode 100644
index 545393362426..000000000000
--- a/app-laptop/mbpfan-1.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A simple daemon to control fan speed on all Macbook/Macbook Pros
-EAPI=6
-HOMEPAGE=https://github.com/dgraziotin/mbpfan
-IUSE=kernel_linux
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/dgraziotin/mbpfan/archive/v1.9.1.tar.gz -> mbpfan-1.9.1.tar.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=44e1b9a8425610f190ad8864139c0c4b
diff --git a/app-laptop/mbpfan-2.0.0 b/app-laptop/mbpfan-2.0.0
deleted file mode 100644
index 283916f1d432..000000000000
--- a/app-laptop/mbpfan-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A simple daemon to control fan speed on all Macbook/Macbook Pros
-EAPI=6
-HOMEPAGE=https://github.com/dgraziotin/mbpfan
-IUSE=kernel_linux
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/dgraziotin/mbpfan/archive/v2.0.0.tar.gz -> mbpfan-2.0.0.tar.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6cc7951d6ba3224af9a9cfd92e4c6c97
diff --git a/app-laptop/mbpfan-2.0.1 b/app-laptop/mbpfan-2.0.1
deleted file mode 100644
index 2fcc8663e65e..000000000000
--- a/app-laptop/mbpfan-2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A simple daemon to control fan speed on all Macbook/Macbook Pros
-EAPI=6
-HOMEPAGE=https://github.com/dgraziotin/mbpfan
-IUSE=kernel_linux
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/dgraziotin/mbpfan/archive/v2.0.1.tar.gz -> mbpfan-2.0.1.tar.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a0d5a8cf8e0c71466837bd76a3c07693
diff --git a/app-laptop/mbpfan-9999 b/app-laptop/mbpfan-9999
deleted file mode 100644
index 7cb712b4348d..000000000000
--- a/app-laptop/mbpfan-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A simple daemon to control fan speed on all Macbook/Macbook Pros
-EAPI=6
-HOMEPAGE=https://github.com/dgraziotin/mbpfan
-IUSE=kernel_linux
-LICENSE=GPL-3+
-RESTRICT=test
-SLOT=0
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	git-r3	8f6de46b0aa318aea0e8cac62ece098b	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a0d5a8cf8e0c71466837bd76a3c07693
diff --git a/app-laptop/mbpfan/Manifest b/app-laptop/mbpfan/Manifest
new file mode 100644
index 000000000000..326e74f66504
--- /dev/null
+++ b/app-laptop/mbpfan/Manifest
@@ -0,0 +1,8 @@
+DIST mbpfan-1.9.1.tar.gz 24393 BLAKE2B 9fd96f6903aa360a86e2813d9bf3e57fe28dacc7bbfb25c94eba90a41de1bbf48adb840ec664e9ab3dccafcb361a8799d14ccc258fa377fac88a510c1063a92d SHA512 04f1f70697ccd182c329588623c6664979e1cc25db8a39a2ea9f6d1ec49f3914172c3ada392fabc9ac51a811f36087dc600426c34c201d02a5d7b791b04f0f3b
+DIST mbpfan-2.0.0.tar.gz 37912 BLAKE2B 8d2ce41d8f6a724e28ace0c23047dde4a0a60ae10beeec3e3d7194bbd6b87ae0c340cf025deca896208e225083e0bb67043c6b00135544f2d78e39fbf55b3fcd SHA512 9a7f930afe0a151fe50bf3ef1a06a5cecaced0c47f7088a83b91e25dff85d4b0d53494eac5eb1b624bde6ff1d3307a0d9fe6ba392fdacbe58e241d93d11cda6d
+DIST mbpfan-2.0.1.tar.gz 37805 BLAKE2B 0988a9b5cd359b4e64fdb1e63322dea7582fdc9a9dda0760550945282ef6142dbcab8aeb78ec1a725b5f9aebcda72386e3fa4b8b5f7ecdf078106d229fb7e2af SHA512 8fd2e37b9b81720ff7efa490d285da5980ef5dcc858fef4b0c24166a8f0df46aa230ea18fca5775b222271918e5ca6df1bfbbdced068182c20eeb86192ed2019
+EBUILD mbpfan-1.9.1.ebuild 766 BLAKE2B c8bcc93a3b0a26f6b17b320f0eba11cbe01995314f78e6feef34f3a35c6e089fb71300efe88badc975b4cf747a9103cd27d7144e0a0f16e977b5e990b587bd82 SHA512 e805289f5db3b918a975028a2d16e3eef35f48ccb3db18c9f3cc12b51b4871e5420f8d90c2729e90b6b607a12aac95e88b45ed7ebf3de2e6c2818e7383d2c18b
+EBUILD mbpfan-2.0.0.ebuild 1239 BLAKE2B 58302c6ffab70950fbfeda28331b702749d12908ab65e6637ec16e550f79cdd31502dc9d59e98b63e46c042ccd158d46cfce3916d584faff6fa7ca59bdbaf3c5 SHA512 84a5ff0e5f7bd141a13177760baf22d6e5c0f156aff187600b9b1c803d6616d6d9528c61303b40792d59b9a8f905c2d214b2e568b62c7da120b8e3b86cd298bb
+EBUILD mbpfan-2.0.1.ebuild 1175 BLAKE2B a3a1263571fe29d67bee6ef96e8a4ba92d7259cdeb2f294e254823885b9d898f80ed97d6b8149f4630ee9ecf2145ac0f86a24371b17cbc517d37703d5b209e51 SHA512 82368d46789134ec2b7c86d671096c9a5e64db7956075dd599b858400d069a2ca07db94b41c89152493b577409aa5f458abd5caf502df472ac4c82a6fc6514a9
+EBUILD mbpfan-9999.ebuild 1175 BLAKE2B a3a1263571fe29d67bee6ef96e8a4ba92d7259cdeb2f294e254823885b9d898f80ed97d6b8149f4630ee9ecf2145ac0f86a24371b17cbc517d37703d5b209e51 SHA512 82368d46789134ec2b7c86d671096c9a5e64db7956075dd599b858400d069a2ca07db94b41c89152493b577409aa5f458abd5caf502df472ac4c82a6fc6514a9
+MISC metadata.xml 689 BLAKE2B 27fd22350963186cbee04938bcd8e14e7662ea0d0d432c45ae1a6d352588e13d33cee3f461ffcef5b0c7fd0dccee8b63eb806ca05c8887d4f8c98940d93521b3 SHA512 8edd05f68f3781e684706e61cc28a1d8d5877746c7022ed5a247bb5e686de7f75cbcca2253962b51ccfc06d47445d553399e90b465a9ae466d45cd47d7d05c36
diff --git a/app-laptop/mbpfan/mbpfan-1.9.1.ebuild b/app-laptop/mbpfan/mbpfan-1.9.1.ebuild
new file mode 100644
index 000000000000..58ae75eb0cb0
--- /dev/null
+++ b/app-laptop/mbpfan/mbpfan-1.9.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A simple daemon to control fan speed on all Macbook/Macbook Pros"
+HOMEPAGE="https://github.com/dgraziotin/mbpfan"
+SRC_URI="https://github.com/dgraziotin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test" # will fail if the hardware is unavailable, not useful
+
+CONFIG_CHECK="~SENSORS_APPLESMC ~SENSORS_CORETEMP"
+
+src_prepare() {
+	sed -i -e "s:g++:$(tc-getCXX):g" Makefile || die
+	default
+}
+
+src_install() {
+	dosbin bin/mbpfan
+
+	insinto /etc
+	doins ${PN}.conf
+
+	newinitd ${PN}.init.gentoo ${PN}
+	systemd_dounit ${PN}.service
+
+	einstalldocs
+}
diff --git a/app-laptop/mbpfan/mbpfan-2.0.0.ebuild b/app-laptop/mbpfan/mbpfan-2.0.0.ebuild
new file mode 100644
index 000000000000..fb1fc7c3f9dc
--- /dev/null
+++ b/app-laptop/mbpfan/mbpfan-2.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A simple daemon to control fan speed on all Macbook/Macbook Pros"
+HOMEPAGE="https://github.com/dgraziotin/mbpfan"
+LICENSE="GPL-3+"
+SLOT="0"
+RESTRICT="test" # will fail if the hardware is unavailable, not useful
+
+if [[ "${PV}" = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dgraziotin/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/dgraziotin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+CONFIG_CHECK="~SENSORS_APPLESMC ~SENSORS_CORETEMP"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	# There's a double linking problem in install
+	emake DESTDIR="${ED}" CC="$(tc-getCC)" install
+
+	# Remove the empty systemd unit directory
+	# It doesn't actually install the unit file
+	rmdir --ignore-fail-on-non-empty -p "${ED%/}/lib/systemd/system" || die
+	# Actually install the sytstemd unit file
+	systemd_dounit ${PN}.service
+	# Install openrc init file
+	newinitd ${PN}.init.gentoo ${PN}
+
+	# make install doesn't install the docs in the right place
+	rm -rf "${ED%/}/usr/share/doc/${PN}" || die
+
+	einstalldocs
+}
diff --git a/app-laptop/mbpfan/mbpfan-2.0.1.ebuild b/app-laptop/mbpfan/mbpfan-2.0.1.ebuild
new file mode 100644
index 000000000000..357bf95cf287
--- /dev/null
+++ b/app-laptop/mbpfan/mbpfan-2.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A simple daemon to control fan speed on all Macbook/Macbook Pros"
+HOMEPAGE="https://github.com/dgraziotin/mbpfan"
+LICENSE="GPL-3+"
+SLOT="0"
+RESTRICT="test" # will fail if the hardware is unavailable, not useful
+
+if [[ "${PV}" = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dgraziotin/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/dgraziotin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+CONFIG_CHECK="~SENSORS_APPLESMC ~SENSORS_CORETEMP"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	# Remove the empty systemd unit directory
+	# It doesn't actually install the unit file
+	rmdir --ignore-fail-on-non-empty -p "${ED%/}/lib/systemd/system" || die
+	# Actually install the sytstemd unit file
+	systemd_dounit ${PN}.service
+	# Install openrc init file
+	newinitd ${PN}.init.gentoo ${PN}
+
+	# make install doesn't install the docs in the right place
+	rm -rf "${ED%/}/usr/share/doc/${PN}" || die
+
+	einstalldocs
+}
diff --git a/app-laptop/mbpfan/mbpfan-9999.ebuild b/app-laptop/mbpfan/mbpfan-9999.ebuild
new file mode 100644
index 000000000000..357bf95cf287
--- /dev/null
+++ b/app-laptop/mbpfan/mbpfan-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A simple daemon to control fan speed on all Macbook/Macbook Pros"
+HOMEPAGE="https://github.com/dgraziotin/mbpfan"
+LICENSE="GPL-3+"
+SLOT="0"
+RESTRICT="test" # will fail if the hardware is unavailable, not useful
+
+if [[ "${PV}" = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dgraziotin/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/dgraziotin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+CONFIG_CHECK="~SENSORS_APPLESMC ~SENSORS_CORETEMP"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	# Remove the empty systemd unit directory
+	# It doesn't actually install the unit file
+	rmdir --ignore-fail-on-non-empty -p "${ED%/}/lib/systemd/system" || die
+	# Actually install the sytstemd unit file
+	systemd_dounit ${PN}.service
+	# Install openrc init file
+	newinitd ${PN}.init.gentoo ${PN}
+
+	# make install doesn't install the docs in the right place
+	rm -rf "${ED%/}/usr/share/doc/${PN}" || die
+
+	einstalldocs
+}
diff --git a/app-laptop/mbpfan/metadata.xml b/app-laptop/mbpfan/metadata.xml
new file mode 100644
index 000000000000..95aa53e5c65e
--- /dev/null
+++ b/app-laptop/mbpfan/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gokturk@gentoo.org</email>
+    <name>Göktürk Yüksek</name>
+  </maintainer>
+  <longdescription>
+    mbpfan is a daemon that uses input from coretemp module and sets
+    the fan speed using the applesmc module. This is an enhanced
+    version of Allan McRae mbpfan. This enhanced version assumes any
+    number of processors and fans.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/dgraziotin/mbpfan/issues</bugs-to>
+    <remote-id type="github">dgraziotin/mbpfan</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-laptop/metadata.xml b/app-laptop/metadata.xml
new file mode 100644
index 000000000000..bee35931772d
--- /dev/null
+++ b/app-laptop/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-laptop category contains packages which are designed to work
+		with certain kinds of laptop or notebook computer.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-laptop enthält Pakete für das Arbeiten mit verschiedenen
+		Notebook- und Laptop-Modellen.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-laptop contiene paquetes diseñados para trabajar
+		con ciertas clases de laptops ó computadoras portátiles.
+	</longdescription>
+	<longdescription lang="ja">
+		app-laptopカテゴリには様々なラップトップとノートブックコンピュータで
+		使うパッケージが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De app-laptop categorie bevat applicaties voor laptopgebruikers.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-laptop chứa các gói danh cho các loại máy
+		tính laptop và notebook.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-laptop contiene pacchetti progettaati per lavorare con alcuni
+		tipi di laptop o notebook.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria app-laptop contém pacotes que são desenhados para
+		trabalhar com certos tipos de laptops e notebooks.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-laptop zawiera pakiety ściśle związane z pracą na
+		laptopach i notebookach.
+	</longdescription>
+</catmetadata>
+
diff --git a/app-laptop/nvidiabl-0.83 b/app-laptop/nvidiabl-0.83
deleted file mode 100644
index 97cd75350ea3..000000000000
--- a/app-laptop/nvidiabl-0.83
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst pretend setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Linux driver for setting the backlight brightness on laptops using NVIDIA GPU
-EAPI=5
-HOMEPAGE=https://github.com/guillaumezin/nvidiabl
-IUSE=kernel_linux kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( virtual/modutils )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/guillaumezin/nvidiabl/archive/v0.83.tar.gz -> nvidiabl-0.83.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a08935f81e897db5c7d6a2c3592dfbaf
diff --git a/app-laptop/nvidiabl-0.87 b/app-laptop/nvidiabl-0.87
deleted file mode 100644
index 3a4a8f050dd7..000000000000
--- a/app-laptop/nvidiabl-0.87
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Linux driver for setting the backlight brightness on laptops using NVIDIA GPU
-EAPI=5
-HOMEPAGE=https://github.com/guillaumezin/nvidiabl
-IUSE=kernel_linux kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://github.com/guillaumezin/nvidiabl/archive/v0.87.tar.gz -> nvidiabl-0.87.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d7383141872533c28a028b9b5b15ee8d
diff --git a/app-laptop/nvidiabl/Manifest b/app-laptop/nvidiabl/Manifest
new file mode 100644
index 000000000000..2b21beac5b26
--- /dev/null
+++ b/app-laptop/nvidiabl/Manifest
@@ -0,0 +1,6 @@
+AUX nvidiabl-0.87-linux-4.0.patch 904 BLAKE2B 0c08b3b88a71bac091cfc5c8ea584387e0be9317bae49924ac5ea9a3b8144fb62f53786d048766612b27edd85af827f29f37d630d4de269753c82e35936332f6 SHA512 85860cdd66605c88b1d806e8c6962d70c246dd34e463e9c990156b8a023bb7d47585e95a0444ca63827f64fc4a95064c9d12cdec29264b5d4a439dbcb33958ed
+DIST nvidiabl-0.83.tar.gz 448594 BLAKE2B c80b4f5e09f71004cc1e5eea033181a3de9906648775c415cf9c07e2a16e32fc7e45c32cbe4cd1cb264a2c4be00fc6bb80ac76a6109caf523663132fbf2df662 SHA512 cbf4f042acb9005c25d8d008973220f4d42fe890bfd86a34b72c0e56129dfcdcad2383acacf048e5e9da33aaf759053cdadeddac9e0946ae49a8a29ed03447dd
+DIST nvidiabl-0.87.tar.gz 36563463 BLAKE2B 6feab5505583a26d2426cb3a682e96dd72bb903b5c4187516b22fe4a0b4fb7bb0d7c797396c4b69ab62240baf65337dcb41efcd9952400e1c098f26f6e31ae10 SHA512 778f8b9e7d6d8e9ecbeef745bf3602e56b38757791d7b49ebf3326758117487f7494e232aaa9354b91fd17ee3578c80278e0e60175b274b1a1a93e952dc0dfe5
+EBUILD nvidiabl-0.83.ebuild 886 BLAKE2B 63e23276c6c22baa8dce2d84cddeca8a951e6cd57f123ab0d1f7b9b5073ebf995a7dca16e6e0352dfed95172eeda9485628e0e3213307b8f4ddb96da5c258c91 SHA512 f6c9be10669d2c4df5f7131b3f0407ed103a27fa10c802717a59efd19ee78d21a73b1695fa060f4465d965a3b286122ad8d2d042f8b8b22d61596e732cdb81db
+EBUILD nvidiabl-0.87.ebuild 910 BLAKE2B f73a517b6bbb7e304aad8a9a2a1183f48440299c5ce4bdf157ef1450cea4d23a1ad5ce966f0e4620958955d5c60b182d72af3da8f336d70a658b0d7ab3b718f8 SHA512 ab316b3421500eca4a562593075a0c79bbc7e0efc327c43109d0340be8ced1e2905a3069d0c10d780e5a6031dd687c655d20fe59a547cadb14b3fd577fec2613
+MISC metadata.xml 456 BLAKE2B 1ad02f89ac63a165bec586af632d8bb790bbbd90bff827d3a9407c460cd7a8a8fcaa00539f179cb4f2b22b43031c7db192785a6e6eed7fdfdf3ad177f9cb494b SHA512 d6330a8829f23e5bf3552ba6d04e863203342ba30ab75b3447696c416a33f63a0e8dcc318b3b4cb77ed98b4058a4f58cb0c3faf80946a3a7ea42fcce105320c5
diff --git a/app-laptop/nvidiabl/files/nvidiabl-0.87-linux-4.0.patch b/app-laptop/nvidiabl/files/nvidiabl-0.87-linux-4.0.patch
new file mode 100644
index 000000000000..b466bcb620c9
--- /dev/null
+++ b/app-laptop/nvidiabl/files/nvidiabl-0.87-linux-4.0.patch
@@ -0,0 +1,23 @@
+From dee67fbf8eeec1651dbee3c2045ce6a93da949dc Mon Sep 17 00:00:00 2001
+From: Thomas Wucher <mail@thomaswucher.de>
+Date: Tue, 14 Apr 2015 08:41:09 +0200
+Subject: [PATCH] Replace strnicmp by stncasecmp to fix build on Linux 4.0
+
+---
+ nvidiabl-module.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nvidiabl-module.c b/nvidiabl-module.c
+index b789ea4..b306579 100644
+--- a/nvidiabl-module.c
++++ b/nvidiabl-module.c
+@@ -214,7 +214,7 @@ static int __init nvidiabl_init(void)
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
+ 	
+ 	for (iii = 0 ; iii < sizeof(backlight_type_ids) ; iii++) {
+-		if (strnicmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) {
++		if (strncasecmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) {
+ 			props.type = backlight_type_ids[iii].type;
+ 			printk(KERN_INFO "nvidiabl: backlight type is %s\n", backlight_type_ids[iii].id);
+ 		}
+
diff --git a/app-laptop/nvidiabl/metadata.xml b/app-laptop/nvidiabl/metadata.xml
new file mode 100644
index 000000000000..d57b36ae2558
--- /dev/null
+++ b/app-laptop/nvidiabl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoobugzilla@jeltef.nl</email>
+		<name>Jelte Fennema</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">guillaumezin/nvidiabl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-laptop/nvidiabl/nvidiabl-0.83.ebuild b/app-laptop/nvidiabl/nvidiabl-0.83.ebuild
new file mode 100644
index 000000000000..60f196c88ea6
--- /dev/null
+++ b/app-laptop/nvidiabl/nvidiabl-0.83.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-mod
+
+DESCRIPTION="Linux driver for setting the backlight brightness on laptops using
+NVIDIA GPU"
+HOMEPAGE="https://github.com/guillaumezin/nvidiabl"
+SRC_URI="https://github.com/guillaumezin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+RESTRICT="test"
+
+BUILD_TARGETS="modules"
+MODULE_NAMES="nvidiabl()"
+
+pkg_pretend() {
+	CONFIG_CHECK="FB_BACKLIGHT"
+	ERROR_FB_BACKLIGHT="Your kernel does not support FB_BACKLIGHT. To enable you
+it you can enable any frame buffer with backlight control or nouveau.
+Note that you cannot use FB_NVIDIA with nvidia's proprietary driver"
+	linux-mod_pkg_setup
+}
+
+src_compile() {
+	BUILD_PARAMS="KVER=${KV_FULL}"
+	MAKEOPTS+=" V=1"
+	linux-mod_src_compile
+}
diff --git a/app-laptop/nvidiabl/nvidiabl-0.87.ebuild b/app-laptop/nvidiabl/nvidiabl-0.87.ebuild
new file mode 100644
index 000000000000..e4179351b278
--- /dev/null
+++ b/app-laptop/nvidiabl/nvidiabl-0.87.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-mod eutils
+
+DESCRIPTION="Linux driver for setting the backlight brightness on laptops using NVIDIA GPU"
+HOMEPAGE="https://github.com/guillaumezin/nvidiabl"
+SRC_URI="https://github.com/guillaumezin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+pkg_setup() {
+	CONFIG_CHECK="FB_BACKLIGHT"
+	ERROR_FB_BACKLIGHT="Your kernel does not support FB_BACKLIGHT. To enable you
+it you can enable any frame buffer with backlight control or nouveau.
+Note that you cannot use FB_NVIDIA with nvidia's proprietary driver"
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-linux-4.0.patch
+}
+
+src_compile() {
+	BUILD_PARAMS="KVER=${KV_FULL}"
+	BUILD_TARGETS="modules"
+	MODULE_NAMES="nvidiabl()"
+
+	MAKEOPTS+=" V=1"
+	linux-mod_src_compile
+}
diff --git a/app-laptop/pbbuttonsd-0.8.1a b/app-laptop/pbbuttonsd-0.8.1a
deleted file mode 100644
index 1c647b940312..000000000000
--- a/app-laptop/pbbuttonsd-0.8.1a
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.6 alsa? ( >=media-libs/alsa-lib-1.0 ) macbook? ( sys-apps/pciutils sys-libs/libsmbios ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Handles power management and special keys on laptops
-EAPI=6
-HOMEPAGE=http://pbbuttons.berlios.de
-IUSE=acpi alsa doc ibam macbook oss static-libs
-KEYWORDS=~amd64 ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.6 alsa? ( >=media-libs/alsa-lib-1.0 ) macbook? ( sys-apps/pciutils sys-libs/libsmbios )
-SLOT=0
-SRC_URI=mirror://sourceforge/pbbuttons/pbbuttonsd-0.8.1a.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ff95994853c4fc7362ea1c9f6353fbf0
diff --git a/app-laptop/pbbuttonsd/Manifest b/app-laptop/pbbuttonsd/Manifest
new file mode 100644
index 000000000000..8dec472ebd03
--- /dev/null
+++ b/app-laptop/pbbuttonsd/Manifest
@@ -0,0 +1,11 @@
+AUX pbbuttonsd-0.8.1-cpufreq.patch 757 BLAKE2B 1095205cc20461b49161e7071daa2654b675447574de5575e6d623d920cc8ea827f593bca03692ee5defd61cbfc8261646a1e321a9924f331dd6cd05d18722c4 SHA512 b458ddbcbe8e20fdb316d436f3c3f6c7668ce02cabd2d25d7ed731ad14b431a3f1eb67185d3d5bec26921db1343d5996541c248b7bfeaf1117d469aa4f2a7bad
+AUX pbbuttonsd-0.8.1-fnmode.patch 850 BLAKE2B 91190aced95ce4e3d9e0266074f0dcdd2037d3a3f8bfad90c6f44d04187f9f837da61b34420bb0a70f14aa5802499b039dee9ea3373889b0f9f454016bcb78e9 SHA512 00ed4dd0c0e9e7e92078275fc9fb71c5dd1afd78796cf644f091e32d8d97d7e6f2dce31cf01664f40c51e8ecbfcfe200b09c626c898dfb002426bc2e59ef1609
+AUX pbbuttonsd-0.8.1-g++.patch 431 BLAKE2B c63ff011777c4fc35c3c96985727f07967fbdb9eca66362447030adca13b0922dd5a9ffa0a3b5f2ada9d734af5a256c6be175b33566911e2d212d6063a83cd1b SHA512 01597510267ea52816bbe7e90e6ac1f872265b77f689387557b8263e5631e1ebfba09af2fc27a1034f2cde7164801c284e1b565064675dd598cc0aa82bd64073
+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.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
+MISC metadata.xml 511 BLAKE2B 74e7a1939ef37f6fb312232b3df04de1ba6b0bb2e8bd476c0ebdeb2d7efcda0015204e4c003388194ac481f3fcb551949b4dba5515b770cd2d6ab78dd43ab72b SHA512 5a56b1fe175cd76fa23d90e4499f0a6bacfacdb9cb2fd647dbabec42030021c0b4f27eb04b523b9ae7bc44706ee9404abdf5ff16aa92655fab5d00ac187eca5b
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-cpufreq.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-cpufreq.patch
new file mode 100644
index 000000000000..89ab72a8947f
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-cpufreq.patch
@@ -0,0 +1,20 @@
+--- a/scripts/scripts.d/cpufreq
++++ b/scripts/scripts.d/cpufreq
+@@ -18,7 +18,7 @@
+ case "$1" in
+   powersave|custom)
+     case "$KVER" in
+-      2.6.*)
++      "2.6."*|"3."*)
+         if [ -d /sys ]; then
+           echo -n "userspace" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+           cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
+@@ -41,7 +41,7 @@
+    ;;
+   performance)
+      case "$KVER" in
+-      2.6.*)
++      "2.6."*|"3."*)
+         if [ -d /sys ]; then
+           echo -n "userspace" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+           cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-fnmode.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-fnmode.patch
new file mode 100644
index 000000000000..3c4ed71cb367
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-fnmode.patch
@@ -0,0 +1,23 @@
+--- a/src/module_pmac.c
++++ b/src/module_pmac.c
+@@ -990,7 +990,9 @@
+ 		}
+ 	} else {
+ 		if ((fd = open ("/sys/module/usbhid/parameters/pb_fnmode", O_RDONLY)) < 0)
+-			fd = open ("/sys/module/hid/parameters/pb_fnmode", O_RDONLY);
++			if ((fd = open ("/sys/module/hid/parameters/pb_fnmode", O_RDONLY)) < 0)
++				fd = open("/sys/module/hid_apple/parameters/fnmode", O_RDONLY);
++
+ 		
+ 		if (fd >= 0) {
+ 			if ((n = read (fd, ADBBuffer, ADB_BUFSIZE-1)) > 0) {
+@@ -1025,7 +1027,8 @@
+ 		}
+ 	} else {
+ 		if ((fd = open ("/sys/module/usbhid/parameters/pb_fnmode", O_WRONLY)) < 0)
+-			fd = open ("/sys/module/hid/parameters/pb_fnmode", O_WRONLY);
++			if ((fd = open ("/sys/module/hid/parameters/pb_fnmode", O_WRONLY)) < 0)
++				fd = open ("/sys/module/hid_apple/parameters/fnmode", O_WRONLY);
+ 		
+ 		if (fd >= 0) {
+ 			sprintf ((char*)ADBBuffer, "%d", config);
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-g++.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-g++.patch
new file mode 100644
index 000000000000..de43b800128f
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-g++.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -319,7 +319,7 @@
+ 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ pbbuttonsd$(EXEEXT): $(pbbuttonsd_OBJECTS) $(pbbuttonsd_DEPENDENCIES) 
+ 	@rm -f pbbuttonsd$(EXEEXT)
+-	$(CXXLINK) $(pbbuttonsd_LDFLAGS) $(pbbuttonsd_OBJECTS) $(pbbuttonsd_LDADD) $(LIBS)
++	$(LINK) $(pbbuttonsd_LDFLAGS) $(pbbuttonsd_OBJECTS) $(pbbuttonsd_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-laptopmode.sh.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-laptopmode.sh.patch
new file mode 100644
index 000000000000..c29efe3122ac
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-laptopmode.sh.patch
@@ -0,0 +1,29 @@
+--- a/scripts/scripts.d/laptopmode.sh
++++ b/scripts/scripts.d/laptopmode.sh
+@@ -122,7 +122,7 @@
+ 	     )
+ 	 )
+ case "$KLEVEL" in
+-	"2.4"|"2.6")
++	"2.4"|"2.6"|"3."*)
+ 		true
+ 		;;
+ 	*)
+@@ -222,7 +222,7 @@
+ 				echo "1"				> /proc/sys/vm/laptop_mode
+ 				echo "30 500 0 0 $AGE $AGE 60 20 0"	> /proc/sys/vm/bdflush
+ 				;;
+-			"2.6")
++			"2.6"|"3."*)
+ 				echo "5"				> /proc/sys/vm/laptop_mode
+ 				echo "$AGE"				> /proc/sys/vm/dirty_writeback_centisecs
+ 				echo "$AGE"				> /proc/sys/vm/dirty_expire_centisecs
+@@ -268,7 +268,7 @@
+ 			"2.4")
+ 				echo "30 500 0 0 $U_AGE $B_AGE 60 20 0"	> /proc/sys/vm/bdflush
+ 				;;
+-			"2.6")
++			"2.6"|"3."*)
+ 				echo "$U_AGE"				> /proc/sys/vm/dirty_writeback_centisecs
+ 				echo "$B_AGE"				> /proc/sys/vm/dirty_expire_centisecs
+ 				echo "$DEF_DIRTY_RATIO"			> /proc/sys/vm/dirty_ratio
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-lm.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-lm.patch
new file mode 100644
index 000000000000..794de96244cb
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-lm.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -255,7 +255,7 @@
+ 						   module_peep.c module_peep.h debug.h \
+ 						   tcp.c tcp.h
+ 
+-pbbuttonsd_LDADD = -lpbb $(INTLLIBS) $(PB_OBJECTS) $(PB_LIBS) @PACKAGE_LIBS@
++pbbuttonsd_LDADD = -lpbb -lm $(INTLLIBS) $(PB_OBJECTS) $(PB_LIBS) @PACKAGE_LIBS@
+ pbbuttonsd_LDFLAGS = -L$(top_srcdir)/libpbbipc
+ pbbuttonsd_DEPENDENCIES = $(PB_OBJECTS)
+ @DEBUG_TRUE@AM_CFLAGS1 = -DDEBUG
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-lz.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-lz.patch
new file mode 100644
index 000000000000..93cebe1d5c6e
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-lz.patch
@@ -0,0 +1,25 @@
+--- a/configure.in
++++ b/configure.in
+@@ -33,6 +33,9 @@
+ PB_OBJECTS=
+ PB_LIBS=
+ 
++### Setup PKG_CONFIG
++PKG_PROG_PKG_CONFIG
++
+ if test "x$laptop" != "x"; then
+     ac_laptop=$laptop
+ elif test "x$LAPTOP" != "x"; then
+@@ -59,10 +62,9 @@
+ 		AC_CHECK_HEADERS([smbios/SystemInfo.h],
+ 			AC_DEFINE_UNQUOTED(WITH_SMBIOS, 1, [SMBIOS available]),
+ 			AC_MSG_ERROR([SMBios library not available. Please install development files for libsmbios.]), [/* dummy */])
+-		AC_CHECK_HEADERS([pci/pci.h sys/io.h], ac_macbook=yes,
+-			AC_MSG_ERROR([Please install development files for libpci and direct I/O.]), [/* dummy */])
++		PKG_CHECK_MODULES(LIBPCI, libpci)
+ 		PB_OBJECTS+=" driver_backlight_x1600.$OBJEXT driver_backlight_gma950.$OBJEXT module_acpi.$OBJEXT module_imac.$OBJEXT"
+-		PB_LIBS+=" -lpci -lsmbios"
++		PB_LIBS+=" -lsmbios $LIBPCI_LIBS"
+ 		LCD_FADINGSPEED="448"
+ 		LCD_AUTOADJMODE="linear"
+ 		LCD_AUTOADJPARMBAT="0,10,80,30"
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd.rc6 b/app-laptop/pbbuttonsd/files/pbbuttonsd.rc6
new file mode 100644
index 000000000000..ba5e167790d0
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/pbbuttonsd.rc6
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use alsasound
+}
+
+start() {
+	ebegin "Starting pbbuttonsd"
+	/usr/bin/pbbuttonsd -d > /dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping pbbuttonsd"
+	start-stop-daemon --stop --quiet --exec /usr/bin/pbbuttonsd
+	eend $?
+}
diff --git a/app-laptop/pbbuttonsd/files/wireless b/app-laptop/pbbuttonsd/files/wireless
new file mode 100644
index 000000000000..b110b3819a68
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/wireless
@@ -0,0 +1,7 @@
+#!/bin/sh
+### Restart the wireless device on Gentoo
+### Useful for bcm43xx/b43 which doesn't reconnect on resume
+
+### Uncomment the line below and properly set the device variable
+WIRELESS="net.wlan0"
+# /etc/init.d/${WIRELESS} restart
diff --git a/app-laptop/pbbuttonsd/metadata.xml b/app-laptop/pbbuttonsd/metadata.xml
new file mode 100644
index 000000000000..c123825ee27e
--- /dev/null
+++ b/app-laptop/pbbuttonsd/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
+	<use>
+		<flag name="ibam">Enable support for Intelligent Battery Monitoring</flag>
+		<flag name="macbook">Enable support for the Macbook and Macbook Pro</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">pbbuttons</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1a.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1a.ebuild
new file mode 100644
index 000000000000..8a17130c0544
--- /dev/null
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1a.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic
+
+DESCRIPTION="Handles power management and special keys on laptops"
+HOMEPAGE="http://pbbuttons.berlios.de"
+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"
+
+RDEPEND="
+	>=dev-libs/glib-2.6
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	macbook? (
+		sys-apps/pciutils
+		sys-libs/libsmbios
+	)
+"
+DEPEND="
+	 ${RDEPEND}
+	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"
+)
+
+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
+
+	default
+
+	eautoconf
+}
+
+src_configure() {
+	# Fix crash bug on some systems
+	replace-flags -O? -O1
+
+	if use macbook; then
+		laptop=macbook
+	elif use x86 || use amd64; then
+		if use acpi; then
+			laptop=acpi
+		else
+			laptop=i386
+		fi
+	# Default to PowerBook
+	else
+		laptop=powerbook
+	fi
+
+	laptop=$laptop \
+		econf \
+		$(use_with alsa) \
+		$(use_with doc doxygen_docs) \
+		$(use_with ibam) \
+		$(use_with oss)
+
+}
+
+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
+	else
+		emake
+	fi
+}
+
+src_install() {
+	dodir /etc/power
+	use ibam && dodir /var/lib/ibam
+
+	default
+
+	use static-libs || rm "${D}"/usr/$(get_libdir)/libpbb.a
+
+	newinitd "${FILESDIR}/pbbuttonsd.rc6" pbbuttonsd
+	dodoc README
+	use doc && dodoc -r doc/
+
+	dodir /etc/power/resume.d
+	dodir /etc/power/suspend.d
+	dodir /etc/power/scripts.d
+	exeinto /etc/power/scripts.d
+	doexe "${FILESDIR}"/wireless
+	ln -s "${D}"/etc/power/scripts.d/wireless "${D}"/etc/power/resume.d/wireless
+}
+
+pkg_postinst() {
+	if [ -e /etc/pbbuttonsd.conf ]; then
+		ewarn "The pbbuttonsd.cnf file replaces /etc/pbuttonsd.conf with a new"
+		ewarn "file (/etc/pbbuttonsd.conf) and a new format. Please check the"
+		ewarn "manual page with 'man pbbuttonsd.cnf' for details."
+		ewarn
+	fi
+
+	if use macbook; then
+		ewarn "Macbook and Macbook Pro users should make sure to have applesmc"
+		ewarn "loaded before starting pbbuttonsdm otherwise auto-adjustments"
+		ewarn "will not work and pbbuttonsd may segfault."
+		ewarn
+	fi
+
+	ewarn "Ensure that the evdev kernel module is loaded otherwise"
+	ewarn "pbbuttonsd won't work. SysV IPC is also required."
+	ewarn
+	ewarn "If you need extra security, you can tell pbbuttonsd to only accept"
+	ewarn "input from one user. You can set the userallowed option in"
+	ewarn "/etc/pbbuttonsd.cnf to limit access."
+	ewarn
+
+	if use ibam; then
+		elog "To properly initialize the IBaM battery database, you will"
+		elog "need to perform a full discharge/charge cycle. For more"
+		elog "details, please see the pbbuttonsd man page."
+		elog
+	fi
+
+	elog "A script is now available to reset your wirless connection on resume."
+	elog "Simply uncomment the commented command and set the correct device to"
+	elog "use it. You can find the script in /etc/power/resume.d/wireless"
+
+}
diff --git a/app-laptop/pommed-1.39-r1 b/app-laptop/pommed-1.39-r1
deleted file mode 100644
index ef29ea9d8fd3..000000000000
--- a/app-laptop/pommed-1.39-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=media-libs/alsa-lib x86? ( sys-apps/pciutils ) amd64? ( sys-apps/pciutils ) dev-libs/confuse >=sys-apps/dbus-1.1 dev-libs/dbus-glib sys-libs/zlib media-libs/audiofile gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXpm ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Manage screen and keyboard backlight on Apple MacBook Pro/PowerBook
-EAPI=5
-HOMEPAGE=http://technologeek.org/projects/pommed/index.html
-IUSE=gtk X kernel_linux
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib x86? ( sys-apps/pciutils ) amd64? ( sys-apps/pciutils ) dev-libs/confuse >=sys-apps/dbus-1.1 dev-libs/dbus-glib sys-libs/zlib media-libs/audiofile gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXpm ) media-sound/alsa-utils virtual/eject
-SLOT=0
-SRC_URI=http://alioth.debian.org/frs/download.php/3583/pommed-1.39.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1995755252f1db45c17208d41fc41138
diff --git a/app-laptop/pommed/Manifest b/app-laptop/pommed/Manifest
new file mode 100644
index 000000000000..5ce54a7f3d2d
--- /dev/null
+++ b/app-laptop/pommed/Manifest
@@ -0,0 +1,6 @@
+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 2306 BLAKE2B 20c999e57edd6a9886c823bacd766d791bbd46c36b2dfddd77a5a130c447650cf70861e9ead702df9bccb4fa31197c41208e8c08ab12b801b52e1644ae1fd7fd SHA512 451d30a5c7b18c5f035cd1d3009d55ff5575616c9195e6977b15ba5762786af10c6dd0081fd36ae887f7320a60ee578d54832da7b8deaea877914aa7a8912a15
+MISC metadata.xml 644 BLAKE2B e8639125013d5f7024f9e49cbfef306ead9a8c7c3486fe2538a79de4394d01e122c5b6af241b98405491299d00a48fd683fb94fd4795294ea5f96ba56b434784 SHA512 3e31c0588847153aa548d8b09eb5a896f372f6c2c70deb5ac5efbd0f6401877fcf38fb8d04d5cfc718ec228157da86229eefb8101be5bdca0c6e5e540e48aa01
diff --git a/app-laptop/pommed/files/pommed-1.39.patch b/app-laptop/pommed/files/pommed-1.39.patch
new file mode 100644
index 000000000000..1215606c35cb
--- /dev/null
+++ b/app-laptop/pommed/files/pommed-1.39.patch
@@ -0,0 +1,89 @@
+diff --git a/gpomme/Makefile b/gpomme/Makefile
+index 0874b48..a3ab64a 100644
+--- a/gpomme/Makefile
++++ b/gpomme/Makefile
+@@ -1,5 +1,3 @@
+-CC = gcc
+-
+ GTK_CFLAGS = $(shell pkg-config --cflags gtk+-2.0)
+ GTK_LIBS = $(shell pkg-config --libs gtk+-2.0)
+ 
+@@ -14,7 +12,7 @@ CONFUSE_LIBS = $(shell pkg-config libconfuse --libs)
+ 
+ INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H)
+ 
+-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS)
++CFLAGS += -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS)
+ LDLIBS = -lpthread -lX11 $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS)
+ 
+ SOURCES = gpomme.c theme.c conffile.c \
+@@ -30,6 +28,7 @@ all: gpomme mo
+ mo: $(MOFILES)
+ 
+ gpomme: $(OBJS)
++	${CC} -o $@ ${OBJS} ${LDLIBS} ${LDFLAGS}
+ 
+ gpomme.o: gpomme.c gpomme.h theme.h ../client-common/dbus-client.h ../client-common/video-client.h
+ 
+diff --git a/pommed/Makefile b/pommed/Makefile
+index 5f3cbf9..3425a2a 100644
+--- a/pommed/Makefile
++++ b/pommed/Makefile
+@@ -1,7 +1,5 @@
+ ARCH ?= $(shell uname -m)
+ 
+-CC = gcc
+-
+ DBUS_CFLAGS = $(shell pkg-config dbus-1 --cflags) -DDBUS_API_SUBJECT_TO_CHANGE
+ DBUS_LIBS = $(shell pkg-config dbus-1 --libs)
+ 
+@@ -18,7 +16,7 @@ INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INO
+ 
+ TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H)
+ 
+-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
++CFLAGS += -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
+ 
+ LDLIBS = -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
+ 
+@@ -54,6 +52,7 @@ ifeq ($(LIBPCI_SHARED), true)
+ 
+ 	CFLAGS += $(LIBPCI_CFLAGS)
+ 	LDLIBS += $(LIBPCI_LIBS)
++	LIBS = $(LIBPCI_LIBS)
+ else
+ 	LIB_OBJS += /usr/lib/libpci.a
+ 	LDLIBS += -lz
+@@ -73,6 +72,7 @@ OBJS = $(SOURCES:%.c=%.o)
+ 
+ 
+ pommed: $(OBJS) $(LIB_OBJS)
++	${CC} -o $@ ${OBJS} ${LDLIBS} ${LDFLAGS}
+ 
+ pommed.o: pommed.c pommed.h evloop.h kbd_backlight.h lcd_backlight.h cd_eject.h evdev.h conffile.h audio.h dbus.h beep.h
+ 
+diff --git a/wmpomme/Makefile b/wmpomme/Makefile
+index cc7a438..6c4bee1 100644
+--- a/wmpomme/Makefile
++++ b/wmpomme/Makefile
+@@ -1,11 +1,9 @@
+-CC = gcc
+-
+ DBUS_CFLAGS = $(shell pkg-config dbus-1 --cflags) -DDBUS_API_SUBJECT_TO_CHANGE
+ DBUS_LIBS = $(shell pkg-config dbus-1 --libs)
+ 
+ TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H)
+ 
+-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
++CFLAGS += -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
+ LDLIBS = -lrt -lXpm -lXext -lX11 $(DBUS_LIBS)
+ 
+ SOURCES = wmgeneral.c wmpomme.c \
+@@ -15,6 +13,7 @@ SOURCES = wmgeneral.c wmpomme.c \
+ OBJS = $(SOURCES:%.c=%.o)
+ 
+ wmpomme: $(OBJS)
++	${CC} -o $@ ${OBJS} ${LDLIBS} ${LDFLAGS}
+ 
+ wmpomme.o: wmpomme.c wmgeneral.h wmpomme-master.xpm ../client-common/dbus-client.h
+ 
diff --git a/app-laptop/pommed/files/pommed.rc b/app-laptop/pommed/files/pommed.rc
new file mode 100644
index 000000000000..23904fc7d3a0
--- /dev/null
+++ b/app-laptop/pommed/files/pommed.rc
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need dbus alsasound
+}
+
+start() {
+	ebegin "Running pommed daemon"
+	start-stop-daemon --start --quiet --exec /usr/bin/pommed
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping pommed daemon"
+	start-stop-daemon --stop --pidfile /var/run/pommed.pid
+	eend $?
+}
diff --git a/app-laptop/pommed/files/pommed.service b/app-laptop/pommed/files/pommed.service
new file mode 100644
index 000000000000..8407c1db9550
--- /dev/null
+++ b/app-laptop/pommed/files/pommed.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=MacBook Hotkey Event Handler
+
+[Service]
+Type=dbus
+BusName=org.pommed
+ExecStart=/usr/bin/pommed -f
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-laptop/pommed/metadata.xml b/app-laptop/pommed/metadata.xml
new file mode 100644
index 000000000000..03eedeaa5399
--- /dev/null
+++ b/app-laptop/pommed/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>naota@gentoo.org</email>
+</maintainer>
+<longdescription> pommed handles the hotkeys found on the Apple MacBook Pro,
+MacBook and PowerBook laptops and adjusts the LCD backlight, sound volume,
+keyboard backlight or ejects the CD-ROM drive accordingly.
+pommed also monitors the ambient light sensors to automatically light up the
+keyboard backlight on the MacBook Pro and the latest PowerBook.
+Optional support for the Apple Remote control is available.</longdescription>
+</pkgmetadata>
diff --git a/app-laptop/pommed/pommed-1.39-r1.ebuild b/app-laptop/pommed/pommed-1.39-r1.ebuild
new file mode 100644
index 000000000000..e915f399b70d
--- /dev/null
+++ b/app-laptop/pommed/pommed-1.39-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs linux-info systemd
+
+DESCRIPTION="Manage screen and keyboard backlight on Apple MacBook Pro/PowerBook"
+HOMEPAGE="http://technologeek.org/projects/pommed/index.html"
+ALIOTH_NUMBER="3583"
+SRC_URI="http://alioth.debian.org/frs/download.php/${ALIOTH_NUMBER}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="gtk X"
+
+COMMON_DEPEND="media-libs/alsa-lib
+	x86? ( sys-apps/pciutils )
+	amd64? (  sys-apps/pciutils )
+	dev-libs/confuse
+	>=sys-apps/dbus-1.1
+	dev-libs/dbus-glib
+	sys-libs/zlib
+	media-libs/audiofile
+	gtk? ( x11-libs/gtk+:2 )
+	X? ( x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	media-sound/alsa-utils
+	virtual/eject"
+
+pkg_setup() {
+	if ! use ppc; then
+		linux-info_pkg_setup
+
+		CONFIG_CHECK="~DMIID"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}.patch"
+}
+
+src_compile() {
+	cd "${S}"/pommed
+	emake CC="$(tc-getCC)" OFLIB=1 || die "emake pommed failed"
+
+	if use gtk; then
+		cd "${S}"/gpomme
+		local POFILES=""
+		for LANG in ${LINGUAS}; do
+			if [ -f po/${LANG}.po ]; then
+				POFILES="${POFILES} po/${LANG}.po"
+			fi
+		done
+		emake CC="$(tc-getCC)" POFILES="${POFILES}" || die "emake gpomme failed"
+	fi
+	if use X; then
+		cd "${S}"/wmpomme
+		emake CC="$(tc-getCC)" || die "emake wmpomme failed"
+	fi
+}
+
+src_install() {
+	insinto /etc
+	if use x86 || use amd64; then
+		newins pommed.conf.mactel pommed.conf
+	elif use ppc; then
+		newins pommed.conf.pmac pommed.conf
+	fi
+
+	insinto /etc/dbus-1/system.d
+	newins dbus-policy.conf pommed.conf
+
+	insinto /usr/share/pommed
+	doins pommed/data/*.wav
+
+	dobin pommed/pommed
+
+	newinitd "${FILESDIR}"/pommed.rc pommed
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodoc AUTHORS ChangeLog README TODO
+
+	if use gtk ; then
+		dobin gpomme/gpomme
+		for LANG in ${LINGUAS}; do
+			if [ -f gpomme/po/${LANG}.mo ]; then
+				einfo "Installing lang ${LANG}"
+				insinto /usr/share/locale/${LANG}/LC_MESSAGES/
+				doins gpomme/po/${LANG}.mo
+			fi
+		done
+
+		domenu gpomme/gpomme.desktop gpomme/gpomme-c.desktop
+		insinto /usr/share/gpomme/
+		doins -r gpomme/themes
+	fi
+
+	if use X ; then
+		dobin wmpomme/wmpomme
+	fi
+}
diff --git a/app-laptop/radeontool-1.6.3 b/app-laptop/radeontool-1.6.3
deleted file mode 100644
index 85c3c4635cfa..000000000000
--- a/app-laptop/radeontool-1.6.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=x11-libs/libpciaccess-0.12.0 virtual/pkgconfig
-DESCRIPTION=Manage the backlight, external video output and registers of ATI Radeon cards
-EAPI=5
-HOMEPAGE=https://cgit.freedesktop.org/~airlied/radeontool/
-KEYWORDS=amd64 ppc x86
-LICENSE=ZLIB
-RDEPEND=>=x11-libs/libpciaccess-0.12.0
-SLOT=0
-SRC_URI=https://people.freedesktop.org/~airlied/radeontool/radeontool-1.6.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d32918758143d5af623bfdb4fe8219a9
diff --git a/app-laptop/radeontool/Manifest b/app-laptop/radeontool/Manifest
new file mode 100644
index 000000000000..bf4876ae4357
--- /dev/null
+++ b/app-laptop/radeontool/Manifest
@@ -0,0 +1,3 @@
+DIST radeontool-1.6.3.tar.bz2 367487 BLAKE2B 0af4f7ce5f638b1ebfa191439f048bd3687ecec0085621b931890f07154fd40349c7d5eab57cb58fb75a6b0c9ebb687728332e3b72826f9b57b2272f67691eca SHA512 937ddf3e2b7dc35b9bc872d770b184303ac9e8199c0de6c17d187acfc5c398abc0cec2071c1af5ad16b0df2976418e06db8b1f90775fe59a8a80bdb3f8e2dca6
+EBUILD radeontool-1.6.3.ebuild 559 BLAKE2B 93c5569717865bf9dbf494161d5582297b35ac8be67353f5e34a7e77922b26439e8d70da543b9ce7a6cc6d6979a40dba55efe6a2617ee413a422a79f634146f6 SHA512 5a3e1d3c3f299032d8df4214cdce746e9e06e212322f44f8368877069c18b005cc88cbd434e1e1414aec967df2339966245b62efe15f95b269560dca2d918e44
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-laptop/radeontool/metadata.xml b/app-laptop/radeontool/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-laptop/radeontool/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-laptop/radeontool/radeontool-1.6.3.ebuild b/app-laptop/radeontool/radeontool-1.6.3.ebuild
new file mode 100644
index 000000000000..edd777f7ac49
--- /dev/null
+++ b/app-laptop/radeontool/radeontool-1.6.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Manage the backlight, external video output and registers of ATI Radeon cards"
+
+HOMEPAGE="https://cgit.freedesktop.org/~airlied/radeontool/"
+SRC_URI="https://people.freedesktop.org/~airlied/${PN}/${P}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+IUSE=""
+
+RDEPEND=">=x11-libs/libpciaccess-0.12.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_install() {
+	emake install DESTDIR="${D}"
+}
diff --git a/app-laptop/spicctrl-1.9-r1 b/app-laptop/spicctrl-1.9-r1
deleted file mode 100644
index 41d9da017453..000000000000
--- a/app-laptop/spicctrl-1.9-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DESCRIPTION=tool for the sonypi-Device (found in Sony Vaio Notebooks)
-EAPI=4
-HOMEPAGE=http://www.popies.net/sonypi/
-KEYWORDS=~amd64 -ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.popies.net/sonypi/spicctrl-1.9.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=47499fe28590af917be157e525f3a243
diff --git a/app-laptop/spicctrl/Manifest b/app-laptop/spicctrl/Manifest
new file mode 100644
index 000000000000..54fa1aa8eaef
--- /dev/null
+++ b/app-laptop/spicctrl/Manifest
@@ -0,0 +1,4 @@
+AUX spicctrl-1.9-makefile.patch 284 BLAKE2B 86f2e5f7f5748de8051deb3f94f86c1227416ef23b57e5f8ef9486dccb4a2d080fca3c36ad9aaecf65cd8b48a0ae0eccf37387a4360f021cd9d7a8fcb3c0446d SHA512 65a4dc464660cb7b157f3fd6c17dbd1ef9a1976525e68b3bbab72fbb389cc1ff98da43a7e332be360727852ffa86bd237ef633f8253cb1a731efa91a99e93913
+DIST spicctrl-1.9.tar.bz2 10917 BLAKE2B c26101bb13bd512434b076b9fc6467189c7cb60f7b4a8dd0eede7b18b888d2b418c505896f2b52724df5ea7fab50b336f5843369a9ef4d19e642adc0f8399a01 SHA512 7b1d7862a51dd3321fe84cc5921d71a8f0b978755cbd7c31e54a59ad1c9d3f781d649436bd9b7fba71446a593ad7e925470731f5bd135350942fb0c03fbd4d3e
+EBUILD spicctrl-1.9-r1.ebuild 538 BLAKE2B bb22fb85feae533c67c12d0d51ee30fd5bb08599df03893235db9c4cf4aea3234b5f2e4272796ef34df5ed6aca97129b779f98858a1cdc8313d090aa1fa21ebe SHA512 346ce1707c6c8baeabcbd89415ad8ce395a501fc5fb3ffe9c5c87b128da7737f9d0d6da28d2f2441142e1b340d693c8a8fc3f52b412caadc6d5149d18f4d5da5
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-laptop/spicctrl/files/spicctrl-1.9-makefile.patch b/app-laptop/spicctrl/files/spicctrl-1.9-makefile.patch
new file mode 100644
index 000000000000..a49a29c30fb5
--- /dev/null
+++ b/app-laptop/spicctrl/files/spicctrl-1.9-makefile.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2012-11-20 12:38:41.528871594 +0400
++++ Makefile	2012-11-20 12:39:42.630871103 +0400
+@@ -14,7 +14,7 @@
+ all: spicctrl
+ 
+ spicctrl: $(OBJ)
+-	$(CC) -o spicctrl $(OBJ) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o spicctrl $(OBJ) $(LIBS)
+ 
+ clean:
+ 	rm -f $(OBJ) spicctrl *~
diff --git a/app-laptop/spicctrl/metadata.xml b/app-laptop/spicctrl/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-laptop/spicctrl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-laptop/spicctrl/spicctrl-1.9-r1.ebuild b/app-laptop/spicctrl/spicctrl-1.9-r1.ebuild
new file mode 100644
index 000000000000..d1aceef29615
--- /dev/null
+++ b/app-laptop/spicctrl/spicctrl-1.9-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit base toolchain-funcs
+
+DESCRIPTION="tool for the sonypi-Device (found in Sony Vaio Notebooks)"
+HOMEPAGE="http://www.popies.net/sonypi/"
+SRC_URI="http://www.popies.net/sonypi/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin spicctrl
+}
diff --git a/app-laptop/thinkfan-0.9.3 b/app-laptop/thinkfan-0.9.3
deleted file mode 100644
index 32f945e85f0e..000000000000
--- a/app-laptop/thinkfan-0.9.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=atasmart? ( dev-libs/libatasmart ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=simple fan control program for thinkpads
-EAPI=6
-HOMEPAGE=http://thinkfan.sourceforge.net
-IUSE=atasmart
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=atasmart? ( dev-libs/libatasmart )
-SLOT=0
-SRC_URI=mirror://sourceforge/thinkfan/thinkfan-0.9.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c4a48e349cc8591588e4945c68d93c1e
diff --git a/app-laptop/thinkfan/Manifest b/app-laptop/thinkfan/Manifest
new file mode 100644
index 000000000000..3878b64edae0
--- /dev/null
+++ b/app-laptop/thinkfan/Manifest
@@ -0,0 +1,3 @@
+DIST thinkfan-0.9.3.tar.gz 39527 BLAKE2B e6a6d09493d94b4de9ada20dcc4b0251c5f2c148f7faa7f69c04fe2a279a9cfe253a0ea1a01fe94ed108e8731e2ba01edef5df10dfb887ea961a356dff733854 SHA512 d2a29f9cae636c22b66958f8ec50cb60a162d745c3967257bb5e20cc9e152894d4e8a66f897ffa4e49353eba4a42e3499bb9e554719974284089a46cfc6280d7
+EBUILD thinkfan-0.9.3.ebuild 1069 BLAKE2B 0e4862e477f197efc30f9c72330e8153327325a733277220a0e65725483762e700515dc3204712d8f6af2b06c576cf17f114683993c0385383cc92c58e211318 SHA512 ffec534bfe1c1eb08c1de3858347781d6f0dc349d7f3de39196a47166e65142d649e0e889141e9c90ce193f0f984ac386ce39cc45f6e70ff971278c3b6560247
+MISC metadata.xml 419 BLAKE2B 614fa01aed150fe8dd815d2efa970e0a78de6652c114a3c5236dbd00cb794fc283f5360bc1d9e79a02fa9866a817785f362aba5908ea08864820a89ba526c2ea SHA512 c0979a5886be1a527d7eb45176316320b6c116181f83ade62c6b900a01e6fb6538d738eb081e99dc6f3fd03589e34ac45f5c5da8eebbd33f13d04baa7fd913c8
diff --git a/app-laptop/thinkfan/metadata.xml b/app-laptop/thinkfan/metadata.xml
new file mode 100644
index 000000000000..79dc72426bd0
--- /dev/null
+++ b/app-laptop/thinkfan/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<use>
+		<flag name="atasmart">include libatasmart support to get disc temperature</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">thinkfan</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-laptop/thinkfan/thinkfan-0.9.3.ebuild b/app-laptop/thinkfan/thinkfan-0.9.3.ebuild
new file mode 100644
index 000000000000..ca8dc1c15153
--- /dev/null
+++ b/app-laptop/thinkfan/thinkfan-0.9.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils readme.gentoo-r1 systemd
+
+DESCRIPTION="simple fan control program for thinkpads"
+HOMEPAGE="http://thinkfan.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="atasmart"
+
+DEPEND="atasmart? ( dev-libs/libatasmart )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s:#!/sbin/runscript:#!/sbin/openrc-run:" \
+		-i rcscripts/thinkfan.gentoo
+
+	sed -e "s:share/doc/${PN}:share/doc/${PF}:" \
+	    -e "s:thinkfan.1:src/thinkfan.1:" \
+		-i CMakeLists.txt
+}
+
+src_configure() {
+	local mycmakeargs+=(
+		"-DCMAKE_BUILD_TYPE:STRING=Debug"
+		"-DUSE_ATASMART=$(usex atasmart)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newinitd rcscripts/${PN}.gentoo ${PN}
+	systemd_dounit rcscripts/${PN}.service
+
+	readme.gentoo_create_doc
+}
+
+DOC_CONTENTS="Please read the documentation and copy an
+appropriate file to /etc/thinkfan.conf."
diff --git a/app-laptop/tp_smapi-0.42-r1 b/app-laptop/tp_smapi-0.42-r1
deleted file mode 100644
index 0e6413dc5451..000000000000
--- a/app-laptop/tp_smapi-0.42-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst pretend setup
-DEPEND=sys-apps/dmidecode kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=IBM ThinkPad SMAPI BIOS driver
-EAPI=6
-HOMEPAGE=https://github.com/evgeni/tp_smapi
-IUSE=hdaps kernel_linux kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/dmidecode kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://github.com/evgeni/tp_smapi/releases/download/tp-smapi/0.42/tp_smapi-0.42.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6134569d57a9e55d27ce14003f91f0b0
diff --git a/app-laptop/tp_smapi-0.43 b/app-laptop/tp_smapi-0.43
deleted file mode 100644
index ade0296650dd..000000000000
--- a/app-laptop/tp_smapi-0.43
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst pretend setup
-DEPEND=sys-apps/dmidecode kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=IBM ThinkPad SMAPI BIOS driver
-EAPI=6
-HOMEPAGE=https://github.com/evgeni/tp_smapi
-IUSE=hdaps kernel_linux kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/dmidecode kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://github.com/evgeni/tp_smapi/releases/download/tp-smapi/0.43/tp_smapi-0.43.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=afce0f0e14218e4aad80fde497c798c9
diff --git a/app-laptop/tp_smapi/Manifest b/app-laptop/tp_smapi/Manifest
new file mode 100644
index 000000000000..2728a26c4f61
--- /dev/null
+++ b/app-laptop/tp_smapi/Manifest
@@ -0,0 +1,7 @@
+AUX tp_smapi-0.40-confd 785 BLAKE2B da1e2a5ce6e441eebf1a3dffcce8a863688a525f6ee4c29537b1783e3283c5a0311e4317617cff4be8c35246accf69738778c6c34e4d2af77a18f23a1e84b363 SHA512 a08f0b15ea37f79e1a8b41b3a3a59421dcf26e482d2eaa269e7c3f728c142e68e8c130c8a53f4c14829436a20e1354318464de780d9fbe10777d7929d7944dca
+AUX tp_smapi-0.40-initd 1851 BLAKE2B 852fc13e2d74a570918c451966214ed8ca3daea9bdb66e856f48554261f4cafc8d8be7b76889a6a639f0dc1310d34036131a9982be0cdcf0e458707e7938b161 SHA512 ebf8ac628e00979f21e266fb6d187f02bfeeafc9482a0c5bed4fd4f092c7a27158747ccf629c802969ad2a8f13124276ef889927b3f1f01a7ce44fdcde103698
+DIST tp_smapi-0.42.tgz 39867 BLAKE2B 0f7285fe99766437d964780f3c9d88480a19ed07de155e1794b5c48f318846fbde4eb759e825af9f5da89fb20aee5e217f32e873a70c7d85f63e3a44b385b0f7 SHA512 1004b7ef961a9908c2144b26ea60b6dddabd83d60c11421a03e3b810f5b635415ef52656d6980915512d68f809f7bc3d662328f25d111537bd7e175d252cf83b
+DIST tp_smapi-0.43.tgz 40122 BLAKE2B e14caa05d741d14b03c56c57badc5900a47735bc58966b5195ca34269a6227ecc50518ee5ce8cf47a4aacb314a0ed0332b987098f3be024b6af9024df6efdf9b SHA512 ec2e40a248e7eb5bff2ad9e57087058a8b4706d564bd340daba5a4700ad8a5389d1f9ec29984516a1167827ae55c28240dafb558df29e1f758a4f7af80caa1e7
+EBUILD tp_smapi-0.42-r1.ebuild 1947 BLAKE2B 8b3ce3e2e96c025ee1236feb410019d9033b8633a476b346e6aae63d4b1a48940edf9a294de5d85c4e6eb2d337f654dfd5379439ed17548502fbec98ae03a872 SHA512 d09fe01652350951baaaf67af7ce32036515a1535cb9f774d2e0e2f92b0f79163babc3c19c554a37a15b5ddde3bf5a4904e95dfaa74274783911d2c5335fbbef
+EBUILD tp_smapi-0.43.ebuild 1949 BLAKE2B fa54b6dfafcb3dc842ca205e21deb68eab8f7f4c7fcc858680ed7742d3ab906e3f140aadbf736f4f92efc413b204a254017ea622e15432e2e3eb01712297ac4f SHA512 f88a84f395b578979f152437904224b5de061584e95fd4d635b014c1d4513b83af312d93914e804c7c96e75448d3649e6f2d41acf55267b23a00ab9cf6c2fff3
+MISC metadata.xml 473 BLAKE2B 9d19f4112fc0ac3e045c2d92e510bec52bbfbcd9bbca442d856598cc95f546592c4661b317215d35a6540a14e4bf68b3b826baa8c434a170e9841fce3706cc99 SHA512 21ce54c4cd204ddea9f1170f8e1b66e636bb2b541856ff541371bd572403519a09cf2367f5642a596684d66145bc9ab92396b102ef51086f2d22f96fc6c0b7af
diff --git a/app-laptop/tp_smapi/files/tp_smapi-0.40-confd b/app-laptop/tp_smapi/files/tp_smapi-0.40-confd
new file mode 100644
index 000000000000..7c80f35e390b
--- /dev/null
+++ b/app-laptop/tp_smapi/files/tp_smapi-0.40-confd
@@ -0,0 +1,20 @@
+# /etc/conf.d/smapi: config file for /etc/init.d/smapi
+
+# use '/etc/init.d/smapi info' at any time to check the thresholds
+# currently used by the driver
+# Note that the kernel does some sanity checking on the values and
+# will not accept any combination of values you may try to set up.
+# (i.e. stop value lower than start) So if the output of info does
+# not match what you wanted the driver probably did not like your
+# configuration.
+
+# default thresholds for '/etc/init.d/smapi start'
+SMAPI_THRESH_START="30"
+SMAPI_THRESH_STOP="85"
+# values to be used for '/etc/init.d/smapi low'
+SMAPI_LOW_THRESH_START="${SMAPI_THRESH_START}"
+SMAPI_LOW_THRESH_STOP="${SMAPI_THRESH_STOP}"
+
+# values to be used for '/etc/init.d/smapi high'
+SMAPI_HIGH_THRESH_START="95"
+SMAPI_HIGH_THRESH_STOP="100"
diff --git a/app-laptop/tp_smapi/files/tp_smapi-0.40-initd b/app-laptop/tp_smapi/files/tp_smapi-0.40-initd
new file mode 100644
index 000000000000..3b8c10d9274a
--- /dev/null
+++ b/app-laptop/tp_smapi/files/tp_smapi-0.40-initd
@@ -0,0 +1,92 @@
+#!/sbin/openrc-run
+# Copyright (C) 2011 Henning Schild <henning@wh9.tu-dresden.de>
+# Copyright (C) 2011 Sebastian Pipping <sebastian@pipping.org>
+#
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_started_commands="low high info"
+
+SMAPI_SYSFS="/sys/devices/platform/smapi"
+BATS="BAT0 BAT1"
+
+depend() {
+	after modules
+}
+
+start() {
+	local state1
+	local state2
+
+	ebegin "Making sure that module 'tp_smapi' is loaded"
+	modprobe tp_smapi
+	state1=$?
+	eend ${state1}
+
+	ebegin "Checking for \"${SMAPI_SYSFS}\""
+	test -d "${SMAPI_SYSFS}"
+	state2=$?
+	eend ${state2}
+
+	if [ "${state1}" -ne "0" ] || [ "${state2}" -ne "0" ]; then
+		return 1
+	fi
+
+	ebegin "Starting ${SVCNAME}"
+	set_all ${SMAPI_THRESH_START} ${SMAPI_THRESH_STOP}
+	eend $?
+}
+
+stop() {
+	einfo "Nothing required to be done to stop ${SVCNAME}"
+}
+
+require_started() {
+	if ! service_started; then
+		"${RC_SERVICE}" start || return $?
+	fi
+}
+
+high() {
+	require_started
+
+	einfo "Switching ${SVCNAME} to high thesholds"
+	set_all ${SMAPI_HIGH_THRESH_START} ${SMAPI_HIGH_THRESH_STOP}
+}
+
+low() {
+	require_started
+
+	einfo "Switching ${SVCNAME} to low thesholds"
+	set_all ${SMAPI_LOW_THRESH_START} ${SMAPI_LOW_THRESH_STOP}
+}
+
+set_all() {
+	local tstart=$1
+	local tstop=$2
+	local bat
+
+	for bat in ${BATS}; do
+		ebegin "  setting thresholds for ${bat}: $tstart $tstop"
+		echo ${tstart} > ${SMAPI_SYSFS}/${bat}/start_charge_thresh
+		echo ${tstop} > ${SMAPI_SYSFS}/${bat}/stop_charge_thresh
+		eend $?
+	done
+}
+
+info() {
+	local presence
+	local tstart
+	local tstop
+	local bat
+
+	require_started
+
+	for bat in ${BATS}; do
+		tstart=$(cat ${SMAPI_SYSFS}/${bat}/start_charge_thresh)
+		tstop=$(cat ${SMAPI_SYSFS}/${bat}/stop_charge_thresh)
+		if [ "$(cat ${SMAPI_SYSFS}/${bat}/installed)" -eq "1" ]; then
+			presence="  [installed]"
+		fi
+		einfo "${bat}: ${tstart} ${tstop}${presence}"
+	done
+}
diff --git a/app-laptop/tp_smapi/metadata.xml b/app-laptop/tp_smapi/metadata.xml
new file mode 100644
index 000000000000..2f944f633c24
--- /dev/null
+++ b/app-laptop/tp_smapi/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+
+  <use>
+    <flag name="hdaps">Install a compatible HDAPS module</flag>
+  </use>
+
+  <upstream>
+    <remote-id type="github">evgeni/tp_smapi</remote-id>
+    <remote-id type="sourceforge">tpctl</remote-id>
+  </upstream>
+
+</pkgmetadata>
diff --git a/app-laptop/tp_smapi/tp_smapi-0.42-r1.ebuild b/app-laptop/tp_smapi/tp_smapi-0.42-r1.ebuild
new file mode 100644
index 000000000000..a7aa31518d52
--- /dev/null
+++ b/app-laptop/tp_smapi/tp_smapi-0.42-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic linux-mod
+
+DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
+HOMEPAGE="https://github.com/evgeni/${PN}"
+SRC_URI="${HOMEPAGE}/releases/download/tp-smapi/${PV}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="hdaps"
+
+# We need dmideode if the kernel does not support
+# DMI_DEV_TYPE_OEM_STRING in dmi.h.
+DEPEND="sys-apps/dmidecode"
+RDEPEND="${DEPEND}"
+
+# This code is factored out of both pkg_pretend() and pkg_setup()
+# because the PMS states that ebuilds may not call phase functions
+# directly (see the "List of functions" section). This was bug #596616
+# and #596622.
+tp_smapi_pkg_pretend() {
+	linux-mod_pkg_setup
+
+	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
+	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_OUT_DIR}"
+	BUILD_TARGETS="default"
+
+	if use hdaps; then
+		CONFIG_CHECK="~INPUT_UINPUT"
+		WARNING_INPUT_UINPUT="Your kernel needs uinput for the hdaps module to perform better"
+		# Why call this twice?
+		linux-info_pkg_setup
+
+		MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)"
+		BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1"
+
+		CONFIG_CHECK="~!SENSORS_HDAPS"
+		ERROR_SENSORS_HDAPS="${P} with USE=hdaps conflicts with in-kernel HDAPS (CONFIG_SENSORS_HDAPS)"
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_pretend() {
+	tp_smapi_pkg_pretend
+}
+
+pkg_setup() {
+	# run again as pkg_pretend is not var safe
+	tp_smapi_pkg_pretend
+}
+
+src_compile() {
+	# Kernel Makefiles may pull in -mpreferred-stack-boundary=3
+	# which requires that SSE disabled or compilation will fail.
+	# So we need to ensure that appended user CLAGS do not re-enable SSE
+	# https://bugs.gentoo.org/show_bug.cgi?id=492964
+	replace-flags '-msse*' ''
+	replace-flags '-mssse3' ''
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+	einstalldocs
+	newinitd "${FILESDIR}/${PN}-0.40-initd" smapi
+	newconfd "${FILESDIR}/${PN}-0.40-confd" smapi
+}
diff --git a/app-laptop/tp_smapi/tp_smapi-0.43.ebuild b/app-laptop/tp_smapi/tp_smapi-0.43.ebuild
new file mode 100644
index 000000000000..011865482566
--- /dev/null
+++ b/app-laptop/tp_smapi/tp_smapi-0.43.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic linux-mod
+
+DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
+HOMEPAGE="https://github.com/evgeni/${PN}"
+SRC_URI="${HOMEPAGE}/releases/download/tp-smapi/${PV}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="hdaps"
+
+# We need dmideode if the kernel does not support
+# DMI_DEV_TYPE_OEM_STRING in dmi.h.
+DEPEND="sys-apps/dmidecode"
+RDEPEND="${DEPEND}"
+
+# This code is factored out of both pkg_pretend() and pkg_setup()
+# because the PMS states that ebuilds may not call phase functions
+# directly (see the "List of functions" section). This was bug #596616
+# and #596622.
+tp_smapi_pkg_pretend() {
+	linux-mod_pkg_setup
+
+	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
+	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_OUT_DIR}"
+	BUILD_TARGETS="default"
+
+	if use hdaps; then
+		CONFIG_CHECK="~INPUT_UINPUT"
+		WARNING_INPUT_UINPUT="Your kernel needs uinput for the hdaps module to perform better"
+		# Why call this twice?
+		linux-info_pkg_setup
+
+		MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)"
+		BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1"
+
+		CONFIG_CHECK="~!SENSORS_HDAPS"
+		ERROR_SENSORS_HDAPS="${P} with USE=hdaps conflicts with in-kernel HDAPS (CONFIG_SENSORS_HDAPS)"
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_pretend() {
+	tp_smapi_pkg_pretend
+}
+
+pkg_setup() {
+	# run again as pkg_pretend is not var safe
+	tp_smapi_pkg_pretend
+}
+
+src_compile() {
+	# Kernel Makefiles may pull in -mpreferred-stack-boundary=3
+	# which requires that SSE disabled or compilation will fail.
+	# So we need to ensure that appended user CLAGS do not re-enable SSE
+	# https://bugs.gentoo.org/show_bug.cgi?id=492964
+	replace-flags '-msse*' ''
+	replace-flags '-mssse3' ''
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+	einstalldocs
+	newinitd "${FILESDIR}/${PN}-0.40-initd" smapi
+	newconfd "${FILESDIR}/${PN}-0.40-confd" smapi
+}
diff --git a/app-laptop/tpacpi-bat-1.1-r1 b/app-laptop/tpacpi-bat-1.1-r1
deleted file mode 100644
index f14362362bdd..000000000000
--- a/app-laptop/tpacpi-bat-1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Control battery thresholds of recent ThinkPads, not supported by tp_smapi
-EAPI=5
-HOMEPAGE=https://github.com/teleshoes/tpacpi-bat
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=sys-power/acpi_call dev-lang/perl
-SLOT=0
-SRC_URI=https://github.com/teleshoes/tpacpi-bat/archive/v1.1.tar.gz -> tpacpi-bat-1.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=66e31d3eaa744b50864a6739a0ffe4f3
diff --git a/app-laptop/tpacpi-bat-2.1 b/app-laptop/tpacpi-bat-2.1
deleted file mode 100644
index 598cb5df454b..000000000000
--- a/app-laptop/tpacpi-bat-2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Control battery thresholds of recent ThinkPads, not supported by tp_smapi
-EAPI=5
-HOMEPAGE=https://github.com/teleshoes/tpacpi-bat
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=sys-power/acpi_call dev-lang/perl
-SLOT=0
-SRC_URI=https://github.com/teleshoes/tpacpi-bat/archive/v2.1.tar.gz -> tpacpi-bat-2.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=66e31d3eaa744b50864a6739a0ffe4f3
diff --git a/app-laptop/tpacpi-bat-3.0 b/app-laptop/tpacpi-bat-3.0
deleted file mode 100644
index 6a38c2e552f9..000000000000
--- a/app-laptop/tpacpi-bat-3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Control battery thresholds of recent ThinkPads, not supported by tp_smapi
-EAPI=5
-HOMEPAGE=https://github.com/teleshoes/tpacpi-bat
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=sys-power/acpi_call dev-lang/perl
-SLOT=0
-SRC_URI=https://github.com/teleshoes/tpacpi-bat/archive/v3.0.tar.gz -> tpacpi-bat-3.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=66e31d3eaa744b50864a6739a0ffe4f3
diff --git a/app-laptop/tpacpi-bat-3.0-r1 b/app-laptop/tpacpi-bat-3.0-r1
deleted file mode 100644
index 74eae8ffc934..000000000000
--- a/app-laptop/tpacpi-bat-3.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Control battery thresholds of recent ThinkPads, not supported by tp_smapi
-EAPI=6
-HOMEPAGE=https://github.com/teleshoes/tpacpi-bat
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=sys-power/acpi_call dev-lang/perl
-SLOT=0
-SRC_URI=https://github.com/teleshoes/tpacpi-bat/archive/v3.0.tar.gz -> tpacpi-bat-3.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=743a2a01ea7cbe2dc59a569982db9ff4
diff --git a/app-laptop/tpacpi-bat-3.1 b/app-laptop/tpacpi-bat-3.1
deleted file mode 100644
index b23df8026643..000000000000
--- a/app-laptop/tpacpi-bat-3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Control battery thresholds of recent ThinkPads, not supported by tp_smapi
-EAPI=6
-HOMEPAGE=https://github.com/teleshoes/tpacpi-bat
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=sys-power/acpi_call dev-lang/perl
-SLOT=0
-SRC_URI=https://github.com/teleshoes/tpacpi-bat/archive/v3.1.tar.gz -> tpacpi-bat-3.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8cf00147f907f4ceb2e13541269412f5
diff --git a/app-laptop/tpacpi-bat-9999 b/app-laptop/tpacpi-bat-9999
deleted file mode 100644
index 3c52f44599fb..000000000000
--- a/app-laptop/tpacpi-bat-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Control battery thresholds of recent ThinkPads, not supported by tp_smapi
-EAPI=6
-HOMEPAGE=https://github.com/teleshoes/tpacpi-bat
-LICENSE=GPL-3
-RDEPEND=sys-power/acpi_call dev-lang/perl
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8cf00147f907f4ceb2e13541269412f5
diff --git a/app-laptop/tpacpi-bat/Manifest b/app-laptop/tpacpi-bat/Manifest
new file mode 100644
index 000000000000..d854e95f84b0
--- /dev/null
+++ b/app-laptop/tpacpi-bat/Manifest
@@ -0,0 +1,15 @@
+AUX tpacpi-bat.confd.0 587 BLAKE2B 642637e9dfa6473e78cf9426d89132b1ec77cac9e02cf2db6764d4de59f25e5eaf2ec18a2f87d37c90af433a6760b522dc4a0556f3b6f74d9a27a884f278fb53 SHA512 a2131a32123e649cd5958aea67d4c96a9bd35ba19bc2c5eef794be7f7e386085e0eb825517783999d6da7abd025b004e357daa024f39d71ea6f653b4ed934271
+AUX tpacpi-bat.confd.1 668 BLAKE2B 88ebd00838e2ed0febbd1321e2ab13dfc4bea292f3f7f665b045370b960d5c462e1d4c139dfbf1061d1692d7acf79b8b794f3c51d4c3e626c9ca7ef515fc6c78 SHA512 570824184f85e9f4b687e67131165671389b836d94f15edbd4bd14c77b0c6546c2991da25bc0172ccdee03cc8c0ad82c378e982e147334e9cb83334d0382038b
+AUX tpacpi-bat.initd.1 1498 BLAKE2B 31af866602be78366e7ff967424929f630e9b28fd7c313b707f36c77b86010781203b95c2cc7977fda41378b34f12c80f150b3126774ec0499d148643c35f850 SHA512 1e06d2f4c4356f97c40752d532ea448db9ca39186028bddbe58125fce0e236ed3abd262621c16152b8c44ff24a160c62a51097a37c02dba191403ec71ee005ac
+AUX tpacpi-bat.initd.2 1488 BLAKE2B 43e196ae490ba367edc15b1b9a0ef81cc7f56fec33b7ee8e91251f66705d1c5e38caa65a803e8872344149e384ae0b162c6b30e540c38aeceb12958fa0386b86 SHA512 ccd84bc4cd44ed8a3b2c101501ae220d8add3b189f172e4ba5fe9532ba5a64a188b90054696cc60b7bc1b3d72f636649e4678c020c789933d0b4d25f6ffd386d
+DIST tpacpi-bat-1.1.tar.gz 17781 BLAKE2B 73e9cef77f5eb889e653dab05b3f9502795833221d007319abad0017b70dc3c60d1a2e7649f1003e9eb16da94efa185b195e42789b528b5c5b62738abaff9e3a SHA512 7b8838e6db7f98cd5bb674a99dbb880ba6574529de68d97ce704bf225ba416183971aae3c2dd623bc8750767c54a2a52cd0b525bce70640ecf0b307fdba03821
+DIST tpacpi-bat-2.1.tar.gz 17753 BLAKE2B c470cfdb98c2873ca44dad9cb0fc31e6bc97c8832735003b707ee191c65dba3cd9c0422513b4a93aae26692a154675cb94e02d30b721d498610bf21711bcf1e6 SHA512 7ed4974d84c3f1ddc9fd5cd6d7f103a11e2f808a223692749e3ae0ec2e888b62083d577214e27634cd76e9b616a6b8d5cb5474ddb64f73972d08641051c5c6f8
+DIST tpacpi-bat-3.0.tar.gz 18137 BLAKE2B db0db2c06d5bc78eb028cb0db2532e5500cce2370c23ab3bf1e49433b83ed2be7cfffe080e46c3699838ff00025d516dd37e071081f79c7d5d6293f4f49730d4 SHA512 2beab3e5495f028b53d673a4243a2128f4ff85e19e18ac7d53663a1d62e20b271442d6c2c8f19cb41d618ddf7ebb4d9b8390f7f185f77bdca33c69bb19463128
+DIST tpacpi-bat-3.1.tar.gz 18584 BLAKE2B 5f1e890f33be4e0d176bda486d9e4363d56a7a933677eb69bedca9ec42e8af5a0e5494f8447702d33ffecda3d1d4a447a56f7aeb9480a3b855a24bce45028d38 SHA512 cdc9e0c0ded96281678199783b4c48ff85a497c90b244a7ce2276b54d7ae4bfa7eb430214bcdb6fabd7478796507b0fbe7fed4b1ab4bc4cdd7bd5ae25f943a77
+EBUILD tpacpi-bat-1.1-r1.ebuild 796 BLAKE2B 7081b9758755b266fe03371c901ceeb731c6fccfe4e663e45967697d84111b259e77284656ef58e24c7e702b771e383b469749d8c740ad6a979096cc2d60aebb SHA512 25911886dedb8a5ba2820d456245e4bf6647b55280bea2201ea17eadf9450a4169c971bf1aa386be5340b340deb7b0ff20b0d7b50ff7d3dd602b5f53120d3d88
+EBUILD tpacpi-bat-2.1.ebuild 796 BLAKE2B 7081b9758755b266fe03371c901ceeb731c6fccfe4e663e45967697d84111b259e77284656ef58e24c7e702b771e383b469749d8c740ad6a979096cc2d60aebb SHA512 25911886dedb8a5ba2820d456245e4bf6647b55280bea2201ea17eadf9450a4169c971bf1aa386be5340b340deb7b0ff20b0d7b50ff7d3dd602b5f53120d3d88
+EBUILD tpacpi-bat-3.0-r1.ebuild 789 BLAKE2B e29bb0916b2d4f43ecdc97b366c07e48fc54fde2fbace42d01b27c91f8a0e6b7ccbced748477c3c83f0140f0ebe0b172add09c0ec6fac8277e7ba7c8f87751b3 SHA512 21e9be8dd04c70e67b68e82ac9c416e7589c5b074e0cd0b1974592e56ab98f1669b0c59085678a3b45df0d3dd02c68d5d288634a60f7ea9e5300b3d3e0123aa1
+EBUILD tpacpi-bat-3.0.ebuild 796 BLAKE2B 7081b9758755b266fe03371c901ceeb731c6fccfe4e663e45967697d84111b259e77284656ef58e24c7e702b771e383b469749d8c740ad6a979096cc2d60aebb SHA512 25911886dedb8a5ba2820d456245e4bf6647b55280bea2201ea17eadf9450a4169c971bf1aa386be5340b340deb7b0ff20b0d7b50ff7d3dd602b5f53120d3d88
+EBUILD tpacpi-bat-3.1.ebuild 829 BLAKE2B e6a07ad049035d1d1a89a01a7c77c0481bfbd7ae6528ed4b8a83df704cca53b6c4f0b05a95ce917555b7e3c21a56e04d6f002dcc492e9345071fc82d35061b4f SHA512 de3f25f6c612b61db7951eee048a757b107d8f2486f5f5c101a30e33b844d57106f379764bc407c1a65de1ed7362a66a401de74a9eb5e031b455b0a838b5fc75
+EBUILD tpacpi-bat-9999.ebuild 829 BLAKE2B e6a07ad049035d1d1a89a01a7c77c0481bfbd7ae6528ed4b8a83df704cca53b6c4f0b05a95ce917555b7e3c21a56e04d6f002dcc492e9345071fc82d35061b4f SHA512 de3f25f6c612b61db7951eee048a757b107d8f2486f5f5c101a30e33b844d57106f379764bc407c1a65de1ed7362a66a401de74a9eb5e031b455b0a838b5fc75
+MISC metadata.xml 338 BLAKE2B 612018ee773059fbd8492aa11f53aa5c99190b9189b864365d06bc309950c11747fae5c0b4b0e2e2915981a4642523ac439988bcaa8003c1394eb58af5ebdcad SHA512 e6cb10546e9a71a1c5fbcea24b4ca97c5eed95e4553d3cd4bbedbf1180da9533a0e570fa674ccf12574825cb369d6197e51969361945958f4322d6cb91e25714
diff --git a/app-laptop/tpacpi-bat/files/tpacpi-bat.confd.0 b/app-laptop/tpacpi-bat/files/tpacpi-bat.confd.0
new file mode 100644
index 000000000000..94da0a3eb12a
--- /dev/null
+++ b/app-laptop/tpacpi-bat/files/tpacpi-bat.confd.0
@@ -0,0 +1,15 @@
+# /etc/conf.d/tpacpi-bat: config file for /etc/init.d/tpacpi-bat
+
+# use '/etc/init.d/tpacpi-bat info' at any time to check the thresholds
+# currently used by the driver
+
+# default thresholds for '/etc/init.d/tpacpi-bat start'
+TPACPI_BAT_THRESH_START="30"
+TPACPI_BAT_THRESH_STOP="85"
+# values to be used for '/etc/init.d/tpacpi-bat low'
+TPACPI_BAT_LOW_THRESH_START="${TPACPI_BAT_THRESH_START}"
+TPACPI_BAT_LOW_THRESH_STOP="${TPACPI_BAT_THRESH_STOP}"
+
+# values to be used for '/etc/init.d/tpacpi-bat high'
+TPACPI_BAT_HIGH_THRESH_START="95"
+TPACPI_BAT_HIGH_THRESH_STOP="99" #see bug #485526
diff --git a/app-laptop/tpacpi-bat/files/tpacpi-bat.confd.1 b/app-laptop/tpacpi-bat/files/tpacpi-bat.confd.1
new file mode 100644
index 000000000000..f1faf1d7fd47
--- /dev/null
+++ b/app-laptop/tpacpi-bat/files/tpacpi-bat.confd.1
@@ -0,0 +1,19 @@
+# /etc/conf.d/tpacpi-bat: config file for /etc/init.d/tpacpi-bat
+
+# use '/etc/init.d/tpacpi-bat info' at any time to check the thresholds
+# currently used by the driver
+
+# list of batteries the script should manage
+# for example: BATS="1 2"
+BATS="1"
+
+# default thresholds for '/etc/init.d/tpacpi-bat start'
+TPACPI_BAT_THRESH_START="30"
+TPACPI_BAT_THRESH_STOP="85"
+# values to be used for '/etc/init.d/tpacpi-bat low'
+TPACPI_BAT_LOW_THRESH_START="${TPACPI_BAT_THRESH_START}"
+TPACPI_BAT_LOW_THRESH_STOP="${TPACPI_BAT_THRESH_STOP}"
+
+# values to be used for '/etc/init.d/tpacpi-bat high'
+TPACPI_BAT_HIGH_THRESH_START="95"
+TPACPI_BAT_HIGH_THRESH_STOP="99" #see bug #485526
diff --git a/app-laptop/tpacpi-bat/files/tpacpi-bat.initd.1 b/app-laptop/tpacpi-bat/files/tpacpi-bat.initd.1
new file mode 100644
index 000000000000..d9f5de7fb3dd
--- /dev/null
+++ b/app-laptop/tpacpi-bat/files/tpacpi-bat.initd.1
@@ -0,0 +1,78 @@
+#!/sbin/openrc-run
+# Copyright (C) 2012-2016 Christoph Junghans <junghans@gentoo.org>
+#
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_started_commands="low high info"
+
+BATS="1"
+
+depend() {
+	after modules
+}
+
+start() {
+	local state1
+
+	ebegin "Making sure that module 'acpi_call' is loaded"
+	modprobe acpi_call
+	state1=$?
+	eend ${state1}
+
+	[ "${state1}" -ne "0" ] && return 1
+
+	ebegin "Starting ${SVCNAME}"
+	set_all ${TPACPI_BAT_THRESH_START} ${TPACPI_BAT_THRESH_STOP}
+	eend $?
+}
+
+stop() {
+	einfo "Nothing required to be done to stop ${SVCNAME}"
+}
+
+require_started() {
+	if ! service_started; then
+		"${RC_SERVICE}" start || return $?
+	fi
+}
+
+high() {
+	require_started
+
+	einfo "Switching ${SVCNAME} to high thesholds"
+	set_all ${TPACPI_BAT_HIGH_THRESH_START} ${TPACPI_BAT_HIGH_THRESH_STOP}
+}
+
+low() {
+	require_started
+
+	einfo "Switching ${SVCNAME} to low thesholds"
+	set_all ${TPACPI_BAT_LOW_THRESH_START} ${TPACPI_BAT_LOW_THRESH_STOP}
+}
+
+set_all() {
+	local tstart=$1
+	local tstop=$2
+	local bat
+
+	for bat in ${BATS}; do
+		ebegin "  setting thresholds for ${bat}: $tstart $tstop"
+		/usr/bin/tpacpi-bat -s startThreshold ${bat} ${tstart}
+		/usr/bin/tpacpi-bat -s stopThreshold ${bat} ${tstop}
+		eend $?
+	done
+}
+
+info() {
+	local tstart
+	local tstop
+	local bat
+
+	require_started
+
+	for bat in ${BATS}; do
+		tstart=$(/usr/bin/tpacpi-bat -g startThreshold ${bat})
+		tstop=$(/usr/bin/tpacpi-bat -g stopThreshold ${bat})
+		einfo "Battery ${bat}: ${tstart} ${tstop}"
+	done
+}
diff --git a/app-laptop/tpacpi-bat/files/tpacpi-bat.initd.2 b/app-laptop/tpacpi-bat/files/tpacpi-bat.initd.2
new file mode 100644
index 000000000000..7c92b739193d
--- /dev/null
+++ b/app-laptop/tpacpi-bat/files/tpacpi-bat.initd.2
@@ -0,0 +1,76 @@
+#!/sbin/openrc-run
+# Copyright (C) 2012-2016 Christoph Junghans <junghans@gentoo.org>
+#
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_started_commands="low high info"
+
+depend() {
+	after modules
+}
+
+start() {
+	local state1
+
+	ebegin "Making sure that module 'acpi_call' is loaded"
+	modprobe acpi_call
+	state1=$?
+	eend ${state1}
+
+	[ "${state1}" -ne "0" ] && return 1
+
+	ebegin "Starting ${SVCNAME}"
+	set_all ${TPACPI_BAT_THRESH_START} ${TPACPI_BAT_THRESH_STOP}
+	eend $?
+}
+
+stop() {
+	einfo "Nothing required to be done to stop ${SVCNAME}"
+}
+
+require_started() {
+	if ! service_started; then
+		"${RC_SERVICE}" start || return $?
+	fi
+}
+
+high() {
+	require_started
+
+	einfo "Switching ${SVCNAME} to high thesholds"
+	set_all ${TPACPI_BAT_HIGH_THRESH_START} ${TPACPI_BAT_HIGH_THRESH_STOP}
+}
+
+low() {
+	require_started
+
+	einfo "Switching ${SVCNAME} to low thesholds"
+	set_all ${TPACPI_BAT_LOW_THRESH_START} ${TPACPI_BAT_LOW_THRESH_STOP}
+}
+
+set_all() {
+	local tstart=$1
+	local tstop=$2
+	local bat
+
+	for bat in ${BATS}; do
+		ebegin "  setting thresholds for ${bat}: $tstart $tstop"
+		/usr/bin/tpacpi-bat -s startThreshold ${bat} ${tstart}
+		/usr/bin/tpacpi-bat -s stopThreshold ${bat} ${tstop}
+		eend $?
+	done
+}
+
+info() {
+	local tstart
+	local tstop
+	local bat
+
+	require_started
+
+	for bat in ${BATS}; do
+		tstart=$(/usr/bin/tpacpi-bat -g startThreshold ${bat})
+		tstop=$(/usr/bin/tpacpi-bat -g stopThreshold ${bat})
+		einfo "Battery ${bat}: ${tstart} ${tstop}"
+	done
+}
diff --git a/app-laptop/tpacpi-bat/metadata.xml b/app-laptop/tpacpi-bat/metadata.xml
new file mode 100644
index 000000000000..a50d8d26b076
--- /dev/null
+++ b/app-laptop/tpacpi-bat/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>junghans@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">teleshoes/tpacpi-bat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-laptop/tpacpi-bat/tpacpi-bat-1.1-r1.ebuild b/app-laptop/tpacpi-bat/tpacpi-bat-1.1-r1.ebuild
new file mode 100644
index 000000000000..e23197335543
--- /dev/null
+++ b/app-laptop/tpacpi-bat/tpacpi-bat-1.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/teleshoes/tpacpi-bat.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/teleshoes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+DESCRIPTION="Control battery thresholds of recent ThinkPads, not supported by tp_smapi"
+HOMEPAGE="https://github.com/teleshoes/tpacpi-bat"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-power/acpi_call
+	dev-lang/perl"
+
+src_install() {
+	dodoc README battery_asl
+	dobin tpacpi-bat
+	newinitd "${FILESDIR}"/${PN}.initd.1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd.0 ${PN}
+	systemd_newunit tpacpi.service ${PN}.service
+}
diff --git a/app-laptop/tpacpi-bat/tpacpi-bat-2.1.ebuild b/app-laptop/tpacpi-bat/tpacpi-bat-2.1.ebuild
new file mode 100644
index 000000000000..e23197335543
--- /dev/null
+++ b/app-laptop/tpacpi-bat/tpacpi-bat-2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/teleshoes/tpacpi-bat.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/teleshoes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+DESCRIPTION="Control battery thresholds of recent ThinkPads, not supported by tp_smapi"
+HOMEPAGE="https://github.com/teleshoes/tpacpi-bat"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-power/acpi_call
+	dev-lang/perl"
+
+src_install() {
+	dodoc README battery_asl
+	dobin tpacpi-bat
+	newinitd "${FILESDIR}"/${PN}.initd.1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd.0 ${PN}
+	systemd_newunit tpacpi.service ${PN}.service
+}
diff --git a/app-laptop/tpacpi-bat/tpacpi-bat-3.0-r1.ebuild b/app-laptop/tpacpi-bat/tpacpi-bat-3.0-r1.ebuild
new file mode 100644
index 000000000000..350f9db837ce
--- /dev/null
+++ b/app-laptop/tpacpi-bat/tpacpi-bat-3.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/teleshoes/tpacpi-bat.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/teleshoes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+DESCRIPTION="Control battery thresholds of recent ThinkPads, not supported by tp_smapi"
+HOMEPAGE="https://github.com/teleshoes/tpacpi-bat"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-power/acpi_call
+	dev-lang/perl"
+
+src_install() {
+	dodoc README battery_asl
+	dobin tpacpi-bat
+	newinitd "${FILESDIR}"/${PN}.initd.2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd.1 ${PN}
+	systemd_newunit tpacpi.service ${PN}.service
+}
diff --git a/app-laptop/tpacpi-bat/tpacpi-bat-3.0.ebuild b/app-laptop/tpacpi-bat/tpacpi-bat-3.0.ebuild
new file mode 100644
index 000000000000..e23197335543
--- /dev/null
+++ b/app-laptop/tpacpi-bat/tpacpi-bat-3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/teleshoes/tpacpi-bat.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/teleshoes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+DESCRIPTION="Control battery thresholds of recent ThinkPads, not supported by tp_smapi"
+HOMEPAGE="https://github.com/teleshoes/tpacpi-bat"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-power/acpi_call
+	dev-lang/perl"
+
+src_install() {
+	dodoc README battery_asl
+	dobin tpacpi-bat
+	newinitd "${FILESDIR}"/${PN}.initd.1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd.0 ${PN}
+	systemd_newunit tpacpi.service ${PN}.service
+}
diff --git a/app-laptop/tpacpi-bat/tpacpi-bat-3.1.ebuild b/app-laptop/tpacpi-bat/tpacpi-bat-3.1.ebuild
new file mode 100644
index 000000000000..6364a4ee745f
--- /dev/null
+++ b/app-laptop/tpacpi-bat/tpacpi-bat-3.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/teleshoes/tpacpi-bat.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/teleshoes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+DESCRIPTION="Control battery thresholds of recent ThinkPads, not supported by tp_smapi"
+HOMEPAGE="https://github.com/teleshoes/tpacpi-bat"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-power/acpi_call
+	dev-lang/perl"
+
+src_install() {
+	dodoc README.md battery_asl
+	dobin tpacpi-bat
+	newinitd "${FILESDIR}"/${PN}.initd.2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd.1 ${PN}
+	systemd_newunit examples/systemd_fixed_threshold/tpacpi.service \
+		${PN}.service
+}
diff --git a/app-laptop/tpacpi-bat/tpacpi-bat-9999.ebuild b/app-laptop/tpacpi-bat/tpacpi-bat-9999.ebuild
new file mode 100644
index 000000000000..6364a4ee745f
--- /dev/null
+++ b/app-laptop/tpacpi-bat/tpacpi-bat-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/teleshoes/tpacpi-bat.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/teleshoes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+DESCRIPTION="Control battery thresholds of recent ThinkPads, not supported by tp_smapi"
+HOMEPAGE="https://github.com/teleshoes/tpacpi-bat"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-power/acpi_call
+	dev-lang/perl"
+
+src_install() {
+	dodoc README.md battery_asl
+	dobin tpacpi-bat
+	newinitd "${FILESDIR}"/${PN}.initd.2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd.1 ${PN}
+	systemd_newunit examples/systemd_fixed_threshold/tpacpi.service \
+		${PN}.service
+}
diff --git a/app-laptop/tpb-0.6.4-r1 b/app-laptop/tpb-0.6.4-r1
deleted file mode 100644
index d367bc2c7b39..000000000000
--- a/app-laptop/tpb-0.6.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=x11-libs/libXt x11-libs/libXext xosd? ( >=x11-libs/xosd-2.2.0 )
-DESCRIPTION=IBM ThinkPad buttons utility
-EAPI=5
-HOMEPAGE=https://savannah.nongnu.org/projects/tpb/
-IUSE=nls xosd kernel_linux
-KEYWORDS=amd64 -ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXt x11-libs/libXext xosd? ( >=x11-libs/xosd-2.2.0 )
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/tpb/tpb-0.6.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a3f76a90131031f7f3a7c408ba96bb43
diff --git a/app-laptop/tpb/Manifest b/app-laptop/tpb/Manifest
new file mode 100644
index 000000000000..bd23395c9922
--- /dev/null
+++ b/app-laptop/tpb/Manifest
@@ -0,0 +1,5 @@
+AUX tpb-0.6.4-nvram.patch 2321 BLAKE2B 183d5a76ffda4d0da3b9e7f06add1c0258bd56fb651980599d6401bc914f3b95aa584ab7835d3a9a6a2865208a325e22f6ae07caa9790207b7212c813c15ab14 SHA512 0e59e3c01805c608738b6539e4cab78d7377b0550c08636b51f4df0ed02d3adb2d391d5e76bdf043a835fb523492dea8c0c7293915f0dc60df357dec4d759457
+AUX tpb-configure-fix.diff 478 BLAKE2B bb28bd7f2f0c0bf10904f97314323244999688726d96786e46b7c5e3b5d3e248f1f74a42cc6908eafce3fd97e7db073eb7497339eaf9849babad4b7762635511 SHA512 461088eb82e66976a6bf591e4bb0de43e76c8aa9e404448d862535a27acb2857fcf3b5830edc6ece650857eb0e1ed24e7366c83d77d2e91b427f96f68928b32a
+DIST tpb-0.6.4.tar.gz 280316 BLAKE2B c629840245d2e749f3669e274da72baffb2856f969346d1f1feed3e45b9909f1ba12d125e48baa4cd29d021a04cba9cddec35edad80bd3ccff1ffea1423157a3 SHA512 1a12f4231b86bc3da2867670d5800f8f99f347743cf40b229c92485b6fe52e12b0222356d95d071ec26162ac778d2fe40867b4e635701620bc52236dbdb7b76a
+EBUILD tpb-0.6.4-r1.ebuild 806 BLAKE2B 1667105c2af273a522cb695fa54090808b56ddfa41a8d9cc1707cb05b43c2829000a6b4d256089918cf382b7fddb3060965dd042475befd6dbbd4b1d3f65126c SHA512 ee233ff77a410ae38578e36787e462580c3fca7d6273c1965cf3da5cc09d84afe1f5f252863de79155235125f5440d6b1b482e632161255b93b0cb23ff848a55
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-laptop/tpb/files/tpb-0.6.4-nvram.patch b/app-laptop/tpb/files/tpb-0.6.4-nvram.patch
new file mode 100644
index 000000000000..1ead9cbe5929
--- /dev/null
+++ b/app-laptop/tpb/files/tpb-0.6.4-nvram.patch
@@ -0,0 +1,34 @@
+diff -Naur tpb-0.6.4-org/src/tpb.c tpb-0.6.4/src/tpb.c
+--- tpb-0.6.4-org/src/tpb.c	2005-07-18 16:15:59.000000000 +0200
++++ tpb-0.6.4/src/tpb.c	2008-05-13 15:15:34.000000000 +0200
+@@ -523,10 +523,10 @@
+     /* determine the state of the brightness buttons {{{ */
+     if(thinkpad_state.brightness_level != last_thinkpad_state.brightness_level) {
+       if(cfg.verbose == STATE_ON) {
+-	printf(_("Brightness changed: Level %d\n"), thinkpad_state.brightness_level * 100 / 7);
++	printf(_("Brightness changed: Level %d\n"), thinkpad_state.brightness_level * 100 / 15);
+       }
+       if(cfg.callback != NULL) {
+-	snprintf(callback_cmd, sizeof(callback_cmd), "%s brightness %d", cfg.callback, thinkpad_state.brightness_level * 100 / 7);
++	snprintf(callback_cmd, sizeof(callback_cmd), "%s brightness %d", cfg.callback, thinkpad_state.brightness_level * 100 / 15);
+ 	if(fork_app(callback_cmd) != 0) {
+ 	  _exit(0);
+ 	}
+@@ -537,7 +537,7 @@
+       if(osd_ptr != NULL &&
+ 	 ((cfg.osd == STATE_OFF && cfg.osdbrightness == STATE_ON) || (cfg.osd == STATE_ON && cfg.osdbrightness != STATE_OFF))) {
+ 	xosd_display(osd_ptr, 0, XOSD_string, _("Brightness"));
+-	xosd_display(osd_ptr, 1, XOSD_percentage, thinkpad_state.brightness_level * 100 / 7);
++	xosd_display(osd_ptr, 1, XOSD_percentage, thinkpad_state.brightness_level * 100 / 15);
+       }
+     }
+ #endif /* HAVE_LIBXOSD */ /* }}} */
+@@ -1031,7 +1031,7 @@
+   thinkpad_state->hibernate_toggle  = (thinkpad_state->hibernate_toggle  & ~0x01) | (( buffer[0x58] & 0x01)     );
+   thinkpad_state->display_state     =                                               (( buffer[0x59] & 0x03)     );
+   thinkpad_state->expand_toggle     = (thinkpad_state->expand_toggle     & ~0x01) | (( buffer[0x59] & 0x10) >> 4);
+-  thinkpad_state->brightness_level  =                                               (( buffer[0x5E] & 0x07)     );
++  thinkpad_state->brightness_level  =                                               (( buffer[0x5E] & 0x0F)     );
+   thinkpad_state->brightness_toggle = (thinkpad_state->brightness_toggle & ~0x01) | (( buffer[0x5E] & 0x20) >> 5);
+   thinkpad_state->volume_level      =                                               (( buffer[0x60] & 0x0f)     );
+   thinkpad_state->volume_toggle     = (thinkpad_state->volume_toggle     & ~0x01) | (( buffer[0x60] & 0x80) >> 7);
diff --git a/app-laptop/tpb/files/tpb-configure-fix.diff b/app-laptop/tpb/files/tpb-configure-fix.diff
new file mode 100644
index 000000000000..7dc4683d158b
--- /dev/null
+++ b/app-laptop/tpb/files/tpb-configure-fix.diff
@@ -0,0 +1,16 @@
+diff -aur tpb-0.5.1/configure tpb-0.5.1-patched/configure
+--- tpb-0.5.1/configure	2003-04-10 04:06:26.000000000 -0400
++++ tpb-0.5.1-patched/configure	2003-06-30 12:06:41.000000000 -0400
+@@ -790,10 +790,10 @@
+ 
+ # additional options
+ # Check whether --enable-xosd or --disable-xosd was given.
+-if test "${enable_xosd+set}" = set; then
+-  enableval="$enable_xosd"
++if test "x${enable_xosd}" = xno; then
+   enable_xosd=no
+ else
++  enableval="$enable_xosd"
+   enable_xosd=yes
+ fi
+ 
diff --git a/app-laptop/tpb/metadata.xml b/app-laptop/tpb/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-laptop/tpb/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-laptop/tpb/tpb-0.6.4-r1.ebuild b/app-laptop/tpb/tpb-0.6.4-r1.ebuild
new file mode 100644
index 000000000000..f8bff7aa3280
--- /dev/null
+++ b/app-laptop/tpb/tpb-0.6.4-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info eutils
+
+DESCRIPTION="IBM ThinkPad buttons utility"
+HOMEPAGE="https://savannah.nongnu.org/projects/tpb/"
+SRC_URI="https://savannah.nongnu.org/download/tpb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 -ppc x86"
+IUSE="nls xosd"
+
+RDEPEND="x11-libs/libXt
+	x11-libs/libXext
+	xosd? ( >=x11-libs/xosd-2.2.0 )"
+DEPEND="${RDEPEND}"
+
+CONFIG_CHECK="~NVRAM"
+ERROR_NVRAM="${P} requires /dev/nvram support (CONFIG_NVRAM)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-configure-fix.diff
+	epatch "${FILESDIR}"/${P}-nvram.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable xosd)
+}
+
+src_install() {
+	default
+	dodoc doc/{callback_example.sh,nvram.txt,tpbrc}
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
commit	8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree	7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-laptop
parent	30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)