sys-apps/calculate-toolkit, sys-apps/caculculate-access, sys-apps/keyexec: improvements

Signed-off-by: Alexander Kurakin <kuraga333@mail.ru>
14 changed files with 73 additions and 68 deletions
--- a/sys-apps/calculate-access/calculate-access-0.1.2.ebuild
+++ b/sys-apps/calculate-access/calculate-access-0.1.2.ebuild
@ -1,18 +1,19 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 2008-2018 Mir Calculate
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
-EAPI="7"
+EAPI=7
 DESCRIPTION="Cryptodata management tools for Calculate"
 HOMEPAGE="https://www.calculate-linux.org"
 DESCRIPTION="Cryptodata management tools"
 HOMEPAGE="https://www.calculate-linux.org/main/en/calculate_access"
 SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 KEYWORDS="amd64 x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+client server"
 REQUIRED_USE="|| ( client server )"
 RDEPEND="sys-apps/openrc
 	net-misc/openssh
 	client? ( sys-fs/cryptsetup )
@ -21,11 +22,11 @@ RDEPEND="sys-apps/openrc
 src_install() {
 	if use client
 	then
-		DESTDIR=$D emake install_client
+		DESTDIR="$D" emake install_client
 	fi
 	if use server
 	then
-		DESTDIR=$D emake install_server
+		DESTDIR="$D" emake install_server
 	fi
 }
--- a/sys-apps/calculate-access/calculate-access-9999.ebuild
+++ b/sys-apps/calculate-access/calculate-access-9999.ebuild
@ -1,30 +1,27 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 2008-2024 Mir Calculate
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
-EAPI="7"
+EAPI=8
-inherit git-r3
+DESCRIPTION="Cryptodata management tools for Calculate"
 HOMEPAGE="https://www.calculate-linux.org"
 EGIT_REPO_URI="https://git.calculate-linux.org/calculate/calculate-access.git"
-DESCRIPTION="Cryptodata management tools"
+inherit git-r3
 HOMEPAGE="https://www.calculate-linux.org/main/en/calculate_access"
 SRC_URI=""
 EGIT_REPO_URI="git://git.calculate-linux.org/calculate-access.git"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
 IUSE="+client server"
 REQUIRED_USE="|| ( client server )"
 src_install() {
 	if use client
 	then
-		DESTDIR=$D emake install_client
+		DESTDIR="$D" emake install_client
 	fi
 	if use server
 	then
-		DESTDIR=$D emake install_server
+		DESTDIR="$D" emake install_server
 	fi
 }
--- a/sys-apps/calculate-access/metadata.xml
+++ b/sys-apps/calculate-access/metadata.xml
@ -6,8 +6,18 @@
        <name>Mir Calculate</name>
        <description>Calculate Overlay</description>
    </maintainer>
-    <use>
+    <longdescription lang="en">
-        <flag name="client">Calculate-access client</flag>
+        Cryptodata management tools for Calculate.
-        <flag name="server">Calculate-access server</flag>
+    </longdescription>
    <upstream>
        <bugs-to>mailto:support@calculate.ru</bugs-to>
    </upstream>
    <use lang="en">
        <flag name="client">calculate-access client</flag>
        <flag name="server">calculate-access server</flag>
    </use>
    <use lang="ru">
        <flag name="client">Клиент calculate-access</flag>
        <flag name="server">Клиент calculate-access</flag>
    </use>
 </pkgmetadata>
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.3.2-r7.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.3.2-r7.ebuild
@ -1,20 +1,20 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 2008-2023 Mir Calculate
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
-EAPI="7"
+EAPI=7
 PYTHON_COMPAT=( python3_{9..12} )
-SRC_URI="https://git.calculate-linux.org/calculate/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+PYTHON_COMPAT=( python3_{9..12} )
 DESCRIPTION="Collection of administration scripts for Calculate"
-HOMEPAGE="https://www.calculate-linux.org/"
+HOMEPAGE="https://www.calculate-linux.org"
 SRC_URI="https://git.calculate-linux.org/calculate/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="amd64"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64"
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 RDEPEND=">=sys-apps/calculate-utils-3.6
 	app-arch/zstd
--- a/sys-apps/calculate-toolkit/calculate-toolkit-9999.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-9999.ebuild
@ -1,15 +1,15 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 2008-2024 Mir Calculate
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI=8
 inherit git-r3
 DESCRIPTION="Collection of administration scripts for Calculate"
