[gentoo-commits] repo/proj/guru:dev commit in: net-misc/bee/, net-misc/bee/files/, net-misc/bee-node/, net-misc/bee-node/files/

[Alessandro Barbieri]

commit:     04582b117f449eda3f0943ce8bc61a3e01544fd7
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun May  8 01:01:00 2022 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun May  8 01:58:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=04582b11

net-misc/bee: rename net-misc/bee-node

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 net-misc/{bee-node => bee}/Manifest                |  0
 .../bee-0.3.1-r1.ebuild}                           |  5 +++--
 .../bee-1.0.0_alpha4-r1.ebuild}                    | 25 ++++++++++++++++------
 .../files/bee-1.0.0_alpha4-no-download.patch}      |  0
 net-misc/bee/files/bee-alphanet.service            | 21 ++++++++++++++++++
 net-misc/bee/files/bee-mainnet.service             | 21 ++++++++++++++++++
 net-misc/{bee-node => bee}/metadata.xml            |  0
 7 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/net-misc/bee-node/Manifest b/net-misc/bee/Manifest
similarity index 100%
rename from net-misc/bee-node/Manifest
rename to net-misc/bee/Manifest

diff --git a/net-misc/bee-node/bee-node-0.3.1.ebuild b/net-misc/bee/bee-0.3.1-r1.ebuild
similarity index 98%
rename from net-misc/bee-node/bee-node-0.3.1.ebuild
rename to net-misc/bee/bee-0.3.1-r1.ebuild
index 9703140af..ec261353d 100644
--- a/net-misc/bee-node/bee-node-0.3.1.ebuild
+++ b/net-misc/bee/bee-0.3.1-r1.ebuild
@@ -416,7 +416,7 @@ CRATES="
 LLVM_MAX_SLOT=14
 QA_FLAGS_IGNORED="usr/bin/bee"
 
-inherit cargo llvm
+inherit cargo llvm systemd
 
 DESCRIPTION="IOTA node written in rust"
 HOMEPAGE="https://github.com/iotaledger/bee"
@@ -425,7 +425,7 @@ SRC_URI="
 	https://github.com/iotaledger/bee/archive/${BEE_COMMIT}.tar.gz -> bee-${BEE_COMMIT}.tar.gz
 	$(cargo_crate_uris)
 "
-S="${WORKDIR}/bee-${PV}/${PN}"
+S="${WORKDIR}/${P}/bee-node"
 
 LICENSE="
 	|| ( Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT )
@@ -484,4 +484,5 @@ src_install() {
 	cargo_src_install
 	insinto "/etc/${PN}"
 	doins config*.toml
+	systemd_newunit "${FILESDIR}/bee-mainnet.service" "bee.service"
 }

diff --git a/net-misc/bee-node/bee-node-1.0.0_alpha4.ebuild b/net-misc/bee/bee-1.0.0_alpha4-r1.ebuild
similarity index 95%
rename from net-misc/bee-node/bee-node-1.0.0_alpha4.ebuild
rename to net-misc/bee/bee-1.0.0_alpha4-r1.ebuild
index 100287178..03b136880 100644
--- a/net-misc/bee-node/bee-node-1.0.0_alpha4.ebuild
+++ b/net-misc/bee/bee-1.0.0_alpha4-r1.ebuild
@@ -436,7 +436,7 @@ LLVM_MAX_SLOT=14
 MYPV="${PV/_alpha/-alpha.}"
 QA_FLAGS_IGNORED="usr/bin/bee"
 
-inherit cargo llvm
+inherit cargo llvm systemd
 
 DESCRIPTION="IOTA node written in rust"
 HOMEPAGE="https://github.com/iotaledger/bee"
@@ -448,7 +448,6 @@ SRC_URI="
 "
 S="${WORKDIR}/bee-${MYPV}"
 
-# TODO: find out licenses from the bundled dashboard
 LICENSE="
 	|| ( Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT )
 	|| ( Apache-2.0 BSD MIT )
