From 9d17bef0278238ff336c34488d151a32efd5d879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Fri, 29 May 2020 09:26:42 +0200
Subject: dev-util/laminar: fix hash usage

---
 dev-util/laminar/Manifest                | 12 +++----
 dev-util/laminar/laminar-0.8-r4.ebuild   | 61 ++++++++++++++++++++++++++++++++
 dev-util/laminar/laminar-0.8.1-r1.ebuild | 59 ------------------------------
 3 files changed, 67 insertions(+), 65 deletions(-)
 create mode 100644 dev-util/laminar/laminar-0.8-r4.ebuild
 delete mode 100644 dev-util/laminar/laminar-0.8.1-r1.ebuild

(limited to 'dev-util')

diff --git a/dev-util/laminar/Manifest b/dev-util/laminar/Manifest
index 4956ff8..5a8d94f 100644
--- a/dev-util/laminar/Manifest
+++ b/dev-util/laminar/Manifest
@@ -1,6 +1,6 @@
-DIST laminar-0.8.1-Chart.min.js 159638 BLAKE2B 073844d4f5cbc09a9a865da0c5f6ee0aae5e87aeec043da3bc762d12b156f486d919bd8a5527960cfe6c91e591f3a0a46a8cfcb7e55655366237ec391f47c89d SHA512 1aca85f35d1c3701cc08310b4f08b7620588070298425bc2d564c027a7e4f34aed07accddc859da6842e8c1402b8e30ec575e4b045b01349382eb6fe37cec365
-DIST laminar-0.8.1-ansi_up.js 11014 BLAKE2B fbb6f492925af2cecae0da5ae660fe1f89f88cd6a89bad359e49cd4b4b64578d38648c2902e7c7b037e51020e0756862575743b973026a7fb65f13d7d1580911 SHA512 b5833288efea1636ce702701ac88a0cca2064f3f281c68a71d7773a411aefdd07a47f29aa17b86e2f7fe11dab154ca5d94eb97622bf2770bca450a5dde99a702
-DIST laminar-0.8.1-bootstrap.min.css 122540 BLAKE2B 3dc1618f259ada9ba72ed50d990e25bcab6f1a0d941bfa8cdbd15f231cd6cc0172e531da38baa3f92e34d0a2c22b3914d46da285068fe04962dc47f01a61117f SHA512 7537e07bfce0a0c6293fb41b1f2e2058c106b1bb1d65e097cfb8ab22d8dc0b7b0f505b5fd24b856c3cff8b11bb02b4f19838cb5c399ecc7b9b78d8a4c8a195c9
-DIST laminar-0.8.1-vue-router.min.js 23642 BLAKE2B e8d5960f298ab9797dc9bbc979963f6223c18ad91fe4edaece3abab4beec62211ef7ec4efef026c7361c7daa19168d4dd5e0734b94fc8c7be475fd216c14edb3 SHA512 31eefac960689ecfc45b2b761959db99e1bfce2cc1ef1f32bf5bd55a69e50282acbb2f0d76fa9aca0bb77f5187deb5b8b29ff854f2c8d191ed6f51083f8ca029
-DIST laminar-0.8.1-vue.min.js 79034 BLAKE2B a845a0c6e177682a416d299c3aa4bda091e03f95502c6cfae996dfbbf29605b129fb6405c14db2c481f602f6e825f6e42aed6d381316ec001385f52232275f58 SHA512 1c6517acd7262c39904512f71c75b0c51da7a7c03e02a1bda747263958d96f377a23dd12c7c4b2f7404ce39f33783f2606cf861fd8a69059142ae77065dfabfc
-DIST laminar-0.8.1.tar.gz 90407 BLAKE2B d56b4966c4f6c550a50df4c32040036c28b74931d62681291a3f0298acc07a62fc083040cae76111fdfa7f5442ea192c788247a998d81ca364b1e056ee4dc214 SHA512 993aeb4087cfd52b98bd9f85e1b2e0e5cc62af0f10a45d44d0af92e58a4c7a58fa2eac2ebbec9a93f5d6ec0db335afd0014c9800b87e4489133e433c58526bd7
+DIST laminar-1.3.0-ansi_up.js 11014 BLAKE2B fbb6f492925af2cecae0da5ae660fe1f89f88cd6a89bad359e49cd4b4b64578d38648c2902e7c7b037e51020e0756862575743b973026a7fb65f13d7d1580911 SHA512 b5833288efea1636ce702701ac88a0cca2064f3f281c68a71d7773a411aefdd07a47f29aa17b86e2f7fe11dab154ca5d94eb97622bf2770bca450a5dde99a702
+DIST laminar-2.3.4-vue.min.js 79034 BLAKE2B a845a0c6e177682a416d299c3aa4bda091e03f95502c6cfae996dfbbf29605b129fb6405c14db2c481f602f6e825f6e42aed6d381316ec001385f52232275f58 SHA512 1c6517acd7262c39904512f71c75b0c51da7a7c03e02a1bda747263958d96f377a23dd12c7c4b2f7404ce39f33783f2606cf861fd8a69059142ae77065dfabfc
+DIST laminar-2.7.0-vue-router.min.js 23642 BLAKE2B e8d5960f298ab9797dc9bbc979963f6223c18ad91fe4edaece3abab4beec62211ef7ec4efef026c7361c7daa19168d4dd5e0734b94fc8c7be475fd216c14edb3 SHA512 31eefac960689ecfc45b2b761959db99e1bfce2cc1ef1f32bf5bd55a69e50282acbb2f0d76fa9aca0bb77f5187deb5b8b29ff854f2c8d191ed6f51083f8ca029
+DIST laminar-2.7.2-Chart.min.js 159638 BLAKE2B 073844d4f5cbc09a9a865da0c5f6ee0aae5e87aeec043da3bc762d12b156f486d919bd8a5527960cfe6c91e591f3a0a46a8cfcb7e55655366237ec391f47c89d SHA512 1aca85f35d1c3701cc08310b4f08b7620588070298425bc2d564c027a7e4f34aed07accddc859da6842e8c1402b8e30ec575e4b045b01349382eb6fe37cec365
+DIST laminar-3.3.5-bootstrap.min.css 122540 BLAKE2B 3dc1618f259ada9ba72ed50d990e25bcab6f1a0d941bfa8cdbd15f231cd6cc0172e531da38baa3f92e34d0a2c22b3914d46da285068fe04962dc47f01a61117f SHA512 7537e07bfce0a0c6293fb41b1f2e2058c106b1bb1d65e097cfb8ab22d8dc0b7b0f505b5fd24b856c3cff8b11bb02b4f19838cb5c399ecc7b9b78d8a4c8a195c9
+DIST laminar-6c61fb311169146eb40c835e1285ac97e43b2082.tar.gz 90407 BLAKE2B d56b4966c4f6c550a50df4c32040036c28b74931d62681291a3f0298acc07a62fc083040cae76111fdfa7f5442ea192c788247a998d81ca364b1e056ee4dc214 SHA512 993aeb4087cfd52b98bd9f85e1b2e0e5cc62af0f10a45d44d0af92e58a4c7a58fa2eac2ebbec9a93f5d6ec0db335afd0014c9800b87e4489133e433c58526bd7
diff --git a/dev-util/laminar/laminar-0.8-r4.ebuild b/dev-util/laminar/laminar-0.8-r4.ebuild
new file mode 100644
index 0000000..a8bf8b5
--- /dev/null
+++ b/dev-util/laminar/laminar-0.8-r4.ebuild
@@ -0,0 +1,61 @@
+EAPI=6
+
+inherit cmake-utils
+
+HASH="6c61fb311169146eb40c835e1285ac97e43b2082"
+DESCRIPTION="Lightweight and modular Continuous Integration service for Linux"
+HOMEPAGE="http://laminar.ohwg.net/"
+SRC_URI="https://github.com/ohwgiles/${PN}/archive/${HASH}.tar.gz -> ${PN}-${HASH}.tar.gz
+	https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js -> ${PN}-2.3.4-vue.min.js
+	https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js -> ${PN}-2.7.0-vue-router.min.js
+	https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js -> ${PN}-1.3.0-ansi_up.js
+	https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js -> ${PN}-2.7.2-Chart.min.js
+	https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css -> ${PN}-3.3.5-bootstrap.min.css"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/laminar-${HASH}"
+
+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 "${PN}-${HASH}.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}/${PN}-*-${file}" > "${BUILD_DIR}/js/${file}"
+	done
+	mkdir -p ${BUILD_DIR}/css
+	for file in bootstrap.min.css; do
+		cat "${DISTDIR}/${PN}-*-${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.1-r1.ebuild b/dev-util/laminar/laminar-0.8.1-r1.ebuild
deleted file mode 100644
index 7f36b1c..0000000
--- a/dev-util/laminar/laminar-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-EAPI=6
-
-inherit cmake-utils
-
-HASH="6c61fb311169146eb40c835e1285ac97e43b2082"
-DESCRIPTION="Lightweight and modular Continuous Integration service for Linux"
-HOMEPAGE="http://laminar.ohwg.net/"
-SRC_URI="https://github.com/ohwgiles/${PN}/archive/${HASH}.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