gentoo auto-resync : 01:08:2022 - 03:14:32

4 files changed, 20 insertions, 63 deletions

diff --git a/app-laptop/mbpfan/Manifest b/app-laptop/mbpfan/Manifest
index 6151ba2b3229..f6c7542890eb 100644
--- a/app-laptop/mbpfan/Manifest
+++ b/app-laptop/mbpfan/Manifest
@@ -1,6 +1,4 @@
-DIST mbpfan-2.1.1.tar.gz 40637 BLAKE2B bdd17a9a883cc9af3cb7d55a2c8594c435fb367f0c6b5dec2b3da85747e2c2af591ed1dabf082cbbc31ac92ce5b2dc5194d8a50836c87cd784f238322ab09d9f SHA512 c1bf81c5e2f2f4f710a8455c65f10dc2dc2255319a7dbf4367c31884eece8d9909d28f3a00e5fc4d964d65254b36202a2a2b666d0ef04ea04153baded6039449
 DIST mbpfan-2.2.1.tar.gz 40455 BLAKE2B 0932919b4808fa41d64c326f0d202650be25798ca692b4c17cc94a88f3287ccdd10d74c27f95ac8ef7d900f0067b3c40dc8798d99210b89c01b8cb0d63187b98 SHA512 ce358047910bd6996e1d47fe08e1825863e043fc9a33b3c4922ea537e58dd7508fc45c651816125e7b32472cbb3d06afa4a487daba5b910a8580623def938a71
-EBUILD mbpfan-2.1.1.ebuild 1159 BLAKE2B b732fd2d324cd270af00564df237896b6651074c4aa4b499f62ee789288be470be9d14581ca4e44bb25aaa92ea48f3e50a68fce24b4bf83d6dbcfc22b3cd330f SHA512 16fac95a2daf9ae4a6dd5d342c0a396a7152b9b2be861636ee57fe3699d18abb143c635287103276668696e91d5ce390d706f4657ee7c89130316602c3c9b388
-EBUILD mbpfan-2.2.1.ebuild 1272 BLAKE2B 1ee6390cd18d42b15408b825403a531da829eb71ed914a93a2c476c9b44be7de66cdeb545dafb55d072cef77779c0229c26e19808533ac6fc421c2484c12ac55 SHA512 0a12fd5703c1eee437efd224068a362eccdf036a9f3496b0b94e36be1e4b09bcaab8aceb4ce36f5dc33a1ee542d19fe4ae5dff23043fc460776c5842f8fc7eb5
-EBUILD mbpfan-9999.ebuild 1272 BLAKE2B 1ee6390cd18d42b15408b825403a531da829eb71ed914a93a2c476c9b44be7de66cdeb545dafb55d072cef77779c0229c26e19808533ac6fc421c2484c12ac55 SHA512 0a12fd5703c1eee437efd224068a362eccdf036a9f3496b0b94e36be1e4b09bcaab8aceb4ce36f5dc33a1ee542d19fe4ae5dff23043fc460776c5842f8fc7eb5
+EBUILD mbpfan-2.2.1-r1.ebuild 1268 BLAKE2B d06dc087c6c857239069624770bdf8214847d44bc4f0156654e812666dd87fc2bcc2e3d04af0de513f655c58dbfcb6b3d57e919ef0adbf448aeede8352285780 SHA512 ced6de88ebfda6389f250234ed474373e64b759f970384f0866667e104e3760a14e911ca680ee286682e32deb6a3dbe78fee9cd6ac3210fbe60f91656a71a2ca
+EBUILD mbpfan-9999.ebuild 1268 BLAKE2B d06dc087c6c857239069624770bdf8214847d44bc4f0156654e812666dd87fc2bcc2e3d04af0de513f655c58dbfcb6b3d57e919ef0adbf448aeede8352285780 SHA512 ced6de88ebfda6389f250234ed474373e64b759f970384f0866667e104e3760a14e911ca680ee286682e32deb6a3dbe78fee9cd6ac3210fbe60f91656a71a2ca
 MISC metadata.xml 690 BLAKE2B bde3ec1fac36fe5dd4f3fa628f16a7fb6fe64179ae8f9e8ee8edb651abec9da089d1e875db956931d4182d8975bd1de04c43104260e1bba04f01433f0741fe7e SHA512 bbec74e4ae64483001c35aa3963e9e681d63c4e6205b838b0dc0d952b461497c0ff3ad5d52e8714d1804f2935d4db8f69da6aa79b01964f0a6da99ed6eb5f89c
diff --git a/app-laptop/mbpfan/mbpfan-2.1.1.ebuild b/app-laptop/mbpfan/mbpfan-2.1.1.ebuild
deleted file mode 100644
index 565655fb2b27..000000000000
--- a/app-laptop/mbpfan/mbpfan-2.1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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"
-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-2.2.1.ebuild b/app-laptop/mbpfan/mbpfan-2.2.1-r1.ebuild
index e1a4cb35e935..1bbd3102e15e 100644
--- a/app-laptop/mbpfan/mbpfan-2.2.1.ebuild
+++ b/app-laptop/mbpfan/mbpfan-2.2.1-r1.ebuild
@@ -1,17 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 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
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dgraziotin/${PN}.git"
 else
@@ -19,6 +16,10 @@ else
 	KEYWORDS="~amd64"
 fi
 
+LICENSE="GPL-3+"
+SLOT="0"
+RESTRICT="test" # will fail if the hardware is unavailable, not useful
+
 CONFIG_CHECK="~SENSORS_APPLESMC ~SENSORS_CORETEMP"
 
 src_compile() {
@@ -33,14 +34,14 @@ src_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
+	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
+	rm -r "${ED}"/usr/share/doc/${PN} || die
 
 	einstalldocs
 }
diff --git a/app-laptop/mbpfan/mbpfan-9999.ebuild b/app-laptop/mbpfan/mbpfan-9999.ebuild
index e1a4cb35e935..1bbd3102e15e 100644
--- a/app-laptop/mbpfan/mbpfan-9999.ebuild
+++ b/app-laptop/mbpfan/mbpfan-9999.ebuild
@@ -1,17 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 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
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dgraziotin/${PN}.git"
 else
@@ -19,6 +16,10 @@ else
 	KEYWORDS="~amd64"
 fi
 
+LICENSE="GPL-3+"
+SLOT="0"
+RESTRICT="test" # will fail if the hardware is unavailable, not useful
+
 CONFIG_CHECK="~SENSORS_APPLESMC ~SENSORS_CORETEMP"
 
 src_compile() {
@@ -33,14 +34,14 @@ src_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
+	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
+	rm -r "${ED}"/usr/share/doc/${PN} || die
 
 	einstalldocs
 }