gentoo resync : 16.06.2018

3 files changed, 41 insertions, 4 deletions

diff --git a/app-laptop/tpacpi-bat/Manifest b/app-laptop/tpacpi-bat/Manifest
index d0e54816f922..d854e95f84b0 100644
--- a/app-laptop/tpacpi-bat/Manifest
+++ b/app-laptop/tpacpi-bat/Manifest
@@ -5,9 +5,11 @@ AUX tpacpi-bat.initd.2 1488 BLAKE2B 43e196ae490ba367edc15b1b9a0ef81cc7f56fec33b7
 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-9999.ebuild 789 BLAKE2B 3fae2bda5aa63e3e019650dcb0cf35fe1497a259b68d4ef3aa5154ce2094f27538412cad5d299b0b657415855c541cb64a8efe13795964743a69142f31a4d2ef SHA512 c9dd392897b43155a1fc58a7a11f69e50856dd23b7810575ab21a6620cc6efc9bfbfeeda2a0d8ba05126ed18655eca4866b8296e696cd39ab7fdc82971f9ccd3
+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/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
index c3feb204bff7..6364a4ee745f 100644
--- a/app-laptop/tpacpi-bat/tpacpi-bat-9999.ebuild
+++ b/app-laptop/tpacpi-bat/tpacpi-bat-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,9 +25,10 @@ RDEPEND="sys-power/acpi_call
 	dev-lang/perl"
 
 src_install() {
-	dodoc README battery_asl
+	dodoc README.md battery_asl
 	dobin tpacpi-bat
 	newinitd "${FILESDIR}"/${PN}.initd.2 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd.1 ${PN}
-	systemd_newunit tpacpi.service ${PN}.service
+	systemd_newunit examples/systemd_fixed_threshold/tpacpi.service \
+		${PN}.service
 }