gentoo resync : 15.12.2019

3 files changed, 4 insertions, 37 deletions

diff --git a/x11-themes/gnustep-silver-theme/Manifest b/x11-themes/gnustep-silver-theme/Manifest
index a31b760a5631..59c14530753f 100644
--- a/x11-themes/gnustep-silver-theme/Manifest
+++ b/x11-themes/gnustep-silver-theme/Manifest
@@ -1,5 +1,3 @@
 DIST Silver.theme-3.1.tar.gz 44371 BLAKE2B 9f7f55262e4d4d64475426cb9daeead392623e5dd9456e042f9add87af15126808738d60b7d4027e1c4a388baf682062c6ed4399111732e0291327c6cce69c96 SHA512 8b62e7d868bfa9b2a871de3688439af7a4d6fce8291ca458e80e8496f5ae6c0f06d693c93149cef61fcff596d34e9e71e919804211ba52f4621ec9deba0bb9e1
-DIST silver.theme-2.5.tar.gz 33686 BLAKE2B 2eb7ada309f9d42679cc599db39cc07f2676807882247398383bb4e87ad99be521d696a518b8eed73bd82d4c539562b10c7be4201e889117bf7a237873a5b079 SHA512 ae55ab519ae8e809807b85c9346fe5c30f48860607d9e42ddd58d15c402380ebfd3cde3750f00e541358d2c15380435dd852d2e07024cd8bd3b9624a478ce904
-EBUILD gnustep-silver-theme-2.5.ebuild 636 BLAKE2B e63820bd0248c74961336c8e92eb03b3e8db79e3ff5262c0696aade7504facdd19d5372f4bce60fefff7ed2d2e02cc68359d18c061c24989a6efecb30fcd3147 SHA512 2c20f239c9ffe219175789a349328347a462020e85e583745c675e10ff916cb258d434aacfee2c25f5ef69a898b4b6383dc465325803ad08f4f988d4eba26f20
-EBUILD gnustep-silver-theme-3.1.ebuild 511 BLAKE2B 606cab6b2796eb8cc790e09d7aff4401f54ae0f3ef3f38772c5e2440d72a498a4bfe4551ba50cef11e9f2d13fbcde0891f87cd4ef6c76149f5d4a8c2830373ff SHA512 3d48b9dacdf9cc5c80538474f5a79603e654dceefc3c55638c8458f0dca0d1e1a9e309f3b653d5323391bfa38b5f789860d06b67235f1f3d11504d96194e47eb
+EBUILD gnustep-silver-theme-3.1-r1.ebuild 512 BLAKE2B 7ca79d7f366e61f2440d3d2129bc7edb0c52578260a7b6bea89f046e6f0f25dfa74b0002b47ec3ac069ece7cc8ca8c63377d2ae2873d0f388cbf4eb0f2e086ac SHA512 9f273a7a971a676afac17fe5237f9bec69fa5c47444d7b7d58c092a5bfa8e599a1745f95aa41db12c2d82068e5347b721ed092768b45c88ed438f12c5362cc70
 MISC metadata.xml 488 BLAKE2B 09db0bda118c6afabecb2b19adcf3605d09ce1ac0bec544ff94aebe19f13300051093add6ffe91b318a54ec39f8185feddf8af83e7ec31a98220be1c836b349a SHA512 6c6e9cf1c09d110cacdf7f62c98ac63a44b209d5db7aae0a990a097a880a5a00110c0b1b7b0dfde8752505bbf8a2f37cfbfa41ee960099f51cc36057aedc7e96
diff --git a/x11-themes/gnustep-silver-theme/gnustep-silver-theme-2.5.ebuild b/x11-themes/gnustep-silver-theme/gnustep-silver-theme-2.5.ebuild
deleted file mode 100644
index 063a38ac2a50..000000000000
--- a/x11-themes/gnustep-silver-theme/gnustep-silver-theme-2.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-DESCRIPTION="a GNUstep silver theme"
-HOMEPAGE="http://wiki.gnustep.org/index.php/Themes"
-SRC_URI="http://download.gna.org/gnustep-nonfsf/silver.theme-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/Silver.theme
-
-src_install() {
-	egnustep_env
-
-	#install themes
-	insinto ${GNUSTEP_SYSTEM_LIBRARY}/Themes/Silver.theme
-	doins -r Resources Theme.bundle
-}
-
-pkg_postinst() {
-	elog "Use gnustep-apps/systempreferences to switch theme"
-}
diff --git a/x11-themes/gnustep-silver-theme/gnustep-silver-theme-3.1.ebuild b/x11-themes/gnustep-silver-theme/gnustep-silver-theme-3.1-r1.ebuild
index ac55f971ca22..7a6cfbbcee8a 100644
--- a/x11-themes/gnustep-silver-theme/gnustep-silver-theme-3.1.ebuild
+++ b/x11-themes/gnustep-silver-theme/gnustep-silver-theme-3.1-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 inherit gnustep-2
 
 MY_P=Silver.theme-${PV}
 DESCRIPTION="a GNUstep silver theme"
 HOMEPAGE="http://wiki.gnustep.org/index.php/Silver.theme"
-SRC_URI="http://download.gna.org/gnustep-nonfsf/${MY_P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"