From ae3fceb734189a2ab1d6308c450a9cd2d0f98d6a 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: Thu, 6 Jul 2017 15:55:23 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20ebuild'=D1=8B=20=D1=82=D0=B5=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

http://www.calculate-linux.ru/issues/1000
---
 media-gfx/calculate-wallpapers/Manifest       |  3 +-
 .../calculate-wallpapers-17.ebuild            | 31 ++++++++---------
 media-gfx/splash-themes-calculate/Manifest    |  1 -
 .../splash-themes-calculate-17.ebuild         | 33 -------------------
 4 files changed, 17 insertions(+), 51 deletions(-)
 delete mode 100644 media-gfx/splash-themes-calculate/splash-themes-calculate-17.ebuild

diff --git a/media-gfx/calculate-wallpapers/Manifest b/media-gfx/calculate-wallpapers/Manifest
index b41c9bd25..c45b3bbf7 100644
--- a/media-gfx/calculate-wallpapers/Manifest
+++ b/media-gfx/calculate-wallpapers/Manifest
@@ -1,7 +1,6 @@
-DIST calculate-wallpapers-17.jpg 1519740 SHA256 f3fd643a7b38f063742ee81be0aef0107a55a0cec9aacbeb49365fd72e0c8fd0 SHA512 c7d918513efee4b40f43d0fe33be87305746d5788c0343ae21c0af531da2403e03066d3622dd1f6316bc92004821676cc519dc0c6023a401fd573d1c4fec8acb WHIRLPOOL ab6bcc70ab895d5d7a6a12e778576390d8e8efd8f1d0461421be84cf2679cdbda0ff0885f0cc4efd9b519fc41bc52ccd16c14b2d331456de21087e99bd94fd20
+DIST calculate-wallpapers-17.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
 DIST wallpapers-14-r1.tar.bz2 6632861 SHA256 44758e60504fe7f917da601c7d4d4a06de03fee19e86913b3c002b68eac150f8 SHA512 04660bb6f05156ead4b2353f60ad11b886fa9048eaa0b7240dd8ba845591e00b1a57792429397e916ca7761f05ee1919945bd5bc4c53d253b7b0eb827b3997bd WHIRLPOOL 968d64e510fb9e0a6b93530dce3c65d2eea480a0c5433424d40ae48b89649f1ef61ee988b73ffdd9e1060ec129444ba87ebe827c051e39574f005aab53ed7421
 DIST wallpapers-15.tar.bz2 7374260 SHA256 b19eca913fea09c49752b42c34b2c433f2c1b74ae2c9adeed7d72248a7c90098 SHA512 f5400cd3709ffb80e4c904be6fd540f2b47e39bfec86715975ab81bfaee2eebb4fec0b03c21fc3d2f09ce784690a1744f64a95f5c4ad6c3968312931f1c6c90b WHIRLPOOL 9adde23b98d34797c174880f29eb8b8d2b8b6fa86e6493b162948d6ad661a8dc7a5f9b990ac9b17211021a6bf428802ed84863cf4915f594e9cc001e135afc0d
-DIST wallpapers-17.tar.bz2 3155801 SHA256 1cdd65a26358cc8735545e8609c735fbf1b6d1de92dea3e2649d897cebb2d2ff SHA512 4ec4117e0a749e44918522b7ef11aecfb18581740669d4f822e297a68537e5605b6084c6d7c61f62c72f34cbcfcd5bafd4ede35118786c5efcfe4df0f3ce8255 WHIRLPOOL 1f35935469f7d81a3e207eeabad5f1751856ba217c73a403f59093f37b8cc6d2055588ef6f1b5a614775354bdfccd99942095f2be3854d85f1ea7ac8568a25ae
diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-17.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-17.ebuild
index 81bddfa67..06b2f4357 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-17.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-17.ebuild
@@ -14,41 +14,43 @@ VERSION_IUSE="CL11 CL12 CL13 CL14 CL15"
 IUSE="+CL11 +CL12 +CL13 +CL14 +CL15"
 
 SRC_URI="
