gentoo resync : 28.04.2021

3 files changed, 64 insertions, 75 deletions

diff --git a/games-action/intrusion2/Manifest b/games-action/intrusion2/Manifest
index 5ba695765a81..e24cba7e67cd 100644
--- a/games-action/intrusion2/Manifest
+++ b/games-action/intrusion2/Manifest
@@ -1,3 +1,3 @@
 DIST intrusion2-1370288626-bin 88713512 BLAKE2B 87d236dbba41a6b6cade2ea632c15c4f777fb245b7f1161f0b54ff931859b00f9326fa58d6207d5222c44faa6b6e6c44920b7409acc5bbd6b5f6aa920bcb2825 SHA512 ce3fc5c9dc388cd777e978c54b6696d102870f8111122e646637e12cb336767c60ffa8864ffa634012868f2b9ca231598e89438f226ca4465d8c4e936d492b06
-EBUILD intrusion2-1.024.ebuild 1778 BLAKE2B 0b9cd594dbce82a376c6dd42f858335174c19e18b3c8233bc2172fd2e5c8bbebcc9aae94fdb8b7c4e0b9d8ff74b38eaa3b9d731b4483e66606e74cfa02848c07 SHA512 d18d953961047b5eb9f53ad8c0a3563f3770a157bfad86ce66cf6308781e707319cd151cd852ac8eb1a20599ce8d2ee92d1311a708747490ff60370206137d38
+EBUILD intrusion2-1.024-r1.ebuild 1517 BLAKE2B 1c432665e441c12fe3a92a4346a6408c6a6fd965dbe796e30ea20580224ff6c02583f27c5bb986806340a01bbaa21e52eee07e131011055d5e0860fd03bd5012 SHA512 35de9d21fb4d4452ac2fb020b3c3ee0e636b11efb884013eac81d0ae1f814985f25129dfb23ea7f2806c29089d0a189f421e1a789786c785d15ab8adeacd2577
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/intrusion2/intrusion2-1.024-r1.ebuild b/games-action/intrusion2/intrusion2-1.024-r1.ebuild
new file mode 100644
index 000000000000..144d88aeeae9
--- /dev/null
+++ b/games-action/intrusion2/intrusion2-1.024-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+USELESS_ID="1370288626"
+DESCRIPTION="Fast paced action sidescroller set in a sci-fi environment"
+HOMEPAGE="http://intrusion2.com"
+SRC_URI="intrusion2-${USELESS_ID}-bin"
+S="${WORKDIR}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch"
+
+MYGAMEDIR=opt/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}"/${PN}
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
+	>=dev-libs/atk-2.10.0[abi_x86_32(-)]
+	>=media-libs/gst-plugins-base-0.10.36[abi_x86_32(-)]
+	>=media-libs/gstreamer-0.10.36-r2[abi_x86_32(-)]
+	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+	>=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
+	>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
+	>=x11-libs/pango-1.36.3[abi_x86_32(-)]
+	>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
+	>=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)]
+"
+
+RDEPEND="
+	amd64? (
+		${COMMON_DEPEND}
+	)
+	x86? (
+		${COMMON_DEPEND//\[abi_x86_32(-)\]/}
+	)
+"
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to your DISTFILES directory."
+	einfo
+}
+
+src_unpack() { :; }
+
+src_install() {
+	exeinto "/${MYGAMEDIR}"
+	newexe "${DISTDIR}"/${SRC_URI} ${PN}
+
+	make_wrapper ${PN} "${MYGAMEDIR}"/${PN}
+	make_desktop_entry ${PN}
+}
diff --git a/games-action/intrusion2/intrusion2-1.024.ebuild b/games-action/intrusion2/intrusion2-1.024.ebuild
deleted file mode 100644
index 627e48003a22..000000000000
--- a/games-action/intrusion2/intrusion2-1.024.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-USELESS_ID="1370288626"
-DESCRIPTION="Fast paced action sidescroller set in a sci-fi environment"
-HOMEPAGE="http://intrusion2.com"
-SRC_URI="intrusion2-${USELESS_ID}-bin"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist fetch"
-
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/${PN}"
-
-RDEPEND="
-	amd64? (
-		>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
-		>=dev-libs/atk-2.10.0[abi_x86_32(-)]
-		>=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
-		>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
-		>=x11-libs/pango-1.36.3[abi_x86_32(-)]
-		>=media-libs/gst-plugins-base-0.10.36[abi_x86_32(-)]
-		>=media-libs/gstreamer-0.10.36-r2[abi_x86_32(-)]
-		>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-		>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-		>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-		>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
-		>=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)]
-	)
-	x86? (
-		dev-libs/glib:2
-		dev-libs/atk
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/pango
-		media-libs/gst-plugins-base
-		media-libs/gstreamer
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXtst
-	)"
-
-S=${WORKDIR}
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to your DISTFILES directory."
-	einfo
-}
-
-src_unpack() { :; }
-
-src_install() {
-	exeinto "${MYGAMEDIR}"
-	newexe "${DISTDIR}"/${SRC_URI} ${PN}
-
-	games_make_wrapper ${PN} "${MYGAMEDIR}/${PN}"
-	make_desktop_entry ${PN}
-
-	prepgamesdirs
-}