From f9d266b037ac6ebb0b40360f3de005eeb95e2bd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Wed, 25 Jul 2018 18:01:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=82=D0=B5=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 media-gfx/calculate-wallpapers/Manifest       |  3 +-
 ...uild => calculate-wallpapers-17-r3.ebuild} | 24 +++----
 .../calculate-wallpapers-17.ebuild            | 70 -------------------
 media-gfx/dm-themes-calculate/Manifest        |  5 +-
 ...build => dm-themes-calculate-17-r4.ebuild} |  8 +--
 .../dm-themes-calculate-17.ebuild             | 26 -------
 6 files changed, 19 insertions(+), 117 deletions(-)
 rename media-gfx/calculate-wallpapers/{calculate-wallpapers-17-r2.ebuild => calculate-wallpapers-17-r3.ebuild} (53%)
 delete mode 100644 media-gfx/calculate-wallpapers/calculate-wallpapers-17.ebuild
 rename media-gfx/dm-themes-calculate/{dm-themes-calculate-17-r3.ebuild => dm-themes-calculate-17-r4.ebuild} (62%)
 delete mode 100644 media-gfx/dm-themes-calculate/dm-themes-calculate-17.ebuild

diff --git a/media-gfx/calculate-wallpapers/Manifest b/media-gfx/calculate-wallpapers/Manifest
index fa08dd5c0..2aaeeabc9 100644
--- a/media-gfx/calculate-wallpapers/Manifest
+++ b/media-gfx/calculate-wallpapers/Manifest
@@ -1,5 +1,4 @@
-DIST calculate-wallpapers-17-r2.jpg 1519740 SHA256 f3fd643a7b38f063742ee81be0aef0107a55a0cec9aacbeb49365fd72e0c8fd0 SHA512 c7d918513efee4b40f43d0fe33be87305746d5788c0343ae21c0af531da2403e03066d3622dd1f6316bc92004821676cc519dc0c6023a401fd573d1c4fec8acb WHIRLPOOL ab6bcc70ab895d5d7a6a12e778576390d8e8efd8f1d0461421be84cf2679cdbda0ff0885f0cc4efd9b519fc41bc52ccd16c14b2d331456de21087e99bd94fd20
-DIST calculate-wallpapers-17.jpg 1498109 SHA256 60630db4073904d372fa80a8bc7d3f03cb207c82c0cc63780e212d84a5c887fa SHA512 0c6ea3b9bfd822e98738b162ab28a410296b96c16901712cf69710f4af3af2f56a64f2cf24d3207b2e274ebc9b6f18268f2fa1aeee5b15f2aabdaff7de91095a WHIRLPOOL 0587809ba13ad7793bff7157ac30e1fae445e80e76f38ca94df7dd43cdd1e9675fd59c0e05ed26c50834a0ef45e444b850e9b66db325a45d26ac62357dc7ed37
+DIST calculate-wallpapers-17-r3.jpg 1498109 SHA256 60630db4073904d372fa80a8bc7d3f03cb207c82c0cc63780e212d84a5c887fa SHA512 0c6ea3b9bfd822e98738b162ab28a410296b96c16901712cf69710f4af3af2f56a64f2cf24d3207b2e274ebc9b6f18268f2fa1aeee5b15f2aabdaff7de91095a WHIRLPOOL 0587809ba13ad7793bff7157ac30e1fae445e80e76f38ca94df7dd43cdd1e9675fd59c0e05ed26c50834a0ef45e444b850e9b66db325a45d26ac62357dc7ed37
 DIST wallpapers-11.tar.bz2 5318262 SHA256 9f33f5d4bf4aedfd10cc024c54d324f3bcbd9e633c95be7f166bd0e10e5ede35 SHA512 32e0573427357d1c372df3a68f77bd6d6faab16c9f5fc67b6cf21486683644de5a2878e8f1fb5826e3b67acc262c21b46d07f942341090e776e4bfcece37378a WHIRLPOOL ad61f7954323d436c3fae199aa64c477acfcfbb6fae23a939c18e5e50c7150c0b4cf64951ce1d60292f05b8a8a0d7b745a15eddbc6a41bc171c844509eaa215e
 DIST wallpapers-12.tar.bz2 14993163 SHA256 864e16a96960d65cccd7363390138af54e19106bfc700fe1d6913562d7b18b4b SHA512 b35b712e1993f960bdbfd0343b03d21bd990c38e9053920ac395443d010b4eb9f6178cfde0a3ca45a83c67a9b6609ffce9905dec4be400b521d82255533d60ec WHIRLPOOL 89ac4ee7edb961aebe62142badf6804eb0d7e381945360638c745c10b34e87e49d2aa6d3c1b73454b564a39eff9b387aabd9079b1f1c2dcd2b3a6549a866b466
 DIST wallpapers-13.tar.bz2 14606610 SHA256 6838b0e70c50201b36e600a27a68af0b5b142b585299e27412836f72e5d36862 SHA512 9b83d30a428b2897708acda943cdf3de7e400a4fa1f4bdd6eea827fc6be37c0b1e8fdddf9acc9f3dea493071006bd2e4663c569562c546a56dddc60be2acc12b WHIRLPOOL da01fbcfef13e7d6f413903a3ff7011901ec782eab446e93ae20108e387faa7d472b4cf6650f78066640b8086a585aec876f012674e20b92ffd2ec3e683c34f4
diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-17-r2.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-17-r3.ebuild
similarity index 53%
rename from media-gfx/calculate-wallpapers/calculate-wallpapers-17-r2.ebuild
rename to media-gfx/calculate-wallpapers/calculate-wallpapers-17-r3.ebuild
index c503353aa..2a4d4b736 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-17-r2.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-17-r3.ebuild
@@ -14,27 +14,27 @@ VERSION_IUSE="CL11 CL12 CL13 CL14 CL15"
 IUSE="+CL11 +CL12 +CL13 +CL14 +CL15"
 
 SRC_URI="
-	http://mirror.calculate-linux.org/themes/calculate/wallpaper-17-r1.jpg -> ${PF}.jpg
-	http://mirror.yandex.ru/calculate/themes/calculate/wallpaper-17-r1.jpg -> ${PF}.jpg
+	https://mirror.calculate-linux.org/themes/calculate/wallpaper-17.jpg -> ${PF}.jpg
+	https://mirror.yandex.ru/calculate/themes/calculate/wallpaper-17.jpg -> ${PF}.jpg
 	CL15? (
-		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-15.tar.bz2
-		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-15.tar.bz2
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-15.tar.bz2
+		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-15.tar.bz2
 	)
 	CL14? (
-		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
-		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
+		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
 	)
 	CL11? (
-		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
-		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-11.tar.bz2
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
+		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-11.tar.bz2
 	)
 	CL12? (
-		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
-		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-12.tar.bz2
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
+		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-12.tar.bz2
 	)
 	CL13? (
-		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
-		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-13.tar.bz2
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
+		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-13.tar.bz2
 	)
 	"
 
diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-17.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-17.ebuild
deleted file mode 100644
index d1b722884..000000000
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-17.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-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="
-	http://mirror.calculate-linux.org/themes/calculate/wallpaper-17.jpg -> ${PF}.jpg
-	http://mirror.yandex.ru/calculate/themes/calculate/wallpaper-17.jpg -> ${PF}.jpg
-	CL15? (
-		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-15.tar.bz2
-		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-15.tar.bz2
-	)
-	CL14? (
-		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
-		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
-	)
-	CL11? (
-		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
-		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-11.tar.bz2
-	)
-	CL12? (
-		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
-		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-12.tar.bz2
-	)
-	CL13? (
-		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
-		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-13.tar.bz2
-	)
-	"
-
-DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
-
-# need for templates
-RDEPEND="${DEPEND}
-	media-gfx/imagemagick"
-
-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
-}
diff --git a/media-gfx/dm-themes-calculate/Manifest b/media-gfx/dm-themes-calculate/Manifest
index 8939b6ca5..7038270a3 100644
--- a/media-gfx/dm-themes-calculate/Manifest
+++ b/media-gfx/dm-themes-calculate/Manifest
@@ -1,9 +1,8 @@
 DIST dm-14-r4.tar.bz2 4899217 SHA256 f8bf0cbcfcb4dab4f3c02c94efd6f50ec7a6c9b4d25f37f3f3d83873d66b314e SHA512 3165841d4fa984ca658c71d3c2bdcb6f2b318ff26c5c5f086d3e44f5ee4bb696707ff4fd8ef1d9e6557c5cebf0c278a87e4f09f574bf439201def06c183ee23e WHIRLPOOL 2c6013de91796c06bebc7fb214235423f4464db8ff7d5613b5c69d64724ce117cfd0c172046bb4ca8aedd1e68403640aa8a1b50703aa397a6e1e8521f7a96994
 DIST dm-15.tar.bz2 23220475 SHA256 7874657e5be24f50e8e654980f2e18ec5f87df0e272cdae91e1857c158334e05 SHA512 4773ac9315dc9340cbd43b25eca506c1884fc6b53e05843b9dbf256e61bcc1dd3254e439a27aff4c94283fed8d486d65bbfa2fa1cea066cc330dc6d8ba85168b WHIRLPOOL 003aed6b7540ef7083fd8e370ee55704a3bd9cd6b0e3992297942e55d7f1681da0c14c529cbe102ae236e6642c640361ccdfe6193998743e413fec9d695ab7a6
