sys-kernel/calculate-sources: Version bump to 6.8.8, 6.6.29, 6.1.89

* Отключение автообновления плагина bitwarden

acct-group/jackett/jackett-0.ebuild

@@ -1,10 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=-1
-DESCRIPTION="Group for www-apps/jackett-bin"
-KEYWORDS="amd64"

acct-group/torrserver/torrserver-0.ebuild

@@ -1,10 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=-1
-DESCRIPTION="Group for net-p2p/torrserver-bin"
-KEYWORDS="amd64"

acct-user/jackett/jackett-0.ebuild

@@ -1,14 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-apps/jackett-bin"
-KEYWORDS="amd64"
-ACCT_USER_ID=-1
-ACCT_USER_GROUPS=( jackett )
-ACCT_USER_HOME="/var/lib/jackett/"
-
-acct-user_add_deps

acct-user/torrserver/torrserver-0.ebuild

@@ -1,14 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/torrserver-bin"
-KEYWORDS="amd64"
-ACCT_USER_ID=-1
-ACCT_USER_GROUPS=( torrserver )
-ACCT_USER_HOME="/var/lib/torrserver/"
-
-acct-user_add_deps

app-crypt/openpgp-keys-calculate-release/metadata.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="project">
+        <email>support@calculate.ru</email>
+        <name>Mir Calculate</name>
+        <description>Calculate Overlay</description>
+    </maintainer>
+    <longdescription lang="en">
+        OpenPGP keys used for Calculate binary packages.
+    </longdescription>
+    <longdescription lang="ru">
+        Ключи OpenPGP, используемые для бинарных пакетов Calculate.
+    </longdescription>
+    <upstream>
+        <bugs-to>mailto:support@calculate.ru</bugs-to>
+    </upstream>
+</pkgmetadata>

app-crypt/openpgp-keys-calculate-release/openpgp-keys-calculate-release-20180827.ebuild

@@ -1,18 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="OpenPGP keys used for Calculate binary packages"
-HOMEPAGE="http://www.calculate-linux.org"
+HOMEPAGE="https://www.calculate-linux.org/"
 SRC_URI="https://mirror.calculate-linux.org/source/openpgp-keys/calculate-release.asc.${PV}.gz"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="test"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_install() {
 	insinto /usr/share/openpgp-keys

app-crypt/shim-signed/metadata.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="project">
+        <email>support@calculate.ru</email>
+        <name>Mir Calculate</name>
+        <description>Calculate Overlay</description>
+    </maintainer>
+    <longdescription lang="en">
+        UEFI Shim bootloader for SecureBoot signed by Microsoft.
+    </longdescription>
+    <longdescription lang="ru">
+        Загрузчик UEFI Shim для SecureBoot, подписанный Microsoft.
+    </longdescription>
+</pkgmetadata>

app-crypt/shim-signed/shim-signed-0.2.ebuild

@@ -1,25 +1,19 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="UEFI Shim bootloader for SecureBoot signed by Microsoft"
-HOMEPAGE="http://mjg59.dreamwidth.org/20303.html"
-SRC_URI="http://www.codon.org.uk/~mjg59/${PN}/${P}.tgz"
+HOMEPAGE="https://mjg59.dreamwidth.org/20303.html"
 SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tgz"
 
-LICENSE="as-is"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
 
 S="${WORKDIR}"
 
 src_install() {
 	insinto /usr/share
-	doins -r $PN
+	doins -r "${PN}"
 }

app-misc/geoclue/Manifest

@@ -1 +1 @@
-DIST geoclue-2.6.0.tar.bz2 94890 BLAKE2B d579752482e77e6ec6df3cb34f6b1c7ca61ea425f1c29195f1bcd031afe22644aed2f5b3f75e82c20e0e3cf0d415ca858b30351b2ee3835fff0ca25e63fc6395 SHA512 13205ab88cbd9748c155081318ae1909fddedce4250e3ece39a9f379b8cfea91dfe571961e278406ba54f8efd3a1070967479feb8256f50170112b28246b3103
+DIST geoclue-2.7.1.tar.bz2 106458 BLAKE2B a2fc44d4941936d8dcd495d77d11b0d948d7031ca048b97ff0940c7fcdd37ba604655f2e255c5e0dd5cc7a82a2d5a15b18aab4825b2446560e225c13df6da3b8 SHA512 972663a6f8c969d0e1a5f911af2b8afed486d5c0ba06dadc19bcfbe1ea22cef10243b2bd0084e5c45b70977cfa5650c8f15f760e4bc4e7dbd946745b67c9188b

app-misc/geoclue/geoclue-2.7.1-r1.ebuild

@@ -1,26 +1,28 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# NOTE: This is a version of `app-misc/geoclue-2.7.1::gentoo` allowed to install in Calculate
+
 EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit meson python-any-r1 systemd vala xdg
 
 DESCRIPTION="A location information D-Bus service"
-HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"
+HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/-/wikis/home"
 SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+ GPL-2+"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+introspection gtk-doc modemmanager vala zeroconf"
 REQUIRED_USE="vala? ( introspection )"
 
 DEPEND="
-	>=dev-libs/glib-2.44:2
+	>=dev-libs/glib-2.68:2
 	>=dev-libs/json-glib-0.14.0
-	>=net-libs/libsoup-2.42.0:2.4
+	>=net-libs/libsoup-3.0.0:3.0
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 	modemmanager? ( >=net-misc/modemmanager-1.6 )
 	zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )

app-misc/geoclue/metadata.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="project">
+        <email>support@calculate.ru</email>
+        <name>Mir Calculate</name>
+        <description>Calculate Overlay</description>
+    </maintainer>
+    <longdescription lang="en">
+        Geoclue is a D-Bus geoinformation service. The goal of the Geoclue project is to make creating location-aware
+        applications as simple as possible.
+    </longdescription>
+    <longdescription lang="ru">
+        Geoclue - это геоинформационный сервис для D-Bus. Цель проекта Geoclue - сделать создание геоинформационного
+        сервиса с учётом местоположения приложения максимально простым.
+    </longdescription>
+    <use lang="en">
+        <flag name="modemmanager">Enable geolocation through 3G or GPS enabled hardware through <pkg>net-misc/modemmanager</pkg></flag>
+        <flag name="zeroconf">Enable retrieval of GPS location from Android devices with GeoclueShare</flag>
+    </use>
+    <use lang="ru">
+        <flag name="modemmanager">Включить геолокацию через устройства с включенными 3G и GPS с использованием <pkg>net-misc/modemmanager</pkg></flag>
+        <flag name="zeroconf">Включить получение локации GPS из Android-устройства с использованием GeoclueShare</flag>
+    </use>
+    <upstream>
+        <remote-id type="freedesktop-gitlab">geoclue/geoclue</remote-id>
+        <bugs-to>https://gitlab.freedesktop.org/geoclue/geoclue/-/issues</bugs-to>
+        <changelog>https://gitlab.freedesktop.org/geoclue/geoclue/-/blob/master/NEWS</changelog>
+    </upstream>
+</pkgmetadata>

app-misc/xorg-meta/metadata.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="project">
+        <email>support@calculate.ru</email>
+        <name>Mir Calculate</name>
+        <description>Calculate Overlay</description>
+    </maintainer>
+</pkgmetadata>

app-misc/xorg-meta/xorg-meta-7.4-r5.ebuild

@@ -1,30 +1,21 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=7
+EAPI=8
 
-DESCRIPTION="Calculate Linux (Xorg meta package)"
-HOMEPAGE="http://www.calculate-linux.org/"
-SRC_URI=""
+DESCRIPTION="Xorg meta package for Calculate Linux"
+HOMEPAGE="https://www.calculate-linux.org/"
 
-LICENSE="GPL-2"
+LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	!x11-base/xorg-x11
-"
+KEYWORDS="amd64"
 
 # Server
 RDEPEND="${RDEPEND}
 	x11-base/xorg-server[-minimal]
 "
-
 #Applications
 RDEPEND="${RDEPEND}
-	!x11-apps/xsetmode
 	x11-apps/appres
 	x11-apps/bitmap
 	x11-apps/iceauth
@@ -41,7 +32,6 @@ RDEPEND="${RDEPEND}
 	x11-apps/xdpyinfo
 	x11-apps/xdriinfo
 	x11-apps/xev
-	x11-apps/xf86dga
 	x11-apps/xgamma
 	x11-apps/xhost
 	x11-apps/xinput
@@ -64,19 +54,16 @@ RDEPEND="${RDEPEND}
 	x11-apps/xwininfo
 	x11-apps/xwud
 "
-
 # Data
 RDEPEND="${RDEPEND}
 	x11-misc/xbitmaps
 	x11-themes/xcursor-themes
 "
-
 # Utilities
 RDEPEND="${RDEPEND}
 	x11-misc/makedepend
 	x11-misc/util-macros
 "
-
 # Fonts
 RDEPEND="${RDEPEND}
 	media-fonts/corefonts

app-text/wgetpaste/Manifest

@@ -1 +1,2 @@
-DIST wgetpaste-2.25.tar.bz2 11107 BLAKE2B 1ed46ada9045326583900a78bbbd66ea7776ae7ae7191b14f258ef417ef65c344d6ff7e6c5ac0592d93c2936bc189ea0a33c18a8f2e6a0eb9e4e1d9d3b67701b SHA512 c3cd56f32311c77ce5ac970f0cd6b2e8285cac3caaf61669237ac707ed3b9aab285fbe9dee6260ea13b8df41a22acfaa3b8439298560ab68c3a568d60557d82e
+DIST wgetpaste-2.33.tar.xz 16408 BLAKE2B 78baebf4edb6e6340a73127099366d306359d02c0c1eab137822c56669da0609a5479940b4fb2accbc79978df091dcd34415876618e64aa556d1584f74773736 SHA512 9bf1f379316da372b4f69296b54f9a266dcf9fdaa2a8718165a2029571f4c2c0166304ffebeb2ec4657ea6f49087793f40d9da383f5da052bce0543c90ea13ab
+DIST wgetpaste-2.34.tar.xz 16640 BLAKE2B 6bc71d74945b88774f866a8c1bb693d52b3d5d680a04e45ec29acfb6dd9d9de16433ed9d675db1d63705dac356e44c89d7af0e7b18a71089778bfa92833d95d3 SHA512 9f334299d0314e821d989c785aaae9e8e9c0e4972ced9330039f7e2ca1867528a2d4f090dd754ec72e8a9d7005d8f5154266cd0769627b1023d1199893cf4f8c

app-text/wgetpaste/files/calculate_wgetpaste-25.patch

@@ -1,188 +0,0 @@
-diff -ruN wgetpaste-2.22.orig/wgetpaste wgetpaste-2.22/wgetpaste
---- wgetpaste-2.25.orig/wgetpaste	2014-01-21 11:31:59.475610453 +0400
-+++ wgetpaste-2.25/wgetpaste	2014-01-21 11:41:13.858639053 +0400
-@@ -6,6 +6,8 @@
- 
- VERSION="2.25"
- 
-+DEFAULT_SERVICE="calculate"
-+
- # don't inherit LANGUAGE from the env
- unset LANGUAGE
- 
-@@ -14,7 +16,7 @@ E=$'\e'
- N=$'\n'
- 
- ### services
--SERVICES="bpaste ca codepad dpaste gists poundpython"
-+SERVICES="bpaste ca codepad dpaste gists poundpython calculate"
- # bpaste
- ENGINE_bpaste=lodgeit
- URL_bpaste="http://bpaste.net/"
-@@ -42,6 +44,17 @@ URL_poundpython="http://paste.pound-python.org/"
- ENGINE_tinyurl=tinyurl
- URL_tinyurl="http://tinyurl.com/ api-create.php"
- REGEX_RAW_tinyurl='s|^\(http://[^/]*/\)\([[:alnum:]]*\)$|\1\2|'
-+# calculate
-+ENGINE_calculate=calculate
-+if [[ "$LANG" =~ 'ru_RU' ]]; then
-+    URL_calculate="http://pastebin.calculate-linux.ru"
-+else
-+    URL_calculate="http://pastebin.calculate-linux.org"
-+fi
-+DEFAULT_LANGUAGE_calculate="Text"
-+DEFAULT_PARENT_calculate=""
-+DEFAULT_PRIVATE_calculate=0
-+SIZE_calculate="25000 25%kB"
- 
- ### engines
- # ca
-@@ -52,12 +65,12 @@ LANGUAGE_COUNT_ca=0
- EXPIRATIONS_ca="Never 5%minutes 10%minutes 15%minutes 30%minutes 45%minutes 1%hour 2%hours \
- 4%hours 8%hours 12%hours 1%day 2%days 3%days 1%week 2%weeks 3%weeks 1%month 2%months \
- 3%months 4%months 5%months 6%months 1%year"
--POST_ca="s=Submit+Post name description type expiry % content"
-+POST_ca="s=Submit+Post name description type expiry % % % content"
- REGEX_URL_ca='s|^.*content="[0-9]*;\(http://[^/]*/[0-9]*\)".*$|\1|p'
- REGEX_RAW_ca='s|^\(http://[^/]*/\)\([0-9]*\)$|\1raw/\2|'
- # codepad
- LANGUAGES_codepad="C C++ D Haskell Lua OCaml PHP Perl Plain%Text Python Ruby Scheme Tcl"
--POST_codepad="submit % % lang % % code"
-+POST_codepad="submit % % lang % % % % code"
- REGEX_URL_codepad='s|^--.*\(http://codepad.org/[^ ]\+\)|\1|p'
- REGEX_RAW_codepad='s|^\(http://[^/]*/\)\([[:alnum:]]*\)$|\1\2/raw.rb|'
- # dpaste
-@@ -67,7 +80,7 @@ LANGUAGE_VALUES_dpaste="% Apache Bash Css Diff DjangoTemplate Haskell JScript Py
- Ruby Rhtml Sql Xml"
- EXPIRATIONS_dpaste="30%days 30%days%after%last%view"
- EXPIRATION_VALUES_dpaste="off on"
--POST_dpaste="submit=Paste+it poster title language hold % content"
-+POST_dpaste="submit=Paste+it poster title language hold % % % content"
- REGEX_RAW_dpaste='s|^\(http://[^/]*/\)[^0-9]*\([0-9]*/\)$|\1\2plain/|'
- # gists
- LANGUAGES_gists="ActionScript Ada Apex AppleScript Arc Arduino ASP Assembly
-@@ -141,8 +154,23 @@ objective-c objective-j ocaml ooc perl php text pov prolog python python3 py3tb
- ragel-c ragel-cpp ragel-d ragel-java ragel-objc ragel-ruby raw rconsole rebol redcode rst rhtml rb \
- rbcon splus sass scala scheme smalltalk smarty sql sqlite3 squidconf tcl tcsh tex diff vala vb.net \
- vim xml xml+cheetah xml+django xml+evoque xml+mako xml+myghty xml+php xml+erb xml+smarty xslt yaml"
--POST_lodgeit="submit=Paste! % % language % % code"
-+POST_lodgeit="submit=Paste! % % language % % % % code"
- REGEX_RAW_lodgeit='s|^\(http://[^/]*/\)show\(/[[:alnum:]]*/\)$|\1raw\2|'
-+# calculate
-+LANGUAGES_calculate="Apache Bash Batch Boo C C# C++ Clojure Creole_Wiki CSS \
-+CSV D Debian_control-files Django_Jinja_Templates Dylan Erlang eRuby_rhtml GAS GCC_Messages \
-+Genshi_Templates Gettext_catalogs GL_Shader_language Haskell HTML INI_File Interactive_Ruby IO \
-+IRC_Logs Java javac_Messages JavaScript JSP Lighttpd Literate_Haskell LLVM Lua Mako_Templates Matlab \
-+Matlab_Session MiniD Multi-File Myghty_Templates MySQL Nasm Nginx Object-Pascal OCaml Perl PHP \
-+PHP_(inline) Povray Python Python_Console_Sessions Python_Tracebacks reStructuredText Ruby Scala \
-+Scheme Smalltalk Smarty sources.list SQL SquidConf TeX_LaTeX Text Unified_Diff Vim XML XSLT YAML"
-+LANGUAGE_VALUES_calculate="apache bash bat boo c csharp cpp clojure creole css csv d control html+django \
-+dylan erlang rhtml gas gcc-messages html+genshi gettext glsl haskell html ini irb io irc java \
-+javac-messages js jsp lighttpd literate-haskell llvm lua html+mako matlab matlabsession minid multi \
-+html+myghty mysql nasm nginx objectpascal ocaml perl html+php php povray python pycon pytb rst ruby \
-+scala scheme smalltalk smarty sourceslist sql squidconf tex text diff vim xml xslt yaml"
-+POST_calculate="submit=paste! % % language % parent private % text"
-+REGEX_RAW_calculate='s|^\(http://[^/]*/\)show\(/[0-9]*/\)$|\1raw\2|'
- 
- ### errors
- die() {
-@@ -340,6 +368,9 @@ Options:
-     -s, --service SERVICE         set service to use (defaults to "$DEFAULT_SERVICE")
-     -e, --expiration EXPIRATION   set when it should expire (defaults to "$DEFAULT_EXPIRATION")
- 
-+    -p, --parent PARENT           set parent paste (defaults to "$DEFAULT_PARENT", make use id paste) (Calculate pastebin option)
-+    -P, --private PRIVATE         set private status (defaults to "$DEFAULT_PRIVATE") (Calculate pastebin option)
-+
-     -S, --list-services           list supported pastebin services
-     -L, --list-languages          list languages supported by the specified service
-     -E, --list-expiration         list expiration setting supported by the specified service
-@@ -431,6 +462,18 @@ showlanguages() {
- 	done | sort
- }
- 
-+showprivate() {
-+   local p priv d
-+   priv=PRIVATE_$ENGINE
-+   [[ -n $COMPLETIONS ]] && printlist ${!priv} | sort && exit 0
-+   echo "Private supported by $(getrecipient) (case sensitive):"
-+   [[ -z ${!priv} ]] && echo "$N\"$ENGINE\" has no support for setting language." >&2 && exit 1
-+   for p in ${!priv}; do
-+       [[ ${p//\%/ } = $DEFAULT_PRIVATE ]] && d="*" || d=" "
-+       echo "   $d${p//\%/ }"
-+   done | sort
-+}
-+
- showexpirations() {
- 	local e expiration info d
- 	expiration=EXPIRATIONS_$ENGINE
-@@ -484,7 +527,7 @@ postdata() {
- 	post=POST_$ENGINE
- 	if [[ -n ${!post} ]]; then
- 		nr=${!post//[^ ]}
--		[[ 6 = ${#nr} ]] || die "\"${SERVICE}\" is not supported by ${FUNCNAME}()."
-+		[[ 8 = ${#nr} ]] || die "\"${SERVICE}\" is not supported by ${FUNCNAME}()."
- 		extra=${!post%% *}
- 		[[ '%' = $extra ]] || echo -n "$extra&"
- 		e() {
-@@ -497,7 +540,7 @@ postdata() {
- 				post=${post#$f }
- 			done
- 		}
--		e "${!post#$extra }" NICK DESCRIPTION LANGUAGE EXPIRATION CVT_TABS INPUT
-+		e "${!post#$extra }" NICK DESCRIPTION LANGUAGE EXPIRATION PARENT PRIVATE CVT_TABS INPUT
- 	elif [[ function == $(type -t json_$ENGINE) ]]; then
- 		json_$ENGINE "$DESCRIPTION" "$LANGUAGE" "$INPUT"
- 	else
-@@ -600,6 +643,16 @@ while [[ -n $1 ]]; do
- 		-L | --list-languages )
- 		LISTLANGUAGES=0
- 		;;
-+		-p | --parent )
-+		requiredarg "$@"
-+		PARENTSET=0
-+		PARENT="$2"
-+		;;
-+		-P | --private )
-+		requiredarg "$@"
-+		PRIVATESET=0
-+		PRIVATE="$2"
-+		;;
- 		-n | --nick )
- 		requiredarg "$@"
- 		NICK=$(escape "$2")
-@@ -677,12 +730,16 @@ load_configs
- DEFAULT_NICK=${DEFAULT_NICK:-$(whoami)} || die "whoami failed"
- DEFAULT_SERVICE=${DEFAULT_SERVICE:-bpaste}
- DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-Plain Text}
-+DEFAULT_PARENT=${DEFAULT_PARENT:-''}
-+DEFAULT_PRIVATE=${DEFAULT_PRIVATE:-0}
- DEFAULT_EXPIRATION=${DEFAULT_EXPIRATION:-1 month}
- SERVICE=${SERVICE:-${DEFAULT_SERVICE}}
- ENGINE=ENGINE_$SERVICE
- ENGINE="${!ENGINE}"
- default="DEFAULT_NICK_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_NICK=${!default}
- default="DEFAULT_LANGUAGE_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_LANGUAGE=${!default}
-+default="DEFAULT_PARENT_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_PARENT=${!default}
-+default="DEFAULT_PRIVATE_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_PRIVATE=${!default}
- default="DEFAULT_EXPIRATION_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_EXPIRATION=${!default}
- NICK=${NICK:-$(escape "${DEFAULT_NICK}")}
- [[ -z $SOURCE ]] && SOURCE="stdin"
-@@ -704,6 +761,10 @@ INFO_ARGS=${INFO_ARGS:-"--ignore-default-opts"}
- LANGUAGE=${LANGUAGE:-${DEFAULT_LANGUAGE}}
- verifylanguage
- LANGUAGE=$(escape "$LANGUAGE")
-+PARENT=${PARENT:-${DEFAULT_PARENT}}
-+PARENT=$(escape "$PARENT")
-+PRIVATE=${PRIVATE:-${DEFAULT_PRIVATE}}
-+PRIVATE=$(escape "$PRIVATE")
- EXPIRATION=${EXPIRATION:-${DEFAULT_EXPIRATION}}
- verifyexpiration
- EXPIRATION=$(escape "$EXPIRATION")
-@@ -853,6 +914,7 @@ else
- 	[[ -f $TMPF ]] || TMPF=$(mktemp /tmp/wgetpaste.XXXXXX)
- 	if [[ -f $TMPF ]]; then
- 		postdata > "$TMPF" || die "Failed to write to temporary file: \"$TMPF\"."
-+		[[ $LANG =~ ru_RU ]] && enconv $TMPF
- 		WGETARGS="--post-file=$TMPF"
- 	else
- 		# fall back to using --post-data if the temporary file could not be created

app-text/wgetpaste/files/wgetpaste-2.33-add-A-ansi.patch

@@ -0,0 +1,39 @@
+From 9614658e6a31bf1b318972008fd9fd1301e9d92f Mon Sep 17 00:00:00 2001
+From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+Date: Sun, 13 Aug 2023 14:32:34 -0500
+Subject: [PATCH 2/3] Add -A/--ansi
+
+Don't strip ANSI codes.
+---
+See also: https://github.com/zlin/wgetpaste/pull/46
+- Oskari
+
+ wgetpaste | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/wgetpaste b/wgetpaste
+index 5f4152d..1e3ae35 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -556,6 +556,8 @@ Options:
+     -X, --xpaste                  write resulting url to the X primary selection buffer (requires x11-misc/xclip)
+     -C, --xclippaste              write resulting url to the X clipboard selection buffer (requires x11-misc/xclip)
+     -N, --no-ansi                 strip ANSI codes such as colors before pasting (requires app-text/ansifilter)
++    -A, --ansi                    don't strip ANSI codes
++                                  (useful for undoing NOANSI specified in a config file)
+ 
+     -r, --raw                     show url for the raw paste (no syntax highlighting or html)
+     -t, --tee                     use tee to show what is being pasted
+@@ -789,6 +791,9 @@ while [[ -n $1 ]]; do
+ 		-- )
+ 		shift && getfilenames "$@" && break
+ 		;;
++		-A | --ansi )
++		NOANSI=
++		;;
+ 		-c | --command )
+ 		requiredarg "$@"
+ 		SOURCE="command"
+-- 
+2.41.0
+

app-text/wgetpaste/files/wgetpaste-2.33-add-paste-calculate.patch

@@ -0,0 +1,72 @@
+--- a/wgetpaste	2023-11-05 01:00:11.421397200 +0300
++++ b/wgetpaste	2023-11-05 01:08:36.145761741 +0300
+@@ -41,7 +41,18 @@
+ }
+ 
+ ### services
+-SERVICES="0x0 bpaste codepad dpaste gists ix_io pgz snippets"
++SERVICES="0x0 bpaste codepad dpaste gists ix_io pgz snippets calculate"
++# calculate
++ENGINE_calculate=calculate
++if [[ "$LANG" =~ 'ru_RU' ]]; then
++    URL_calculate="http://pastebin.calculate-linux.ru"
++else
++    URL_calculate="http://pastebin.calculate-linux.org"
++fi
++DEFAULT_LANGUAGE_calculate="Text"
++DEFAULT_PARENT_calculate=""
++DEFAULT_PRIVATE_calculate=0
++SIZE_calculate="25000 25%kB"
+ # 0x0
+ ENGINE_0x0=0x0
+ URL_0x0="http://0x0.st"
+@@ -89,6 +100,22 @@
+ # 0x0
+ escape_description_0x0() { echo "$*"; }
+ escape_input_0x0() { echo "$*"; }
++LANGUAGES_calculate="Apache Bash Batch Boo C C# C++ Clojure Creole_Wiki CSS \
++CSV D Debian_control-files Django_Jinja_Templates Dylan Erlang eRuby_rhtml GAS GCC_Messages \
++Genshi_Templates Gettext_catalogs GL_Shader_language Haskell HTML INI_File Interactive_Ruby IO \
++IRC_Logs Java javac_Messages JavaScript JSP Lighttpd Literate_Haskell LLVM Lua Mako_Templates Matlab \
++Matlab_Session MiniD Multi-File Myghty_Templates MySQL Nasm Nginx Object-Pascal OCaml Perl PHP \
++PHP_(inline) Povray Python Python_Console_Sessions Python_Tracebacks reStructuredText Ruby Scala \
++Scheme Smalltalk Smarty sources.list SQL SquidConf TeX_LaTeX Text Unified_Diff Vim XML XSLT YAML"
++LANGUAGE_VALUES_calculate="apache bash bat boo c csharp cpp clojure creole css csv d control html+django \
++dylan erlang rhtml gas gcc-messages html+genshi gettext glsl haskell html ini irb io irc java \
++javac-messages js jsp lighttpd literate-haskell llvm lua html+mako matlab matlabsession minid multi \
++html+myghty mysql nasm nginx objectpascal ocaml perl html+php php povray python pycon pytb rst ruby \
++scala scheme smalltalk smarty sourceslist sql squidconf tex text diff vim xml xslt yaml"
++REGEX_RAW_calculate='s|^\(http://[^/]*/\)show\(/[0-9]*/\)$|\1raw\2|'
++POST_calculate() {
++	POST_generic "submit=paste! parent private language % % text" "$PARENT" "$PRIVATE" "$3" "$4" "$5" "$6"
++}
+ POST_0x0() {
+ 	local filename="${2}"
+ 	local content="${6}" boundary="WGETPASTE-yuLr+iHOSQ+trEgDcj9UVq5R302bid"
+@@ -562,6 +589,8 @@
+     -q, --quiet                   show the url only
+     -v, --verbose                 show wget stderr output if no url is received
+         --completions             emit output suitable for shell completions (only affects --list-*)
+         --debug                   be *very* verbose (implies -v)
++    -p, --parent PARENT           [service calculate only!] set parent paste as -p <id> paste
++    -P, --private PRIVATE         [service calculate only!] set private status as -P <seed>
+ 
+     -h, --help                    show this help
+@@ -847,6 +876,17 @@
+ 		-C | --xclippaste )
+ 		XCLIPPASTE=0
+ 		;;
++ 		-p | --parent )
++ 		requiredarg "$@"
++ 		PARENTSET=0
++ 		PARENT="$2"
++ 		;;
++ 		-P | --private )
++ 		requiredarg "$@"
++ 		PRIVATESET=0
++ 		PRIVATE="$2"
++ 		;;
++
+ 		-* )
+ 		die "$0: unrecognized option \`$1'"
+ 		;;

app-text/wgetpaste/files/wgetpaste-2.33-add-paste-gentoo-zip.patch

@@ -0,0 +1,69 @@
+From cc41231b0ea2ec5cc0a8353fd4a9b6b71301f819 Mon Sep 17 00:00:00 2001
+From: Christopher Fore <csfore@posteo.net>
+Date: Sat, 14 Oct 2023 21:48:39 -0400
+Subject: [PATCH] Add new service - paste.gentoo.zip
+
+Specified in the code with `pgz` and in the cli for usage and brevity.
+---
+See also: https://github.com/zlin/wgetpaste/pull/48
+- Oskari
+
+ wgetpaste | 21 +++++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/wgetpaste b/wgetpaste
+index b3a537b..fc0b559 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -41,7 +41,7 @@ POST_generic() {
+ }
+ 
+ ### services
+-SERVICES="0x0 bpaste codepad dpaste gists ix_io snippets"
++SERVICES="0x0 bpaste codepad dpaste gists ix_io pgz snippets"
+ # 0x0
+ ENGINE_0x0=0x0
+ URL_0x0="http://0x0.st"
+@@ -68,6 +68,10 @@ URL_gists="https://api.github.com/gists"
+ ENGINE_ix_io=ix_io
+ URL_ix_io="http://ix.io"
+ SIZE_ix_io="1000000 1%MB"
++# paste.gentoo.zip
++ENGINE_pgz=pgz
++URL_pgz="https://paste.gentoo.zip"
++SIZE_pgz="2000000 2%MB"
+ # snippets
+ ENGINE_snippets=snippets
+ URL_snippets="https://gitlab.com/api/v4/snippets"
+@@ -139,7 +143,6 @@ POST_dpaste() {
+ }
+ REGEX_RAW_dpaste='s|^http.*|\0.txt|'
+ REGEX_URL_dpaste='s|^http.*|\0|p'
+-
+ # gists
+ LANGUAGES_gists="ActionScript Ada Apex AppleScript Arc Arduino ASP Assembly
+ Augeas AutoHotkey Batchfile Befunge BlitzMax Boo Brainfuck Bro C C# C++
+@@ -230,6 +233,20 @@ POST_lodgeit() {
+ 	POST_generic "submit=Paste! % % language % % code" "$1" "$2" "$3" "$4" "$5" "$6"
+ }
+ REGEX_RAW_lodgeit='s|^\(https\?://[^/]*/\)show\(/[[:alnum:]]*/\)$|\1raw\2|'
++# paste.gentoo.zip
++escape_input_pgz() { echo "$*"; }
++POST_pgz() {
++	local content="${6}"
++	local boundary="WGETPASTE-3d8dfd9bff2b12a7410328d2ec1ed145"
++	echo "--${boundary}"
++	echo "Content-Disposition: form-data; name=\"file\""
++	echo ""
++	echo "${content}"
++	echo "--${boundary}--"
++	ADDITIONAL_HEADERS_pgz=("Content-Type: multipart/form-data; boundary=${boundary}")
++}
++REGEX_RAW_pgz='s|^http.*|\0|'
++REGEX_URL_pgz='s|^http.*|\0|p'
+ # pinnwand
+ LANGUAGES_pinnwand="ABAP ActionScript%3 ActionScript Ada ANTLR ANTLR%With%ActionScript%Target \
+ ANTLR%With%CPP%Target ANTLR%With%C#%Target ANTLR%With%Java%Target ANTLR%With%ObjectiveC%Target \
+-- 
+2.41.0
+

app-text/wgetpaste/files/wgetpaste-2.33-add-paste-orgru.patch

@@ -0,0 +1,38 @@
+--- a/wgetpaste	2023-11-05 01:14:42.819088466 +0300
++++ b/wgetpaste	2023-11-06 14:31:32.400944620 +0300
+@@ -41,7 +41,14 @@
+ }
+ 
+ ### services
+-SERVICES="0x0 bpaste codepad dpaste gists ix_io pgz snippets calculate"
++SERVICES="0x0 bpaste codepad dpaste gists ix_io pgz snippets calculate orgru"
++# orgru
++ENGINE_orgru=orgru
++URL_orgru="http://paste.org.ru/"
++SIZE_orgru="100000 100%kB"
++REGEX_URL_orgru="s|<a href=\"\(/\?.*\)\">refresh</a>|http://paste.org.ru\1|p"
++REGEX_RAW_orgru="s|<a href=\"\(/\?.*\)\">refresh</a>|http://paste.org.ru\1|"
++DEFAULT_LANGUAGE_orgru="AutoDetect"
+ # calculate
+ ENGINE_calculate=calculate
+ if [[ "$LANG" =~ 'ru_RU' ]]; then
+@@ -97,6 +104,19 @@
+ REGEX_RAW_tinyurl='s|^\(http://[^/]*/\)\([[:alnum:]]*\)$|\1\2|'
+ 
+ ### engines
++# orgru
++LANGUAGES_orgru="AutoDetect C C++ ASM Perl Java IDL Pascal C# JS.NET VB.NET Forth Fortran Visual%Basic html css css%for%html \
++css%for%svg jsp php xhtml%transitional xhtml%strict xhtml%frameset SVG%1.0 ColdFusion JavaScript ActionScript VBScript xml \
++dtd xslt%1.0 XML%Schema Relax%NG Clarion Clipper FoxPro SQLJ%(Java%sql) Paradox SQL,%PL/SQL MySQL Batch/Config.sys/NTcmd \
++sh/ksh/bash%script Apache%httpd.conf Config,%INI%and%CTL Java%properties Lex YACC makefile TeX VRML 1C Ada ABAP/4 AutoIt%2.x \
++AWK Dssp ADSP-21xx%Asm Cobol Cache/Open-M Eiffel Erlang Icon Lisp MatLab Modula2%and%Oberon2 PicAsm Python Rexx Ruby Standard%ML \
++OCaml Tcl/Tk Verilog%HDL VHDL Diff/Patch xslfo%1.0 DocBook%4.2 MathML2 wml rss mason PostScript RTF%text M4 VIM"
++LANGUAGE_VALUES_orgru="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 27 28 29 30 31 32 33 34 35 36 38 39 40 41 42 \
++43 44 45 46 47 48 53 54 55 56 59 61 66 67 68 69 70 71 72 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 91 92 98 111 112 113 114 \
++120 133 135 137 156 158"
++POST_orgru(){
++	POST_generic "submit % % type % % code" "$1" "$2" "$3" "$4" "$5" "$6"
++}
+ # 0x0
+ escape_description_0x0() { echo "$*"; }
+ escape_input_0x0() { echo "$*"; }

app-text/wgetpaste/files/wgetpaste-2.33-added-quiet-flag.patch

@@ -0,0 +1,61 @@
+From fa0bd6dd8b7bc21b292e4f94eaa4fbf71d5240f1 Mon Sep 17 00:00:00 2001
+From: Richard-Rogalski <rrogalski@tutanota.com>
+Date: Mon, 6 Nov 2023 14:00:02 -0600
+Subject: [PATCH] Added --quiet flag
+
+Signed-off-by: Richard Rogalski <rrogalski@firemail.cc>
+Closes: #19
+---
+See also: https://github.com/zlin/wgetpaste/pull/51
+- Oskari
+
+ _wgetpaste | 1 +
+ wgetpaste  | 6 +++++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/_wgetpaste b/_wgetpaste
+index c4703e5..63696ad 100644
+--- a/_wgetpaste
++++ b/_wgetpaste
+@@ -50,6 +50,7 @@ _arguments -s : \
+   '(--xclippaste -C)'{--xclippaste,-C}'[write resulting url to the X clipboard selection buffer]' \
+   '(--raw -r)'{--raw,-r}'[show url for the raw paste]' \
+   '(--tee -t)'{--tee,-t}'[use tee to show what is being pasted]' \
++  '(--quiet -q)'{--quiet,-q}'[show the url only]' \
+   '(--verbose -v)'{--verbose,-v}'[show wget stderr output if no url is received]' \
+   '--debug[be very verbose]' \
+   '(--help -h)'{--help,-h}'[show help and exit]' \
+diff --git a/wgetpaste b/wgetpaste
+index 1e3ae35..e38f9e5 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -561,6 +561,7 @@ Options:
+ 
+     -r, --raw                     show url for the raw paste (no syntax highlighting or html)
+     -t, --tee                     use tee to show what is being pasted
++    -q, --quiet                   show the url only
+     -v, --verbose                 show wget stderr output if no url is received
+         --completions             emit output suitable for shell completions (only affects --list-*)
+         --debug                   be *very* verbose (implies -v)
+@@ -659,7 +660,7 @@ showexpirations() {
+ }
+ 
+ showurl() {
+-	echo -n "Your ${2}paste can be seen here: " >&2
++	[[ $QUIET ]] || echo -n "Your ${2}paste can be seen here: " >&2
+ 	echo "$1"
+ 	[[ $XPASTE ]] && x_paste "$1" primary
+ 	[[ $XCLIPPASTE ]] && x_paste "$1" clipboard
+@@ -841,6 +842,9 @@ while [[ -n $1 ]]; do
+ 		-N | --no-ansi )
+ 		NOANSI=0
+ 		;;
++		-q | --quiet)
++		QUIET=0
++		;;
+ 		-r | --raw )
+ 		RAW=0
+ 		;;
+-- 
+2.41.0
+

