From ae8d2786cbcb1ef313282f91bf8089693f735032 Mon Sep 17 00:00:00 2001
From: Alexander Tratsevskiy <at@calculate.ru>
Date: Wed, 9 Mar 2022 17:18:16 +0300
Subject: [PATCH] sys-apps/calculate-toolkit: Version bump to 0.3.0

---
 sys-apps/calculate-toolkit/Manifest           |  7 +------
 .../calculate-toolkit-0.2.1.ebuild            | 20 ------------------
 .../calculate-toolkit-0.2.2.ebuild            | 20 ------------------
 .../calculate-toolkit-0.2.3.ebuild            | 20 ------------------
 .../calculate-toolkit-0.2.5.ebuild            | 20 ------------------
 .../calculate-toolkit-0.2.6.ebuild            | 21 -------------------
 .../calculate-toolkit-0.2.7-r1.ebuild         |  2 +-
 ....ebuild => calculate-toolkit-0.3.0.ebuild} | 12 +++++------
 .../calculate-toolkit-9999.ebuild             |  4 ++--
 9 files changed, 9 insertions(+), 117 deletions(-)
 delete mode 100644 sys-apps/calculate-toolkit/calculate-toolkit-0.2.1.ebuild
 delete mode 100644 sys-apps/calculate-toolkit/calculate-toolkit-0.2.2.ebuild
 delete mode 100644 sys-apps/calculate-toolkit/calculate-toolkit-0.2.3.ebuild
 delete mode 100644 sys-apps/calculate-toolkit/calculate-toolkit-0.2.5.ebuild
 delete mode 100644 sys-apps/calculate-toolkit/calculate-toolkit-0.2.6.ebuild
 rename sys-apps/calculate-toolkit/{calculate-toolkit-0.2.7.ebuild => calculate-toolkit-0.3.0.ebuild} (65%)

diff --git a/sys-apps/calculate-toolkit/Manifest b/sys-apps/calculate-toolkit/Manifest
index 6e4998c4c..c13258e65 100644
--- a/sys-apps/calculate-toolkit/Manifest
+++ b/sys-apps/calculate-toolkit/Manifest
@@ -1,7 +1,2 @@
-DIST calculate-toolkit-0.2.1.tar.bz2 18158 BLAKE2B baaa871064f9b5e666b7cf9f23f9901284328048edd99060116d850c0f5d4c597f32cf52ce3028233f3b32d324277949f872629efe7ffacb2f453c611e376527 SHA512 77ecaea9b0adbd487447359d0772cd7fcee81502fddb273361c48d127bfd0eac98df3799021db89580f0d26ec1eac77cef5489ccabde4b4728d0273166ba890d
-DIST calculate-toolkit-0.2.2.tar.bz2 18195 BLAKE2B 45a20cca78430e87d3c7776235709eadb520d3ff2ac8a4f003199021e00e90be77244adf2968fa9bcdd40bd2d1752d1dda4624f88590d40768903e2400abf8f9 SHA512 3d92ca328179fb03abefbb63115ce4570eb3c96374eff603287fbc6d5c0a01da3b691dce4ada3f864647801fe1579876a17a5c97ba6b71475093f15c0740b39e
-DIST calculate-toolkit-0.2.3.tar.bz2 18166 BLAKE2B b9767a265817550969f364697544673fbbe6640becfc5e2c3fa83a0be42cf4470fa11c8302b82eef79b4017a77cd9d71fadb1a67d65d6739d200f2bdf19aac08 SHA512 5f71281d00c9ec21ecc34ab2f48869ad53f8c0914ed2bcb3694deb41f603f15a943ab13fe322f30f49d516bcbddb7641d9e647f466590f78a7a0dd8ced8ef9d0
-DIST calculate-toolkit-0.2.5.tar.bz2 18301 BLAKE2B 11f45c6468091e4d9b856e3f7f95c19ccea22434d04fcc0ac9e7eb9cd65e00ff1e6d5ce2be6a4be38219957cc8b39570c959c1274385f37b9acc757e894b4ce3 SHA512 60e97773a32716c022dbd400ad75d1551088d7246c1bf1b6dd3a8641f9307cc7af0a52bcd7f7aadf194819f0c7a79aa08ea6079e22dfdab260fa31f2e92fdff7
-DIST calculate-toolkit-0.2.6.tar.bz2 18414 BLAKE2B 58b20a0a48566fd780e8550a0d282e06b40fa406552fc9346cd8530a84be9edf0b1c76043bd5b81f803e8d61e39d078a7325532353cbb6f5f985337f45e539b9 SHA512 e180d84cf757f6e42dcf9247c6a635b4cd62f937a40f552b7ad974e38ecbd88d5b253510740bf7f23a4104a6b4f9f2601e7eee3b72b6d5cab5eab42fbfef4cba
 DIST calculate-toolkit-0.2.7-r1.tar.bz2 18448 BLAKE2B cafbfefc9cfc3912b4cba9c140dfd24331b6f0f1d40721b395a6b04a64c3d5b6104e25bfeecc6c76e6f14a2541b295666ec20d355dfc92bd272f6da0bc8db64f SHA512 032d313bbfaff7174d1f57c158338b594a049b0f5a6c69c68910c36157ef73eb3f260b097aa0c484a96df9dbcf88235b78d5a36a79dd508efde8702c46c63b7a