-DIST dm-17.tar.bz2 25400696 SHA256 cae632df2130b6e8e16d43b9af3c17da8c6bad56ba6fb4dbf0f98bbfdf604f85 SHA512 4b2fca32e7b23d3a272b6054b15a3ab8fcd078f1fadfbb29da68b8da8bc8dcc9539e0208c3850b0f5d0ced439b9b8be398019a4579f8c80e5c6391137fb973d1 WHIRLPOOL 05414f5b9dd9c450f6bbe437eaec9d34b8dc55bac5bd4052260f7c454a482d61868863ec262d1bfb11c3a639fdb5bb3f03e5daa024a7c73e01ca706eda5458e9
 DIST dm-cld-13.tar.bz2 2861465 SHA256 aacd046dd375eded1e3c74dd039bc0820159e07f82d2d3b58f233e0f3fac6f01 SHA512 0550323efdec2149114d858e8268cd11be584901132b6f9fd44ace72be5d68949a68316416e5d84c8d01dea61ab19dc1be1f09cb8d95ccbb424fba04811c3efb WHIRLPOOL 9c7db5e5c0fb24168bc962e6959a3fa7ee4e42b3d27ddae988091511ee964f8420cf0c64eede25398e72bd045bb75a2652697d1aa4a42c1f948eecec09688482
 DIST dm-cldg-13.tar.bz2 3118843 SHA256 a7898282262f12e1294347141c9ad38b4990c13035535fa9fd9aaaf5e272ad62 SHA512 22b19896056eadb8eb94e6fc716ee807a3a5d8c21104ac391ae9eff68691c80d905eb28d29f89358520c3cbd90fdc148ecaf62170e3ce581f14eb3c7ae43e041 WHIRLPOOL f08054d04380baf9db4fbadf5f56dbce8944985344ed4fb4b2bb1a611ce08749491c3522589e1cf47ffebceaa7e4864e9774d3258c642e608645f7a8070737bf
 DIST dm-cldx-13.tar.bz2 3126013 SHA256 da1e83127fe5a36f6004c98fe28e631a361efb8397a44c35b9f02115a0470717 SHA512 8c1832cc3db67de9198cf5ff675c97745859656146bafb703748cf6c7f6ff46d190100ffb5669f70d052a14e854cf7bfa0d751e015d5c5ae17c9f5abee91e079 WHIRLPOOL f509fe1812cc3aaccbe8aa75ac450208a4336dfc23aa2951cb490fe03b8fa49a8162c0c48113e9412b8c9fdb617db44dd5f45fece405e593ccc2aa3280714a17
 DIST dm-cls-13.tar.bz2 3140558 SHA256 62cf3d9e1f620a2788c9d85ab68f84817b45278abcafaa135636f8f5c6486a6f SHA512 ec94f1884f3b0b50737d2e225be0e490d463a07c452ce5d006f6780f21f9fef3e34e352b055c921e3a4c50b57ff6283e07840e92bf24a54924b1ed315316e9fc WHIRLPOOL d818e8e6178eb15390a5a114df2ecda54243efd35d737cd1b254ac79e7c8140dd813b82d62d471b569305352f55c393e83e6d49e80231776d25201fd58ce9ad5