-HOMEPAGE="https://www.calculate-linux.org/main/en/calculate_toolkit"
+HOMEPAGE="https://www.calculate-linux.org"
-EGIT_REPO_URI="https://git.calculate-linux.org/calculate/calculate-toolkit"
+EGIT_REPO_URI="https://git.calculate-linux.org/calculate/calculate-toolkit.git"
 inherit git-r3
 LICENSE="Apache-2.0"
 SLOT="0"
 RDEPEND=">=sys-apps/calculate-utils-3.3.0.10"
--- a/sys-apps/calculate-toolkit/metadata.xml
+++ b/sys-apps/calculate-toolkit/metadata.xml
@ -6,4 +6,10 @@
        <name>Mir Calculate</name>
        <description>Calculate Overlay</description>
    </maintainer>
    <longdescription lang="en">
        Collection of administration scripts for Calculate.
    </longdescription>
    <upstream>
        <bugs-to>mailto:support@calculate.ru</bugs-to>
    </upstream>
 </pkgmetadata>
--- a/sys-apps/keyexec/ChangeLog
+++ b/sys-apps/keyexec/ChangeLog
@ -1,14 +0,0 @@
 # ChangeLog for sys-apps/keyexec
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
  01 Jun 2010; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
  keyexec-0.1.2-r4.ebuild:
  Change home page.
 *keyexec-0.1.2-r4 (01 Jun 2010)
  01 Jun 2010; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
  -keyexec-0.1.2-r3.ebuild, +keyexec-0.1.2-r4.ebuild:
  Added depend from rdesktop. Fix compile stage.
--- a/sys-apps/keyexec/keyexec-0.1.3.ebuild
+++ b/sys-apps/keyexec/keyexec-0.1.3.ebuild
@ -1,18 +1,16 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 2008-2022 Mir Calculate
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI=8
 DESCRIPTION="Runs other programs with the user password, kept in the Linux kernel"
 HOMEPAGE="https://www.calculate-linux.org/main/en/keyexec"
 SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 KEYWORDS="amd64 x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="kde +rdesktop +freerdp"
 DEPEND="
@ -21,7 +19,6 @@ DEPEND="
 	>=sys-apps/keyutils-1.1
 	>=sys-auth/pam_keystore-0.1
 	kde? ( kde-plasma/kde-cli-tools:5 )"
 RDEPEND="${DEPEND}"
 src_compile() {
--- a/sys-apps/keyexec/metadata.xml
+++ b/sys-apps/keyexec/metadata.xml
@ -8,12 +8,20 @@
    </maintainer>
    <longdescription lang="en">
        Help to run programs like rdesktop, xfreerdp and KDE kstart with the user password,
-        kept in the Linux kernel
+        kept in the Linux kernel.
    </longdescription>
-    <use>
+    <upstream>
-        <flag name="kde">Use KDE libs.</flag>
+        <bugs-to>mailto:support@calculate.ru</bugs-to>
-        <flag name="rdesktop">Include net-misc/rdesktop package.</flag>
+    </upstream>
-        <flag name="freerdp">Include net-misc/freerdp package.</flag>
+    <use lang="en">
        <flag name="kde">Use KDE libs</flag>
        <flag name="rdesktop">Include net-misc/rdesktop package</flag>
        <flag name="freerdp">Include net-misc/freerdp package</flag>
    </use>
    <use lang="ru">
        <flag name="kde">Использовать библиотеки KDE</flag>
        <flag name="rdesktop">Включить пакет net-misc/rdesktop</flag>
        <flag name="freerdp">Включить пакет net-misc/freerdp</flag>
    </use>
 </pkgmetadata>
--- a/sys-kernel/calculate-sources/calculate-sources-6.1.82.ebuild
+++ b/sys-kernel/calculate-sources/calculate-sources-6.1.82.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
--- a/sys-kernel/calculate-sources/calculate-sources-6.6.12.ebuild
+++ b/sys-kernel/calculate-sources/calculate-sources-6.6.12.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
--- a/sys-kernel/calculate-sources/calculate-sources-6.6.22.ebuild
+++ b/sys-kernel/calculate-sources/calculate-sources-6.6.22.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
--- a/sys-kernel/calculate-sources/calculate-sources-6.7.10.ebuild
+++ b/sys-kernel/calculate-sources/calculate-sources-6.7.10.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
--- a/sys-kernel/fake-sources/fake-sources-0.ebuild
+++ b/sys-kernel/fake-sources/fake-sources-0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -7,4 +7,4 @@ DESCRIPTION="Stub package for Linux kernel sources dependense"
 LICENSE=""
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"