gentoo resync 31.01.2019

4 files changed, 2 insertions, 41 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 4ffa60c9c441..863530da8399 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/ubuntu-wallpapers/Manifest b/x11-themes/ubuntu-wallpapers/Manifest
index 8de48ce8f533..3a17edbb3e23 100644
--- a/x11-themes/ubuntu-wallpapers/Manifest
+++ b/x11-themes/ubuntu-wallpapers/Manifest
@@ -1,5 +1,3 @@
-DIST ubuntu-wallpapers_18.04.1.orig.tar.gz 167057924 BLAKE2B 0d1bd7dc96d3a1ddc3becaa775a6da47645d5962cbcc49e4cab8430adef6ff5c13248b7eb88b1394c80fa5e1b53f8aff94b15b3c7ba836fcc5d94ea86e02572e SHA512 ad46d79cc32315f67f244bfabb74188478c43374d3021e20d0f0d4182cff7f93920df2fae141257695148dc0d69d8e4e0fa486ac616e6256e9269c8b5d6e06d6
 DIST ubuntu-wallpapers_18.10.2.orig.tar.gz 186856866 BLAKE2B 4cc8f3f0e95bdc28d25d5b664678b60b924d2fbbd0876c260f45320bcb64bec4ddb3889c16b1bba1fc2506eba5ce579987a9cf8b25c3748a1c4529b52813c64c SHA512 dadd84e0b0d6be010254577239001d423b06730690cce44031ec90b1c7fe28312afb0720f8da7758f069b81556662f8a3c231c50255695090bc932d3ec9496db
-EBUILD ubuntu-wallpapers-18.04.1.ebuild 703 BLAKE2B 80ac7b517b943525fe10e57d8708b74e8d941ebac060bc59392fe86e75bb42bd22721b5a0c639ab3ed23de9250adda626914869a10c0a5d0f00bd1cbc1f2887e SHA512 74c8f2ec2d30c205415a3d1124e18e0f7f3679766ff1ce966c4f1a61e94cfcea27cc6f5831c31eb00941bcc03d0e319c5130bbb78613cc3d19ec052f49665f9d
-EBUILD ubuntu-wallpapers-18.10.2.ebuild 703 BLAKE2B 92553a04081523da62077ec7b7c3ca667d81479dfa6a92b4cd48c25c45b38e5dc2bb78e9928a695c126191b4471641b1fa6a3937ba4f4c4eb0918a04ebe1a712 SHA512 d0914b1fedfe886c25b216320425f4998087b013ccdeaa9b2fe261cf7226c5fe4c63ac4b3aaf17ce3779c2b2183e4e9d0fa1af420c8ff60cd6acf2ac1afc3f56
+EBUILD ubuntu-wallpapers-18.10.2.ebuild 700 BLAKE2B 6750412c5ff8a8d0cf9b1d49ebdbe86012ad8ecaa518fc4c930bfff8e9c264d27d6cd46a28a88eccd4840062eb5716fcd2017a2d8e08c6b6e06cbaf87a5a9ab4 SHA512 c8352dbde77bcaa73c1d9a31ecc39b359dab9559a2fc527c99b676f108fd946dee8dcec16137be205f5a0a2110418d6917ff09787c629461cae979700efb7352
 MISC metadata.xml 316 BLAKE2B a54db9a97a4e74453d251c1d1905bb0f1d0fdeff85fb9b3064c1efd259306ccbd5b895b269587c657d328358f18cc15dc8dbc737c490a1ad5fb829c72cc15808 SHA512 82eff3745d3cc9097b48d9c789f3754c96ac8b5921709bd1545f8380a2fed6abc274e60ff8dde614344731fe9759cc8e016e465b025555a20c1ec57d23119ab7
diff --git a/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-18.04.1.ebuild b/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-18.04.1.ebuild
deleted file mode 100644
index 9ff5a144f20e..000000000000
--- a/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-18.04.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Ubuntu wallpapers"
-HOMEPAGE="https://launchpad.net/ubuntu/+source/ubuntu-wallpapers"
-MY_P="${PN}_${PV}"
-SRC_URI="mirror://ubuntu/pool/main/u/${PN}/${MY_P}.orig.tar.gz"
-LICENSE="CC-BY-SA-3.0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}/${MY_P/_/-}"
-
-SLOT="0"
-
-src_compile() { :; }
-src_test() { :; }
-
-src_install() {
-	insinto /usr/share/backgrounds
-	doins *.jpg *.png
-
-	insinto /usr/share/backgrounds/contest
-	doins contest/*.xml
-
-	for i in *.xml.in; do
-		insinto /usr/share/gnome-background-properties
-		newins ${i} ${i/.in/}
-	done
-
-	einstalldocs
-}
diff --git a/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-18.10.2.ebuild b/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-18.10.2.ebuild
index f302875b2504..127023f22931 100644
--- a/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-18.10.2.ebuild
+++ b/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-18.10.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://launchpad.net/ubuntu/+source/ubuntu-wallpapers"
 MY_P="${PN}_${PV}"
 SRC_URI="mirror://ubuntu/pool/main/u/${PN}/${MY_P}.orig.tar.gz"
 LICENSE="CC-BY-SA-3.0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE=""
 
 RDEPEND=""