dev-util/laminar: update to version 1.0

3 files changed, 14 insertions, 65 deletions

diff --git a/dev-util/laminar/Manifest b/dev-util/laminar/Manifest
index f938daa..ed298a6 100644
--- a/dev-util/laminar/Manifest
+++ b/dev-util/laminar/Manifest
@@ -1,6 +1,5 @@
-DIST laminar-0.8.tar.gz 89886 BLAKE2B c7532aefb44fbdbe005f941d3fabdec10985333c26dc875155a11bcc9beeb6662b605030f757fdf3b1623d7ead3a615902ee173359e789212417a486836246cb SHA512 d6cb06e2fce0ddb5ef4a5f4b1351ef385e1db314b158f63a3572a71bc0a24f3959057983cad4a3292e1d9bd47bdf68e2882f8586d023cb1a07d3a710379f027d
-DIST laminar-Chart.min.js 159638 BLAKE2B 073844d4f5cbc09a9a865da0c5f6ee0aae5e87aeec043da3bc762d12b156f486d919bd8a5527960cfe6c91e591f3a0a46a8cfcb7e55655366237ec391f47c89d SHA512 1aca85f35d1c3701cc08310b4f08b7620588070298425bc2d564c027a7e4f34aed07accddc859da6842e8c1402b8e30ec575e4b045b01349382eb6fe37cec365
-DIST laminar-ansi_up.js 11014 BLAKE2B fbb6f492925af2cecae0da5ae660fe1f89f88cd6a89bad359e49cd4b4b64578d38648c2902e7c7b037e51020e0756862575743b973026a7fb65f13d7d1580911 SHA512 b5833288efea1636ce702701ac88a0cca2064f3f281c68a71d7773a411aefdd07a47f29aa17b86e2f7fe11dab154ca5d94eb97622bf2770bca450a5dde99a702
-DIST laminar-bootstrap.min.css 122540 BLAKE2B 3dc1618f259ada9ba72ed50d990e25bcab6f1a0d941bfa8cdbd15f231cd6cc0172e531da38baa3f92e34d0a2c22b3914d46da285068fe04962dc47f01a61117f SHA512 7537e07bfce0a0c6293fb41b1f2e2058c106b1bb1d65e097cfb8ab22d8dc0b7b0f505b5fd24b856c3cff8b11bb02b4f19838cb5c399ecc7b9b78d8a4c8a195c9
-DIST laminar-vue-router.min.js 23642 BLAKE2B e8d5960f298ab9797dc9bbc979963f6223c18ad91fe4edaece3abab4beec62211ef7ec4efef026c7361c7daa19168d4dd5e0734b94fc8c7be475fd216c14edb3 SHA512 31eefac960689ecfc45b2b761959db99e1bfce2cc1ef1f32bf5bd55a69e50282acbb2f0d76fa9aca0bb77f5187deb5b8b29ff854f2c8d191ed6f51083f8ca029
-DIST laminar-vue.min.js 79034 BLAKE2B a845a0c6e177682a416d299c3aa4bda091e03f95502c6cfae996dfbbf29605b129fb6405c14db2c481f602f6e825f6e42aed6d381316ec001385f52232275f58 SHA512 1c6517acd7262c39904512f71c75b0c51da7a7c03e02a1bda747263958d96f377a23dd12c7c4b2f7404ce39f33783f2606cf861fd8a69059142ae77065dfabfc
+DIST laminar-1.0.tar.gz 97271 BLAKE2B 1e5331b1965302d6165f10fa1a43a472fef0e371040180ac99abe2e3a1b7d622ab48a8a26225bb5fdf62bbf15357e4ba5b4a273531b73fda09e0513720cc24bf SHA512 5d9f9c9fe14a90733ab5b2c7f135d2d232e17a8f6bfe054b34f925ed37f589a40e6c2b1ec5fd73cc52f433f1562a6db94c7a4d649631d28b715a0cbbbd184a55
+DIST laminar-1.3.0-ansi_up.js 11014 BLAKE2B fbb6f492925af2cecae0da5ae660fe1f89f88cd6a89bad359e49cd4b4b64578d38648c2902e7c7b037e51020e0756862575743b973026a7fb65f13d7d1580911 SHA512 b5833288efea1636ce702701ac88a0cca2064f3f281c68a71d7773a411aefdd07a47f29aa17b86e2f7fe11dab154ca5d94eb97622bf2770bca450a5dde99a702
+DIST laminar-2.6.12-vue.min.js 93670 BLAKE2B f5b988596e9a9b7fc150813c4f58ab92a47a6063a2de1b6de4f272a00c92a73a7ef033f99c1bb305d110d9912bee29c84dfc40bb19017aeb343719cc0bb426db SHA512 04a6d247e71fcb12dd300b04d2768b45e1522e0f3fa636e07f11e1fe4fe4502f361f2eebe87b51e612e1a1b6a59f681c4efce4cb27a1add444763a6c430cb627
+DIST laminar-2.7.2-Chart.min.js 159638 BLAKE2B 073844d4f5cbc09a9a865da0c5f6ee0aae5e87aeec043da3bc762d12b156f486d919bd8a5527960cfe6c91e591f3a0a46a8cfcb7e55655366237ec391f47c89d SHA512 1aca85f35d1c3701cc08310b4f08b7620588070298425bc2d564c027a7e4f34aed07accddc859da6842e8c1402b8e30ec575e4b045b01349382eb6fe37cec365
+DIST laminar-3.4.8-vue-router.min.js 28334 BLAKE2B 6d1a7daa2ed7585f4679c3f5868daa4348d9ad2f8faa19fde61c78ac3d022a9b2a251dd5942d26317fb78696a43b6465c39920adb14b7ebd824a5f9a4d3e1348 SHA512 0e938bf1c6e5854c162036596387239920a7607173860620f069896590468894aedcb2743d8a466d926355081dcee595f530a9adc0d6ebc2ed252763626f11d4
diff --git a/dev-util/laminar/files/add-missing-includes.patch b/dev-util/laminar/files/add-missing-includes.patch
deleted file mode 100644
index 546e338..0000000
--- a/dev-util/laminar/files/add-missing-includes.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6c61fb311169146eb40c835e1285ac97e43b2082 Mon Sep 17 00:00:00 2001
-From: Oliver Giles <ohw.giles@gmail.com>
-Date: Fri, 22 May 2020 11:42:12 +1200
-Subject: [PATCH] add missing #includes
-
-New compiler version exposed missing header files
-
-resolves #123
----
- src/conf.h   | 1 +
- src/server.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/conf.h b/src/conf.h
-index cdabf95..bc355a7 100644
---- a/src/conf.h
-+++ b/src/conf.h
-@@ -19,6 +19,7 @@
- #ifndef LAMINAR_CONF_H_
- #define LAMINAR_CONF_H_
- 
-+#include <string>
- #include <unordered_map>
- 
- class StringMap : public std::unordered_map<std::string, std::string> {
-diff --git a/src/server.h b/src/server.h
-index 048f388..e7c0b4f 100644
---- a/src/server.h
-+++ b/src/server.h
-@@ -24,6 +24,7 @@
- #include <capnp/message.h>
- #include <capnp/capability.h>
- #include <functional>
-+#include <sys/types.h>
- 
- struct Laminar;
- struct Http;
--- 
-2.26.2
-
diff --git a/dev-util/laminar/laminar-0.8-r5.ebuild b/dev-util/laminar/laminar-1.0-r1.ebuild
index e96686f..9e5112c 100644
--- a/dev-util/laminar/laminar-0.8-r5.ebuild
+++ b/dev-util/laminar/laminar-1.0-r1.ebuild
@@ -5,14 +5,10 @@ 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 -> ${PN}-vue.min.js
-	https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js -> ${PN}-vue-router.min.js
-	https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js -> ${PN}-ansi_up.js
-	https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js -> ${PN}-Chart.min.js
-	https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css -> ${PN}-bootstrap.min.css"
-PATCHES=(
-	"${FILESDIR}/add-missing-includes.patch"
-)
+	https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js -> ${PN}-2.6.12-vue.min.js
+	https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.4.8/vue-router.min.js -> ${PN}-3.4.8-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"
 
 LICENSE=""
 SLOT="0"
@@ -41,17 +37,11 @@ src_unpack() {
 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=/"
-	)
+	cat "${DISTDIR}/${PN}-2.6.12-vue.min.js" > "${BUILD_DIR}/js/vue.min.js"
+	cat "${DISTDIR}/${PN}-3.4.8-vue-router.min.js" > "${BUILD_DIR}/js/vue-router.min.js"
+	cat "${DISTDIR}/${PN}-1.3.0-ansi_up.js" > "${BUILD_DIR}/js/ansi_up.js"
+	cat "${DISTDIR}/${PN}-2.7.2-Chart.min.js" > "${BUILD_DIR}/js/Chart.min.js"
+
 	cmake-utils_src_configure
 }