-DIST dm-themes-calculate-login-17-r3.jpg 1939738 SHA256 499019fa08b30141944acbc7f4fd1b816aac0b62819e8288d9bdccf9945b48dd SHA512 17af17ec9cc0aba94d05729128305de93166217e6f72884d328e58e614db62536ad8c9bec02ac49ddb37478debacbf2a1faf1e324ba4789f28e228f5f6793cf7 WHIRLPOOL f0f60f8ef6c671f5b26ddf25039edc8352c23c6009c91dfd32442eef9a00de1e108a6ce27ea6b6cec73d4dfe5a24cda5f9f87ebe9281720535d96ff264417829
-DIST dm-themes-calculate-splash-17-r3.jpg 6911444 SHA256 c3cdfd21cecbed2da128af6a2e80fa635d834f6746495c5841981133273b8cb9 SHA512 f24965479aaff006b161b5aab84797cb1239f6fc53f9d354bafcb187d937fe67d6f3edbd436458caf386ddcede079e94c1553fb4ed45febf59340c8209c34292 WHIRLPOOL a845e76842a913f4518c280d928a6eb51e99036bee196ddbab0d7fe2781e033c619226ec92c34234391d39ff02e46d439684177722dcee6d941916294a6a8894
+DIST dm-themes-calculate-login-17-r4.jpg 1929196 SHA256 99fd25b5eb542733e81ab4154c94f8347919d02c5245ed2f931d43df531d40a8 SHA512 e1242085dc10d504661ffb929db50e167c43443927ff7da2c02edd3686d9fca46f1b0b87f1a70e0d883c8893f30c9beb67b067a170c648e49c0d64be01b53bf7 WHIRLPOOL e87306b6055411741f7407600e8fb8d7e293155a1fec1c4abc4e150780ce8a62bf3cb74354c590e4cd80741b1e2de7417524c0b911fbe7e6b896b9b91e8fc787
+DIST dm-themes-calculate-splash-17-r4.jpg 6911444 SHA256 c3cdfd21cecbed2da128af6a2e80fa635d834f6746495c5841981133273b8cb9 SHA512 f24965479aaff006b161b5aab84797cb1239f6fc53f9d354bafcb187d937fe67d6f3edbd436458caf386ddcede079e94c1553fb4ed45febf59340c8209c34292 WHIRLPOOL a845e76842a913f4518c280d928a6eb51e99036bee196ddbab0d7fe2781e033c619226ec92c34234391d39ff02e46d439684177722dcee6d941916294a6a8894
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r3.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r4.ebuild
similarity index 62%
rename from media-gfx/dm-themes-calculate/dm-themes-calculate-17-r3.ebuild
rename to media-gfx/dm-themes-calculate/dm-themes-calculate-17-r4.ebuild
index 7a5621451..f30f588d4 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r3.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r4.ebuild
@@ -14,10 +14,10 @@ IUSE="+splash +login"
 
 REQUIRED_USE="|| ( splash login )"
 
-SRC_URI="login? ( http://mirror.calculate-linux.org/themes/calculate/dm-login-${PV}-r1.jpg -> ${PN}-login-${PVR}.jpg
-	http://mirror.yandex.ru/calculate/themes/calculate/dm-login-${PV}-r1.jpg -> ${PN}-login-${PVR}.jpg )
-	splash? ( http://mirror.calculate-linux.org/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg
-	http://mirror.yandex.ru/calculate/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg )"
+SRC_URI="login? ( https://mirror.calculate-linux.org/themes/calculate/dm-login-${PV}.jpg -> ${PN}-login-${PVR}.jpg
+	https://mirror.yandex.ru/calculate/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
+	https://mirror.yandex.ru/calculate/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg )"
 
 DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
 
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-17.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-17.ebuild
deleted file mode 100644
index fed4a7a99..000000000
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-17.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-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="ftp://ftp.calculate-linux.org/calculate/themes/dm/dm-${PV}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/dm/dm-${PV}.tar.bz2"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto /
-	doins -r .
-}
-