-DIST calculate-toolkit-0.2.7.tar.bz2 18395 BLAKE2B d84d0ad9d9766ab8c24e39f786775080c2663c8d8ff71c8d642a98b5f33b03c1515b295ae9095dd17780016d6b9e7935a6ee034a4c2dab62dd6b18699b72b023 SHA512 df32b944cfda21c118ebc289a534eeeddb376c133b36dda16937e15f3c83b68a9cba0a6af2c38ae5055e78073dd8a5a6b3d238ae5e029c259e20f79d5cf03b79
+DIST calculate-toolkit-0.3.0.tar.gz 26528 BLAKE2B ae7ecd06ccc5f3b0fe1d87aef3904cdafc417a20061df8e625fff4a60cc29351eb14f01b8291e9ae6dabdb6688fc5a106804830100f56c998abf5ed5ad5ebf3e SHA512 f627288a3c6be7e5db472607b960064b87274618984a98d8f132a8f0565d470cfac1f4bbaa5dd36e477f629368554179e94a89fc9b32290d909301730938417b
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.1.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.1.ebuild
deleted file mode 100644
index 04c948430..000000000
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-DESCRIPTION="Collection of administration scripts for Calculate"
-HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="x86 amd64"
-
-RDEPEND=">=sys-apps/calculate-utils-3.5.8.12
-	app-arch/xz-utils"
-
-src_unpack() {
-	unpack $A
-}
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.2.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.2.ebuild
deleted file mode 100644
index 04c948430..000000000
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-DESCRIPTION="Collection of administration scripts for Calculate"
-HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="x86 amd64"
-
-RDEPEND=">=sys-apps/calculate-utils-3.5.8.12
-	app-arch/xz-utils"
-
-src_unpack() {
-	unpack $A
-}
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.3.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.3.ebuild
deleted file mode 100644
index 04c948430..000000000
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-DESCRIPTION="Collection of administration scripts for Calculate"
-HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="x86 amd64"
-
-RDEPEND=">=sys-apps/calculate-utils-3.5.8.12
-	app-arch/xz-utils"
-
-src_unpack() {
-	unpack $A
-}
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.5.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.5.ebuild
deleted file mode 100644
index aa2480397..000000000
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-DESCRIPTION="Collection of administration scripts for Calculate"
-HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="x86 amd64"
-
-RDEPEND=">=sys-apps/calculate-utils-3.6
-	app-arch/xz-utils"
-
-src_unpack() {
-	unpack $A
-}
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.6.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.6.ebuild
deleted file mode 100644
index d41ee430d..000000000
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-DESCRIPTION="Collection of administration scripts for Calculate"
-HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="x86 amd64"
-
-RDEPEND=">=sys-apps/calculate-utils-3.6
-	app-arch/zstd
-	app-arch/xz-utils"
-
-src_unpack() {
-	unpack $A
-}
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7-r1.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7-r1.ebuild
index 9a509a061..954fdfc05 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7-r1.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=(python3_9)
 SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${PF}.tar.bz2"
 
 DESCRIPTION="Collection of administration scripts for Calculate"
-HOMEPAGE="http://www.calculate-linux.org"
+HOMEPAGE="https://www.calculate-linux.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.3.0.ebuild
similarity index 65%
rename from sys-apps/calculate-toolkit/calculate-toolkit-0.2.7.ebuild
rename to sys-apps/calculate-toolkit/calculate-toolkit-0.3.0.ebuild
index 90a6d44a9..88c601c90 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.3.0.ebuild
@@ -5,19 +5,17 @@
 EAPI="7"
 PYTHON_COMPAT=(python3_9)
 
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
+SRC_URI="https://git.calculate-linux.org/calculate/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 DESCRIPTION="Collection of administration scripts for Calculate"
-HOMEPAGE="http://www.calculate-linux.org"
+HOMEPAGE="https://www.calculate-linux.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
+
+S=${WORKDIR}/${PN}
 
 RDEPEND=">=sys-apps/calculate-utils-3.6
 	app-arch/zstd
 	app-arch/xz-utils"
-
-src_unpack() {
-	unpack $A
-}
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-9999.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-9999.ebuild
index 348591555..252e0d694 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-9999.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-9999.ebuild
@@ -7,9 +7,9 @@ EAPI="5"
 inherit git-r3
 
 DESCRIPTION="Collection of administration scripts for Calculate"
-HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_toolkit"
+HOMEPAGE="https://www.calculate-linux.org/main/en/calculate_toolkit"
 SRC_URI=""
-EGIT_REPO_URI="git://git.calculate-linux.org/calculate-toolkit.git"
+EGIT_REPO_URI="https://git.calculate-linux.org/calculate/calculate-toolkit"
 
 LICENSE="Apache-2.0"
 SLOT="0"