From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 76871138334 for ; Tue, 18 Jun 2019 21:23:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BFAF7E09BE; Tue, 18 Jun 2019 21:23:28 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7C63CE09BE for ; Tue, 18 Jun 2019 21:23:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42FC3346458 for ; Tue, 18 Jun 2019 21:23:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B2CB623 for ; Tue, 18 Jun 2019 21:23:23 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1560892844.27f5eade487df412b3d6b8501de6440dc9a16cb0.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/doom-data/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-fps/doom-data/Manifest games-fps/doom-data/doom-data-1-r2.ebuild games-fps/doom-data/doom-data-1.9.ebuild games-fps/doom-data/metadata.xml X-VCS-Directories: games-fps/doom-data/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 27f5eade487df412b3d6b8501de6440dc9a16cb0 X-VCS-Branch: master Date: Tue, 18 Jun 2019 21:23:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9b5fa0f1-4b03-42cb-b286-31cceacc4c8b X-Archives-Hash: 648c0ba6e7ba90ccdc68c7f1ba23ac49 commit: 27f5eade487df412b3d6b8501de6440dc9a16cb0 Author: William Breathitt Gray gmail com> AuthorDate: Fri Jun 14 11:30:35 2019 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Tue Jun 18 21:20:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27f5eade games-fps/doom-data: Bump to version 1.9 Remove doomsday USE flag since users can install games-fps/doomsday directly. Install location changed to the /usr/share/doom directory. Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: William Breathitt Gray gmail.com> Signed-off-by: James Le Cuirot gentoo.org> games-fps/doom-data/Manifest | 2 +- games-fps/doom-data/doom-data-1-r2.ebuild | 40 ------------------------------- games-fps/doom-data/doom-data-1.9.ebuild | 26 ++++++++++++++++++++ games-fps/doom-data/metadata.xml | 14 +++++------ 4 files changed, 34 insertions(+), 48 deletions(-) diff --git a/games-fps/doom-data/Manifest b/games-fps/doom-data/Manifest index bfae26b0324..ca5011dac2e 100644 --- a/games-fps/doom-data/Manifest +++ b/games-fps/doom-data/Manifest @@ -1 +1 @@ -DIST doom1.wad.bz2 1689021 BLAKE2B 45ab359525cec44ac6f58110be80e76a75e0d5e186c1fc6bb67e055e7a7e03d2596c2e99cb3636484245d1af85d6b93830f07d8548df99f5f40e55d249bcef16 SHA512 f3aa78fd1e36d2dbd176c8c5284f8cee4f39d8e34df5386fd668565e752410e2b776413c78c1e7a3571695a1668f1e4820338ebc9a2b1a0ed1a81896260534fe +DIST doom1.wad 4196020 BLAKE2B d242892e97f4684d1483192a5fc5b5fe3c662f2b9d61078e869758f400ca9e6d4e81fe51a6ffe562bbbd9d66f3db33f9a780780095aeeba691df1fe9407b1430 SHA512 6c2798417f0a0feaa1ab8777edb54e821eb336acfe953d62214dac46dd62429f58da97f9d13beac5fdaf944e70a07c60c96af9a885a0daf38eff1619cde71c2a diff --git a/games-fps/doom-data/doom-data-1-r2.ebuild b/games-fps/doom-data/doom-data-1-r2.ebuild deleted file mode 100644 index dcbff4655ed..00000000000 --- a/games-fps/doom-data/doom-data-1-r2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# 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 -} diff --git a/games-fps/doom-data/doom-data-1.9.ebuild b/games-fps/doom-data/doom-data-1.9.ebuild new file mode 100644 index 00000000000..73c1f9cd04d --- /dev/null +++ b/games-fps/doom-data/doom-data-1.9.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="The IWAD used by the shareware version of Doom" +HOMEPAGE="http://www.idsoftware.com" +SRC_URI="http://distro.ibiblio.org/pub/linux/distributions/slitaz/sources/packages/d/doom1.wad" + +LICENSE="freedist" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +S="${DISTDIR}" + +DOOMWADPATH="/usr/share/doom" + +src_install() { + insinto ${DOOMWADPATH} + doins doom1.wad +} + +pkg_postinst() { + elog "Doom WAD file installed into the ${DOOMWADPATH} directory." + elog "A Doom engine is required in order to play the doom1.wad file." +} diff --git a/games-fps/doom-data/metadata.xml b/games-fps/doom-data/metadata.xml index 343e8213e1c..4ec24fa26e9 100644 --- a/games-fps/doom-data/metadata.xml +++ b/games-fps/doom-data/metadata.xml @@ -1,11 +1,11 @@ - - games@gentoo.org - Gentoo Games Project - - - Add wrapper to run it within doomsday - + + DOOM1.WAD is the IWAD used by the shareware version of Doom. It is a cut-down version of DOOM.WAD which contains only the first episode. Later on, "Doom 1" became a retronym for Doom after the release of Doom II. + + + games@gentoo.org + Gentoo Games Project +