Skip to content

Commit c472f98

Browse files
inode64inode64
committed
Update zigbee2mqtt and nodejs eclass
Signed-off-by: INODE64 <[email protected]>
1 parent db9fcf5 commit c472f98

File tree

6 files changed

+96
-144
lines changed

6 files changed

+96
-144
lines changed

‎app-misc/zigbee2mqtt/Manifest

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
AUX zigbee2mqtt 632 BLAKE2B 5cb0d8852f0755fa43444eba7d39a536c0c4f79325fef66338228d92530397e6294ce72c0c4d9d4b6f6bbfb0044b77746e6daf9d2dc7b269211cefaed7a99189 SHA512 0a26ef5e136b5536fa4b5d7fe9953b76e5c2fedf433abe91877e78701bb661744ce4dccb642911a28270e9740b7c7af78e75e8c0914c804d1cf0e76698999d70
22
AUX zigbee2mqtt.conf 176 BLAKE2B f1003f37135e10a32c3fe7b387da9f4194cae82339edf77928c2d55e08dcac1f212d27f5bd41a0f20887847fd98f569aaf0ca5f17504be1f3c8d87d38c2f5b87 SHA512 105e618af8ee335a591d791c701ffdbdccc4e967d29433a9d9f6997f5f6c3f50eb3dfe56a3fcd617b0a52ed1380fb889747ef70a148c07d6871c7e3c2beb9dab
33
AUX zigbee2mqtt.service 870 BLAKE2B d680edf72f182e2545d15063786d281bbf31d8e8cb899b0aa103da6dd8180b8afd7d5bef21c760991c27db98151bb48bd569b26318477ddcb71e8a90cbf193af SHA512 f02d59509f632c458cd9e95ecd97421df3aba8a78bac41d55075d8f054e4f3293b414885d0c1337a38a179496e5e2851c00170ca36f8546a6a37d2473811a46a
4-
DIST zigbee2mqtt-1.30.1-node_modules.tar.xz 18782028 BLAKE2B ee85f5de70a6913b164c73420a5ff01761d5ed3e417951e57f391234e66cd5de76dc459fda84452e1615c544f064d89d156bb580137503a45237b4aae4e23a0b SHA512 d4454ef828c66974d1210b7cc1df7526e3e324addc4e420de13314a13070132e3b7958bf2e8fdac50648ed21f06340f5335fc5b947ee1815dea3035f38954876
5-
DIST zigbee2mqtt-1.30.1.tar.gz 483028 BLAKE2B 9c297c85a08ef911ad13b2722adecda6e01f0c5689a5225e3e4b0998c6a6626fe0ded2d64df0479c72971fc5f92f79cb65bdc3f8ecd1583b78d94168de1fcdba SHA512 b38accbaea044c0e5b28a4cef0652d90d7691ca936e82bdd82b39d8f77719ac750c067dcb58b9a9d2251dd821e81ed62eed8bbab3c232f516a7a6247fa575d58
6-
DIST zigbee2mqtt-1.30.2-node_modules.tar.xz 18136688 BLAKE2B cb29dc59ded0b98d2603472694ccec74ffcfcd8ada2a089f05f41b991e81d6946afd41ee01005c37d1910b19789519bb1c6be8401287a21c921edd2e21033a09 SHA512 d09cc8ebae428687a956513f8a2b5748c47183230034d9d9eda3429f167b108840252050ddae021698d3fabbe7c04fe8fdb1fffbd8724863beda5d03b28c03f9
7-
DIST zigbee2mqtt-1.30.2.tar.gz 483544 BLAKE2B 7fe963d1c15dd36af81943db031d36459ea3c106ccb1513eef2ed15148d9ec57d4f84e8ac30a703565e791079897d312b30bf03cb56f07f63769c3422d473516 SHA512 2a27f8ffbb125934a7c75440018d3cb7f3da6c47fbfc0e5850e0ab1c7a5b918dce1d7064b15e91efaf088308760cd73a588b21b1d7a10f14458dbc7d9a2ef62c
8-
EBUILD zigbee2mqtt-1.30.1.ebuild 1449 BLAKE2B bf9ef636fd7dbf2c4520cc3410bfcd69fb2bd8f0f4e852d31acf343e0ea824c674c0982f24ed57ddd3dee2506d8fc45993d99282b4929c8f54e0812318dec709 SHA512 354be668847923e8caf61dd4284505cc151f86f0385471537e14b94f4e3c0fe32f41a36e9d002d3862cf69d743e8b29603476bdccb421c112b531946442fcf2d
9-
EBUILD zigbee2mqtt-1.30.2.ebuild 1449 BLAKE2B c5ef0bc09c4c78769557dbf0544a17d20d4fcc2ba846f76958c471762ad9b705c2cae60319fbee03d530b95d9942300f675773d4371cb1a5fdd10d83db5baf81 SHA512 dd3ea49c82007b993dc330130646bf6b585edae932358b5272061cac13f03eaf1527591c533ed3b4030da06798c22fbc7669ddc69eb725db5946488d06c933b3
4+
DIST zigbee2mqtt-1.33.2-node_modules.tar.xz 17115112 BLAKE2B 1f60034e5651a00b705a9d8e16b3151b9c28a1458ee2ffff8f6367ec4d9839e8178c82c2c5e3c3249674ec2bda73548a66590baa59c071532b8db3b13166aa5b SHA512 e2b393d9f084917bac3157c85fe39d0bffed6930a5714f811aca771e65b9cdec980dfa107380431bfcc2d0d1ff73da4e49cebb3a5df81f681279b08925351f38
5+
DIST zigbee2mqtt-1.33.2.tar.gz 566167 BLAKE2B eaf1f023f0925571a793324d272937a46a7ffab0582ba15eba9e38ab6e8484cf0612e3ee457dccd6da16443481a6273171bd8615dd5864a83a0af9c122d8689d SHA512 986a0eeca4e72fd9da39c909a2f47e64f23fed96970b5fdaa226a69c4316ebb9e158b9ca8f94e84d0450ec688e30533e50d6a9d4033b8aeb48dddd08191491fc
6+
EBUILD zigbee2mqtt-1.33.2.ebuild 1789 BLAKE2B a099d20877b0003fa802be8e008ffc1754428b11ca41f317819a007a499c1ee1f5875cab6094a43579c78d0aa87d6b6b1d8cc86ada911b5a06364e2c199cc4a0 SHA512 cd6715a6a3e2e79af05d7a99f892f4fa2377ffd5e166f6af1d8df9861c12a1ba6b418d942001d428e884ccdae24e1755c9e8d0e797a92a046fd5ac84cfbb6412
107
MISC metadata.xml 480 BLAKE2B dc80fdb17a73b1f63ef970674d5bb1a950b14d6d318276ad3303157dd93fbba9165a9e2b70a0380cbf70b77ecf31ed856698f7887ae0bc09a5d71c66ff7d4b42 SHA512 e7cbfb9fb939af0066a1a779af9af60df9a45d7b42b16706f6dcd321e4bd5b9b432120321b9cfe0d28809cd207f8aba36f9119c07b6adefe109acd207a15e51d

