gentoo resync : 18.12.2020

3 files changed, 2 insertions, 45 deletions

diff --git a/games-strategy/seven-kingdoms/Manifest b/games-strategy/seven-kingdoms/Manifest
index 8c266c69ac2c..b10237c9dbba 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -1,6 +1,4 @@
-DIST 7kaa-2.14.7.tar.xz 31342092 BLAKE2B 1e2456ff8e40eace3185f842aad1d436e7e336eb4489a1a23022c89e7695ef1fc6f632d884d5d992c63f8b67f8b045fbda37e2fa3a07e9be13b9801d959b1e93 SHA512 5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1
 DIST 7kaa-2.15.4p1.tar.xz 46927880 BLAKE2B b32b819bef5918f2de378893224dcb7a27af6afe4e09791d59a2208f92aa8b82f3d9936553734a8b1cdfec93a8cc5562c65a78a15734fa1457dc94a64a49ed93 SHA512 eac0ca91755f828cfc8b0ea07ad1d0c08030c60ac236473992cc7887f8da43a3246a1f375f569e4fc71afaf7c5797ae6911b8b617217077429e5f5c51af4f4b6
 DIST 7kaa.png 559 BLAKE2B 0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113 SHA512 0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6
-EBUILD seven-kingdoms-2.14.7.ebuild 839 BLAKE2B e611c29456970a60ecf4235f03ce74f108655df2e9a67661b149fe0398d8824c22ea108e3eccedf259bf0e9c6c0b590e15dceb70f21147d3d3425db022ca5d9d SHA512 c6ed2f3bf01c2eee117eebb427f7583225050fd05a9fcd3a552be53164c84be96b47208e2f80ec666714db8b9dd24800c20c17fa93996943edeaf28a2ae6a150
-EBUILD seven-kingdoms-2.15.4_p1.ebuild 879 BLAKE2B 3c598c3f546cbb2709b2246a6a601c79a9ba72a9351c94b18aabe4027f6bee3571271142b75ee69d1ee851b5dd0fc0a6f6ab49629edf0395f2d5e5f62bdb2671 SHA512 eb3b16362ceb60ba01335932087d19947f215b84656fce61abeec1833185ccafe68e3c5c0fe1df74717e83376f9b40b0254ef4a2fad3096fea2ccf7ae94d1589
+EBUILD seven-kingdoms-2.15.4_p1.ebuild 877 BLAKE2B 75dde0c3cb9eb2d3835684e11ac2013ae66c5e64f6897af8582ed7f3afc64d4f531460bd75c0681ad8b46ef1b7bf5592948a8b02b28b34e95c32ea4c0350c75b SHA512 4c2f279ca072acfdb9457241fb4d603f3e1a0ee7a94ce00b3ea9f2e0cec63ae7e4d5392d15f7ff0e4f7939dda22fb966e7f7d0b74bc7bd76e0469fa2a89103f1
 MISC metadata.xml 379 BLAKE2B e307acc5095abbee8bc3bdab262c6f85dbf01638364fdc3ff6a1ea4d6ca0409f9e3197bb06fc3724327081fa4316811aecd594c4ecfc2288b978ca09831cfe96 SHA512 74215810c5079763bd386dd78cd2edcdefbac5350226beb275d0229247f733c9f09268893b3a9581e5924bd3651b54203b8acd3691ee86a32c52f382d5e22477
diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
deleted file mode 100644
index e76f54f62801..000000000000
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-MY_PN="7kaa"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Seven Kingdoms: Ancient Adversaries"
-HOMEPAGE="https://7kfans.com/"
-SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="net-libs/enet:1.3=
-	media-libs/libsdl2[X,video]
-	media-libs/openal
-	net-misc/curl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${MY_P}.tar.xz
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	doicon "${DISTDIR}/${MY_PN}.png"
-	make_desktop_entry "${MY_PN}" "Seven Kingdoms: Ancient Adversaries" "${MY_PN}" "Game;StrategyGame"
-}
diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild
index a23677ae1b8b..fccfe63df907 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${MY_PV}/${M
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="net-libs/enet:1.3=
 	media-libs/libsdl2[X,video]