@@ -468,6 +467,19 @@ LICENSE="
 	MIT
 	MPL-2.0
 	openssl
+
+	dashboard? (
+		|| ( Apache-2.0 MPL-1.1 )
+		|| ( BSD GPL-2 )
+		|| ( GPL-3+ MIT )
+		|| ( MIT CC0-1.0 )
+		|| ( WTFPL MIT )
+		CC-BY-3.0
+		CC-BY-4.0
+		ZLIB
+		ODC-By-1.0
+		Unlicense
+	)
 "
 SLOT="0"
 KEYWORDS="~amd64"
@@ -500,12 +512,12 @@ pkg_setup() {
 src_unpack() {
 	cargo_src_unpack
 	if use dashboard; then
-		cp "${DISTDIR}/node-dashboard-bee-${DASHBOARD_VERSION}" "${S}/${PN}/bee-plugin/bee-plugin-dashboard/node-dashboard-bee-${DASHBOARD_VERSION}.zip" || die
+		cp "${DISTDIR}/node-dashboard-bee-${DASHBOARD_VERSION}" "${S}/bee-node/bee-plugin/bee-plugin-dashboard/node-dashboard-bee-${DASHBOARD_VERSION}.zip" || die
 	fi
 }
 
 src_configure() {
-	pushd "${S}/${PN}/${PN}" || die
+	pushd "${S}/bee-node/bee-node" || die
 	local myfeatures=(
 		$(usev dashboard)
 		$(usev rocksdb)
@@ -515,13 +527,14 @@ src_configure() {
 }
 
 src_compile() {
-	pushd "${S}/${PN}/${PN}" || die
+	pushd "${S}/bee-node/bee-node" || die
 	LIBCLANG_PATH="$(get_llvm_prefix)/$(get_libdir)" cargo_src_compile
 }
 
 src_install() {
-	pushd "${S}/${PN}/${PN}" || die
+	pushd "${S}/bee-node/bee-node" || die
 	cargo_src_install
 	insinto "/etc/${PN}"
 	doins config*.toml
+	systemd_newunit "${FILESDIR}/bee-alphanet.service" bee.service
 }

diff --git a/net-misc/bee-node/files/bee-node-1.0.0_alpha4-no-download.patch b/net-misc/bee/files/bee-1.0.0_alpha4-no-download.patch
similarity index 100%
rename from net-misc/bee-node/files/bee-node-1.0.0_alpha4-no-download.patch
rename to net-misc/bee/files/bee-1.0.0_alpha4-no-download.patch

diff --git a/net-misc/bee/files/bee-alphanet.service b/net-misc/bee/files/bee-alphanet.service
new file mode 100644
index 000000000..ace806b4f
--- /dev/null
+++ b/net-misc/bee/files/bee-alphanet.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=bee
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+LimitNOFILE=4096
+SyslogIdentifier=bee
+PrivateDevices=yes
+PrivateTmp=yes
+ProtectSystem=full
+ProtectHome=yes
+
+User=bee
+WorkingDirectory=/var/lib/bee
+TimeoutSec=1200
+Restart=always
+ExecStart=/usr/bin/bee -c "/etc/bee/config.alphanet.toml"
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-misc/bee/files/bee-mainnet.service b/net-misc/bee/files/bee-mainnet.service
new file mode 100644
index 000000000..72dee8adb
--- /dev/null
+++ b/net-misc/bee/files/bee-mainnet.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=bee
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+LimitNOFILE=4096
+SyslogIdentifier=bee
+PrivateDevices=yes
+PrivateTmp=yes
+ProtectSystem=full
+ProtectHome=yes
+
+User=bee
+WorkingDirectory=/var/lib/bee
+TimeoutSec=1200
+Restart=always
+ExecStart=/usr/bin/bee -c "/etc/bee/config.chrysalis-mainnet.toml"
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-misc/bee-node/metadata.xml b/net-misc/bee/metadata.xml
similarity index 100%
rename from net-misc/bee-node/metadata.xml
rename to net-misc/bee/metadata.xml