app-text/wgetpaste/files/wgetpaste-2.33-change-arg-parsing-priority.patch

@@ -0,0 +1,95 @@
+From cfe7dcd8a0e40b8c18556aad0b657f431c90505a Mon Sep 17 00:00:00 2001
+From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+Date: Sun, 13 Aug 2023 14:25:35 -0500
+Subject: [PATCH 1/3] Change arg parsing priority
+
+Read config files before parsing CLI args. Allows all options to be set
+via config and overridden on the CLI.
+---
+See also: https://github.com/zlin/wgetpaste/pull/46
+- Oskari
+
+ wgetpaste | 53 ++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 28 insertions(+), 25 deletions(-)
+
+diff --git a/wgetpaste b/wgetpaste
+index fc0b559..5f4152d 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -720,7 +720,32 @@ geturl() {
+ 	fi | tail -n1
+ }
+ 
+-### read cli options
++# read the config files
++load_configs() {
++	if [[ ! $IGNORECONFIGS ]]; then
++		# compatibility code
++		local f deprecated=
++		for f in {/etc/,~/.}wgetpaste{.d/*.bash,}; do
++			if [[ -f $f ]]; then
++				if [[ -z $deprecated ]]; then
++					echo "The config files for wgetpaste have changed to *.conf.$N" >&2
++					deprecated=0
++				fi
++				echo "Please move ${f} to ${f%.bash}.conf" >&2
++				source "$f" || die "Failed to source $f"
++			fi
++		done
++		[[ -n $deprecated ]] && echo >&2
++		# new locations override old ones in case they collide
++		for f in {/etc/,~/.}wgetpaste{.d/*,}.conf; do
++			if [[ -f $f ]]; then
++				source "$f" || die "Failed to source $f"
++			fi
++		done
++	fi
++}
++
++### get runtime options
+ 
+ # separate groups of short options. replace --foo=bar with --foo bar
+ while [[ -n $1 ]]; do
+@@ -756,6 +781,8 @@ done
+ # set the separated options as input options.
+ set -- "${ARGS[@]}"
+ 
++load_configs
++
+ while [[ -n $1 ]]; do
+ 	((args=1))
+ 	case "$1" in
+@@ -859,30 +886,6 @@ if [[ $NOANSI ]]; then
+ fi
+ 
+ ### defaults
+-load_configs() {
+-	if [[ ! $IGNORECONFIGS ]]; then
+-		# compatibility code
+-		local f deprecated=
+-		for f in {/etc/,~/.}wgetpaste{.d/*.bash,}; do
+-			if [[ -f $f ]]; then
+-				if [[ -z $deprecated ]]; then
+-					echo "The config files for wgetpaste have changed to *.conf.$N" >&2
+-					deprecated=0
+-				fi
+-				echo "Please move ${f} to ${f%.bash}.conf" >&2
+-				source "$f" || die "Failed to source $f"
+-			fi
+-		done
+-		[[ -n $deprecated ]] && echo >&2
+-		# new locations override old ones in case they collide
+-		for f in {/etc/,~/.}wgetpaste{.d/*,}.conf; do
+-			if [[ -f $f ]]; then
+-				source "$f" || die "Failed to source $f"
+-			fi
+-		done
+-	fi
+-}
+-load_configs
+ [[ $SERVICESET ]] && verifyservice "$SERVICESET" && SERVICE=$(escape "$SERVICESET")
+ DEFAULT_NICK=${DEFAULT_NICK:-$(whoami)} || die "whoami failed"
+ DEFAULT_SERVICE=${DEFAULT_SERVICE:-bpaste}
+-- 
+2.41.0
+

app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch

@@ -0,0 +1,31 @@
+https://github.com/zlin/wgetpaste/pull/45
+
+From ab4632ca9cd54c9e7478f37eee821113c0135c37 Mon Sep 17 00:00:00 2001
+From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+Date: Fri, 28 Jul 2023 18:55:10 -0500
+Subject: [PATCH] Disable sprunge
+
+Sprunge seems to have recently died. Disable it by removing it from the
+service list, but keep the core bits in case it decides to come back.
+
+RIP ;(
+---
+ wgetpaste | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wgetpaste b/wgetpaste
+index 864d5ef..b3a537b 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -41,7 +41,7 @@ POST_generic() {
+ }
+ 
+ ### services
+-SERVICES="0x0 bpaste codepad dpaste gists ix_io snippets sprunge"
++SERVICES="0x0 bpaste codepad dpaste gists ix_io snippets"
+ # 0x0
+ ENGINE_0x0=0x0
+ URL_0x0="http://0x0.st"
+-- 
+2.41.0
+

app-text/wgetpaste/files/wgetpaste-2.33-test_ansi-add-A-to-the-tests.patch

@@ -0,0 +1,171 @@
+From a1c0782e828bc5f0fc8b79d0131f1847c5e7b359 Mon Sep 17 00:00:00 2001
+From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+Date: Sun, 13 Aug 2023 14:52:20 -0500
+Subject: [PATCH 3/3] test_ansi: add -A to the tests
+
+---
+See also: https://github.com/zlin/wgetpaste/pull/46
+- Oskari
+
+ test/test_ansi.sh | 92 +++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 81 insertions(+), 11 deletions(-)
+
+diff --git a/test/test_ansi.sh b/test/test_ansi.sh
+index 23b27a8..e1e95f0 100755
+--- a/test/test_ansi.sh
++++ b/test/test_ansi.sh
+@@ -94,8 +94,8 @@ fi
+ 
+ # Paste stuff. Use a short timeout between requests (we're friendly after all!)
+ sleep 1
+-echo -n "Pasting command output (cat): "
+-ERROR_LOG="$DL_DIR/command-error.log"
++echo -n "Pasting command output with ANSI stripping (cat): "
++ERROR_LOG="$DL_DIR/command-noansi-error.log"
+ URL="$("$TEST_DIR"/../wgetpaste -N -r -s "$WORKING" -v -c "cat $ANSI_FILE" 2>"$ERROR_LOG")"
+ if [ $? -ne 0 ]; then
+     echo "FAILED!"
+@@ -104,7 +104,7 @@ else
+     echo "SUCCESS!"
+ 
+     echo -n "Downloading: "
+-    if ! (wget -q "$URL" -O "$DL_DIR/command.txt" 2>>"$ERROR_LOG"); then
++    if ! (wget -q "$URL" -O "$DL_DIR/command-noansi.txt" 2>>"$ERROR_LOG"); then
+         echo "FAILED!"
+         FAILED_PASTE=$((FAILED_PASTE + 1))
+     else
+@@ -112,13 +112,35 @@ else
+         rm "$ERROR_LOG"
+ 
+         echo "Removing 'command run' header"
+-        sed -i -e '1d' "$DL_DIR/command.txt"
++        sed -i -e '1d' "$DL_DIR/command-noansi.txt"
++    fi
++fi
++sleep 1
++echo -n "Pasting command output without ANSI stripping (cat): "
++ERROR_LOG="$DL_DIR/command-ansi-error.log"
++URL="$("$TEST_DIR"/../wgetpaste -A -r -s "$WORKING" -v -c "cat $ANSI_FILE" 2>"$ERROR_LOG")"
++if [ $? -ne 0 ]; then
++    echo "FAILED!"
++    FAILED_PASTE=$((FAILED_PASTE + 1))
++else
++    echo "SUCCESS!"
++
++    echo -n "Downloading: "
++    if ! (wget -q "$URL" -O "$DL_DIR/command-ansi.txt" 2>>"$ERROR_LOG"); then
++        echo "FAILED!"
++        FAILED_PASTE=$((FAILED_PASTE + 1))
++    else
++        echo "SUCCESS"
++        rm "$ERROR_LOG"
++
++        echo "Removing 'command run' header"
++        sed -i -e '1d' "$DL_DIR/command-ansi.txt"
+     fi
+ fi
+ 
+ sleep 1
+-echo -n "Pasting stdin (cat | wgetpaste): "
+-ERROR_LOG="$DL_DIR/stdin-error.log"
++echo -n "Pasting stdin with ANSI stripping (cat | wgetpaste): "
++ERROR_LOG="$DL_DIR/stdin-noansi-error.log"
+ URL="$(cat "$ANSI_FILE" | "$TEST_DIR"/../wgetpaste -N -r -s "$WORKING" -v 2>"$ERROR_LOG")"
+ if [ $? -ne 0 ]; then
+     echo "FAILED!"
+@@ -127,7 +149,26 @@ else
+     echo "SUCCESS!"
+ 
+     echo -n "Downloading: "
+-    if ! (wget -q "$URL" -O "$DL_DIR/stdin.txt" 2>>"$ERROR_LOG"); then
++    if ! (wget -q "$URL" -O "$DL_DIR/stdin-noansi.txt" 2>>"$ERROR_LOG"); then
++        echo "FAILED!"
++        FAILED_PASTE=$((FAILED_PASTE + 1))
++    else
++        echo "SUCCESS!"
++        rm "$ERROR_LOG"
++    fi
++fi
++sleep 1
++echo -n "Pasting stdin without ANSI stripping (cat | wgetpaste): "
++ERROR_LOG="$DL_DIR/stdin-ansi-error.log"
++URL="$(cat "$ANSI_FILE" | "$TEST_DIR"/../wgetpaste -A -r -s "$WORKING" -v 2>"$ERROR_LOG")"
++if [ $? -ne 0 ]; then
++    echo "FAILED!"
++    FAILED_PASTE=$((FAILED_PASTE + 1))
++else
++    echo "SUCCESS!"
++
++    echo -n "Downloading: "
++    if ! (wget -q "$URL" -O "$DL_DIR/stdin-ansi.txt" 2>>"$ERROR_LOG"); then
+         echo "FAILED!"
+         FAILED_PASTE=$((FAILED_PASTE + 1))
+     else
+@@ -137,8 +178,8 @@ else
+ fi
+ 
+ sleep 1
+-echo -n "Pasting a file: "
+-ERROR_LOG="$DL_DIR/file-error.log"
++echo -n "Pasting a file with ANSI stripping: "
++ERROR_LOG="$DL_DIR/file-noansi-error.log"
+ URL="$("$TEST_DIR"/../wgetpaste -N -r -s "$WORKING" -v "$ANSI_FILE" 2>"$ERROR_LOG")"
+ if [ $? -ne 0 ]; then
+     echo "FAILED!"
+@@ -147,7 +188,26 @@ else
+     echo "SUCCESS!"
+ 
+     echo -n "Downloading: "
+-    if ! (wget -q "$URL" -O "$DL_DIR/file.txt" 2>>"$ERROR_LOG"); then
++    if ! (wget -q "$URL" -O "$DL_DIR/file-noansi.txt" 2>>"$ERROR_LOG"); then
++        echo "FAILED!"
++        FAILED_PASTE=$((FAILED_PASTE + 1))
++    else
++        echo "SUCCESS!"
++        rm "$ERROR_LOG"
++    fi
++fi
++sleep 1
++echo -n "Pasting a file without ANSI stripping: "
++ERROR_LOG="$DL_DIR/file-ansi-error.log"
++URL="$("$TEST_DIR"/../wgetpaste -A -r -s "$WORKING" -v "$ANSI_FILE" 2>"$ERROR_LOG")"
++if [ $? -ne 0 ]; then
++    echo "FAILED!"
++    FAILED_PASTE=$((FAILED_PASTE + 1))
++else
++    echo "SUCCESS!"
++
++    echo -n "Downloading: "
++    if ! (wget -q "$URL" -O "$DL_DIR/file-ansi.txt" 2>>"$ERROR_LOG"); then
+         echo "FAILED!"
+         FAILED_PASTE=$((FAILED_PASTE + 1))
+     else
+@@ -157,7 +217,7 @@ else
+ fi
+ 
+ # Compare downloaded files
+-for dl_file in "$DL_DIR"/*.txt; do
++for dl_file in "$DL_DIR"/*-noansi.txt; do
+     echo -n "Testing file $dl_file: "
+     # Ignore missing trailing newline and extra empty lines in downloaded file
+     if (diff -q -Z -B "$NOANSI_FILE" "$dl_file" &>/dev/null); then
+@@ -167,6 +227,16 @@ for dl_file in "$DL_DIR"/*.txt; do
+         DL_MISMATCH=$((DL_MISMATCH + 1))
+     fi
+ done
++for dl_file in "$DL_DIR"/*-ansi.txt; do
++    echo -n "Testing file $dl_file: "
++    # Ignore missing trailing newline and extra empty lines in downloaded file
++    if (diff -q -Z -B "$ANSI_FILE" "$dl_file" &>/dev/null); then
++        echo "SUCCESS!"
++    else
++        echo "FAILED!"
++        DL_MISMATCH=$((DL_MISMATCH + 1))
++    fi
++done
+ 
+ echo "Total failed pastes: $FAILED_PASTE"
+ echo "Total mismatches: $DL_MISMATCH"
+-- 
+2.41.0
+

app-text/wgetpaste/files/wgetpaste-2.33-tests.patch

@@ -0,0 +1,83 @@
+https://github.com/zlin/wgetpaste/pull/38
+
+From 3470bbe651c2264a7f985f3b86f67a6ff6d0c587 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 22 Nov 2022 01:29:16 +0000
+Subject: [PATCH 1/3] test: respect TMPDIR in mktemp (pass --tmpdir)
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/test/test.sh
++++ b/test/test.sh
+@@ -7,7 +7,7 @@
+ # Don't assume the test is being run from the same directory as the script
+ TEST_DIR="$(dirname "$0")"
+ TEST_FILE="$TEST_DIR/test.txt"
+-DL_DIR="$(mktemp -q -d /tmp/wgetpaste_test.XXXXX)"
++DL_DIR="$(mktemp -q --tmpdir -d wgetpaste_test.XXXXX)"
+ # Services to hard skip
+ # Pre-declare as map to maintain type even if empty
+ # key -> value := service -> reason
+--- a/test/test_ansi.sh
++++ b/test/test_ansi.sh
+@@ -9,7 +9,7 @@
+ TEST_DIR="$(dirname "$0")"
+ ANSI_FILE="$TEST_DIR/red.txt"
+ NOANSI_FILE="$TEST_DIR/red_no_ansi.txt"
+-DL_DIR="$(mktemp -q -d /tmp/wgetpaste_test_ansi.XXXXX)"
++DL_DIR="$(mktemp -q --tmpdir -d wgetpaste_test_ansi.XXXXX)"
+ # Services to hard skip
+ # Pre-declare as map to maintain type even if empty
+ # key -> value := service -> reason
+
+From 0c3cc1a5286c95a5bcd6408035f6c230350c1565 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 22 Nov 2022 01:29:40 +0000
+Subject: [PATCH 2/3] test: use portable bash shebang
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/test/test.sh
++++ b/test/test.sh
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#!/usr/bin/env bash
+ 
+ # wgetpaste test script
+ # Exit code: number of mismatched downloads or 1 for general failure
+--- a/test/test_ansi.sh
++++ b/test/test_ansi.sh
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#!/usr/bin/env bash
+ 
+ # wgetpaste test script (stripping ANSI codes)
+ # Based on test/test.sh
+
+From 8d1cf7a8d0ce9ff21a8e1dc66169b04e4f8fc852 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 22 Nov 2022 01:29:55 +0000
+Subject: [PATCH 3/3] test: normalise copyright header
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/test/test.sh
++++ b/test/test.sh
+@@ -2,7 +2,7 @@
+ 
+ # wgetpaste test script
+ # Exit code: number of mismatched downloads or 1 for general failure
+-# Copyright (C) 2021  xxc3nsoredxx
++# Copyright (C) 2022 Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+ 
+ # Don't assume the test is being run from the same directory as the script
+ TEST_DIR="$(dirname "$0")"
+--- a/test/test_ansi.sh
++++ b/test/test_ansi.sh
+@@ -3,7 +3,7 @@
+ # wgetpaste test script (stripping ANSI codes)
+ # Based on test/test.sh
+ # Exit code: number of mismatched downloads or 1 for general failure
+-# Copyright (C) 2022  Oskari Pirhonen <xxc3ncoredxx@gmail.com>
++# Copyright (C) 2022 Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+ 
+ # Don't assume the test is being run from the same directory as the script
+ TEST_DIR="$(dirname "$0")"
+

app-text/wgetpaste/files/wgetpaste-config-default-lodgeit

@@ -1 +0,0 @@
-DEFAULT_SERVICE="bpaste"

app-text/wgetpaste/files/wgetpaste-config-services

@@ -1,6 +1 @@
-#!/bin/bash
-
-SERVICES="${SERVICES} lugons"
-
-ENGINE_lugons=lodgeit
-URL_lugons="https://paste.lugons.org/"
+DEFAULT_SERVICE=calculate

app-text/wgetpaste/metadata.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="project">
+        <email>support@calculate.ru</email>
+        <name>Mir Calculate</name>
+        <description>Calculate Overlay</description>
+    </maintainer>
+    <longdescription>
+        Command-line interface to various pastebins
+    </longdescription>
+    <upstream>
+        <remote-id type="github">zlin/wgetpaste</remote-id>
+        <bugs-to>https://github.com/zlin/wgetpaste/issues</bugs-to>
+        <changelog>https://github.com/zlin/wgetpaste/releases</changelog>
+    </upstream>
+</pkgmetadata>

app-text/wgetpaste/wgetpaste-2.25-r4.ebuild

@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild,v 1.9 2014/11/02 09:09:38 ago Exp $
-
-EAPI="7"
-
-inherit eutils
-
-DESCRIPTION="Command-line interface to various pastebins"
-HOMEPAGE="http://wgetpaste.zlin.dk/"
-SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="net-misc/wget
-	app-i18n/enca
-"
-
-src_prepare() {
-	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
-	epatch "${FILESDIR}"/calculate_wgetpaste-25.patch
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /etc/wgetpaste.d
-	newins "${FILESDIR}"/wgetpaste-config-services services.conf
-	insinto /usr/share/zsh/site-functions
-	doins _wgetpaste
-}

app-text/wgetpaste/wgetpaste-2.33-r0.ebuild

@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: This is a version of `app-text/wgetpaste-2.33-r4::gentoo` with additional services
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="Command-line interface to various pastebins"
+HOMEPAGE="https://github.com/zlin/wgetpaste"
+SRC_URI="https://github.com/zlin/wgetpaste/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="+ssl"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	net-misc/wget[ssl?]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.33-tests.patch
+	"${FILESDIR}"/${PN}-2.33-disable-sprunge.patch
+	"${FILESDIR}"/${PN}-2.33-add-paste-gentoo-zip.patch
+	"${FILESDIR}"/${PN}-2.33-added-quiet-flag.patch
+	"${FILESDIR}"/${PN}-2.33-add-paste-calculate.patch
+	"${FILESDIR}"/${PN}-2.33-add-paste-orgru.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
+}
+
+src_test() {
+	test/test.sh || die
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /usr/share/zsh/site-functions
+	doins _wgetpaste
+	insinto /etc/wgetpaste.d
+	newins "${FILESDIR}"/wgetpaste-config-services services.conf
+}
+
+pkg_postinst() {
+	optfeature "ANSI (color code) stripping support" app-text/ansifilter
+	optfeature "xclip support" x11-misc/xclip
+}

app-text/wgetpaste/wgetpaste-2.33-r15.ebuild

@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: This is a version of `app-text/wgetpaste-2.33-r5::gentoo` with additional services
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="Command-line interface to various pastebins"
+HOMEPAGE="https://github.com/zlin/wgetpaste"
+SRC_URI="https://github.com/zlin/wgetpaste/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+ssl"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="net-misc/wget[ssl?]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.33-tests.patch
+	"${FILESDIR}"/${PN}-2.33-disable-sprunge.patch
+	"${FILESDIR}"/${PN}-2.33-add-paste-gentoo-zip.patch
+	"${FILESDIR}"/${PN}-2.33-change-arg-parsing-priority.patch
+	"${FILESDIR}"/${PN}-2.33-add-A-ansi.patch
+	"${FILESDIR}"/${PN}-2.33-test_ansi-add-A-to-the-tests.patch
+	"${FILESDIR}"/${PN}-2.33-added-quiet-flag.patch
+	"${FILESDIR}"/${PN}-2.33-add-paste-calculate.patch
+	"${FILESDIR}"/${PN}-2.33-add-paste-orgru.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
+}
+
+src_test() {
+	test/test.sh || die
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /usr/share/zsh/site-functions
+	doins _wgetpaste
+	insinto /etc/wgetpaste.d
+	newins "${FILESDIR}"/wgetpaste-config-services services.conf
+}
+
+pkg_postinst() {
+	optfeature "ANSI (color code) stripping support" app-text/ansifilter
+	optfeature "xclip support" x11-misc/xclip
+}

app-text/wgetpaste/wgetpaste-2.34-r10.ebuild

@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: This is a version of `app-text/wgetpaste-2.34::gentoo` with additional services
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="Command-line interface to various pastebins"
+HOMEPAGE="https://github.com/zlin/wgetpaste"
+SRC_URI="https://github.com/zlin/wgetpaste/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+ssl"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="net-misc/wget[ssl?]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.33-add-paste-calculate.patch
+	"${FILESDIR}"/${PN}-2.33-add-paste-orgru.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
+}
+
+src_test() {
+	test/test.sh || die
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /usr/share/zsh/site-functions
+	doins _wgetpaste
+	insinto /etc/wgetpaste.d
+	newins "${FILESDIR}"/wgetpaste-config-services services.conf
+}
+
+pkg_postinst() {
+	optfeature "ANSI (color code) stripping support" app-text/ansifilter
+	optfeature "xclip support" x11-misc/xclip
+}

dev-python/pymilter/Manifest

@@ -0,0 +1 @@
+DIST pymilter-1.0.5.gh.tar.gz 1030610 BLAKE2B 7af714ca771ad9c90a0b20b386f0d46d25fc5cd213c43f7c1c6edc1a9300f7bda987f46fa9a9b8add68f020c33783648f9187c3b05a34a4c13ad8a4ae7206f39 SHA512 d6cd291f3be5402d6e4ab824deba940c6500d970b30c8d73b2fb1952eede4ac784033a7ae0b9a7307f18a3bfd52fc3f40fb0a9cce6cb94e724fce5cc3e8eb25e

dev-python/pymilter/metadata.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+		A python extension module to enable python scripts to attach
+		to sendmail’s libmilter functionality. Additional python
+		modules provide for navigating and modifying MIME parts, and
+		sending DSNs or doing CBVs.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">sdgathman/pymilter</remote-id>
+		<remote-id type="pypi">pymilter</remote-id>
+	</upstream>
+</pkgmetadata>

dev-python/pymilter/pymilter-1.0.5-r1.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to sendmail milter API"
+HOMEPAGE="https://github.com/sdgathman/pymilter"
+SRC_URI="https://github.com/sdgathman/${PN}/archive/${P}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="
+	mail-filter/libmilter:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		|| (
+			mail-mta/opensmtpd
+			mail-mta/sendmail
+		)
+	)
+"
+
+distutils_enable_tests unittest

dev-python/sjcl/metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="project">
+        <email>support@calculate.ru</email>
+        <name>Mir Calculate</name>
+        <description>Calculate Overlay</description>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">berlincode/sjcl</remote-id>
+        <remote-id type="pypi">sjcl</remote-id>
+    </upstream>
+</pkgmetadata>

dev-python/sjcl/sjcl-0.2.1.ebuild

@@ -1,20 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( pypy3 python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9,10,11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Decrypt and encrypt messages compatible to the SJCL message format"
 HOMEPAGE="https://github.com/berlincode/sjcl"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="$(pypi_sdist_url --no-normalize ${PN} ${PV})"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="dev-python/pycryptodome"
 DEPEND="${RDEPEND}"
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+	sed -e "s:description-:description_:" -i setup.cfg
+}

dev-util/eclipse-sdk-bin/Manifest

@@ -1 +1 @@
-DIST eclipse-java-2020-03-R-linux-gtk-x86_64-4.15.0.tar.gz 201754965 BLAKE2B aaf82de630bac3c0e0e097d0c78c4796a7913acf7824226c60d0c9dbc7c5f38fab874cbd30e059b3c87c10a605baa71423b6841ba5f99bf27e088e30fd507c88 SHA512 c9390723fe39e86c7c75fce130a2a46e75c43970e1d801b4025f969369dfe6ce75cb990f8208918a89c04f371300ec482ed8e4fd74ab28252219c64f0107e51c
+DIST eclipse-java-2022-06-R-linux-gtk-x86_64-4.24.0.tar.gz 317733533 BLAKE2B 40bc09aef8a11a4d66556721d865e39df5476d6e9b0d4038e66d3696ad48ccd2a9a8b232e533d83db081f65850e95c3fec7ba9654eedb96db5b14d5a892ae33b SHA512 69c7bece9cf9b632c0f3d8072f206b8e574a53bfa46fce6e257e32e0841d564aec92b03eb82bf4cfd97307fa9b82b1f9d5914ddb1cf4e33d6714b25dd3d59a70

dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.24.0.ebuild

@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=7
+EAPI=8
 
-inherit eutils desktop
+inherit desktop
 
 SR="R"
-RNAME="2020-03"
+RNAME="2022-06"
 
 SRC_BASE="https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/${RNAME}/${SR}/eclipse-java-${RNAME}-${SR}-linux-gtk"
 
@@ -16,9 +16,8 @@ HOMEPAGE="http://www.eclipse.org"
 SRC_URI="amd64? ( ${SRC_BASE}-x86_64.tar.gz&r=1 -> eclipse-java-${RNAME}-${SR}-linux-gtk-x86_64-${PV}.tar.gz )"
 
 LICENSE="EPL-1.0"
-SLOT="4.15"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~x86 amd64"
-IUSE=""
 
 RDEPEND="
 	>=virtual/jdk-1.8

eclass/calculate-kernel-8.eclass

@@ -15,15 +15,15 @@
 # @DESCRIPTION:
 # This eclass use for calculate-sources ebuild
 
-inherit calculate eutils kernel-2
+inherit calculate kernel-2
 EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst
 
 
 REQUIRED_USE="minimal? ( vmlinuz )"
 
-CDEPEND="vmlinuz? ( || ( app-arch/xz-utils app-arch/lzma-utils )
-		grub? ( sys-boot/grub )
-	)
+CDEPEND="
+	vmlinuz? ( app-arch/xz-utils )
+	grub? ( sys-boot/grub )
 	firmware? ( || ( sys-kernel/linux-firmware
 		sys-firmware/eth-firmware ) )
 	sys-apps/kmod[zstd]"
@@ -63,7 +63,7 @@ calculate-kernel-8_pkg_setup() {
 
 calculate-kernel-8_src_unpack() {
 	kernel-2_src_unpack
-	cd ${S}
+	cd "${S}"
 	local GENTOOARCH="${ARCH}"
 	unset ARCH
 	emake defconfig || die "kernel configure failed"
@@ -80,7 +80,7 @@ vmlinuz_src_compile() {
 	# disable sandbox
 	local GENTOOARCH="${ARCH}"
 	unset ARCH
-	cd ${S}
+	cd "${S}"
 	vmlinuz_clean_localversion
 	emake olddefconfig || die "kernel configure failed"
 	emake && emake modules || die "kernel build failed"
@@ -95,21 +95,21 @@ calculate-kernel-8_src_compile() {
 vmlinuz_src_install() {
 	# dracut change this files in chroot of ramdisk
 	SANDBOX_WRITE="${SANDBOX_WRITE}:/run/blkid:/etc/ld.so.cache~:/etc/ld.so.cache:/etc/mtab"
-	cd ${S}
+	cd "${S}"
 	dodir /usr/share/${PN}/${PV}/boot
 	INSTALL_PATH=${D}/usr/share/${PN}/${PV}/boot emake install
 	INSTALL_MOD_PATH=${D} emake modules_install
-	/sbin/depmod -b ${D} ${KV_FULL}
+	/sbin/depmod -b "${D}" "${KV_FULL}"
 
 	cp /etc/dracut.conf dracut.conf
 	echo >>dracut.conf
 	if use themes
 	then
-		echo add_dracutmodules+=\" plymouth\" >>dracut.conf
+		echo add_dracutmodules+=\" plymouth \" >>dracut.conf
 	else
-		echo omit_dracutmodules+=\" plymouth\" >>dracut.conf
+		echo omit_dracutmodules+=\" plymouth \" >>dracut.conf
 	fi
-	echo add_dracutmodules+=\" calculate video\" >>dracut.conf
+	echo add_dracutmodules+=\" calculate video \" >>dracut.conf
 
 	if grep -q CONFIG_RD_ZSTD=y .config &>/dev/null
 	then
@@ -123,18 +123,18 @@ vmlinuz_src_install() {
 	else
 		RDARCH=""
 	fi
-	/usr/bin/dracut $RDARCH -c dracut.conf -k ${D}/lib/modules/${KV_FULL} \
+	/usr/bin/dracut "${RDARCH}" -c dracut.conf -k "${D}/lib/modules/${KV_FULL}" \
 		--kver ${KV_FULL} \
-		${D}/usr/share/${PN}/${PV}/boot/initramfs-${KV_FULL}
+		"${D}/usr/share/${PN}/${PV}/boot/initramfs-${KV_FULL}"
 	# move firmware to share, because /lib/firmware installation does collisions
 	rm dracut.conf
-	mv ${D}/lib/firmware ${D}/usr/share/${PN}/${PV}
-	insinto /usr/share/${PN}/${PV}/boot/
+	mv "${D}/lib/firmware" "${D}/usr/share/${PN}/${PV}"
+	insinto "/usr/share/${PN}/${PV}/boot/"
 	newins .config config-${KV_FULL}
 
 	# recreate symlink in /lib/modules because symlink point to tmp/portage after make install
-	rm ${D}/lib/modules/${KV_FULL}/build
-	rm ${D}/lib/modules/${KV_FULL}/source
+	rm "${D}/lib/modules/${KV_FULL}/build"
+	rm "${D}/lib/modules/${KV_FULL}/source"
 	dosym /usr/src/linux-${KV_FULL} \
 		"/lib/modules/${KV_FULL}/source" ||
 		die "cannot install source symlink"
@@ -165,29 +165,31 @@ clean_for_minimal() {
 	done
 	mv backup/Module.symvers .
 	rmdir backup
-	KEEPLIST="scripts/Makefile.lib scripts/module-common.lds \
+	KEEPLIST="arch/x86/Makefile_32.cpu arch/x86/Makefile \
+		include/config/kernel.release include/config/auto.conf \
+		Module.symvers \
+		scripts/check-local-export \
+		scripts/depmod.sh scripts/Makefile.host \
+		scripts/gcc-goto.sh scripts/Makefile.headersinst \
 		scripts/gcc-version.sh scripts/Makefile.help \
-		scripts/Makefile.modinst scripts/Makefile.asm-generic \
-		scripts/Makefile.modbuiltin scripts/Makefile.fwinst \
-		scripts/Makefile.modfinal \
+		scripts/Kbuild.include scripts/Makefile.modpost \
+		scripts/Makefile.build scripts/basic/fixdep \
+		scripts/Makefile.clean scripts/mod/modpost \
 		scripts/Makefile.compiler \
-		scripts/modules-check.sh \
 		scripts/Makefile.extrawarn scripts/Makefile.kasan \
-		scripts/depmod.sh scripts/Makefile.host \
 		scripts/Makefile.gcc-plugins \
-		Module.symvers \
-		scripts/Makefile.ubsan \
 		scripts/Makefile.kcov \
+		scripts/Makefile.lib scripts/module-common.lds \
+		scripts/Makefile.modbuiltin scripts/Makefile.fwinst \
+		scripts/Makefile.modfinal \
+		scripts/Makefile.modinst scripts/Makefile.asm-generic \
+		scripts/Makefile.ubsan \
 		scripts/module.lds \
+		scripts/modules-check.sh \
+		scripts/pahole-flags.sh \
 		scripts/subarch.include \
-		scripts/Kbuild.include scripts/Makefile.modpost \
-		scripts/gcc-goto.sh scripts/Makefile.headersinst \
-		scripts/Makefile.build scripts/basic/fixdep \
-		scripts/Makefile.clean scripts/mod/modpost \
-		tools/objtool/objtool \
-		include/config/kernel.release include/config/auto.conf \
-		arch/x86/Makefile_32.cpu arch/x86/Makefile \
-		System.map Kconfig Makefile Kbuild"
+		System.map Kconfig Makefile Kbuild \
+		tools/objtool/objtool"
 	find . -type f -a \! -wholename ./.config \
 		$(echo $KEEPLIST | sed -r 's/(\S+)(\s|$)/-a \! -wholename .\/\1 /g') \
 		-a \! -name "*.h" -delete
@@ -206,7 +208,7 @@ calculate-kernel-8_src_install() {
 		insinto /usr/share/${PN}/${PV}/boot
 		newins .config config-${KV_FULL}
 	fi
-	use vmlinuz && touch ${D}/usr/src/linux-${KV_FULL}/.calculate
+	use vmlinuz && touch "${D}/usr/src/linux-${KV_FULL}/.calculate"
 }
 
 vmlinuz_pkg_postinst() {
@@ -216,8 +218,8 @@ vmlinuz_pkg_postinst() {
 	calculate_update_ver /boot initramfs ${KV_FULL} /usr/share/${PN}/${PV}/boot/initramfs-${KV_FULL} .img
 	calculate_update_ver /boot System.map ${KV_FULL} /usr/share/${PN}/${PV}/boot/System.map-${KV_FULL}
 	# install firmware into /
-	mkdir -p ${ROOT}/lib/firmware
-	cp -a ${ROOT}/usr/share/${PN}/${PV}/firmware/* ${ROOT}/lib/firmware/
+	mkdir -p "${ROOT}/lib/firmware"
+	cp -a "${ROOT}/usr/share/${PN}/${PV}/firmware/"* "${ROOT}/lib/firmware/"
 	calculate_update_depmod
 	calculate_update_modules
 }
@@ -226,7 +228,7 @@ calculate-kernel-8_pkg_postinst() {
 	kernel-2_pkg_postinst
 
 	KV_OUT_DIR=${ROOT}/usr/src/linux-${KV_FULL}
-	use vmlinuz && cp -p /usr/share/${PN}/${PV}/boot/System.map* ${KV_OUT_DIR}/System.map
+	use vmlinuz && cp -p /usr/share/${PN}/${PV}/boot/System.map* "${KV_OUT_DIR}/System.map"
 
 	if ! use minimal
 	then

eclass/calculate-utils-r16.eclass

@@ -1,313 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: calculate-utils-r15.eclass
-# @MAINTAINER:
-# support@calculate.ru
-# @AUTHOR:
-# Author: Mir Calculate
-# @BLURB: Functions for calculate-utils
-# @DESCRIPTION:
-# This eclass use for calculate-utils ebuild
-
-PYTHON_COMPAT=(python3_10)
-
-inherit distutils-r1 eutils
-
-EXPORTED_FUNCTIONS="src_compile src_install pkg_preinst"
-
-CALCULATE_URI="https://mirror.calculate-linux.org/source/calculate3"
-MIRROR_URI=
-
-# @ECLASS-VARIABLE: CALCULATE_MODULES
-# @DESCRIPTION:
-# Associative array module names and versions
-# Example:
-# declare -A CALCULATE_MODULES=(
-#   ["console-gui"]="3.2.3.4"
-# )
-
-# @ECLASS-VARIABLE: CALCULATE_MODULES_USE
-# @DESCRIPTION:
-# Associative array module names and use for IUSE
-# Example:
-# declare -A CALCULATE_MODULES_USE=(
-#   ["console-gui"]=""
-# )
-
-# @ECLASS-VARIABLE: CALCULATE_TARBALL
-# @DESCRIPTION:
-# Associative array module names and tarball archive name
-# Example:
-# declare -A CALCULATE_TARBALL=( ["lib"]="calculate-lib-3.2.3-r1.tar.bz2" )
-
-# @ECLASS-VARIABLE: UTILS_PV
-# @DESCRIPTION:
-# Default version of all components
-# Example:
-: ${UTILS_PV:=$(ver_cut 1-3 ${PV})}
-
-declare -g -A CALCULATE_TARBALL_=()
-
-declare -g -A CALCULATE_MODULES_=(
-	["lib"]="$UTILS_PV"
-	["install"]="$UTILS_PV"
-	["core"]="$UTILS_PV"
-	["update"]="$UTILS_PV"
-	["console-gui"]="$UTILS_PV"
-	["builder"]="$UTILS_PV"
-	["i18n"]="$UTILS_PV"
-	["desktop"]="$UTILS_PV"
-	["client"]="$UTILS_PV"
-	["console"]="$UTILS_PV"
-)
-
-declare -g -A CALCULATE_MODULES_USE_=(
-	["console-gui"]="qt5"
-	["desktop"]="desktop"
-	["client"]="client"
-	["console"]="console"
-)
-
-EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
-
-# @FUNCTION: prepare_variables
-# @DESCRIPTION:
-# Prepare variables for ebuild
-prepare_variables() {
-	for module in ${!CALCULATE_MODULES[@]}
-	do
-		CALCULATE_MODULES_[$module]=${CALCULATE_MODULES[$module]}
-	done
-
-	for module in ${!CALCULATE_MODULES_USE[@]}
-	do
-		CALCULATE_MODULES_USE_[$module]=${CALCULATE_MODULES_USE[$module]}
-	done
-
-	for module in ${!CALCULATE_MODULES_[@]}
-	do
-		MODULE_PN=calculate-${module}
-		MODULE_PV=${CALCULATE_MODULES_[$module]}
-		if [[ -n ${CALCULATE_TARBALL[$module]} ]]
-		then
-			CALCULATE_TARBALL_[$module]="${MODULE_PN}/${CALCULATE_TARBALL[$module]}"
-		else
-			CALCULATE_TARBALL_[$module]="${MODULE_PN}/${MODULE_PN}-${MODULE_PV}.tar.bz2"
-		fi
-	done
-
-	for module in ${!CALCULATE_MODULES_[@]}
-	do
-		MODULE_USE=${CALCULATE_MODULES_USE_[$module]}
-		MODULE_URI=""
-		for URI in $CALCULATE_URI $MIRROR_URI
-		do
-			MODULE_URI="${MODULE_URI} ${URI}/${CALCULATE_TARBALL_[$module]}"
-		done
-		if [[ -n $MODULE_USE ]]
-		then
-			MODULE_URI="${MODULE_USE}? ( $MODULE_URI )"
-		fi
-		SRC_URI="$SRC_URI $MODULE_URI"
-	done
-
-	IUSE="+install dbus +gpg minimal pxe backup ${CALCULATE_MODULES_USE_[@]}"
-	S="${WORKDIR}"
-}
-
-# @FUNCTION: prepare_module_info
-# @DESCRIPTION:
-# Prepare module info for compile and install
-prepare_module_info() {
-	MODULE_INFO=()
-	for module in ${!CALCULATE_MODULES_[@]}
-	do
-		MODULE_USE=${CALCULATE_MODULES_USE_[$module]}
-		if [[ -z $MODULE_USE ]] || use $MODULE_USE
-		then
-				MODULE_INFO+=("calculate-$module ${CALCULATE_MODULES_[$module]}")
-		fi
-	done
-}
-
-prepare_variables
-
-# dev-libs/libbsd need to automagic depends of sys-fs/mtools
-
-RDEPEND="
-	dev-libs/libbsd
-	install? ( >=app-cdr/cdrtools-3.01_alpha13
-		>=sys-boot/grub-2.00-r3
-		>=sys-boot/syslinux-5
-		sys-fs/squashfs-tools
-		sys-fs/dosfstools
-		sys-block/parted
-		sys-apps/gptfdisk
-		sys-fs/lvm2
-		sys-fs/mdadm
-	)
-	!minimal? (
-		>=sys-apps/util-linux-2.19.1
-		net-misc/rsync
-		dev-python/pyopenssl[python_targets_python3_10]
-		dev-python/cryptography[python_targets_python3_10]
-		dev-python/cffi[python_targets_python3_10]
-		dev-python/six[python_targets_python3_10]
-		dev-libs/openssl
-		dev-python/m2crypto[python_targets_python3_10]
-		dev-python/pytz[python_targets_python3_10]
-	)
-	gpg? (
-		app-crypt/gnupg
-		app-crypt/openpgp-keys-calculate-release
-	)
-	dev-python/jaraco-functools[python_targets_python3_10]
-	dev-python/lxml[python_targets_python3_10]
-        dev-python/aiohttp
-	sys-apps/iproute2[-minimal]
-	sys-apps/pciutils
-	app-arch/xz-utils
-	app-portage/eix
-
-	app-eselect/eselect-repository
-	>=virtual/udev-197
-	!app-misc/livecd-tools
-	sys-apps/coreutils[xattr]
-
-	pxe? ( sys-apps/calculate-server
-		net-ftp/tftp-hpa
-		net-misc/dhcp
-		net-fs/nfs-utils
-	)
-
-	!<sys-apps/calculate-server-2.1.18-r1
-
-	qt5? (
-		dev-python/dbus-python[python_targets_python3_10]
-		media-gfx/imagemagick[jpeg]
-		dev-python/PyQt5[python_targets_python3_10]
-		dev-python/pyinotify[python_targets_python3_10]
-	)
-
-	dbus? (
-		dev-python/dbus-python[python_targets_python3_10]
-	)
-
-	dev-python/pexpect[python_targets_python3_10]
-
-	desktop? (
-		media-gfx/feh
-		x11-apps/xmessage
-		sys-apps/keyutils
-		sys-auth/pam_keystore
-		dev-lang/swig
-		dev-qt/qdbus
-		sys-apps/edid-decode
-		dev-python/pygobject[python_targets_python3_10]
-		dev-python/dbus-python[python_targets_python3_10]
-	)
-
-	client? (
-		dev-python/python-ldap[ssl,python_targets_python3_10]
-		sys-auth/pam_client
-		>=sys-auth/pam_ldap-180[ssl]
-		>=sys-auth/nss_ldap-239
-	)
-	backup? ( !sys-apps/calculate-server )
-"
-#	server? (
-#		sys-auth/pam_ldap
-#		sys-auth/nss_ldap
-#		dev-python/python-ldap[python_targets_python3_10]
-#	)
-#
-#
-#	server? ( !sys-apps/calculate-server )
-
-DEPEND="
-	sys-devel/gettext"
-
-#REQUIRED_USE="client? ( desktop )"
-
-# @FUNCTION: calculate-utils-r15_src_compile
-# @DESCRIPTION:
-# Compile all modules of calculate utils
-calculate-utils-r16_src_compile() {
-	if ! use backup
-	then
-		sed -ir "s/'cl-backup'/None/" calculate-core-*/pym/core/wsdl_core.py
-		sed -ir "s/'cl-backup-restore'/None/" calculate-core-*/pym/core/wsdl_core.py
-		sed -ir "s/__('Backup')/None/g" calculate-core-*/pym/core/wsdl_core.py
-	fi
-	prepare_module_info
-	for MODULE in "${MODULE_INFO[@]}"
-	do
-		MODULE_DATA=( $MODULE )
-		MODULE_PN=${MODULE_DATA[0]}
-		MODULE_PV=${MODULE_DATA[1]}
-		if [[ $PV == "3.7.9999" ]]
-		then
-			S="${WORKDIR}/${MODULE_PN/calculate-/}-${MODULE_PV}"
-		else
-			S="${WORKDIR}/${MODULE_PN}-${MODULE_PV}"
-		fi
-		cd $S
-		if [[ $MODULE_PN == "calculate-lib" ]]
-		then
-			sed -ri "/class VariableClVer/{N;N;N;N;s/value = \".*?\"/value = \"${PV}\"/;}" \
-				pym/calculate/lib/variables/__init__.py
-		fi
-		distutils-r1_src_compile
-	done
-}
-
-# @FUNCTION: calculate-utils-r15_src_install
-# @DESCRIPTION:
-# Install all modules of calculate utils
-calculate-utils-r16_src_install() {
-	prepare_module_info
-	for MODULE in "${MODULE_INFO[@]}"
-	do
-		MODULE_DATA=( $MODULE )
-		MODULE_PN=${MODULE_DATA[0]}
-		MODULE_PV=${MODULE_DATA[1]}
-		if [[ $PV == "3.7.9999" ]]
-		then
-			S="${WORKDIR}/${MODULE_PN/calculate-/}-${MODULE_PV}"
-		else
-			S="${WORKDIR}/${MODULE_PN}-${MODULE_PV}"
-		fi
-		cd $S
-		distutils-r1_src_install
-	done
-}
-
-python_install() {
-	PYTHON_INSTALL_PARAMS=
-	if [[ $MODULE_PN == "calculate-client" ]]
-	then
-		PYTHON_INSTALL_PARAMS="--install-scripts=/usr/sbin"
-	fi
-	if [[ $MODULE_PN == "calculate-core" ]] && use dbus
-	then
-		PYTHON_INSTALL_PARAMS="$PYTHON_INSTALL_PARAMS --dbus"
-	fi
-	distutils-r1_python_install $PYTHON_INSTALL_PARAMS
-}
-
-calculate-utils-r16_pkg_preinst() {
-	dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-core-setup
-	dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-core-patch
-	dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-update
-	dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-update-profile
-	dosym /usr/lib/python-exec/python3.10/cl-console /usr/bin/cl-console
-	if use qt5
-	then
-		dosym /usr/lib/python-exec/python3.10/cl-console-gui /usr/bin/cl-console-gui
-		dosym /usr/lib/python-exec/python3.10/cl-console-gui /usr/bin/cl-console-gui-install
-		dosym /usr/lib/python-exec/python3.10/cl-console-gui /usr/bin/cl-console-gui-update
-		dosym /usr/lib/python-exec/python3.10/cl-update-checker /usr/bin/cl-update-checker
-	fi
-}

eclass/calculate-utils-r17.eclass

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-# @ECLASS: calculate-utils-r15.eclass
+# @ECLASS: calculate-utils-r16.eclass
 # @MAINTAINER:
 # support@calculate.ru
 # @AUTHOR:
@@ -11,16 +11,16 @@
 # @DESCRIPTION:
 # This eclass use for calculate-utils ebuild
 
-PYTHON_COMPAT=(python3_10)
+PYTHON_COMPAT=(python3_11)
 
-inherit distutils-r1 eutils
+inherit distutils-r1
 
 EXPORTED_FUNCTIONS="src_compile src_install pkg_preinst"
 
 CALCULATE_URI="https://mirror.calculate-linux.org/source/calculate3"
 MIRROR_URI=
 
-# @ECLASS-VARIABLE: CALCULATE_MODULES
+# @ECLASS_VARIABLE: CALCULATE_MODULES
 # @DESCRIPTION:
 # Associative array module names and versions
 # Example:
@@ -28,7 +28,7 @@ MIRROR_URI=
 #   ["console-gui"]="3.2.3.4"
 # )
 
-# @ECLASS-VARIABLE: CALCULATE_MODULES_USE
+# @ECLASS_VARIABLE: CALCULATE_MODULES_USE
 # @DESCRIPTION:
 # Associative array module names and use for IUSE
 # Example:
@@ -36,13 +36,13 @@ MIRROR_URI=
 #   ["console-gui"]=""
 # )
 
-# @ECLASS-VARIABLE: CALCULATE_TARBALL
+# @ECLASS_VARIABLE: CALCULATE_TARBALL
 # @DESCRIPTION:
 # Associative array module names and tarball archive name
 # Example:
 # declare -A CALCULATE_TARBALL=( ["lib"]="calculate-lib-3.2.3-r1.tar.bz2" )
 
-# @ECLASS-VARIABLE: UTILS_PV
+# @ECLASS_VARIABLE: UTILS_PV
 # @DESCRIPTION:
 # Default version of all components
 # Example:
@@ -151,24 +151,29 @@ RDEPEND="
 	!minimal? (
 		>=sys-apps/util-linux-2.19.1
 		net-misc/rsync
-		dev-python/pyopenssl[python_targets_python3_10]
-		dev-python/cryptography[python_targets_python3_10]
-		dev-python/cffi[python_targets_python3_10]
-		dev-python/six[python_targets_python3_10]
+		dev-python/pyopenssl[python_targets_python3_11]
+		dev-python/cryptography[python_targets_python3_11]
+		dev-python/cffi[python_targets_python3_11]
+		dev-python/six[python_targets_python3_11]
 		dev-libs/openssl
-		dev-python/m2crypto[python_targets_python3_10]
-		dev-python/pytz[python_targets_python3_10]
+		dev-python/m2crypto[python_targets_python3_11]
+		dev-python/pytz[python_targets_python3_11]
 	)
 	gpg? (
 		app-crypt/gnupg
 		app-crypt/openpgp-keys-calculate-release
 	)
-	dev-python/jaraco-functools[python_targets_python3_10]
-	dev-python/lxml[python_targets_python3_10]
+	dev-python/jaraco-functools[python_targets_python3_11]
+	dev-python/lxml[python_targets_python3_11]
+	dev-python/aiohttp
 	sys-apps/iproute2[-minimal]
 	sys-apps/pciutils
 	app-arch/xz-utils
 	app-portage/eix
+	app-portage/portage-utils
+
+	sys-apps/debianutils
+	sys-kernel/installkernel
 
 	app-eselect/eselect-repository
 	>=virtual/udev-197
@@ -184,17 +189,17 @@ RDEPEND="
 	!<sys-apps/calculate-server-2.1.18-r1
 
 	qt5? (
-		dev-python/dbus-python[python_targets_python3_10]
+		dev-python/dbus-python[python_targets_python3_11]
 		media-gfx/imagemagick[jpeg]
-		dev-python/PyQt5[python_targets_python3_10]
-		dev-python/pyinotify[python_targets_python3_10]
+		dev-python/PyQt5[python_targets_python3_11]
+		dev-python/pyinotify[python_targets_python3_11]
 	)
 
 	dbus? (
-		dev-python/dbus-python[python_targets_python3_10]
+		dev-python/dbus-python[python_targets_python3_11]
 	)
 
-	dev-python/pexpect[python_targets_python3_10]
+	dev-python/pexpect[python_targets_python3_11]
 
 	desktop? (
 		media-gfx/feh
@@ -204,12 +209,12 @@ RDEPEND="
 		dev-lang/swig
 		dev-qt/qdbus
 		sys-apps/edid-decode
-		dev-python/pygobject[python_targets_python3_10]
-		dev-python/dbus-python[python_targets_python3_10]
+		dev-python/pygobject[python_targets_python3_11]
+		dev-python/dbus-python[python_targets_python3_11]
 	)
 
 	client? (
-		dev-python/python-ldap[ssl,python_targets_python3_10]
+		dev-python/python-ldap[ssl,python_targets_python3_11]
 		sys-auth/pam_client
 		>=sys-auth/pam_ldap-180[ssl]
 		>=sys-auth/nss_ldap-239
@@ -219,7 +224,7 @@ RDEPEND="
 #	server? (
 #		sys-auth/pam_ldap
 #		sys-auth/nss_ldap
-#		dev-python/python-ldap[python_targets_python3_10]
+#		dev-python/python-ldap[python_targets_python3_11]
 #	)
 #
 #
@@ -233,7 +238,7 @@ DEPEND="
 # @FUNCTION: calculate-utils-r15_src_compile
 # @DESCRIPTION:
 # Compile all modules of calculate utils
-calculate-utils-r15_src_compile() {
+calculate-utils-r17_src_compile() {
 	if ! use backup
 	then
 		sed -ir "s/'cl-backup'/None/" calculate-core-*/pym/core/wsdl_core.py
@@ -252,7 +257,7 @@ calculate-utils-r15_src_compile() {
 		else
 			S="${WORKDIR}/${MODULE_PN}-${MODULE_PV}"
 		fi
-		cd $S
+		cd "$S"
 		if [[ $MODULE_PN == "calculate-lib" ]]
 		then
 			sed -ri "/class VariableClVer/{N;N;N;N;s/value = \".*?\"/value = \"${PV}\"/;}" \
@@ -265,7 +270,7 @@ calculate-utils-r15_src_compile() {
 # @FUNCTION: calculate-utils-r15_src_install
 # @DESCRIPTION:
 # Install all modules of calculate utils
-calculate-utils-r15_src_install() {
+calculate-utils-r17_src_install() {
 	prepare_module_info
 	for MODULE in "${MODULE_INFO[@]}"
 	do
@@ -278,7 +283,7 @@ calculate-utils-r15_src_install() {
 		else
 			S="${WORKDIR}/${MODULE_PN}-${MODULE_PV}"
 		fi
-		cd $S
+		cd "$S"
 		distutils-r1_src_install
 	done
 }
@@ -296,17 +301,17 @@ python_install() {
 	distutils-r1_python_install $PYTHON_INSTALL_PARAMS
 }
 
-calculate-utils-r15_pkg_preinst() {
+calculate-utils-r17_pkg_preinst() {
 	dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-core-setup
 	dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-core-patch
 	dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-update
 	dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-update-profile
-	dosym /usr/lib/python-exec/python3.10/cl-console /usr/bin/cl-console
+	dosym /usr/lib/python-exec/python3.11/cl-console /usr/bin/cl-console
 	if use qt5
 	then
-		dosym /usr/lib/python-exec/python3.10/cl-console-gui /usr/bin/cl-console-gui
-		dosym /usr/lib/python-exec/python3.10/cl-console-gui /usr/bin/cl-console-gui-install
-		dosym /usr/lib/python-exec/python3.10/cl-console-gui /usr/bin/cl-console-gui-update
-		dosym /usr/lib/python-exec/python3.10/cl-update-checker /usr/bin/cl-update-checker
+		dosym /usr/lib/python-exec/python3.11/cl-console-gui /usr/bin/cl-console-gui
+		dosym /usr/lib/python-exec/python3.11/cl-console-gui /usr/bin/cl-console-gui-install
+		dosym /usr/lib/python-exec/python3.11/cl-console-gui /usr/bin/cl-console-gui-update
+		dosym /usr/lib/python-exec/python3.11/cl-update-checker /usr/bin/cl-update-checker
 	fi
 }

eclass/calculate.eclass

@@ -11,7 +11,7 @@
 # @DESCRIPTION:
 # This eclass use for calculate-utils and calculate-sources ebuilds
 
-inherit eutils linux-info
+inherit linux-info
 
 EXPORT_FUNCTIONS pkg_postinst
 
@@ -95,7 +95,7 @@ update_file() {
 # @DESCRIPTION:
 # Detect calculate linux shortname by /etc/make.profile
 detect_linux_shortname() {
-	local makeprofile=$(readlink ${ROOT}/etc/make.profile)
+	local makeprofile=$(readlink "${ROOT}/etc/make.profile")
 	local profile=
 	local system=
 	local shortname=
@@ -137,8 +137,8 @@ calculate_update_kernel() {
 
 	ebegin "Trying to optimize initramfs"
 	( which calculate &>/dev/null && calculate --initrd ) && eend 0 || eend 1
-	if [[ "$(md5sum ${ROOT}/boot/initrd | awk '{print $1}')" == \
-		"$(md5sum ${ROOT}/boot/initrd-install | awk '{print $1}')" ]]
+	if [[ "$(md5sum "${ROOT}/boot/initrd" | awk '{print $1}')" == \
+		"$(md5sum "${ROOT}/boot/initrd-install" | awk '{print $1}')" ]]
 	then
 		ewarn
 		ewarn "Perform command after reboot for optimization initramfs:"
@@ -146,6 +146,11 @@ calculate_update_kernel() {
 	fi
 }
 
+# @FUNCTION: is_broken_link
+# @INTERNAL
+# @USAGE: [filename]
+# @DESCRIPTION:
+# Check symlink broken
 is_broken_link() {
 	fname=$1
 	[[ -n $( file $fname | grep "broken symbolic link" ) ]] &&
@@ -172,7 +177,13 @@ calculate_restore_kernel() {
 		mv ${dir}/System.map.old ${dir}/System.map
 }
 
+# @VARIABLE: TMP_INITRAMFS
+# @DESCRIPTION:
+# Path to initramfs
 TMP_INITRAMFS=${T}/initramfs
+# @VARIABLE: SPLASH_DESCRIPTOR
+# @DESCRIPTION:
+# Path to splash image
 SPLASH_DESCRIPTOR=/etc/splash/tty1/1024x768.cfg
 
 # @FUNCTION: calculate_rm_modules_dir
@@ -205,6 +216,10 @@ calculate_rm_modules_dir() {
 	fi
 }
 
+# @FUNCTION: initramfs_unpack
+# @USAGE: [initramfs_unpack]
+# @DESCRIPTION:
+# Unpack initramfs
 initramfs_unpack() {
 	mkdir -p ${TMP_INITRAMFS}
 	cd ${TMP_INITRAMFS}
@@ -221,18 +236,18 @@ initramfs_change_spalsh() {
 	then
 		# get silentpic param
 		SILENTPIC=$( sed -nr '/^silentpic/ s/^[^=]+=(.*)$/\1/p' \
-			${ROOT}${SPLASH_DESCRIPTOR} )
+			"${ROOT}${SPLASH_DESCRIPTOR}" )
 		# get pic param
 		PIC=$( sed -nr '/^pic/ s/^[^=]+=(.*)$/\1/p' \
-			${ROOT}${SPLASH_DESCRIPTOR} )
+			"${ROOT}${SPLASH_DESCRIPTOR}" )
 		if [ -f ${ROOT}${SILENTPIC} ] && [ -f ${ROOT}${PIC} ]
 		then
-			cp ${ROOT}${SPLASH_DESCRIPTOR} \
-					${TMP_INITRAMFS}${SPLASH_DESCRIPTOR} &&
+			cp "${ROOT}${SPLASH_DESCRIPTOR}" \
+					"${TMP_INITRAMFS}${SPLASH_DESCRIPTOR}" &&
 				mkdir -p ${TMP_INITRAMFS}${SILENTPIC%$(basename $SILENTPIC)} &&
-				cp ${ROOT}${SILENTPIC} ${TMP_INITRAMFS}${SILENTPIC} &&
+				cp "${ROOT}${SILENTPIC}" "${TMP_INITRAMFS}${SILENTPIC}" &&
 				mkdir -p ${TMP_INITRAMFS}${PIC%$(basename $PIC)} &&
-				cp ${ROOT}$PIC ${TMP_INITRAMFS}${PIC}
+				cp "${ROOT}$PIC" "${TMP_INITRAMFS}${PIC}"
 			return $?
 		fi
 	else
@@ -240,6 +255,10 @@ initramfs_change_spalsh() {
 	fi
 }
 
+# @FUNCTION: initramfs_pack
+# @USAGE: [initramfs_pack]
+# @DESCRIPTION:
+# Pack initramfs
 initramfs_pack() {
 	# pack new initramfs
 	cd ${TMP_INITRAMFS}
@@ -387,7 +406,7 @@ ROOTDEV=
 # @DESCRIPTION:
 # Change version in /etc/issue
 change_issue() {
-	sed -ri "s/${LINUXVER}/${PV}/" ${ROOT}/etc/issue
+	sed -ri "s/${LINUXVER}/${PV}/" "${ROOT}/etc/issue"
 }
 
 # @FUNCTION: change_grub
@@ -499,29 +518,29 @@ calculate_pkg_postinst() {
 			local initrdfile=$(calculate_get_current_initrd )
 			local initrdinstallfile=$(calculate_get_current_initrd -install)
 			[[ -f ${ROOT}${initrdfile} ]] &&
-				calculate_update_splash ${ROOT}${initrdfile}
+				calculate_update_splash "${ROOT}${initrdfile}"
 			[[ -f ${ROOT}${initrdinstallfile} &&
 				"${ROOT}${initrdinstallfile}" != "${ROOT}${initrdfile}" ]] &&
-				calculate_update_splash ${ROOT}${initrdinstallfile}
+				calculate_update_splash "${ROOT}${initrdinstallfile}"
 			;;
 	esac
 }
 
-# @FUNCTION: calculate_update_ver (/boot vmlinuz
+# @FUNCTION: calculate_update_ver
 # @USAGE: boot_dir file_basename version source_file [suffix]
 # @DESCRIPTION:
 # Create backups of older versions before installing
 calculate_update_ver() {
-  local dir=$1
-  local fn=$2
-  local ver=$3
-  local src=$4
-  local suffix="$5"
-  if [ -f "$dir/$fn-$ver$suffix" ] ; then
-    mv "$dir/$fn-$ver$suffix" "$dir/$fn-$ver$suffix.old"
-  fi
-
-  cat "$src" > "$dir/$fn-$ver$suffix"
+	local dir=$1
+	local fn=$2
+	local ver=$3
+	local src=$4
+	local suffix="$5"
+	if [ -f "$dir/$fn-$ver$suffix" ] ; then
+		mv "$dir/$fn-$ver$suffix" "$dir/$fn-$ver$suffix.old"
+	fi
+
+	cat "$src" > "$dir/$fn-$ver$suffix"
 }
 
 # @FUNCTION: calculate_fix_lib_modules_contents
@@ -529,7 +548,7 @@ calculate_update_ver() {
 # @DESCRIPTION:
 # Unlink /lib/modules files from CONTENTS
 calculate_fix_lib_modules_contents() {
-    local vardb=/var/db/pkg
-    local content="${vardb}/${CATEGORY}/${PF}/CONTENTS"
-    sed -i '/ \/lib\/modules/d' $content
+	local vardb=/var/db/pkg
+	local content="${vardb}/${CATEGORY}/${PF}/CONTENTS"
+	sed -i '/ \/lib\/modules/d' $content
 }

games-util/steam-launcher/Manifest

@@ -1 +1,2 @@
 DIST steam_1.0.0.74.tar.gz 3604858 BLAKE2B dbe02066d08530378ff922daf8733ad373c0eae9be94479aba94077a0f5c093afc39a95c6770494655af1c33895c981219418f8d4024c391a337d16ec32253c1 SHA512 2a08d9bb6e17a481c577b6aad7d53b51c7d9f6638aaccffc6b9f750dca4a1f9d12c02fd1446c174e979605ef29bdc10fc8249fd97fe79d62934efe26f4ac7369
+DIST steam_1.0.0.76.tar.gz 3782461 BLAKE2B de38c2604b3fb7a65a25d317718272c607f60e4bedf2efb83eebcf30e01fbccd94fac572f65e6b995e95e981191c241138cd9a9a6f51ba768cd0b3efd9edc0a5 SHA512 cb2fd0a55f23c92ec46c27edd4595421d4ac346f8cd4faeb2b8e0b017232ac637ee20ed3a00c8b79ee106e922ade6efc5e09c970807757cc372fa9fc26fe9ed1

games-util/steam-launcher/steam-launcher-1.0.0.74.ebuild

@@ -12,7 +12,7 @@ DESCRIPTION="Installer, launcher and supplementary files for Valve's Steam clien
 HOMEPAGE="https://steampowered.com"
 SRC_URI="https://repo.steampowered.com/steam/archive/stable/steam_${PV}.tar.gz"
 
-LICENSE="ValveSteamLicense MIT"
+LICENSE="Steam MIT"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="+joystick +steamruntime +udev"
@@ -22,6 +22,9 @@ RDEPEND="
 		app-arch/tar
 		app-shells/bash
 		net-misc/curl
+
+		sys-libs/libudev-compat
+
 		|| (
 			>=gnome-extra/zenity-3
 			x11-terms/xterm
@@ -37,9 +40,6 @@ RDEPEND="
 			x11-libs/libxcb[abi_x86_32]
 			x11-libs/libXdmcp[abi_x86_32]
 			)
-		!steamruntime? (
-			>=games-util/steam-client-meta-0-r20210608[steamruntime?]
-			)
 
 		amd64? (
 			>=sys-devel/gcc-4.6.0[multilib]
@@ -57,7 +57,7 @@ pkg_setup() {
 
 	if ! { linux_config_exists && linux_chkconfig_present INPUT_UINPUT; }; then
 		ewarn "If you want to use Steam Input's virtual controller"
-		eawen "implementation, please make sure CONFIG_INPUT_UINPUT"
+		ewarn "implementation, please make sure CONFIG_INPUT_UINPUT"
 		ewarn "is enabled in your kernel config."
 
 		# Device Drivers
@@ -72,7 +72,8 @@ path_entries() {
 	shift
 
 	while true; do
-		echo -n ${EPREFIX}/usr/$(get_libdir)/${1}$(${multilib} && use amd64 && echo :${EPREFIX}/usr/$(ABI=x86 get_libdir)/${1})
+		echo -n ${EPREFIX}/usr/$(get_libdir)/${1}$(${multilib} \
+			&& use amd64 && echo :${EPREFIX}/usr/$(ABI=x86 get_libdir)/${1})
 		shift
 
 		if [[ -n ${1} ]]; then

games-util/steam-launcher/steam-launcher-1.0.0.76.ebuild

@@ -0,0 +1,143 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please report bugs/suggestions on: https://github.com/anyc/steam-overlay
+# or come to #gentoo-games in Libera Chat IRC
+
+inherit desktop linux-info prefix xdg
+
+DESCRIPTION="Installer, launcher and supplementary files for Valve's Steam client"
+HOMEPAGE="https://steampowered.com"
+SRC_URI="https://repo.steampowered.com/steam/archive/stable/steam_${PV}.tar.gz"
+
+LICENSE="Steam MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="+joystick +steamruntime +udev"
+RESTRICT="bindist mirror test"
+
+RDEPEND="
+		app-arch/tar
+		app-shells/bash
+		net-misc/curl
+
+		sys-libs/libudev-compat
+
+		joystick? (
+			udev? ( games-util/game-device-udev-rules )
+		)
+		steamruntime? (
+			virtual/opengl[abi_x86_32]
+			x11-libs/libX11[abi_x86_32]
+			x11-libs/libXau[abi_x86_32]
+			x11-libs/libxcb[abi_x86_32]
+			x11-libs/libXdmcp[abi_x86_32]
+			)
+		!steamruntime? (
+			>=games-util/steam-client-meta-0-r20230513[steamruntime?]
+			)
+
+		amd64? (
+			>=sys-devel/gcc-4.6.0[multilib]
+			>=sys-libs/glibc-2.15[multilib]
+			)
+		x86? (
+			>=sys-devel/gcc-4.6.0
+			>=sys-libs/glibc-2.15
+			)"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if ! { linux_config_exists && linux_chkconfig_present INPUT_UINPUT; }; then
+		ewarn "If you want to use Steam Input's virtual controller"
+		ewarn "implementation, please make sure CONFIG_INPUT_UINPUT"
+		ewarn "is enabled in your kernel config."
+
+		# Device Drivers
+		#  -> Input device support
+		#   -> Miscellaneous devices
+		#    -> User level driver support
+	fi
+}
+
+path_entries() {
+	local multilib=${1}
+	shift
+
+	while true; do
+		echo -n ${EPREFIX}/usr/$(get_libdir)/${1}$(${multilib} && use amd64 && echo :${EPREFIX}/usr/$(ABI=x86 get_libdir)/${1})
+		shift
+
+		if [[ -n ${1} ]]; then
+			echo -n :
+		else
+			break
+		fi
+	done
+}
+
+native_path_entries() { path_entries false "${@}"; }
+multilib_path_entries() { path_entries true "${@}"; }
+
+src_prepare() {
+	default
+
+	sed \
+		-e "s#@@PVR@@#${PVR}#g" \
+		-e "s#@@GENTOO_LD_LIBRARY_PATH@@#$(multilib_path_entries debiancompat fltk)#g" \
+		-e "s#@@STEAM_RUNTIME@@#$(usex steamruntime 1 0)#g" \
+		"${FILESDIR}"/steam-wrapper.sh > steam-wrapper.sh || die
+
+	# Still need EPREFIX in the sed replacements above because the
+	# regular expression used by hprefixify doesn't match there.
+	hprefixify bin_steam.sh steam-wrapper.sh
+}
+
+src_install() {
+	emake install-{icons,bootstrap} \
+		  DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+
+	newbin steam-wrapper.sh steam
+	exeinto /usr/lib/steam
+	doexe bin_steam.sh
+	domenu steam.desktop
+
+	dodoc README debian/changelog
+	doman steam.6
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Execute ${EPREFIX}/usr/bin/steam to download and install the actual"
+	elog "client into your home folder. After installation, the script"
+	elog "also starts the client from your home folder."
+	elog ""
+
+	if use steamruntime; then
+		ewarn "You enabled the Steam runtime environment. Steam will use bundled"
+		ewarn "libraries instead of Gentoo's system libraries."
+		ewarn ""
+	else
+		elog "We disable STEAM_RUNTIME in order to ignore bundled libraries"
+		elog "and use installed system libraries instead. If you have problems,"
+		elog "try starting Steam with: STEAM_RUNTIME=1 steam"
+		ewarn ""
+		ewarn "Notice: Valve only supports Steam with the runtime enabled!"
+		ewarn ""
+	fi
+
+	if ! has_version "gnome-extra/zenity"; then
+		ewarn "Valve does not provide a xterm fallback for all calls of zenity."
+		ewarn "Please install gnome-extra/zenity for full support."
+		ewarn ""
+	fi
+
+	ewarn "The Steam client and the games are _not_ controlled by Portage."
+	ewarn "Updates are handled by the client itself."
+}

gnome-extra/yad/metadata.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="project">
+        <email>support@calculate.ru</email>
+        <name>Mir Calculate</name>
+        <description>Calculate Overlay</description>
+    </maintainer>
+    <upstream><remote-id type="github">v1cont/yad</remote-id></upstream>
+</pkgmetadata>

licenses/CANON

@@ -1,601 +0,0 @@
-SOFTWARE LICENSE AGREEMENT
-FOR CANON'S OR ITS LICENSORS' SOFTWARE PROGRAMS
-
-IMPORTANT
-
-This is a legal agreement ("Agreement") between you and Canon Inc. ("Canon") 
-governing your use of Canon's or its licensors' software programs incorporated 
-in this Canon's product "Canon CAPT Printer Driver for Linux v1.80" ("Product"), 
-and which software programs are listed in Schedules 1 of Exhibit attached hereto.  
-Such Canon's or its licensors' software programs shall be referred to hereinafter 
-as the "Software."
-
-READ CAREFULLY AND UNDERSTAND ALL OF THE RIGHTS AND RESTRICTIONS DESCRIBED IN 
-THIS AGREEMENT BEFORE USING THE SOFTWARE.
-
-BY USING THE SOFTWARE AS DESCRIBED IN SECION 1 BELOW, YOU AGREE TO BE BOUND BY 
-THE TERMS AND CONDITIONS OF THIS AGREEMENT.  IF YOU DO NOT AGREE TO THE TERMS 
-AND CONDITIONS OF THIS AGREEMENT, DO NOT USE THE SOFWARE AND PROMPTLY RETURN 
-THE SAME TO THE PLACE WHERE YOU OBTAINED IT.
-
-
-1.GRANT OF LICENSE
-
-Canon grants you a personal, limited and non-exclusive license to use ("use" as 
-used herein shall mean storing, loading, installing, accessing, executing or 
-displaying), have used, copy, have copied, distribute and permit third parties 
-to use and copy the Software only on the Product.  You may modify the Software 
-only for your own use and reverse engineer the same for debugging such 
-modifications.  You shall distribute the Software to any third party under the 
-same terms and conditions as contained herein. 
-
-2.RESTRICTIONS
-
-Except as expressly granted or permitted herein, you shall not use, assign, 
-sublicense, sell, rent, lease, loan, convey or transfer to any third party 
-the Software.
-
-3.COPYRIGHT NOTICE
-
-You shall not modify, remove or delete any copyright notice of Canon or 
-its licensors contained in the Software, including any copy thereof.
-
-4.OWNERSHIP
-
-Canon and its licensors retain in all respects the title, ownership and 
-intellectual property rights in and to the Software.  Except as expressly 
-provided herein, no license or right, express or implied, is hereby conveyed 
-or granted by Canon to you for any intellectual property of Canon and 
-its licensors.
-
-5.EXPORT RESTRICTION
-
-You agree to comply with all export laws and restrictions and regulations 
-of the country involved, and not to export or re-export, directly or 
-indirectly, the Software in violation of any such laws, restrictions and 
-regulations, or without all necessary approvals.
-
-6.NO WARRANTY AND DISCLAIMER OF INDEMNITY
-
-THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED 
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO 
-THE QUALITY, FUNCTION AND PERFORMANCE OF THE SOFTWARE IS WITH YOU.  SHOULD 
-THE SOFTWARE PROVE DEFECTIVE, YOU ASSUME THE ENTIRE COST OF ALL NECESSARY 
-SERVICING, REPAIR OR CORRECTION.
-
-IN NO EVENT SHALL EITHER CANON, CANON'S SUBSIDIARIES OR AFFILIATES, THEIR 
-DISTRIBUTORS, DEALERS OR CANON'S LICENSORS BE LIABLE FOR ANY DAMAGES WHATSOEVER 
-(INCLUDING WITHOUT LIMITATION, LOSS OF BUSINESS PROFITS, LOSS OF BUSINESS 
-INFORMATION, BUSINESS INTERRUPTION OR OTHER COMPENSATORY, INCIDENTAL OR 
-CONSEQUENTIAL DAMAGES) ARISING OUT OF THE SOFTWARE, USE THEREOF OR INABILITY 
-TO USE THE SOFTWARE EVEN IF EITHER CANON, CANON'S SUBSIDIARIES OR AFFILIATES, 
-THEIR DISTRIBUTORS, DEALERS OR CANON'S LICENSORS HAVE BEEN ADVISED OF 
-THE POSSIBILITY OF SUCH DAMAGES.
-
-TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, YOU HEREBY RELEASE CANON, 
-CANON'S SUBSIDIARIES AND AFFILIATES, THEIR DISTRIBUTORS, DEALERS AND CANON'S 
-LICENSORS FROM ANY AND ALL LIABILITY ARISING FROM OR RELATED TO ALL CLAIMS 
-CONCERNING THE SOFTWARE OR ITS USE.
-
-7.TERM
-
-This Agreement is effective upon your acceptance hereof by using the Software 
-and remains in effect until terminated.  You may terminate this Agreement by 
-destroying the Software.  
-
-Ca
-non may terminate this Agreement if you fail to comply with any terms hereof.  
-Upon such termination of this Agreement, in addition to Canon enforcing its 
-respective legal rights, you must then promptly destroy the Software.  
-
-Notwithstanding the foregoing, Sections 4, and 6 through 10 shall survive 
-any termination of this Agreement.
-
-8.U.S. GOVERNMENT RESTRICTED RIGHTS NOTICE
-
-The Software is "commercial items," as that term is defined at 48 C.F.R. 2.101 
-(October 1995), consisting of "commercial computer software" as such terms are 
-used in 48 C.F.R. 12.212 (September 1995).  Consistent with 48 C.F.R. 12.212 
-and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government 
-End Users shall acquire the Software with only those rights set forth herein.  
-Manufacturer is Canon Inc./30-2, Shimomaruko 3-chome, Ohta-ku, Tokyo 146-8501, 
-Japan.
-
-9.SEVERABILITY
-
-In the event that any section hereof is declared or found to be illegal by any 
-court or tribunal of competent jurisdiction, such section shall be null and 
-void with respect to the jurisdiction of that court or tribunal and all the 
-remaining provisions hereof shall remain in full force and effect.
-
-10.ACKNOWLEDGEMENT
-
-YOU AGREE THAT THIS AGREEMENT IS THE COMPLETE AND EXCLUSIVE STATEMENT OF 
-AGREEMENT BETWEEN YOU AND CANON CONCERNING THE SUBJECT MATTER HEREOF AND 
-SUPERSEDES ALL PROPOSALS OR PRIOR AGREEMENTS, VERBAL OR WRITTEN, AND ANY OTHER 
-COMMUNICATIONS BETWEEN YOU AND CANON RELATING TO THE SUBJECT MATTER HEREOF.
-
-
-013133 
-
-IMPORTANT NOTICE FOR THE USE OF FREE SOFTWARE COMPONENTS BEING LICENSED UNDER 
-GNU GENERAL PUBLIC LICENSE
-
-This product "Canon CAPT Printer Driver for Linux v1.80" ("Product") of 
-Canon Inc. ("Canon") contains the free software components as listed in 
-Schedule 2  of Exhibit attached hereto, and which are licensed under GNU General 
-Public License version 2 published by the Free Software Foundation ("GPL").
-
-Such free software components are free software; you can redistribute them 
-and/or modify them under the terms of GPL.
-
-Such components are distributed in the hope that they will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
-FITNESS FOR A PARTICULAR PURPOSE.  You can find full text of GPL later within 
-this notice and see it for more details.  
-
-
-GNU GENERAL PUBLIC LICENSE
-Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
-59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
-Everyone is permitted to copy and distribute verbatim copies of this license 
-document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to 
-share and change it. By contrast, the GNU General Public License is intended 
-to guarantee your freedom to share and change free software--to make sure the 
-software is free for all its users. This General Public License applies to 
-most of the Free Software Foundation's software and to any other program whose 
-authors commit to using it. (Some other Free Software Foundation software is 
-covered by the GNU Library General Public License instead.) You can apply it 
-to your programs, too. 
-
-When we speak of free software, we are referring to freedom, not price. 
-Our General Public Licenses are designed to make sure that you have the 
-freedom to distribute copies of free software (and charge for this service 
-if you wish), that you receive source code or can get it if you want it, that 
-you can change the software or use pieces of it in new free programs; and that 
-you know you can do these things. 
-
-To protect your rights, we need to make restrictions that forbid anyone to deny 
-you these rights or to ask you to surrender the rights. These restrictions 
-translate to certain responsibilities for you if you distribute copies of 
-the software, or if you modify it. 
-
-For example, if you distribute copies
- of such a program, whether gratis or 
- for a fee, you must give the recipients all the rights that you have. You must 
- make sure that they, too, receive or can get the source code. And you must 
- show them these terms so they know their rights. 
- 
- We protect your rights with two steps: (1) copyright the software, and (2) 
- offer you this license which gives you legal permission to copy, distribute 
- and/or modify the software. 
- 
- Also, for each author's protection and ours, we want to make certain that 
- everyone understands that there is no warranty for this free software. If the 
- software is modified by someone else and passed on, we want its recipients to 
- know that what they have is not the original, so that any problems introduced 
- by others will not reflect on the original authors' reputations.
-  
-  Finally, any free program is threatened constantly by software patents. We wish 
-  to avoid the danger that redistributors of a free program will individually 
-  obtain patent licenses, in effect making the program proprietary. To prevent 
-  this, we have made it clear that any patent must be licensed for everyone's 
-  free use or not licensed at all. 
-  
-  The precise terms and conditions for copying, distribution and modification 
-  follow. 
-  
-  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  
-  0. This License applies to any program or other work which contains a notice 
-  placed by the copyright holder saying it may be distributed under the terms 
-  of this General Public License. The "Program", below, refers to any such 
-  program or work, and a "work based on the Program" means either the Program 
-  or any derivative work under copyright law: that is to say, a work containing 
-  the Program or a portion of it, either verbatim or with modifications and/or 
-  translated into another language. (Hereinafter, translation is included without 
-  limitation in the term "modification".) Each licensee is addressed as "you". 
-  
-  Activities other than copying, distribution and modification are not covered 
-  by this License; they are outside its scope. The act of running the Program 
-  is not restricted, and the output from the Program is covered only if its 
-  contents constitute a work based on the Program (independent of having been 
-  made by running the Program). Whether that is true depends on what the Program 
-  does. 
-  
-  1. You may copy and distribute verbatim copies of the Program's source code as 
-  you receive it, in any medium, provided that you conspicuously and appropriately 
-  publish on each copy an appropriate copyright notice and disclaimer of warranty; 
-  keep intact all the notices that refer to this License and to the absence of any 
-  warranty; and give any other recipients of the Program a copy of this License 
-  along with the Program. 
-  
-  You may charge a fee for the physical act of transferring a copy, and you may 
-  at your option offer warranty protection in exchange for a fee. 
-  
-  2. You may modify your copy or copies of the Program or any portion of it, 
-  thus forming a work based on the Program, and copy and distribute such 
-  modifications or work under the terms of Section 1 above, provided that 
-  you also meet all of these conditions: 
-  
-  a) You must cause the modified files to carry prominent notices stating that 
-  you changed the files and the date of any change. 
-  
-  b) You must cause any work that you distribute or publish, that in whole or 
-  in part contains or is derived from the Program or any part thereof, to be 
-  licensed as a whole at no charge to all third parties under the terms of this 
-  License. 
-  
-  c) If the modified program normally reads commands interactively when run, 
-  you must cause it, when started running for such interactive use in the most 
-  ordinary way, to print or display an announcement including an appropriate 
-  copyright notice and a notice that there is no warranty (or else, saying that 
-  you provide a warranty) and that users may redistribute the program under these 
-  con
-  ditions, and telling the user how to view a copy of this License. 
-  (Exception: if the Program itself is interactive but does not normally print 
-  such an announcement, your work based on the Program is not required to print 
-  an announcement.) 
-  
-  These requirements apply to the modified work as a whole. If identifiable 
-  sections of that work are not derived from the Program, and can be reasonably 
-  considered independent and separate works in themselves, then this License, 
-  and its terms, do not apply to those sections when you distribute them as 
-  separate works. But when you distribute the same sections as part of a whole 
-  which is a work based on the Program, the distribution of the whole must be 
-  on the terms of this License, whose permissions for other licensees extend to 
-  the entire whole, and thus to each and every part regardless of who wrote it. 
-  
-  Thus, it is not the intent of this section to claim rights or contest your 
-  rights to work written entirely by you; rather, the intent is to exercise 
-  the right to control the distribution of derivative or collective works based 
-  on the Program. 
-  
-  In addition, mere aggregation of another work not based on the Program with 
-  the Program (or with a work based on the Program) on a volume of a storage or 
-  distribution medium does not bring the other work under the scope of this 
-  License. 
-  
-  3. You may copy and distribute the Program (or a work based on it, under 
-  Section 2) in object code or executable form under the terms of Sections 1 
-  and 2 above provided that you also do one of the following: 
-  
-  a) Accompany it with the complete corresponding machine-readable source code, 
-  which must be distributed under the terms of Sections 1 and 2 above on a medium 
-  customarily used for software interchange; or, 
-  
-  b) Accompany it with a written offer, valid for at least three years, to give 
-  any third party, for a charge no more than your cost of physically performing 
-  source distribution, a complete machine-readable copy of the corresponding 
-  source code, to be distributed under the terms of Sections 1 and 2 above on 
-  a medium customarily used for software interchange; or, 
-  
-  c) Accompany it with the information you received as to the offer to 
-  distribute corresponding source code. (This alternative is allowed only for 
-  noncommercial distribution and only if you received the program in object code 
-  or executable form with such an offer, in accord with Subsection b above.) 
-  
-  The source code for a work means the preferred form of the work for making 
-  modifications to it. For an executable work, complete source code means all 
-  the source code for all modules it contains, plus any associated interface 
-  definition files, plus the scripts used to control compilation and 
-  installation of the executable. However, as a special exception, the source 
-  code distributed need not include anything that is normally distributed (in 
-  either source or binary form) with the major components (compiler, kernel, and 
-  so on) of the operating system on which the executable runs, unless that 
-  component itself accompanies the executable. 
-  
-  If distribution of executable or object code is made by offering access to 
-  copy from a designated place, then offering equivalent access to copy the 
-  source code from the same place counts as distribution of the source code, 
-  even though third parties are not compelled to copy the source along with 
-  the object code. 
-  
-  4. You may not copy, modify, sublicense, or distribute the Program except as 
-  expressly provided under this License. Any attempt otherwise to copy, modify, 
-  sublicense or distribute the Program is void, and will automatically terminate 
-  your rights under this License. However, parties who have received copies, or 
-  rights, from you under this License will not have their licenses terminated 
-  so long as such parties remain in full compliance. 
-  
-  5. You are not required to accept this License, since you have not 
-  signed it. 
-  However, nothing else grants you permission to modify or distribute the 
-  Program or its derivative works. These actions are prohibited by law if you 
-  do not accept this License. Therefore, by modifying or distributing the Program 
-  (or any work based on the Program), you indicate your acceptance of this 
-  License to do so, and all its terms and conditions for copying, distributing 
-  or modifying the Program or works based on it. 
-  
-  6. Each time you redistribute the Program (or any work based on the Program), 
-  the recipient automatically receives a license from the original licensor to 
-  copy, distribute or modify the Program subject to these terms and conditions. 
-  You may not impose any further restrictions on the recipients' exercise of the 
-  rights granted herein. You are not responsible for enforcing compliance by 
-  third parties to this License. 
-  
-  7. If, as a consequence of a court judgment or allegation of patent 
-  infringement or for any other reason (not limited to patent issues), 
-  conditions are imposed on you (whether by court order, agreement or otherwise) 
-  that contradict the conditions of this License, they do not excuse you from 
-  the conditions of this License. If you cannot distribute so as to satisfy 
-  simultaneously your obligations under this License and any other pertinent 
-  obligations, then as a consequence you may not distribute the Program at all. 
-  For example, if a patent license would not permit royalty-free redistribution 
-  of the Program by all those who receive copies directly or indirectly through 
-  you, then the only way you could satisfy both it and this License would be to 
-  refrain entirely from distribution of the Program. 
-  
-  If any portion of this section is held invalid or unenforceable under any 
-  particular circumstance, the balance of the section is intended to apply and 
-  the section as a whole is intended to apply in other circumstances. 
-  
-  It is not the purpose of this section to induce you to infringe any patents 
-  or other property right claims or to contest validity of any such claims; this 
-  section has the sole purpose of protecting the integrity of the free software 
-  distribution system, which is implemented by public license practices. Many 
-  people have made generous contributions to the wide range of software 
-  distributed through that system in reliance on consistent application of that 
-  system; it is up to the author/donor to decide if he or she is willing to 
-  distribute software through any other system and a licensee cannot impose 
-  that choice. 
-  
-  This section is intended to make thoroughly clear what is believed to be a 
-  consequence of the rest of this License. 
-  
-  8. If the distribution and/or use of the Program is restricted in certain 
-  countries either by patents or by copyrighted interfaces, the original 
-  copyright holder who places the Program under this License may add an explicit 
-  geographical distribution limitation excluding those countries, so that 
-  distribution is permitted only in or among countries not thus excluded. 
-  In such case, this License incorporates the limitation as if written in the 
-  body of this License. 
-  
-  9. The Free Software Foundation may publish revised and/or new versions of 
-  the General Public License from time to time. Such new versions will be 
-  similar in spirit to the present version, but may differ in detail to address 
-  new problems or concerns. 
-  
-  Each version is given a distinguishing version number. If the Program 
-  specifies a version number of this License which applies to it and "any later 
-  version", you have the option of following the terms and conditions either of 
-  that version or of any later version published by the Free Software Foundation. 
-  If the Program does not specify a version number of this License, you may 
-  choose any version ever published by the Free Software Foundation. 
-  
-  10. If you wish to incorporate parts of the Program into other free programs 
-  whose distribution
-   conditions are different, write to the author to ask for 
-   permission. For software which is copyrighted by the Free Software Foundation, 
-   write to the Free Software Foundation; we sometimes make exceptions for this. 
-   Our decision will be guided by the two goals of preserving the free status of 
-   all derivatives of our free software and of promoting the sharing and reuse 
-   of software generally. 
-   
-   NO WARRANTY
-   
-   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR 
-   THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE 
-   STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE 
-   THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
-   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
-   FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND 
-   PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, 
-   YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
-   
-   12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 
-   WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 
-   REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, 
-   INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING 
-   OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO 
-   LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR 
-   THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), 
-   EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF 
-   SUCH DAMAGES. 
-   
-   END OF TERMS AND CONDITIONS
-   
-   How to Apply These Terms to Your New Programs
-   
-   If you develop a new program, and you want it to be of the greatest possible 
-   use to the public, the best way to achieve this is to make it free software 
-   which everyone can redistribute and change under these terms. 
-   
-   To do so, attach the following notices to the program. It is safest to attach 
-   them to the start of each source file to most effectively convey the exclusion 
-   of warranty; and each file should have at least the "copyright" line and a 
-   pointer to where the full notice is found. 
-   
-   one line to give the program's name and an idea of what it does.
-   Copyright (C) yyyy  name of author
-   
-   This program is free software; you can redistribute it and/or modify it under 
-   the terms of the GNU General Public License as published by the Free Software 
-   Foundation; either version 2 of the License, or (at your option) any later 
-   version.
-   
-   This program is distributed in the hope that it will be useful, but WITHOUT 
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-   FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License along with 
-   this program; if not, write to the Free Software Foundation, Inc., 59 Temple 
-   Place - Suite 330, Boston, MA  02111-1307, USA.
-   
-   Also add information on how to contact you by electronic and paper mail. 
-   
-   If the program is interactive, make it output a short notice like this when 
-   it starts in an interactive mode: 
-   
-   Gnomovision version 69, Copyright (C) year name of author
-   Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.  
-   This is free software, and you are welcome to redistribute it under certain 
-   conditions; type `show c' for details.
-   
-   The hypothetical commands `show w' and `show c' should show the appropriate 
-   parts of the General Public License. Of course, the commands you use may be 
-   called something other than `show w' and `show c'; they could even be 
-   mouse-clicks or menu items--whatever suits your program. 
-   
-   You should also get your employer (if you work as a programmer) or your school,
-   if any, to sign a "copyright disclaimer" for the program, if necessary. 
-   Here is a sample; alter the names: 
-   
-   Yoyody
-   ne, Inc., hereby disclaims all copyright
-   interest in the program `Gnomovision' (which makes passes at compilers) 
-   written by James Hacker.
-   
-   signature of Ty Coon, 1 April 1989
-   Ty Coon, President of Vice
-   
-   This General Public License does not permit incorporating your program into 
-   proprietary programs. If your program is a subroutine library, you may 
-   consider it more useful to permit linking proprietary applications with the 
-   library. If this is what you want to do, use the GNU Library General Public 
-   License instead of this License. 
-   
-   
-   
-   IMPORTANT NOTICE FOR THE USE OF OTHER FREE SOFTWARE COMPONENTS
-   
-   The software components contained in this product "Canon CAPT Printer Driver 
-   for Linux v1.80" which software components are listed in Schedule 3 of 
-   Exhibit attached hereto are free software.
-   
-   Such component shall be deemed as the "Software" defined in the permission 
-   notice below, and you can deal in such component under the terms of such 
-   permission notice.
-    
-    
-    
-    Copyright (c) 2007 Canon Inc.
-    
-    Permission is hereby granted, free of charge, to any person obtaining a copy 
-    of this software and associated documentation files (the "Software"), to deal 
-    in the Software without restriction, including without limitation the rights 
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-    copies of the Software, and to permit persons to whom the Software is 
-    furnished to do so, subject to the following conditions:
-    
-    The above copyright notice and this permission notice shall be included in all 
-    copies or substantial portions of the Software.
-    
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
-    THE SOFTWARE.
-    
-    
-    Exhibit to
-    SOFWTARE LICENSE AGREEMENT FOR CANON'S OR ITS LICENSORS' SOFWTARE PROGRAMS
-    
-    
-    Schedule 1
-    
-    c3pldrv
-    cnpkmodule
-    libc3pl.so.0.0.1
-    libcaepcm.so.1.0
-    libcaiousb.so.1.0.0
-    libcaiowrap.so.1.0.0
-    libcnaccm.so.1.0
-    libcnlbcm.so.1.0
-    CANSRGBA.ICC
-    CNZ005.ICC
-    CNZ006.ICC
-    CNZ007.ICC
-    CNZ008.ICC
-    CNZ055.ICC
-    ccpd.conf
-    ccpd(daemon)
-    captdrv
-    captfilter
-    captmon
-    captmon2
-    captmonlbp3300
-    captmonlbp5000
-    captmoncnab6
-    captmoncnab7
-    captmoncnab8
-    captmoncnab9
-    captmoncnaba
-    captmoncnac5
-    captmoncnac6
-    libcaiocaptnet.so.1.0.0
-    libcaptfilter.so.1.0.0
-    libcncaptnpm.so.1.0.7
-    CNL760A.ICC
-    CNL760B.ICC
-    CNL810A.ICC
-    CNL810B.ICC
-    CNL820A.ICC
-    CNL820B.ICC
-    CnAC0999.DAT
-    CnAC2849.DAT
-    CnAC29A9.DAT
-    CnACB81B.DAT
-    CnACB848.DAT
-    CnACE8E8.DAT
-    CnACF0F1.DAT
-    CnAC_04A.DAT
-    CnAC_09A.DAT
-    CnAC_14A.DAT
-    ccpd(startup script for the daemon)
-    ccpdadmin
-    msgtablelbp3300.xml
-    msgtablelbp5000.xml
-    msgtablecnab6.xml
-    msgtablecnab7.xml
-    msgtablecnab8.xml
-    msgtablecnab9.xml
-    msgtablecnaba.xml
-    msgtablecnac5.xml
-    msgtablecnac6.xml
-    msgtable.xml
-    msgtable2.xml
-    CNAB1CL.BIN
-    CNAB7CL.BIN
-    CNAC4CL.BIN
-    CNAC5CL.BIN
-    CNAC6CL.BIN
-    cnab6cl.bin
-    
-    
-    Schedule 2
-    
-    cngplp
-    cnjatool
-    cngplp.mo
-    ccp
-    pstocapt
-    pstocapt2
-    pstocapt3
-    captstatusui
-    captstatusui.mo
-    *.ppd
-    
-    
-    Schedule 3
-    
-    buflist.h
-    buftool.h
-    cnpklib.h
-    libbuftool.a
-    libcnpk.la
-    libcnpk.so.1.0.0
-    libcanoncapt.la
-    libcanoncapt.so.1.0.0
-    libcanonc3pl.so.1.0.0
-    
-    

licenses/Viber

@@ -0,0 +1,34 @@
+
+LICENSED APPLICATION END USER LICENSE AGREEMENT
+
+Viber Media Inc. ("Viber" or "we" or "us" or "our" or other similar pronouns) offers users with mobile devices ("You") calling and text messages services ("Services") transacted through a licensed application (?Licensed Application") for mobile devices. You understand that, just like when using regular mobile phone service, anyone with knowledge of your phone number may call you or send you messages through our application. Our Licensed Application is licensed, not sold, to You for use only under the terms of this license, unless a product or service is accompanied by a separate license agreement, in which case the terms of that separate license agreement will govern, subject to Your prior acceptance of that separate license agreement. We reserve all rights not expressly granted to You.
+1. Scope of License
+
+This license granted to You for our Licensed Application is limited to a non-transferable license to use the Licensed Application on any mobile device that You own or control and as permitted by the Usage Rules set forth in our Terms and Conditions (the ?Usage Rules?). This license does not allow You to use the Licensed Application on any mobile device that You do not own or control, and You may not distribute or make the Licensed Application available over a network where it could be used by multiple mobile devices at the same time. You may not rent, lease, lend, sell, redistribute or sublicense the Licensed Application. You may not copy (except as expressly permitted by this license and the Usage Rules), decompile, reverse engineer, disassemble, attempt to derive the source code of, modify, or create derivative works of the Licensed Application, any updates, or any part thereof (except as and only to the extent any foregoing restriction is prohibited by applicable law or to the extent as may be permitted by the licensing terms governing use of any open sourced components included with the Licensed Application). Any attempt to do so is a violation of our rights. If You breach this restriction, You may be subject to prosecution and damages. The terms of the license will govern any upgrades provided by us that replace and/or supplement our Services, unless such upgrade is accompanied by a separate license in which case the terms of that license will govern.
+2. Consent to Use of Data
+
+You agree that we may collect and use technical data and related information, including but not limited to technical information about Your mobile device, system and application software, and peripherals, that is gathered periodically to facilitate the provision of software updates, product support and other services to You (if any) related to the Licensed Application. We may use this information, as long as it is in a form that does not personally identify You, to improve our Services offered to You (for further information on our privacy policy click here).
+3. Termination
+
+The license is effective until terminated by You or us. We will terminate your rights under this license without notice if You fail to comply with any term(s) of this license. Upon termination of the license, You shall cease all use of the Licensed Application, and destroy all copies, full or partial, of the Licensed Application.
+4. Services
+
+In the course of using the Licensed Application You may encounter content that may be deemed offensive, indecent, or objectionable. Nevertheless, You agree to use our Services at Your sole risk and we shall not have any liability to You for content that may be found to be offensive, indecent, or objectionable. You agree not to not exploit the Services in any unauthorized way whatsoever, including but not limited to, trespass or burdening network capacity. You further agree not to use our Services in any manner to harass, abuse, stalk, threaten, defame or otherwise infringe or violate the rights of any other party, and that we are not in any way responsible for any such use by You, nor for any harassing, threatening, defamatory, offensive or illegal messages or transmissions that You may receive as a result of using our Services.
+
+We make no representation that our Services are available for use in any particular location. To the extent You choose to access our Services, You do so at Your own initiative and are responsible for compliance with any applicable laws, including but not limited to applicable local laws. We reserve the right to change, suspend, remove, or disable access to our Services at any time without notice. In no event will we be liable for the removal of or disabling of access to our Services. We may also impose limits on the use of or access to our Services, in any case and without notice or liability.
+5. NO WARRANTY
+
+YOU EXPRESSLY ACKNOWLEDGE AND AGREE THAT USE OF THE LICENSED APPLICATION IS AT YOUR SOLE RISK AND THAT THE ENTIRE RISK AS TO SATISFACTORY QUALITY, PERFORMANCE, ACCURACY AND EFFORT IS WITH YOU. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, OUR SERVICES ARE PROVIDED "AS IS" AND ?AS AVAILABLE?, WITH ALL FAULTS AND WITHOUT WARRANTY OF ANY KIND, AND WE HEREBY DISCLAIM ALL WARRANTIES AND CONDITIONS WITH RESPECT TO THE LICENSED APPLICATION AND SERVICES, EITHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF MERCHANTABILITY, OF SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR PURPOSE, OF ACCURACY, OF QUIET ENJOYMENT, AND NON-INFRINGEMENT OF THIRD PARTY RIGHTS. WE DO NOT WARRANT AGAINST INTERFERENCE WITH YOUR ENJOYMENT OF THE LICENSED APPLICATION AND SERVICES OR THAT THE LICENSED APPLICATION AND SERVICES WILL BE UNINTERRUPTED OR ERROR-FREE, OR THAT DEFECTS IN THE LICENSED APPLICATION OR SERVICES WILL BE CORRECTED. NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY US SHALL CREATE A WARRANTY. SHOULD THE LICENSED APPLICATION OR SERVICES CAUSE ANY DEFECTS, YOU ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+6. Limitation of Liability
+
+TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT SHALL WE BE LIABLE FOR PERSONAL INJURY, OR ANY INCIDENTAL, SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES WHATSOEVER, INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF PROFITS, LOSS OF DATA, BUSINESS INTERRUPTION OR ANY OTHER COMMERCIAL DAMAGES OR LOSSES, ARISING OUT OF OR RELATED TO YOUR USE OR INABILITY TO USE THE LICENSED APPLICATION, HOWEVER CAUSED, REGARDLESS OF THE THEORY OF LIABILITY (CONTRACT, TORT OR OTHERWISE) AND EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no event shall our total liability to you for all damages (other than as may be required by applicable law in cases involving personal injury) exceed the amount of fifty dollars ($50.00). The foregoing limitations will apply even if the above stated remedy fails of its essential purpose.
+
+You may not use or otherwise export or re-export the Licensed Application except as authorized by United States law and the laws of the jurisdiction in which the Licensed Application was obtained. In particular, but without limitation, the Licensed Application may not be exported or re-exported (a) into any U.S. embargoed countries or (b) to anyone on the U.S. Treasury Department's list of Specially Designated Nationals or the U.S. Department of Commerce Denied Person?s List or Entity List. By using the Licensed Application, you represent and warrant that you are not located in any such country or on any such list. You also agree that you will not use these products for any purposes prohibited by United States law, including, without limitation, the development, design, manufacture or production of nuclear, missiles, or chemical or biological weapons.
+7. Proprietary Rights
+
+The Licensed Application and related documentation are "Commercial Items", as that term is defined at 48 C.F.R. ?2.101, consisting of "Commercial Computer Software" and "Commercial Computer Software Documentation", as such terms are used in 48 C.F.R. ?12.212 or 48 C.F.R. ?227.7202, as applicable. Consistent with 48 C.F.R. ?12.212 or 48 C.F.R. ?227.7202-1 through 227.7202-4, as applicable, the Commercial Computer Software and Commercial Computer Software Documentation are being licensed to U.S. Government end users (a) only as Commercial Items and (b) with only those rights as are granted to all other end users pursuant to the terms and conditions herein. Unpublished-rights reserved under the copyright laws of the United States.
+
+8. Notice and Take Down Procedures; Copyright Agent: We respect the intellectual property rights of others, and require that the people who use the Site, Services and Licensed Application do the same. If You believe that any materials accessible on or from the Site, Services and Licensed Application infringes on Your copyright, You may request the removal of those materials (or access thereto) by contacting our copyright agent. Please go to the DMCA notification page to review our DMCA notification guidelines and procedures - Viber DMCA POLICY.
+
+9. Jurisdiction: The laws of the State of New York, excluding its conflicts of law rules, govern this license and your use of the Licensed Application. You expressly agree that the courts in the State of New York, New York County have exclusive jurisdiction over any claim or dispute with Viber or relating in any way to your use of the Licensed Application. Your use of the Licensed Application may also be subject to other local, state, national, or international laws.
+

licenses/open-xo-fonts

@@ -0,0 +1,33 @@
+Открытая лицензия ООО «Новые облачные технологии» на использование шрифта
+
+Настоящий Лицензионный договор является договором присоединения и заключается в упрощенном порядке. Любое использование Оригинального шрифта означает Ваше согласие на заключение настоящего Лицензионного договора.
+ОПРЕДЕЛЕНИЯ
+
+«Правообладатель» — ООО «НОВЫЕ ОБЛАЧНЫЕ ТЕХНОЛОГИИ», которому принадлежит исключительное право на Оригинальный шрифт;
+
+«Вы» – любое физическое или юридическое лицо;
+
+«Оригинальный шрифт» — шрифт, созданный Правообладателем;
+
+«Официальное название» — название Оригинального шрифта, утвержденное Правообладателем;
+
+«Модифицированный шрифт» — шрифт, созданный в результате внесения Вами любых изменений в Оригинальный шрифт, в том числе путем добавления к нему новых графических элементов, удаления или замены оригинальных графических элементов, а также изменение формата Оригинального шрифта или его перенос в новую среду.
+УСЛОВИЯ ИСПОЛЬЗОВАНИЯ И ОГРАНИЧЕНИЯ
+
+Правообладатель предоставляет Вам право использования (простая (неисключительная) лицензия) Оригинального шрифта и устанавливает ограничения использования Модифицированного шрифта, на следующих условиях:
+
+    Вы вправе модифицировать, копировать и распространять Оригинальный и Модифицированный Вами шрифт любым способом, включать и объединять их с любыми коммерческими и некоммерческими продуктами при условии соблюдения следующих ограничений:
+    Оригинальный и Модифицированный шрифты и их отдельные графические элементы не могут сами по себе распространяться за плату, т.е. с целью извлечения коммерческой выгоды;
+    Вы вправе распространять Оригинальный шрифт только под его Официальным названием. Вы не вправе использовать Официальное название при любом использовании Модифицированного шрифта;
+    Вы вправе распространять Оригинальный и Модифицированный шрифты только на условиях настоящего Лицензионного договора. Данное требование не распространяется на документы, созданные с использованием Оригинального и Модифицированного шрифта;
+    При распространении Оригинального и Модифицированного шрифтов, Вы должны вместе со шрифтами передавать текст настоящего Лицензионного договора и информацию о Правообладателе Оригинального шрифта, приведенную выше, без каких-либо изменений. Текст Лицензионного договора, должен быть помещен либо в отдельный текстовый файл, либо встроен в передаваемый шрифт таким образом, чтобы получатель мог легко увидеть и прочитать его.
+
+Настоящий Лицензионный договор не имеет ограничений по территории и сроку использования.
+УСЛОВИЯ ПРЕКРАЩЕНИЯ
+
+В случае нарушения Вами условий настоящего Лицензионного договора, он считается расторгнутым в одностороннем внесудебном порядке по инициативе Правообладателя с момента совершения Вами соответствующего нарушения.
+ОГРАНИЧЕНИЯ
+
+Оригинальный шрифт предоставляется на условиях «как есть» (as is). Правообладатель не предоставляет никаких гарантий в отношении его безошибочной и бесперебойной работы, соответствия Вашим конкретным целям и ожиданиям, а также не предоставляет никаких иных гарантий.
+
+ПРАВООБЛАДАТЕЛЬ НИ ПРИ КАКИХ ОБСТОЯТЕЛЬСТВАХ НЕ НЕСЕТ ОТВЕТСТВЕННОСТИ ЗА УБЫТКИ И УЩЕРБ, ВЫЗВАННЫЕ ИСПОЛЬЗОВАНИЕМ ИЛИ НЕВОЗМОЖНОСТЬЮ ИСПОЛЬЗОВАНИЯ ОРИГИНАЛЬНОГО ИЛИ МОДИФИЦИРОВАННОГО ШРИФТОВ.

media-fonts/noto-emoji/Manifest

@@ -1 +0,0 @@
-DIST noto-emoji-20200317.tar.gz 60841240 BLAKE2B aab99a5cbab6943b9e282b33dc113601489c7d02a3670db8675e6c90be615ceaf0f2900bdbc68ffaca6130f4e724b2ec1001cfccce80a181208ace0638492b7e SHA512 958a589ef7d7a0b9e4fa3eb1caa20284fa7463419a740d0ca05f850618324883c13498f92839476042cfd1daffa7eff925b2f22ec318c0726391f69c04911bfb

media-fonts/noto-emoji/files/noto-emoji-20180823-build-path.patch

@@ -1,11 +0,0 @@
---- a/add_glyphs.py.old	2018-11-18 11:11:56.387323302 +0100
-+++ b/add_glyphs.py	2018-11-18 11:12:18.203529159 +0100
-@@ -22,7 +22,7 @@
- import add_emoji_gsub
- import add_aliases
- 
--sys.path.append(
-+sys.path.insert(0,
-     path.join(os.path.dirname(__file__), 'third_party', 'color_emoji'))
- from png import PNG
- 

media-fonts/noto-emoji/files/noto-emoji-20190328-use-gm.patch

@@ -1,27 +0,0 @@
---- a/Makefile~	2019-03-28 17:45:53.000000000 +0100
-+++ b/Makefile	2019-06-02 10:36:55.587055453 +0200
-@@ -21,7 +21,7 @@
- PNGQUANT = pngquant
- PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
- BODY_DIMENSIONS = 136x128
--IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
-+IMOPS = -size 136x128 -background none -gravity center -extent 136x128 -compose copy
- 
- # zopflipng is better (about 5-10%) but much slower.  it will be used if
- # present.  pass ZOPFLIPNG= as an arg to make to use optipng instead.
-@@ -165,13 +165,13 @@
- # imagemagick packaged with ubuntu trusty (6.7.7-10) by using -composite.
- 
- $(EMOJI_DIR)/%.png: $(EMOJI_SRC_DIR)/%.png | $(EMOJI_DIR)
--	@convert $(IMOPS) "$<" -composite "PNG32:$@"
-+	@gm convert $(IMOPS) "$<" "PNG32:$@"
- 
- $(FLAGS_DIR)/%.png: $(FLAGS_SRC_DIR)/%.png ./waveflag | $(FLAGS_DIR)
- 	@./waveflag $(FLAGS_DIR)/ "$<"
- 
- $(RESIZED_FLAGS_DIR)/%.png: $(FLAGS_DIR)/%.png | $(RESIZED_FLAGS_DIR)
--	@convert $(IMOPS) "$<" -composite "PNG32:$@"
-+	@gm convert $(IMOPS) "$<" "PNG32:$@"
- 
- flag-symlinks: $(RESIZED_FLAG_FILES) | $(RENAMED_FLAGS_DIR)
- 	@$(subst ^, ,                                  \

media-fonts/noto-emoji/files/noto-emoji-build-all-flags.patch

@@ -1,11 +0,0 @@
---- old/Makefile	2018-05-03 20:32:14.000000000 +0200
-+++ new/Makefile	2018-05-08 11:48:20.811073447 +0200
-@@ -78,7 +78,7 @@
- 
- ALL_FLAGS = $(basename $(notdir $(wildcard $(FLAGS_SRC_DIR)/*.png)))
- 
--FLAGS = $(SELECTED_FLAGS)
-+FLAGS = $(ALL_FLAGS)
- 
- FLAG_NAMES = $(FLAGS:%=%.png)
- FLAG_FILES = $(addprefix $(FLAGS_DIR)/, $(FLAG_NAMES))

media-fonts/noto-emoji/files/noto-emoji-pngquant-verbose.patch

@@ -1,11 +0,0 @@
---- a/Makefile~	2020-04-22 23:04:44.000000000 +0200
-+++ b/Makefile	2020-04-22 23:06:42.069275340 +0200
-@@ -20,7 +20,7 @@
- 
- PNGQUANT = pngquant
- PYTHON = python3
--PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
-+PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force -v
- BODY_DIMENSIONS = 136x128
- IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
- 

media-fonts/noto-emoji/files/noto-emoji-zopflipng-verbose.patch

@@ -1,11 +0,0 @@
---- a/Makefile~	2020-04-22 23:07:33.000000000 +0200
-+++ b/Makefile	2020-04-22 23:11:46.356767595 +0200
-@@ -194,7 +194,7 @@
- ifdef MISSING_ZOPFLI
- 	@$(OPTIPNG) -quiet -o7 -clobber -force -out "$@" "$<"
- else
--	@$(ZOPFLIPNG) -y "$<" "$@" 1> /dev/null 2>&1
-+	@$(ZOPFLIPNG) -y "$<" "$@" 2>&1
- endif
- 
- 

media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild

@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit font python-any-r1
-
-DESCRIPTION="Google Noto Emoji fonts"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji"
-
-COMMIT="ac1703e9d7feebbf5443a986e08332b1e1c5afcf"
-SRC_URI="https://github.com/googlefonts/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="buildfont"
-
-BDEPEND="
-	buildfont? (
-		${PYTHON_DEPS}
-		app-arch/zopfli
-		$(python_gen_any_dep '
-			dev-python/fonttools[${PYTHON_USEDEP}]
-			dev-python/nototools[${PYTHON_USEDEP}]
-		')
-		media-gfx/pngquant
-		x11-libs/cairo
-		|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
-	)
-"
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-python_check_deps() {
-	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/nototools[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	font_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if use buildfont; then
-		# From Fedora
-		eapply "${FILESDIR}/${PN}-build-all-flags.patch"
-
-		# https://github.com/googlei18n/noto-emoji/issues/240
-		eapply "${FILESDIR}/${PN}-20180823-build-path.patch"
-
-		# Be more verbose, bug #717654
-		eapply "${FILESDIR}"/${PN}-pngquant-verbose.patch
-		eapply "${FILESDIR}"/${PN}-zopflipng-verbose.patch
-
-		# Based on Fedora patch to allow graphicsmagick usage
-		if has_version -b media-gfx/graphicsmagick; then
-			eapply "${FILESDIR}/${PN}-20190328-use-gm.patch"
-		fi
-	fi
-}
-
-src_compile() {
-	if ! use buildfont; then
-		einfo "Installing pre-built fonts provided by upstream."
-		einfo "They could be not fully updated or miss some items."
-		einfo "To build fonts based on latest images enable 'buildfont'"
-		einfo "USE (that will require more time and resources too)."
-	else
-		python_setup
-		einfo "Building fonts..."
-		default
-	fi
-}
-
-src_install() {
-	if ! use buildfont; then
-		FONT_S="${S}/fonts"
-	else
-		mv -i fonts/NotoEmoji-Regular.ttf "${S}" || die
-		# Built font and Regular font
-		FONT_S="${S}"
-
-		# Don't lose fancy emoji icons
-		insinto /usr/share/icons/"${PN}"/128x128/emotes/
-		doins png/128/*.png
-
-		insinto /usr/share/icons/"${PN}"/scalable/emotes/
-		doins svg/*.svg
-	fi
-
-	FONT_SUFFIX="ttf"
-	font_src_install
-
-	dodoc README.md
-}

media-fonts/xo-fonts/Manifest

@@ -0,0 +1 @@
+DIST MyOffice_XO_Fonts_1.1.zip 4294439 BLAKE2B dcd0fc0fa2d0a7e3953db3b3ec7806618454e0a59ca2f4e7ba9ffa5a769079416649a27ebf0e95edf5e6db9bb82e2b43ed5cd124fbf5df78cfcf107c50e1682b SHA512 0c11fc75c330246b74068452ce49ac2dce352129d76b918a876655fba9b2995b3714f6fdd72927a72353d680141704341b6c31ffc441d94091cbabc0e8249e7a

media-fonts/xo-fonts/files/60-xo-fonts.conf

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<match target="pattern">
+		<test qual="any" name="family"><string>Times New Roman</string></test>
+		<edit name="family" mode="assign"><string>XO Thames</string></edit>
+	</match>
+	<match target="pattern">
+		<test qual="any" name="family"><string>Arial</string></test>
+		<edit name="family" mode="assign"><string>XO Oriel</string></edit>
+	</match>
+	<match target="pattern">
+		<test qual="any" name="family"><string>Courier</string></test>
+		<edit name="family" mode="assign"><string>XO Courser</string></edit>
+	</match>
+</fontconfig>
+

media-fonts/xo-fonts/metadata.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="project">
+        <email>support@calculate.ru</email>
+        <name>Mir Calculate</name>
+        <description>Calculate Overlay</description>
+    </maintainer>
+</pkgmetadata>

media-fonts/xo-fonts/xo-fonts-1.1.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+DESCRIPTION="Free XO cyrillic fonts from MyOffice"
+HOMEPAGE="https://myoffice.ru/products/fonts/"
+SRC_URI="https://myoffice.ru/files/fonts/MyOffice_XO_Fonts_${PV}.zip"
+
+LICENSE="open-xo-fonts"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+FONT_CONF=( "${FILESDIR}/60-xo-fonts.conf" )
+
+src_install() {
+	insinto /usr/share/fonts/${PN}
+
+	local f
+	for f in Caliburn Courser Oriel Tahion Thames ; do
+		doins "XO_${f}/XO_${f}/TTF/"*.ttf
+	done
+	for f in Symbol SymbolM Trebizond Verbena Windy ; do
+		doins "XO_${f}/"*.ttf
+	done
+
+	font_xfont_config
+	font_fontconfig
+}

media-gfx/calculate-wallpapers/Manifest

@@ -1,7 +1,4 @@
-DIST calculate-wallpapers-17-r4.jpg 1498109 BLAKE2B e6573ef615a984dda8d1e2390827f8f3c46cafc6c93c0def1b74dfe8d8eac7823f0071bf580a1a9be2b131c4c03f121f10db6a41625cb8506d3d966b5cda4a74 SHA512 0c6ea3b9bfd822e98738b162ab28a410296b96c16901712cf69710f4af3af2f56a64f2cf24d3207b2e274ebc9b6f18268f2fa1aeee5b15f2aabdaff7de91095a
-DIST calculate-wallpapers-18-r1.jpg 1750291 BLAKE2B abb936f262488a896a7056528edb0a2d604b8f1f571aba04ff0599a5a81badc43afb6415d7b69c3704f0b14122f750618919ef2cca889ee2ef8e0dc408c99055 SHA512 59f9ae99fca924a127091aae59a540fd37b23ea6fce1591e6503ed4ab22ed5b0dfa1cd0f163f89d4f531783a66c73a27a921d969a3ea7c41ec62dc60083ef5b3
-DIST calculate-wallpapers-21.jpg 599960 BLAKE2B 1185b772039393bbbb104ea6a29347ccd9eb5ca68c7cab7d5a715fe34b584d55933e3b37a9c8036a566e09b6d770bb16200c21cc535fc358695120180c8a978e SHA512 b1c48c5750c30f9436a6a0e12c4d5633bf87ac6ef1e2fa373aa7b81676d3c51220168a8a5e558045e1034ce8c1eaa28c4e472f2fa9ed114ab37ae98a2de43cb9
-DIST calculate-wallpapers-22.jpg 551009 BLAKE2B e0ac9f68d548b646095452453b101bdf3808d0360ae5bba4e26b4d365223c51c40be8bd0b925ac127b5ee5a1fc40d4b4bde66ff09e961ac5af68bcacd9bba209 SHA512 6ae69d9ee1c91b6a6747f41f3dd77e733ca85c56cc17562544a9bdd73934e7eba25c77f4ec4c36942f3e3a1da9eaa86bf1cc411657ad746dcb48f56fb1beb0ca
+DIST calculate-wallpapers-23.jpg 2098350 BLAKE2B 9f095d984f4ee537522cadc9441c1cfbb6717c91aa4f234f77166a639c072cefafa199b91f7883e6065eca43125337d74790e5c86ab0eb7458940320a8b36f07 SHA512 986370384430344ee5b1f417b0cbe7f31414058c095af39a0de2e29d3f133ac974de780548b26da58cd6dde4e3ed2d12542ed75e5dc12cfad2422aa609b09b73
 DIST wallpapers-11.tar.bz2 5318262 BLAKE2B bbd4b883cf609c0578809145a519b92b2eaec2d961f67c11654e0559bb165cf36fed58111fedd743c99cb2e911d36d2fd792422f93e81e93c34fa23836a23054 SHA512 32e0573427357d1c372df3a68f77bd6d6faab16c9f5fc67b6cf21486683644de5a2878e8f1fb5826e3b67acc262c21b46d07f942341090e776e4bfcece37378a
 DIST wallpapers-12.tar.bz2 14993163 BLAKE2B a42adb0401e4572c06e7db37d8e49aeb8e396fa27ffeb434c67247389a1a64eb918fce96c7918d5ce00a530d99986e2a82bf8953cc6f15b87ce6347ec4cd6578 SHA512 b35b712e1993f960bdbfd0343b03d21bd990c38e9053920ac395443d010b4eb9f6178cfde0a3ca45a83c67a9b6609ffce9905dec4be400b521d82255533d60ec
 DIST wallpapers-13.tar.bz2 14606610 BLAKE2B f47ccd90c2117f2e3440613f8465d91c9fb08432126dc5d1d100f24073bb9a831394262dfc53a44633cfb0884e2bb070756ef726032f667a57df341173801d0c SHA512 9b83d30a428b2897708acda943cdf3de7e400a4fa1f4bdd6eea827fc6be37c0b1e8fdddf9acc9f3dea493071006bd2e4663c569562c546a56dddc60be2acc12b
@@ -9,3 +6,4 @@ DIST wallpapers-14-r1.tar.bz2 6632861 BLAKE2B 09df9235728a29a1288a2e2ef7e859c962
 DIST wallpapers-15.tar.bz2 7374260 BLAKE2B beb45dcb0841131f3e5d335b452002c8fc44c5c5ef6ec009e6739f4c29af62d42bb5e801ad6221c0d7c1302f6a69a9e03711f9060908ea76cc26e07ab9c66208 SHA512 f5400cd3709ffb80e4c904be6fd540f2b47e39bfec86715975ab81bfaee2eebb4fec0b03c21fc3d2f09ce784690a1744f64a95f5c4ad6c3968312931f1c6c90b
 DIST wallpapers-17.tar.bz2 3155801 BLAKE2B 703ae4c9bf3968c0cb7b0f3fc84ad35c7836975eaef92d8e7cb1ec1bc2004a07d6efb504f54782feb6436fea7971945c8a34ec8ff6ecd330f01d1806dae8269e SHA512 4ec4117e0a749e44918522b7ef11aecfb18581740669d4f822e297a68537e5605b6084c6d7c61f62c72f34cbcfcd5bafd4ede35118786c5efcfe4df0f3ce8255
 DIST wallpapers-21.tar.bz2 5550082 BLAKE2B 255644bab9f4de9e8a49e2c200ab3b79570bea602c4789ce2dd26f4bf672bb489cc2ebb7d83131548a6690f3f9632de3c00d9b2f9b05f4a273a3caef98419b1b SHA512 214318e56c44566970857bd1421ff9bd6ac7c6c716803f955d46c6e230b64d56efffe8c3db95e9f79e82031d1adf0cedb5d609b5727c797e2630300c595df168
+DIST wallpapers-22.tar.bz2 2265681 BLAKE2B a6d1bf6c3a8c276e0a874ccb02a1cecc8b290643422a4a86954669b9cb1be4ad22cc8940ee2c766bd7eb2bb53c48ee241d39f2da5cd28fb59d4c5ad813cf0cac SHA512 8930e61780c521331031974aca8bc3602b954ab3285fbe2e3799b6a01bb7d786a8918c8c7137f09e57d6dcd913b8f35da245515f05087c13cac887ce313ba020

media-gfx/calculate-wallpapers/calculate-wallpapers-14-r2.ebuild

@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=7
-
-DESCRIPTION="Wallpapers for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/calculate-wallpapers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-VERSION_IUSE="CL11 CL12 CL13"
-IUSE="+CL11 +CL12 +CL13"
-
-SRC_URI="
-	https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
-	CL11? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
-	)
-	CL12? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
-	)
-	CL13? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
-	)
-	"
-
-RDEPEND="!media-gfx/calculate-cldx-themes
-		!media-gfx/calculate-cld-themes
-		!media-gfx/cld-themes
-		!media-gfx/cldx-themes"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto /
-	doins -r .
-
-	for useflag in $VERSION_IUSE
-	do
-		if use $useflag
-		then
-			cd $WORKDIR/calculate-wallpapers-${useflag//CL}
-			doins -r usr
-		fi
-	done
-}
-

media-gfx/calculate-wallpapers/calculate-wallpapers-15.ebuild

@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=7
-
-DESCRIPTION="Wallpapers for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/calculate-wallpapers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-VERSION_IUSE="CL11 CL12 CL13 CL14"
-IUSE="+CL11 +CL12 +CL13 +CL14"
-
-SRC_URI="
-	https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-15.tar.bz2
-	https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
-	CL11? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
-	)
-	CL12? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
-	)
-	CL13? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
-	)
-	"
-
-RDEPEND="!media-gfx/calculate-cldx-themes
-		!media-gfx/calculate-cld-themes
-		!media-gfx/cld-themes
-		!media-gfx/cldx-themes"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto /
-	doins -r .
-
-	for useflag in $VERSION_IUSE
-	do
-		if use $useflag
-		then
-			cd $WORKDIR/calculate-wallpapers-${useflag//CL}
-			if [[ $useflag == CL14 ]]
-			then
-				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_14
-			fi
-			doins -r usr
-		fi
-	done
-}
-

media-gfx/calculate-wallpapers/calculate-wallpapers-17-r4.ebuild

@@ -1,65 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=7
-
-DESCRIPTION="Wallpapers for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/calculate-wallpapers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-VERSION_IUSE="CL11 CL12 CL13 CL14 CL15"
-IUSE="+CL11 +CL12 +CL13 +CL14 +CL15"
-
-SRC_URI="
-	https://mirror.calculate-linux.org/themes/calculate/wallpaper-17.jpg -> ${PF}.jpg
-	CL15? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-15.tar.bz2
-	)
-	CL14? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
-	)
-	CL11? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
-	)
-	CL12? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
-	)
-	CL13? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
-	)
-	"
-
-DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
-
-# need for templates
-RDEPEND="${DEPEND}
-	|| ( media-gfx/imagemagick
-	media-gfx/graphicsmagick )"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/themes/Calculate/
-	newins "${DISTDIR}"/${PF}.jpg wallpaper.jpg
-
-	insinto /
-	for useflag in $VERSION_IUSE
-	do
-		if use $useflag
-		then
-			cd $WORKDIR/calculate-wallpapers-${useflag//CL}
-			if [[ $useflag == CL14 ]]
-			then
-				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_14
-			fi
-			if [[ $useflag == CL15 ]]
-			then
-				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_15
-			fi
-			doins -r usr
-		fi
-	done
-}

media-gfx/calculate-wallpapers/calculate-wallpapers-18-r1.ebuild

@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=7
-
-DESCRIPTION="Wallpapers for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/calculate-wallpapers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-VERSION_IUSE="CL11 CL12 CL13 CL14 CL15 CL17"
-IUSE="+CL11 +CL12 +CL13 +CL14 +CL15 +CL17"
-
-SRC_URI="
-	https://mirror.calculate-linux.org/themes/calculate/wallpaper-18.jpg -> ${PF}.jpg
-	CL17? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-17.tar.bz2
-	)
-	CL15? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-15.tar.bz2
-	)
-	CL14? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
-	)
-	CL11? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
-	)
-	CL12? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
-	)
-	CL13? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
-	)
-	"
-
-DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
-
-# need for templates
-RDEPEND="${DEPEND}
-	|| ( media-gfx/imagemagick
-	media-gfx/graphicsmagick )"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/themes/Calculate/
-	newins "${DISTDIR}"/${PF}.jpg wallpaper.jpg
-
-	insinto /
-	for useflag in $VERSION_IUSE
-	do
-		if use $useflag
-		then
-			cd $WORKDIR/calculate-wallpapers-${useflag//CL}
-			if [[ $useflag == CL14 ]]
-			then
-				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_14
-			fi
-			if [[ $useflag == CL15 ]]
-			then
-				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_15
-			fi
-			if [[ $useflag == CL17 ]]
-			then
-				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_17
-			fi
-			doins -r usr
-		fi
-	done
-}

media-gfx/calculate-wallpapers/calculate-wallpapers-21.ebuild

@@ -1,72 +0,0 @@
-# Copyritght 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=7
-
-DESCRIPTION="Wallpapers for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/calculate-wallpapers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-VERSION_IUSE="CL11 CL12 CL13 CL14 CL15 CL17"
-IUSE="+CL11 +CL12 +CL13 +CL14 +CL15 +CL17"
-
-SRC_URI="
-	https://mirror.calculate-linux.org/themes/calculate/wallpaper-21.jpg -> ${PF}.jpg
-	CL17? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-17.tar.bz2
-	)
-	CL15? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-15.tar.bz2
-	)
-	CL14? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
-	)
-	CL11? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
-	)
-	CL12? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
-	)
-	CL13? (
-		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
-	)
-	"
-
-DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
-
-# need for templates
-RDEPEND="${DEPEND}
-	|| ( media-gfx/imagemagick
-	media-gfx/graphicsmagick )"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/themes/Calculate/
-	newins "${DISTDIR}"/${PF}.jpg wallpaper.jpg
-
-	insinto /
-	for useflag in $VERSION_IUSE
-	do
-		if use $useflag
-		then
-			cd $WORKDIR/calculate-wallpapers-${useflag//CL}
-			if [[ $useflag == CL14 ]]
-			then
-				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_14
-			fi
-			if [[ $useflag == CL15 ]]
-			then
-				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_15
-			fi
-			if [[ $useflag == CL17 ]]
-			then
-				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_17
-			fi
-			doins -r usr
-		fi
-	done
-}

media-gfx/calculate-wallpapers/calculate-wallpapers-23.ebuild

@@ -5,16 +5,19 @@
 EAPI=7
 
 DESCRIPTION="Wallpapers for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/calculate-wallpapers"
+HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/calculate-wallpapers"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
-VERSION_IUSE="CL11 CL12 CL13 CL14 CL15 CL17 CL21"
-IUSE="+CL11 +CL12 +CL13 +CL14 +CL15 +CL17 +CL21"
+KEYWORDS="amd64"
+VERSION_IUSE="CL11 CL12 CL13 CL14 CL15 CL17 CL21 CL22"
+IUSE="+CL11 +CL12 +CL13 +CL14 +CL15 +CL17 +CL21 +CL22"
 
 SRC_URI="
-	https://mirror.calculate-linux.org/themes/calculate/wallpaper-22.jpg -> ${PF}.jpg
+	https://mirror.calculate-linux.org/themes/calculate/wallpaper-23.jpg -> ${PF}.jpg
+	CL22? (
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-22.tar.bz2
+	)
 	CL21? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-21.tar.bz2
 	)
@@ -38,8 +41,6 @@ SRC_URI="
 	)
 	"
 
-DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
-
 # need for templates
 RDEPEND="${DEPEND}
 	|| ( media-gfx/imagemagick
@@ -52,11 +53,15 @@ src_install() {
 	newins "${DISTDIR}"/${PF}.jpg wallpaper.jpg
 
 	insinto /
-	for useflag in $VERSION_IUSE
+	for useflag in ${VERSION_IUSE}
 	do
 		if use $useflag
 		then
-			cd $WORKDIR/calculate-wallpapers-${useflag//CL}
+			cd "$WORKDIR/calculate-wallpapers-${useflag//CL}"
+			if [[ $useflag == CL22 ]]
+			then
+				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_22
+			fi
 			if [[ $useflag == CL21 ]]
 			then
 				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_21

media-gfx/calculate-wallpapers/metadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>maintainer-wanted</herd>
+	<!-- maintainer-wanted -->
 	<longdescription lang="en">
 Wallpapers for Calculate Linux
 </longdescription>
@@ -11,6 +11,9 @@ Wallpapers for Calculate Linux
 		<flag name="CL13">Include Calculate Linux 13 wallpapers.</flag>
 		<flag name="CL14">Include Calculate Linux 14 wallpapers.</flag>
 		<flag name="CL15">Include Calculate Linux 15 wallpapers.</flag>
+		<flag name="CL17">Include Calculate Linux 17 wallpapers.</flag>
+		<flag name="CL21">Include Calculate Linux 21 wallpapers.</flag>
+		<flag name="CL22">Include Calculate Linux 22 wallpapers.</flag>
 	</use>
 </pkgmetadata>
 

media-gfx/cinnamon-themes-calculate/cinnamon-themes-calculate-15.ebuild

@@ -5,16 +5,14 @@
 EAPI=7
 
 DESCRIPTION="Cinnamon theme for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/cinnamon-themes-calculate"
+HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/cinnamon-themes-calculate"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 SRC_URI="https://mirror.calculate-linux.org/themes/cinnamon/cinnamon-calculate-${PV}.tar.bz2"
 
-REQUIRED_USE=""
 
 S="${WORKDIR}"
 

media-gfx/cinnamon-themes-calculate/metadata.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="project">
+        <email>support@calculate.ru</email>
+        <name>Mir Calculate</name>
+        <description>Calculate Overlay</description>
+    </maintainer>
+</pkgmetadata>

media-gfx/dm-themes-calculate/Manifest

@@ -1,14 +1,10 @@
-DIST dm-14-r4.tar.bz2 4899217 BLAKE2B 97a0ab4218b4c7d7c63210f56b871b258deb030341ec8bd2e4f789f68ea18645d56beb359e89bc9f5a291ef9ab3118dcc5ca43bcb9618ad4bfb82047be3aec99 SHA512 3165841d4fa984ca658c71d3c2bdcb6f2b318ff26c5c5f086d3e44f5ee4bb696707ff4fd8ef1d9e6557c5cebf0c278a87e4f09f574bf439201def06c183ee23e
-DIST dm-15.tar.bz2 23220475 BLAKE2B 9b80b5d200f5c7dc4ce5c92affa4551d0858fb80a83da78034b9f05c64245d6dd5bab2e4eeb1730b3bef94b55b39fae469c1993e24c55b285dae091a10b7935e SHA512 4773ac9315dc9340cbd43b25eca506c1884fc6b53e05843b9dbf256e61bcc1dd3254e439a27aff4c94283fed8d486d65bbfa2fa1cea066cc330dc6d8ba85168b
-DIST dm-cld-13.tar.bz2 2861465 BLAKE2B 3c453d588313336379d066f0129599456236423bb7d8fa62acf910d301446b87ceed6e1c1beae5bb7da0b0cac5c5be9510fb0c88849cdaedc33f63aa594ba713 SHA512 0550323efdec2149114d858e8268cd11be584901132b6f9fd44ace72be5d68949a68316416e5d84c8d01dea61ab19dc1be1f09cb8d95ccbb424fba04811c3efb
-DIST dm-cldg-13.tar.bz2 3118843 BLAKE2B 8172331db778c1dd49dc60724e53624b5cb3ad2d3b00182a9a5863097d43d674d56f501c3de7c72a86143ef49d10106b7af5732fa827e5d80337cdfbff0cfe81 SHA512 22b19896056eadb8eb94e6fc716ee807a3a5d8c21104ac391ae9eff68691c80d905eb28d29f89358520c3cbd90fdc148ecaf62170e3ce581f14eb3c7ae43e041
-DIST dm-cldx-13.tar.bz2 3126013 BLAKE2B eac0050bcd480dda4d1a82b84246e61c111528e6312ad98a87848c00e0f152b38dac41dc87c4969e6f66c2ec2b415e454557f48d7594076bb89b8479b6e75cb6 SHA512 8c1832cc3db67de9198cf5ff675c97745859656146bafb703748cf6c7f6ff46d190100ffb5669f70d052a14e854cf7bfa0d751e015d5c5ae17c9f5abee91e079
-DIST dm-cls-13.tar.bz2 3140558 BLAKE2B 5b6761062ceda4731b2f3f20e62244345362188de5cc107ce1e978e9b880104813f8af7872496f072a13101aed1703473f09a0ac6c114cf652e0a87ddc8446e2 SHA512 ec94f1884f3b0b50737d2e225be0e490d463a07c452ce5d006f6780f21f9fef3e34e352b055c921e3a4c50b57ff6283e07840e92bf24a54924b1ed315316e9fc
 DIST dm-themes-calculate-login-17-r5.jpg 1929196 BLAKE2B f05e6276d48d21cfcfd44c78dec2763eedaab4d315d31316e1dfe2fe46f0f9eb4168fce65d09fc3fa755df200f854506bdc777795483b03012e9277a55b64f28 SHA512 e1242085dc10d504661ffb929db50e167c43443927ff7da2c02edd3686d9fca46f1b0b87f1a70e0d883c8893f30c9beb67b067a170c648e49c0d64be01b53bf7
 DIST dm-themes-calculate-login-18-r1.jpg 1692858 BLAKE2B 2e3c8b97c97ef1fa35ad08ca11542b7e27fb871a762aeed193578ff9a8a02f4b252c0537b708226a62e479e7e6fff736207a0ab99f65dcf516fdfc9550de4b5e SHA512 f1a6b97db272a202b2dbb6ccc31f6ee4dfc253c53a4fb981bc0abd6ed8deed9d724b5bd7136bbfd2f15cf46de48da80018ced1c020bff015181930e98257e010
 DIST dm-themes-calculate-login-21.jpg 599960 BLAKE2B 1185b772039393bbbb104ea6a29347ccd9eb5ca68c7cab7d5a715fe34b584d55933e3b37a9c8036a566e09b6d770bb16200c21cc535fc358695120180c8a978e SHA512 b1c48c5750c30f9436a6a0e12c4d5633bf87ac6ef1e2fa373aa7b81676d3c51220168a8a5e558045e1034ce8c1eaa28c4e472f2fa9ed114ab37ae98a2de43cb9
 DIST dm-themes-calculate-login-22.jpg 598326 BLAKE2B 6f3e47cbab753bd9c93693708b80fa5707d25d3a9a18991bd5917e7c0d14f9ddd08ed58a2e785a028127095790136d58eabc59b9d13754c324bcfc5004491559 SHA512 51c807f31e4aa06f41be135757f6ec871f3aedce88c45f33b44cbabe19da731527b8921f661edc4944e3124c0546b88ad27d57c40da1f79c0e5cbf7529958466
+DIST dm-themes-calculate-login-23.jpg 2098350 BLAKE2B 9f095d984f4ee537522cadc9441c1cfbb6717c91aa4f234f77166a639c072cefafa199b91f7883e6065eca43125337d74790e5c86ab0eb7458940320a8b36f07 SHA512 986370384430344ee5b1f417b0cbe7f31414058c095af39a0de2e29d3f133ac974de780548b26da58cd6dde4e3ed2d12542ed75e5dc12cfad2422aa609b09b73
 DIST dm-themes-calculate-splash-17-r5.jpg 6911444 BLAKE2B a1206edcbeb03cd1e710c298f40f89b2c33e71096707444d69ba99717be7f1ec8721f13ba434c34e7f9791f488f32ba9e7e4139e933748683ffcf90a4d7f64f1 SHA512 f24965479aaff006b161b5aab84797cb1239f6fc53f9d354bafcb187d937fe67d6f3edbd436458caf386ddcede079e94c1553fb4ed45febf59340c8209c34292
 DIST dm-themes-calculate-splash-18-r1.jpg 1750291 BLAKE2B abb936f262488a896a7056528edb0a2d604b8f1f571aba04ff0599a5a81badc43afb6415d7b69c3704f0b14122f750618919ef2cca889ee2ef8e0dc408c99055 SHA512 59f9ae99fca924a127091aae59a540fd37b23ea6fce1591e6503ed4ab22ed5b0dfa1cd0f163f89d4f531783a66c73a27a921d969a3ea7c41ec62dc60083ef5b3
 DIST dm-themes-calculate-splash-21.jpg 599960 BLAKE2B 1185b772039393bbbb104ea6a29347ccd9eb5ca68c7cab7d5a715fe34b584d55933e3b37a9c8036a566e09b6d770bb16200c21cc535fc358695120180c8a978e SHA512 b1c48c5750c30f9436a6a0e12c4d5633bf87ac6ef1e2fa373aa7b81676d3c51220168a8a5e558045e1034ce8c1eaa28c4e472f2fa9ed114ab37ae98a2de43cb9
 DIST dm-themes-calculate-splash-22.jpg 598326 BLAKE2B 6f3e47cbab753bd9c93693708b80fa5707d25d3a9a18991bd5917e7c0d14f9ddd08ed58a2e785a028127095790136d58eabc59b9d13754c324bcfc5004491559 SHA512 51c807f31e4aa06f41be135757f6ec871f3aedce88c45f33b44cbabe19da731527b8921f661edc4944e3124c0546b88ad27d57c40da1f79c0e5cbf7529958466
+DIST dm-themes-calculate-splash-23.jpg 2098350 BLAKE2B 9f095d984f4ee537522cadc9441c1cfbb6717c91aa4f234f77166a639c072cefafa199b91f7883e6065eca43125337d74790e5c86ab0eb7458940320a8b36f07 SHA512 986370384430344ee5b1f417b0cbe7f31414058c095af39a0de2e29d3f133ac974de780548b26da58cd6dde4e3ed2d12542ed75e5dc12cfad2422aa609b09b73

media-gfx/dm-themes-calculate/dm-themes-calculate-13.ebuild

@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=7
-
-DESCRIPTION="Wallpapers for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="themes_CLD themes_CLDX themes_CLS
-themes_CLDG"
-
-SRC_URI="themes_CLD? (
-	https://mirror.calculate-linux.org/themes/dm/dm-cld-13.tar.bz2
-)
-themes_CLDX? (
-	https://mirror.calculate-linux.org/themes/dm/dm-cldx-13.tar.bz2
-)
-themes_CLDG? (
-	https://mirror.calculate-linux.org/themes/dm/dm-cldg-13.tar.bz2
-)
-themes_CLS? (
-	https://mirror.calculate-linux.org/themes/dm/dm-cls-13.tar.bz2
-)"
-
-REQUIRED_USE="^^ ( themes_CLD themes_CLDX themes_CLS themes_CLDG )"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto /
-	doins -r .
-}
-

media-gfx/dm-themes-calculate/dm-themes-calculate-14-r2.ebuild

@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=7
-
-DESCRIPTION="Wallpapers for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_URI="https://mirror.calculate-linux.org/themes/dm/dm-14-r4.tar.bz2"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto /
-	doins -r .
-}
-

media-gfx/dm-themes-calculate/dm-themes-calculate-15.ebuild

@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=7
-
-DESCRIPTION="Wallpapers for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_URI="https://mirror.calculate-linux.org/themes/dm/dm-15.tar.bz2"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto /
-	doins -r .
-}
-

media-gfx/dm-themes-calculate/dm-themes-calculate-17-r5.ebuild

@@ -5,7 +5,7 @@
 EAPI=7
 
 DESCRIPTION="Display manager wallpapers for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
+HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -35,4 +35,3 @@ src_install() {
 	use login && newins "${DISTDIR}"/${PN}-login-${PVR}.jpg dm-login.jpg
 	use splash && newins "${DISTDIR}"/${PN}-splash-${PVR}.jpg dm-splash.jpg
 }
-

media-gfx/dm-themes-calculate/dm-themes-calculate-18-r1.ebuild

@@ -5,7 +5,7 @@
 EAPI=7
 
 DESCRIPTION="Display manager wallpapers for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
+HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -35,4 +35,3 @@ src_install() {
 	use login && newins "${DISTDIR}"/${PN}-login-${PVR}.jpg dm-login.jpg
 	use splash && newins "${DISTDIR}"/${PN}-splash-${PVR}.jpg dm-splash.jpg
 }
-

media-gfx/dm-themes-calculate/dm-themes-calculate-21.ebuild

@@ -5,7 +5,7 @@
 EAPI=7
 
 DESCRIPTION="Display manager wallpapers for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
+HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -35,4 +35,3 @@ src_install() {
 	use login && newins "${DISTDIR}"/${PN}-login-${PVR}.jpg dm-login.jpg
 	use splash && newins "${DISTDIR}"/${PN}-splash-${PVR}.jpg dm-splash.jpg
 }
-

media-gfx/dm-themes-calculate/dm-themes-calculate-22.ebuild

@@ -5,7 +5,7 @@
 EAPI=7
 
 DESCRIPTION="Display manager wallpapers for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
+HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -37,4 +37,3 @@ src_install() {
 	use login && newins "${DISTDIR}"/${PN}-login-${PVR}.jpg dm-login.jpg
 	use splash && newins "${DISTDIR}"/${PN}-splash-${PVR}.jpg dm-splash.jpg
 }
-

media-gfx/dm-themes-calculate/dm-themes-calculate-23.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=7
+
+DESCRIPTION="Display manager wallpapers for Calculate Linux"
+HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+splash +login"
+
+REQUIRED_USE="|| ( splash login )"
+
+SRC_URI="
+	login? (
+		https://mirror.calculate-linux.org/themes/calculate/dm-login-${PV}.jpg -> ${PN}-login-${PVR}.jpg
+	)
+	splash? (
+		https://mirror.calculate-linux.org/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg
+	)
+"
+
+DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
+
+# need for templates
+RDEPEND="${DEPEND}
+	|| ( media-gfx/imagemagick
+	media-gfx/graphicsmagick )"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/themes/Calculate/
+	use login && newins "${DISTDIR}"/${PN}-login-${PVR}.jpg dm-login.jpg
+	use splash && newins "${DISTDIR}"/${PN}-splash-${PVR}.jpg dm-splash.jpg
+}

media-gfx/dm-themes-calculate/metadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>maintainer-wanted</herd>
+	<!-- maintainer-wanted -->
 	<longdescription lang="en">
 Display manager wallpapers for Calculate Linux
 </longdescription>

media-gfx/epson-ds-plugins/Manifest

@@ -1,2 +0,0 @@
-DIST imagescan-bundle-centos-7-1.3.28.x64.rpm.tar.gz 10975019 BLAKE2B c190fd160b91ea192c7f0f431e761e8e4c6ee369924b0e325a57e80a8a4c0b6c3162cdc80121fa813f1afef8118b440e59ea3a38a6621ecc320d00f8cad08268 SHA512 051743bc64760038bb468201114d7270e6f22c3f802824ee80f77b5b6200409aca4da330d3afb4a11a7754dfdcb28d7c4a8246180f3e0fb4483349072c10c86f
-DIST imagescan-bundle-centos-7-3.63.0.x64.rpm.tar.gz 11012473 BLAKE2B 221c041f113405cc679c51242a4b6ebf3fa8e25008748215074966e8c0298a18eb0e89a758d4c2ddaa36c7e0bd43924e17c3b6f75a78fd7a454b42c4d56ffe87 SHA512 ddfbf12849bfe25b903a8c483520a7297ead129477dc4f3b0c39c424918d507314834d0b161f84d58d1ceb469ee9a12c726ff9651a78807e901abbc81e608d2d

media-gfx/epson-ds-plugins/epson-ds-plugins-1.3.28.ebuild

@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm
-
-S="${WORKDIR}"
-
-DESCRIPTION="Non-free network plugin package for Epson DS line of scanners"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-#SRC_URI="https://download2.ebz.epson.net/imagescanv3/centos/latest1/rpm/x64/imagescan-bundle-centos-7-${PV}.x64.rpm.tar.gz"
-SRC_URI="https://download2.ebz.epson.net/imagescanv3/centos/latest2/rpm/x64/imagescan-bundle-centos-7-${PV}.x64.rpm.tar.gz"
-
-RESTRICT="nomirror"
-
-LICENSE="COPYING.EPSON"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	${DEPEND}
-	media-gfx/utsushi
-"
-
-# EPSON provided closed-source binary
-QA_PRESTRIPPED="usr/libexec/utsushi/networkscan"
-
-src_unpack() {
-	# Create a 'core' and 'plugins' directory to unpack into
-	mkdir -p "${WORKDIR}/"{core,plugins}
-
-	# Unpack top-level package
-	unpack "$A"
-
-	# Unpack the core drivers to the created 'core' directory
-	cd "${WORKDIR}/core"
-	rpm_unpack ./../imagescan-bundle-centos-7-${PV}.x64.rpm/core/imagescan-*.rpm
-
-	# Unpack 'networkscan' plugin to the created 'plugins' directory
-	cd "${WORKDIR}/plugins"
-	rpm_unpack ./../imagescan-bundle-centos-7-${PV}.x64.rpm/plugins/imagescan-plugin-networkscan*.rpm
-}
-
-#
-# The udev rules are not installed as it's handled by the 'utsushi' source
-# package.
-#
-# The 'utsushi' config file for SANE (/etc/sane.d/dll.d/utsushi) is handled by
-# the 'utsushi' source package
-#
-src_install() {
-	# Create a subdirectory to install the 'networkscan' docs
-	dodoc ${WORKDIR}/plugins/usr/share/doc/imagescan-plugin-networkscan-*/{README,NEWS}
-
-	# Install the 'networkscan' config files
-	# Renamed config to 'utsushi.conf' to be picked up by utsushi SANE backend
-	insinto /etc/utsushi
-	newins ${WORKDIR}/core/etc/imagescan/imagescan.conf utsushi.conf
-
-	# Install the 'networkscan' binary
-	exeinto /usr/libexec/utsushi
-	doexe ${WORKDIR}/plugins/usr/libexec/utsushi/networkscan
-}
-
-pkg_postinst() {
-	elog
-	elog "Remember to insert your scanner information into:"
-	elog "  /etc/utsushi/utsushi.conf"
-	elog
-	elog "See /usr/share/doc/${PF}/README.bz2 for examples"
-	elog
-}

media-gfx/epson-ds-plugins/epson-ds-plugins-3.63.0.ebuild

@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm
-
-S="${WORKDIR}"
-
-DESCRIPTION="Non-free network plugin package for Epson DS line of scanners"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-#SRC_URI="https://download2.ebz.epson.net/imagescanv3/centos/latest1/rpm/x64/imagescan-bundle-centos-7-${PV}.x64.rpm.tar.gz"
-SRC_URI="https://download2.ebz.epson.net/imagescanv3/centos/latest2/rpm/x64/imagescan-bundle-centos-7-${PV}.x64.rpm.tar.gz"
-
-RESTRICT="nomirror"
-
-LICENSE="COPYING.EPSON"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	${DEPEND}
-	media-gfx/utsushi
-"
-
-# EPSON provided closed-source binary
-QA_PRESTRIPPED="usr/libexec/utsushi/networkscan"
-
-src_unpack() {
-	# Create a 'core' and 'plugins' directory to unpack into
-	mkdir -p "${WORKDIR}/"{core,plugins}
-
-	# Unpack top-level package
-	unpack "$A"
-
-	# Unpack the core drivers to the created 'core' directory
-	cd "${WORKDIR}/core"
-	rpm_unpack ./../imagescan-bundle-centos-7-${PV}.x64.rpm/core/imagescan-*.rpm
-
-	# Unpack 'networkscan' plugin to the created 'plugins' directory
-	cd "${WORKDIR}/plugins"
-	rpm_unpack ./../imagescan-bundle-centos-7-${PV}.x64.rpm/plugins/imagescan-plugin-networkscan*.rpm
-}
-
-#
-# The udev rules are not installed as it's handled by the 'utsushi' source
-# package.
-#
-# The 'utsushi' config file for SANE (/etc/sane.d/dll.d/utsushi) is handled by
-# the 'utsushi' source package
-#
-src_install() {
-	# Create a subdirectory to install the 'networkscan' docs
-	dodoc ${WORKDIR}/plugins/usr/share/doc/imagescan-plugin-networkscan-*/{README,NEWS}
-
-	# Install the 'networkscan' config files
-	# Renamed config to 'utsushi.conf' to be picked up by utsushi SANE backend
-	insinto /etc/utsushi
-	newins ${WORKDIR}/core/etc/imagescan/imagescan.conf utsushi.conf
-
-	# Install the 'networkscan' binary
-	exeinto /usr/libexec/utsushi
-	doexe ${WORKDIR}/plugins/usr/libexec/utsushi/networkscan
-}
-
-pkg_postinst() {
-	elog
-	elog "Remember to insert your scanner information into:"
-	elog "  /etc/utsushi/utsushi.conf"
-	elog
-	elog "See /usr/share/doc/${PF}/README.bz2 for examples"
-	elog
-}

media-gfx/epsonscan2/epsonscan2-6.6.42.0.ebuild

@@ -31,7 +31,6 @@ DEPEND="
 	virtual/libusb:1
 "
 RDEPEND="${DEPEND}"
-BDEPEND=""
 
 src_prepare() {
 	cmake_src_prepare

media-gfx/epsonscan2/metadata.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="project">
+        <email>support@calculate.ru</email>
+        <name>Mir Calculate</name>
+        <description>Calculate Overlay</description>
+    </maintainer>
+</pkgmetadata>

media-gfx/gfxboot-themes-calculate/Manifest

@@ -1,6 +1,3 @@
-DIST gfxboot-themes-calculate-15-r2.tar.bz2 127646 BLAKE2B 257362a84fe267b4aa8b965769e6c0bd586f739a2d8f5c56da1240fec998e42f00a1de538698ffd599b6bd30c6856b3d56a49da7e8c62b1db0fa9cb61a6d35b6 SHA512 e0deb779c077f0aee3c185dbd574b733a4037de8b0ea348f09f5d30e3bd022b08ecd536ee6dfc8d44fe53d2320d5666ba44dd62ac1fa92cd52a4f51f7df2e37e
-DIST gfxboot-themes-calculate-15-r3.tar.bz2 128045 BLAKE2B 88c34b0b6ce7ea203ff0aab6cb9139b6493f6fcd03906885ee143f6361f8a56734c8a5b30b16af0c95127a83d1949dd94ab0da7966e20edaa01a7b6a244d86e9 SHA512 96d53d237472a5ec903829c64009d576c4786c17d08d7ea9bf7d4159dc97330f69365caa6ba4cd89a963018fe531004868b1828e1ab6d07c113e1ab0ec162cde
-DIST gfxboot-themes-calculate-15.tar.bz2 112143 BLAKE2B 9612a4ca78494668f1fe7b59bfa8a8afc4b765491314f7f2c1c7bc76c31cad0fdd974f21a11c4306d3b963f2be85bb03a5befd08ae4c8b0637ba963d9fdaf1ee SHA512 c75a4ee3ad12f4797f755c2554da5c39ebf8349f9b0aa7851ff37da6909109374a14444a9135c356960a6efcbed1f1f3d84fc7628a57987e728c9e82b0f5c310
 DIST gfxboot-themes-calculate-17.tar.bz2 126283 BLAKE2B ef053f2f38105714f8467ff1fa12e4a4543f0465fa311f7ac1e94ce7d92f65a968d0cc53e790cdd08b29a07b2dbf5655e97f4cdadbe898d6b4f5829561bd5859 SHA512 ae5dde88cb4430422be6192b5b6aaeaf5811f0c2d18101b5cab55c0bc4fe001e40644d7c0e794e18785078de3cdad2a9bc802b525c2d4e68c1d4013610adb85d
 DIST gfxboot-themes-calculate-18-r1.tar.bz2 135101 BLAKE2B 5e7bd4194ca8a0fa50229444fb05de36cffaabd523193f9edee2660ec524df1684d292d21914f994af19d613605e6f1bf0bdc66b741770bef688a4ac859620ba SHA512 e17ac5722ee29a093a48cc7bee9b26ee66fcf236bd34a7d30f7d3b04c3ca379359a163734b542c67f431e78751c199f4c51724e4664a6a1afecab6ca1138d60e
 DIST gfxboot-themes-calculate-18.tar.bz2 135102 BLAKE2B fcd8afa443dd811e418850371206d011322229339451ad013eb1ce1d6db856988e71a6d30de931de87195e46347a215a310182744eacccff934f4a19d709220b SHA512 00cacc8278532db5a89e2f7ebb12d2d2fd8c7d9d04f4c114e2341569237540ec1a04f55cabca7aae4d828a86b1dedf0460c6fe0ff2d033f286fc5ac1b8807776

media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r2.ebuild

@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=7
-
-DESCRIPTION="Gfxboot themes for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
-
-RDEPEND="media-gfx/gfxboot"
-
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/share/themes/gfxboot-themes-calculate
-	insinto /usr/share/themes/gfxboot-themes-calculate
-	doins -r $(find install/* | grep -v -e install/log -e bootlogo.tar.gz)
-}

media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r3.ebuild

@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=7
-
-DESCRIPTION="Gfxboot themes for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
-
-RDEPEND="media-gfx/gfxboot"
-
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/share/themes/gfxboot-themes-calculate
-	insinto /usr/share/themes/gfxboot-themes-calculate
-	doins -r $(find install/* | grep -v -e install/log -e bootlogo.tar.gz)
-}

media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15.ebuild

@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=7
-
-DESCRIPTION="Gfxboot themes for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
-
-RDEPEND="media-gfx/gfxboot"
-
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/share/themes/gfxboot-themes-calculate
-	insinto /usr/share/themes/gfxboot-themes-calculate
-	doins -r $(find install/* | grep -v -e install/log -e bootlogo.tar.gz)
-}

media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17-r1.ebuild

@@ -5,12 +5,11 @@
 EAPI=7
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
+HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
 

media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17.ebuild

@@ -5,12 +5,11 @@
 EAPI=7
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
+HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
 

media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18-r1.ebuild

@@ -5,12 +5,11 @@
 EAPI=7
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
+HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 

media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18.ebuild

@@ -5,12 +5,11 @@
 EAPI=7
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
+HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
 

media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r1.ebuild

@@ -5,12 +5,11 @@
 EAPI=7
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
+HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 

media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r2.ebuild

@@ -5,12 +5,11 @@
 EAPI=7
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
+HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 

media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r3.ebuild

@@ -5,12 +5,11 @@
 EAPI=7
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
+HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 

media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19.ebuild

@@ -5,12 +5,11 @@
 EAPI=7
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
+HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 

media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-20.ebuild

@@ -5,12 +5,11 @@
 EAPI=7
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
+HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"