gentoo resync : 28.04.2021

3 files changed, 6 insertions, 36 deletions

diff --git a/dev-games/quake4-sdk/Manifest b/dev-games/quake4-sdk/Manifest
index 3ce4ce9205e2..8b379b3cd00e 100644
--- a/dev-games/quake4-sdk/Manifest
+++ b/dev-games/quake4-sdk/Manifest
@@ -1,4 +1,3 @@
 DIST quake4-linux-1.4.2-sdk.x86.run 65799543 BLAKE2B c4911b63842d4c5226f41bc6bc1137a993ace9644600dad68b328c2c1c4c69c1cc93cbe65f677ea4f092a82e6c5bc41fec49287f25007a34c7d951e421d99624 SHA512 21f09f71f040e22d9d4cfa09aa3d5d276d71716ed4eab5098682f8060eb0159d460f6f02b35d110689570f8c251141bf5d0eb1e4af8f68fcaa66b9e7bcb3855f
-EBUILD quake4-sdk-1.4.2-r1.ebuild 506 BLAKE2B 33e00f6159996a01c8069120ea893170dc44f9eca0fcee245d541bc1f278827011ed332d6d80240c7c26501ad694d637f212c5eaa54dcdc7ba40f6309c716b63 SHA512 24f6f4044e18bfc00e336750251e56fb4cd640449369d2a713be2d346dff073935e75a09be33ffa73584d27faa34edece79fc8c7201ac673c2a31977676deed2
-EBUILD quake4-sdk-1.4.2.ebuild 540 BLAKE2B 282b042508fa49e12294e1bcb2772cb55c37de0be7187da17734b263379540bfbecca1fc2ac1998238f08ab8ffe69b0620319586655ed97ba6c1989ecfa9d0b6 SHA512 7306873b8fa9517e6fab33d1d29874e1d349553b844d4738054a2ed00f978358ab170ab266a147391834ea7d6f0422cc5f5906e3d541e09438a242488159342e
+EBUILD quake4-sdk-1.4.2-r1.ebuild 496 BLAKE2B b2af12fc385bf8809f9c5467d8a700ca5855717b0c5f448775f25b5608b3bed98107de55b8159ba2a0a92e88a5b2552c662db7e964d4838f6509c4f5a1bdd6f5 SHA512 b9e7fbe6fc84441e93893ee514334c607d440bb44860ac5aeef540614b730b192826db18298b1b0aba440bbc2ca18e0ef1a155354a52eda120ec95e53b0fd606
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/dev-games/quake4-sdk/quake4-sdk-1.4.2-r1.ebuild b/dev-games/quake4-sdk/quake4-sdk-1.4.2-r1.ebuild
index fb80cba1dafb..7b32e90dcf28 100644
--- a/dev-games/quake4-sdk/quake4-sdk-1.4.2-r1.ebuild
+++ b/dev-games/quake4-sdk/quake4-sdk-1.4.2-r1.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit unpacker
 
 DESCRIPTION="Quake4 SDK"
 HOMEPAGE="https://www.iddevnet.com/quake4/"
 SRC_URI="mirror://idsoftware/quake4/source/linux/quake4-linux-${PV}-sdk.x86.run"
+S="${WORKDIR}"
 
 LICENSE="QUAKE4"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE=""
 RESTRICT="bindist mirror strip"
 
-S="${WORKDIR}"
-
 src_unpack() {
 	unpack_makeself
 	rm -rf setup.{sh,data} || die
 }
 
 src_install() {
-	insinto "/opt/${PN}"
+	insinto /opt/${PN}
 	doins -r *
 }
diff --git a/dev-games/quake4-sdk/quake4-sdk-1.4.2.ebuild b/dev-games/quake4-sdk/quake4-sdk-1.4.2.ebuild
deleted file mode 100644
index 03bf48f840d3..000000000000
--- a/dev-games/quake4-sdk/quake4-sdk-1.4.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker games
-
-DESCRIPTION="Quake4 SDK"
-HOMEPAGE="https://www.iddevnet.com/quake4/"
-SRC_URI="mirror://idsoftware/quake4/source/linux/quake4-linux-${PV}-sdk.x86.run"
-
-LICENSE="QUAKE4"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="bindist mirror strip"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_makeself
-	rm -rf setup.{sh,data} || die
-}
-
-src_install() {
-	insinto "${GAMES_PREFIX_OPT}/${PN}"
-	doins -r *
-	prepgamesdirs
-}