From 4c05515c2ea6ad965754801eff632b6e3d37c4fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Thu, 12 Mar 2020 15:48:48 +0100
Subject: dev-utils/laminar: supervise this daemon
---
dev-util/laminar/files/laminar.init | 6 ++--
dev-util/laminar/laminar-0.8-r2.ebuild | 58 ----------------------------------
dev-util/laminar/laminar-0.8-r3.ebuild | 58 ++++++++++++++++++++++++++++++++++
3 files changed, 60 insertions(+), 62 deletions(-)
delete mode 100644 dev-util/laminar/laminar-0.8-r2.ebuild
create mode 100644 dev-util/laminar/laminar-0.8-r3.ebuild
(limited to 'dev-util/laminar')
diff --git a/dev-util/laminar/files/laminar.init b/dev-util/laminar/files/laminar.init
index f0a4658..284ca56 100755
--- a/dev-util/laminar/files/laminar.init
+++ b/dev-util/laminar/files/laminar.init
@@ -3,9 +3,7 @@
# Distributed under the terms of the GNU General Public License v2
command=/usr/sbin/laminard
-command_background=yes
-pidfile=/var/run/laminar.pid
-start_stop_daemon_args="$(sed -n 's/^\([^#].*=.*\)/ -e \1/p' /etc/laminar.conf)"
+supervisor="supervise-daemon"
+supervise_daemon_args="$(sed -n 's/^\([^#].*=.*\)/ -e \1/p' /etc/laminar.conf)"
command_user=build
-command_group=build
error_logger=/usr/bin/logger
diff --git a/dev-util/laminar/laminar-0.8-r2.ebuild b/dev-util/laminar/laminar-0.8-r2.ebuild
deleted file mode 100644
index 479ed3b..0000000
--- a/dev-util/laminar/laminar-0.8-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Lightweight and modular Continuous Integration service for Linux"
-HOMEPAGE="http://laminar.ohwg.net/"
-SRC_URI="https://github.com/ohwgiles/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js -> ${P}-vue.min.js
- https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js -> ${P}-vue-router.min.js
- https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js -> ${P}-ansi_up.js
- https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js -> ${P}-Chart.min.js
- https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css -> ${P}-bootstrap.min.css"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- dev-libs/capnproto
- dev-libs/rapidjson
- dev-db/sqlite
- dev-libs/boost
-"
-RDEPEND="${DEPEND}
- acct-user/build
-"
-
-src_unpack() {
- # Note that ${A} contains also other files so no general unpack
- unpack "${P}.tar.gz"
-}
-
-# Note: lamianr build system in default downloads external files but that is not
-# possible for some reason in sandbox. This downloads those files outside of
-# scripts and copies them to correct place before configure which prevents from
-# download happening/failing.
-src_configure() {
- local BUILD_DIR="${WORKDIR}/${P}_build"
- mkdir -p ${BUILD_DIR}/js
- for file in vue.min.js vue-router.min.js ansi_up.js Chart.min.js; do
- cat "${DISTDIR}/${P}-${file}" > "${BUILD_DIR}/js/${file}"
- done
- mkdir -p ${BUILD_DIR}/css
- for file in bootstrap.min.css; do
- cat "${DISTDIR}/${P}-${file}" > "${BUILD_DIR}/css/${file}"
- done
-
- local mycmakeargs=(
- "-DCMAKE_INSTALL_PREFIX=/"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- newinitd "${FILESDIR}/laminar.init" laminar
-}
diff --git a/dev-util/laminar/laminar-0.8-r3.ebuild b/dev-util/laminar/laminar-0.8-r3.ebuild
new file mode 100644
index 0000000..479ed3b
--- /dev/null
+++ b/dev-util/laminar/laminar-0.8-r3.ebuild
@@ -0,0 +1,58 @@
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Lightweight and modular Continuous Integration service for Linux"
+HOMEPAGE="http://laminar.ohwg.net/"
+SRC_URI="https://github.com/ohwgiles/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js -> ${P}-vue.min.js
+ https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js -> ${P}-vue-router.min.js
+ https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js -> ${P}-ansi_up.js
+ https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js -> ${P}-Chart.min.js
+ https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css -> ${P}-bootstrap.min.css"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-libs/capnproto
+ dev-libs/rapidjson
+ dev-db/sqlite
+ dev-libs/boost
+"
+RDEPEND="${DEPEND}
+ acct-user/build
+"
+
+src_unpack() {
+ # Note that ${A} contains also other files so no general unpack
+ unpack "${P}.tar.gz"
+}
+
+# Note: lamianr build system in default downloads external files but that is not
+# possible for some reason in sandbox. This downloads those files outside of
+# scripts and copies them to correct place before configure which prevents from
+# download happening/failing.
+src_configure() {
+ local BUILD_DIR="${WORKDIR}/${P}_build"
+ mkdir -p ${BUILD_DIR}/js
+ for file in vue.min.js vue-router.min.js ansi_up.js Chart.min.js; do
+ cat "${DISTDIR}/${P}-${file}" > "${BUILD_DIR}/js/${file}"
+ done
+ mkdir -p ${BUILD_DIR}/css
+ for file in bootstrap.min.css; do
+ cat "${DISTDIR}/${P}-${file}" > "${BUILD_DIR}/css/${file}"
+ done
+
+ local mycmakeargs=(
+ "-DCMAKE_INSTALL_PREFIX=/"
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ newinitd "${FILESDIR}/laminar.init" laminar
+}
--
cgit v1.2.3