‎app-misc/zigbee2mqtt/zigbee2mqtt-1.30.2.ebuild

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎app-misc/zigbee2mqtt/zigbee2mqtt-1.30.1.ebuild renamed to ‎app-misc/zigbee2mqtt/zigbee2mqtt-1.33.2.ebuild

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ inherit nodejs-mod systemd tmpfiles
1616

1717
DESCRIPTION="It bridges events and allows you to control your Zigbee devices via MQTT"
1818
HOMEPAGE="https://www.zigbee2mqtt.io/"
19-
COMMIT="eb878d3d8ee47f77e27c771452e2d2c77ca83bb5"
19+
COMMIT="9996c931e25a0a3e72d9bb1aa89ed9c36eec8a89"
2020

21-
LICENSE="GPL-3"
21+
LICENSE="0BSD Apache-2.0 BSD-2 CC-BY-4.0 GPL-3 ISC MIT PYTHON"
2222
SLOT="0"
2323
KEYWORDS="~amd64"
2424

@@ -30,6 +30,16 @@ RDEPEND="
3030

3131
NODEJS_EXTRA_FILES="scripts"
3232

33+
pkg_pretend() {
34+
if ! grep -q "CONFIG_PROTECT=\"/var/lib/${PN}\"" "${EROOT}/etc/env.d/90${PN}" 2>/dev/null; then
35+
eerror "Bad CONFIG_PROTECT"
36+
eerror "update ${EROOT}/etc/env.d/90${PN} to include CONFIG_PROTECT=\"/var/lib/${PN}\""
37+
eerror ""
38+
eerror ""
39+
die "Bad CONFIG_PROTECT"
40+
fi
41+
}
42+
3343
src_install() {
3444
echo "${COMMIT}" > dist/.hash
3545

@@ -51,7 +61,7 @@ src_install() {
5161
systemd_dounit "${FILESDIR}/${PN}.service"
5262

5363
dodir /etc/env.d
54-
echo 'CONFIG_PROTECT="/var/lib/${PN}"' >>"${ED}"/etc/env.d/90${PN} || die
64+
echo "CONFIG_PROTECT=\"/var/lib/${PN}"\" >>"${ED}"/etc/env.d/90${PN} || die
5565
}
5666

5767
pkg_postinst() {

‎eclass/nodejs-mod.eclass

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
# Fco. Javier Félix <[email protected]>
77
# @AUTHOR:
88
# Fco. Javier Félix <[email protected]>
9-
# @SUPPORTED_EAPIS: 7 8
9+
# @SUPPORTED_EAPIS: 8
1010
# @BLURB: An eclass for build NodeJS projects
1111
# @DESCRIPTION:
1212
# An eclass providing functions to build NodeJS projects
1313
#
14-
# Changelog:
14+
# Credits and ideas from:
1515
# Initial version from:
1616
# https://github.com/gentoo/gentoo/pull/930/files
1717
# https://github.com/samuelbernardo/ssnb-overlay/blob/master/eclass/npm.eclass
@@ -30,8 +30,8 @@
3030
# tar --create --auto-compress --file foo-1-node_modules.tar.xz foo-1/node_modules/
3131

3232
case ${EAPI} in
33-
7 | 8) ;;
34-
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
33+
8) ;;
34+
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
3535
esac
3636