-	ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-17.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-17.tar.bz2
+	http://mirror.calculate-linux.org/themes/calculate/wallpaper-17.jpg -> ${P}.jpg
+	http://mirror.yandex.ru/calculate/themes/calculate/wallpaper-17.jpg -> ${P}.jpg
 	CL15? (
-		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-15.tar.bz2
+		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-15.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-15.tar.bz2
 	)
 	CL14? (
-		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
+		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? (
-		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-11.tar.bz2
+		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-11.tar.bz2
 	)
 	CL12? (
-		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-12.tar.bz2
+		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-12.tar.bz2
 	)
 	CL13? (
-		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-13.tar.bz2
+		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
 		http://mirror.yandex.ru/calculate/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="!<sys-apps/calculate-utils-3.5.2.6"
 
-DEPEND="${RDEPEND}"
+# need for templates
+RDEPEND="${DEPEND}
+	media-gfx/imagemagick"
+
+S="${WORKDIR}"
 
 src_install() {
-	insinto /
-	doins -r .
+	insinto /usr/share/themes/Calculate/
+	newins "${DISTDIR}"/${P}.jpg wallpaper.jpg
 
+	insinto /
 	for useflag in $VERSION_IUSE
 	do
 		if use $useflag
@@ -66,4 +68,3 @@ src_install() {
 		fi
 	done
 }
-
diff --git a/media-gfx/splash-themes-calculate/Manifest b/media-gfx/splash-themes-calculate/Manifest
index 38de75e8f..0b99dfc5e 100644
--- a/media-gfx/splash-themes-calculate/Manifest
+++ b/media-gfx/splash-themes-calculate/Manifest
@@ -1,5 +1,4 @@
 DIST splash-themes-calculate-15-r2.tar.bz2 3770693 SHA256 5f3ffb0377f4cd90e54bd21ce78e9f0641106fe48cc3f8321890046e5070053b SHA512 ff03779c1707f3625f022c48cb4389499f22c82ef4217e49cb245738a126ab98f5ac45319f9e67ba883b12f1fee614c57f2b32cbb199d4852af652811a10cf25 WHIRLPOOL db7d19db62e4321b077b43ebf8aafda03181248846baf8ee7ac2af37a477ea5cd670c7d1a627db9d1ff5b173156e194becdf493adffd071285ad07fa17b2afd1
-DIST splash-themes-calculate-17.tar.bz2 6652355 SHA256 5d8f4a675b1f34951c7b9201db4692df298d299efeae8d8a3bdc8910cac3010b SHA512 67b1277d550f618f2f68bc1b2885ca4f9a730f98ee190094378fb4c61ada1f5c1f8139a3961e0f188670cc6f0ed80511ff1e44109de8cb00617b08c0c6c0b4ae WHIRLPOOL c5c22c4cb1b021b6c4b3a1d23cae75f633a40f23eb51707e99e0795a041adce59178ff6faba767980ff0c5bab5f27fe392ca2e39bebf42218ea7f08640a799df
 DIST splash-themes-calculate-shutdown-17.jpg 1419977 SHA256 ffb74200a1622c746d98feea4f42661c3d1d271af45b886d36551dda42875242 SHA512 eee4e13d11c1d1f24184bfc7c8443a6966c637d861a8484e4c26c757dd7ba81ca3f9f4b60cd39dd6df8fad0181a4deabe75510f531d18db98f7c6419a48534f4 WHIRLPOOL b7e07ea8ba298b74a5268a631753baa300c8eb68022beac90a3f349cdddc55123f47787d7127530ea665d50b54fc3f24f6b4adb75733ea4fb9f2eaa93b4ad52c
 DIST splash-themes-calculate-silent-17.jpg 1318715 SHA256 abe8e74142273001a018f66e08f755a1313d1da12e150aa6fc96e6a479642488 SHA512 85638a990786d9d151925061ea6ccbde939710de880101b577485da859054d9fef918f2449f36628263e5b6d04a30eb57a378211d0322d51b0a074a481406079 WHIRLPOOL 6d4d5ea11799e087bb60ac76042be9414580ff22201f3224679bc061c93887bb7891e382bf91218e9cfe335ec967ee815ada0fbc0d0f5f7bf517f9a15d39b0f3
 DIST splash-themes-calculate-verbose-17-r1.jpg 1717558 SHA256 b5d0a1f435222cf4f49955dc50eb7177c982e25dedcd959520d0777d6677fffb SHA512 df5a78ce52b187fc8fc43739a38518bf55c27e0e267b58a11b19be2415776d70e0aed9840ec645a769504f57e3364a58efef98b2a1039ea82c4519155d35c3f2 WHIRLPOOL 0674b18455fcaa43728053492c22dc1a1f433e440b43099d05af7a433376eb7e7d3bd3643266688956dba97231ad42d19ad71ce75e77ca866762f1c72a721b89
diff --git a/media-gfx/splash-themes-calculate/splash-themes-calculate-17.ebuild b/media-gfx/splash-themes-calculate/splash-themes-calculate-17.ebuild
deleted file mode 100644
index 4ddd81e86..000000000
--- a/media-gfx/splash-themes-calculate/splash-themes-calculate-17.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit calculate
-
-DESCRIPTION="Calculate Linux theme for gensplash"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/calculate-splash-themes"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/splash/${P}.tar.bz2"
-
-RDEPEND="media-gfx/splashutils
-media-fonts/droid
-!media-gfx/cld-themes
-!media-gfx/cldg-themes
-!media-gfx/cldx-themes
-!media-gfx/cls-themes
-!media-gfx/cmc-themes
-!media-gfx/cds-themes"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto /
-	doins -r .
-}