From 853ac13d1b5b22cbacaa0cbc193002788d6e4097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Wed, 22 Jan 2020 20:19:24 +0100
Subject: dev-util/laminar: fix path in init

---
 dev-util/laminar/files/laminar.init    |  2 +-
 dev-util/laminar/laminar-0.8-r1.ebuild | 55 ++++++++++++++++++++++++++++++++++
 dev-util/laminar/laminar-0.8.ebuild    | 55 ----------------------------------
 3 files changed, 56 insertions(+), 56 deletions(-)
 create mode 100644 dev-util/laminar/laminar-0.8-r1.ebuild
 delete mode 100644 dev-util/laminar/laminar-0.8.ebuild

diff --git a/dev-util/laminar/files/laminar.init b/dev-util/laminar/files/laminar.init
index c8d3eff..46df2d9 100755
--- a/dev-util/laminar/files/laminar.init
+++ b/dev-util/laminar/files/laminar.init
@@ -2,7 +2,7 @@
 # Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-command=/usr/bin/laminard
+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)"
diff --git a/dev-util/laminar/laminar-0.8-r1.ebuild b/dev-util/laminar/laminar-0.8-r1.ebuild
new file mode 100644
index 0000000..55d16d9
--- /dev/null
+++ b/dev-util/laminar/laminar-0.8-r1.ebuild
@@ -0,0 +1,55 @@
+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}"
+
+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.ebuild b/dev-util/laminar/laminar-0.8.ebuild
deleted file mode 100644
index 55d16d9..0000000
--- a/dev-util/laminar/laminar-0.8.ebuild
+++ /dev/null
@@ -1,55 +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}"
-
-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