From 2f8db31405fac68eea6f7257d58529243815033b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 30 Apr 2018 21:33:31 +0100
Subject: gentoo resync : 30.04.2018

---
 games-fps/doom-data/Manifest              |  2 +-
 games-fps/doom-data/doom-data-1-r1.ebuild | 43 -------------------------------
 games-fps/doom-data/doom-data-1-r2.ebuild | 40 ++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 44 deletions(-)
 delete mode 100644 games-fps/doom-data/doom-data-1-r1.ebuild
 create mode 100644 games-fps/doom-data/doom-data-1-r2.ebuild

(limited to 'games-fps/doom-data')

diff --git a/games-fps/doom-data/Manifest b/games-fps/doom-data/Manifest
index 138136bb6e8e..c4056bcb87f6 100644
--- a/games-fps/doom-data/Manifest
+++ b/games-fps/doom-data/Manifest
@@ -1,3 +1,3 @@
 DIST doom1.wad.bz2 1689021 BLAKE2B 45ab359525cec44ac6f58110be80e76a75e0d5e186c1fc6bb67e055e7a7e03d2596c2e99cb3636484245d1af85d6b93830f07d8548df99f5f40e55d249bcef16 SHA512 f3aa78fd1e36d2dbd176c8c5284f8cee4f39d8e34df5386fd668565e752410e2b776413c78c1e7a3571695a1668f1e4820338ebc9a2b1a0ed1a81896260534fe
-EBUILD doom-data-1-r1.ebuild 997 BLAKE2B 4ef324f5ec8f43a5a17aee8ee2b70d560cf5bfa662b03f9a689b66ab2fe204796e655eb022371bccebce5190c22edb683aeea76e4d23684afa5d0505dc5caa5d SHA512 05ddc5e6d798002b397d867eb6ad715535ef69cd752418fff42754af2161c14e6a666c2713132e88504c2ed3558f744b4e91d74babd91d7e4746cca7809bad43
+EBUILD doom-data-1-r2.ebuild 900 BLAKE2B 9a8e2c28cbc9dbc48fb6e986f557fe7629752358822af27a833f7172ef52bde43da146cb855ffc8ebfea4bc920dd4b58ad3088dbaaffa3eabb3ad14910e7639b SHA512 c0b0d7b36df52b3165a07d63297fa14513d6fc1ee01cb0174c8333def136b1ab197dc9ea1c338a58098c003b2c980c6d52397cd316a823a6a89dca2414aafdc4
 MISC metadata.xml 347 BLAKE2B 4655211a8c43a4659d40a685721f45ba4abce6277eba9ec94b19755dff4824feef2bb704d7f5746cb43d91eef2ab9f72a47fe4a116f994cddb8bcc0cf7371180 SHA512 2cf8dbebdc411b37294374d196748fa23a741e5ae37946d87b74fabba84dc67811db3f5e215b82be1ec0e8543ea4e0b5e3a5e46412dffb576b3492ebb79edd3a
diff --git a/games-fps/doom-data/doom-data-1-r1.ebuild b/games-fps/doom-data/doom-data-1-r1.ebuild
deleted file mode 100644
index a17ee253c243..000000000000
--- a/games-fps/doom-data/doom-data-1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="collection of doom wad files from id"
-HOMEPAGE="http://www.idsoftware.com/"
-SRC_URI="mirror://gentoo/doom1.wad.bz2"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doomsday"
-
-DEPEND="doomsday? ( games-fps/doomsday )
-	!<=games-fps/freedoom-0.4.1"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/doom-data
-	doins *.wad
-	if use doomsday; then
-		# Make wrapper for doomsday
-		games_make_wrapper doomsday-demo "jdoom -file \
-			${GAMES_DATADIR}/doom-data/doom1.wad"
-		make_desktop_entry doomsday-demo "Doomsday - Demo"
-	fi
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if use doomsday; then
-		elog "To use the doomsday engine, run doomsday-demo"
-	else
-		elog "A Doom engine is required to play the wad"
-		elog "Enable the doomsday use flag if you want to use"
-		elog "	the doomsday engine"
-	fi
-}
diff --git a/games-fps/doom-data/doom-data-1-r2.ebuild b/games-fps/doom-data/doom-data-1-r2.ebuild
new file mode 100644
index 000000000000..dcbff4655ed9
--- /dev/null
+++ b/games-fps/doom-data/doom-data-1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Collection of doom wad files from id"
+HOMEPAGE="http://www.idsoftware.com/"
+SRC_URI="mirror://gentoo/doom1.wad.bz2"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doomsday"
+
+RDEPEND="doomsday? ( games-fps/doomsday )"
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/doom-data
+	doins *.wad
+	if use doomsday; then
+		# Make wrapper for doomsday
+		make_wrapper doomsday-demo "jdoom -file \
+			/usr/share/doom-data/doom1.wad"
+		make_desktop_entry doomsday-demo "Doomsday - Demo"
+	fi
+}
+
+pkg_postinst() {
+	if use doomsday; then
+		elog "To use the doomsday engine, run doomsday-demo"
+	else
+		elog "A Doom engine is required to play the wad"
+		elog "Enable the doomsday use flag if you want to use"
+		elog "	the doomsday engine"
+	fi
+}
-- 
cgit v1.2.3