3737
if [[ -z ${_NODEJS_MOD_ECLASS} ]]; then
@@ -40,7 +40,7 @@ _NODEJS_MOD_ECLASS=1
4040
inherit nodejs
4141

4242
if has nodejs-pack ${INHERITED}; then
43-
eerror "nodejs-mod and nodejs-pack eclass are incompatible"
43+
die "nodejs-mod and nodejs-pack eclass are incompatible"
4444
fi
4545

4646
RDEPEND+=" net-libs/nodejs:="
@@ -53,7 +53,7 @@ nodejs-mod_src_prepare() {
5353

5454
if [[ ! -e package.json ]]; then
5555
eerror "Unable to locate package.json"
56-
eerror "Consider not inheriting the nodejs eclass."
56+
eerror "Consider not inheriting the NodeJS eclass."
5757
die "FATAL: Unable to find package.json"
5858
fi
5959

@@ -62,7 +62,7 @@ nodejs-mod_src_prepare() {
6262

6363
# @FUNCTION: nodejs-mod_src_compile
6464
# @DESCRIPTION:
65-
# General function for compiling a nodejs module
65+
# General function for compiling a NodeJS module
6666
nodejs-mod_src_compile() {
6767
debug-print-function "${FUNCNAME}" "${@}"
6868

@@ -71,7 +71,7 @@ nodejs-mod_src_compile() {
7171
find node_modules/ -name binding.gyp -exec dirname {} \; | while read -r dir; do
7272
pushd "${dir}" >/dev/null || die
7373
# shellcheck disable=SC2046
74-
npm_config_nodedir=/usr/ /usr/$(get_libdir)/node_modules/npm/bin/node-gyp-bin/node-gyp rebuild --verbose
74+
npm_config_nodedir=/usr/ /usr/$(get_libdir)/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js rebuild --verbose
7575
popd >/dev/null || die
7676
done
7777
fi
@@ -84,7 +84,7 @@ nodejs-mod_src_compile() {
8484

8585
# @FUNCTION: nodejs-mod_src_test
8686
# @DESCRIPTION:
87-
# General function for testing a nodejs module
87+
# General function for testing a NodeJS module
8888
nodejs-mod_src_test() {
8989
debug-print-function "${FUNCNAME}" "${@}"
9090

‎eclass/nodejs-pack.eclass

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
# Fco. Javier Félix <[email protected]>
77
# @AUTHOR:
88
# Fco. Javier Félix <[email protected]>
9-
# @SUPPORTED_EAPIS: 7 8
9+
# @SUPPORTED_EAPIS: 8
1010
# @BLURB: An eclass for build NodeJS projects
1111
# @DESCRIPTION:
1212
# An eclass providing functions to build NodeJS packages
1313
#
14-
# Changelog:
14+
# Credits and ideas from:
1515
# Initial version from:
1616
# https://github.com/gentoo/gentoo/pull/930/files
1717
# https://github.com/samuelbernardo/ssnb-overlay/blob/master/eclass/npm.eclass
1818
# https://github.com/gentoo-mirror/lanodanOverlay/blob/master/eclass/nodejs.eclass
1919
# https://github.com/Tatsh/tatsh-overlay/blob/master/eclass/yarn.eclass
2020

2121
case ${EAPI} in
22-
7 | 8) ;;
23-
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
22+
8) ;;
23+
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
2424
esac
2525

2626
if [[ -z ${_NODEJS_PACK_ECLASS} ]]; then
@@ -29,14 +29,11 @@ _NODEJS_PACK_ECLASS=1
2929
inherit nodejs
3030

3131
if has nodejs-mod ${INHERITED}; then
32-
eerror "nodejs-mod and nodejs-pack eclass are incompatible"
32+
die "nodejs-mod and nodejs-pack eclass are incompatible"
3333
fi
3434

3535
RDEPEND+=" net-libs/nodejs"
3636

37-
# Do not complain about CFLAGS etc since nodejs-pack projects do not use them.
38-
QA_FLAGS_IGNORED='.*'
39-
4037
# Upstream does not support stripping go packages
4138
RESTRICT="test strip"
4239

@@ -57,7 +54,7 @@ nodejs-pack_src_prepare() {
5754

5855
# @FUNCTION: nodejs-pack_src_compile
5956
# @DESCRIPTION:
60-
# General function for compiling a nodejs module
57+
# General function for compiling a NodeJS module
6158
nodejs-pack_src_compile() {
6259
debug-print-function "${FUNCNAME}" "${@}"
6360

@@ -78,7 +75,7 @@ nodejs-pack_src_install() {
7875
install \
7976
"$(nodejs_package)-$(nodejs_version).tgz" || die "install failed"
8077

81-
pushd "${ED}/$(_NODEJS_MODULES)" >/dev/null || die
78+
pushd "${ED}/$(nodejs_modules)" >/dev/null || die
8279
nodejs_remove_dev
8380
popd >/dev/null || die
8481
}

0 commit comments

Comments
 (0)