From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AB5D11381F3 for ; Mon, 5 Aug 2013 14:01:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48DE0E0A7F; Mon, 5 Aug 2013 14:01:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A518AE0A7F for ; Mon, 5 Aug 2013 14:01:48 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 81E0033EC18 for ; Mon, 5 Aug 2013 14:01:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0F7FAE468F for ; Mon, 5 Aug 2013 14:01:46 +0000 (UTC) From: "Vadim A. Misbakh-Soloviov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Vadim A. Misbakh-Soloviov" Message-ID: <1375711206.b543dfc3bc64ca2d298d355f630810f95016f3b1.mva@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: games-action/descent2-vertigo/, games-action/descent2-data/, ... X-VCS-Repository: proj/gamerlay X-VCS-Files: games-action/d1x-rebirth/d1x-rebirth-0.57.3.ebuild games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild games-action/d1x-rebirth/metadata.xml games-action/d2x-rebirth/d2x-rebirth-0.57.1.ebuild games-action/d2x-rebirth/d2x-rebirth-0.57.3.ebuild games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild games-action/d2x-rebirth/metadata.xml games-action/d2x-xl/d2x-xl-1.16.15.ebuild games-action/descent1-data/descent1-data-1.0-r1.ebuild games-action/descent2-data/descent2-data-1.0-r2.ebuild games-action/descent2-vertigo/descent2-vertigo-1.0.ebuild licenses/D1X X-VCS-Directories: games-action/descent2-vertigo/ games-action/descent2-data/ games-action/descent1-data/ games-action/d2x-xl/ games-action/d1x-rebirth/ licenses/ games-action/d2x-rebirth/ X-VCS-Committer: mva X-VCS-Committer-Name: Vadim A. Misbakh-Soloviov X-VCS-Revision: b543dfc3bc64ca2d298d355f630810f95016f3b1 X-VCS-Branch: master Date: Mon, 5 Aug 2013 14:01:46 +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-Archives-Salt: b0e635d0-63da-4f95-9e56-58d1eb75398d X-Archives-Hash: 0ab4d6c1c86ce8191623efff369dc0f0 commit: b543dfc3bc64ca2d298d355f630810f95016f3b1 Author: Alexander Turenko bk ru> AuthorDate: Mon Aug 5 12:56:32 2013 +0000 Commit: Vadim A. Misbakh-Soloviov mva name> CommitDate: Mon Aug 5 14:00:06 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=b543dfc3 Updates for d{1,2}x-* and descent{1,2}-* ebuilds. * Remove unnecessary 'die' calls. * Merge changes from main tree. * Merge changes from bugs.gentoo.org. * Add D1X license. * Update copyrights. * Remove old, add new versions for d{1,2}x-rebirth. --- games-action/d1x-rebirth/d1x-rebirth-0.57.3.ebuild | 94 ++++++++++++---------- games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild | 94 ++++++++++++++++++++++ games-action/d1x-rebirth/metadata.xml | 24 +++--- games-action/d2x-rebirth/d2x-rebirth-0.57.1.ebuild | 69 ---------------- games-action/d2x-rebirth/d2x-rebirth-0.57.3.ebuild | 90 ++++++++++++--------- games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild | 92 +++++++++++++++++++++ games-action/d2x-rebirth/metadata.xml | 8 +- games-action/d2x-xl/d2x-xl-1.16.15.ebuild | 12 ++- .../descent1-data/descent1-data-1.0-r1.ebuild | 17 ++-- .../descent2-data/descent2-data-1.0-r2.ebuild | 75 ++++++++++++----- .../descent2-vertigo/descent2-vertigo-1.0.ebuild | 13 +-- licenses/D1X | 44 ++++++++++ 12 files changed, 421 insertions(+), 211 deletions(-) diff --git a/games-action/d1x-rebirth/d1x-rebirth-0.57.3.ebuild b/games-action/d1x-rebirth/d1x-rebirth-0.57.3.ebuild index eff9f5b..d0f1aea 100644 --- a/games-action/d1x-rebirth/d1x-rebirth-0.57.3.ebuild +++ b/games-action/d1x-rebirth/d1x-rebirth-0.57.3.ebuild @@ -1,84 +1,94 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="5" +EAPI=5 + inherit eutils games scons-utils DV=1 +MY_P=${PN}_v${PV}-src DESCRIPTION="Descent Rebirth - enhanced Descent ${DV} engine" HOMEPAGE="http://www.dxx-rebirth.com/" -SRC_URI="mirror://sourceforge/dxx-rebirth/${PN}_v${PV}-src.tar.gz - opl3? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-opl3-music.zip ) - sc55? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-sc55-music.zip ) - textures? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-hires.zip ) - linguas_de? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-briefings-ger.zip )" +SRC_URI="mirror://sourceforge/dxx-rebirth/${MY_P}.tar.gz + opl3-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-opl3-music.dxa ) + sc55-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-sc55-music.dxa ) + linguas_de? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-briefings-ger.dxa ) + textures? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-hires.dxa )" -LICENSE="D1X GPL-2 as-is" +LICENSE="D1X GPL-2 public-domain" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="cdinstall debug ipv6 linguas_de +opengl opl3 sc55 +textures +timidity" +IUSE="+data debug ipv6 linguas_de +music +opengl opl3-musicpack sc55-musicpack +textures" + +REQUIRED_USE="?? ( opl3-musicpack sc55-musicpack ) + opl3-musicpack? ( music ) + sc55-musicpack? ( music )" + +RDEPEND="dev-games/physfs[hog,zip] + media-libs/libsdl:0[X,audio,joystick,opengl?,video] + music? ( + media-libs/sdl-mixer:0[timidity] + ) + opengl? ( + virtual/opengl + virtual/glu + )" +DEPEND="${RDEPEND}" +PDEPEND="data? ( || ( + games-action/descent1-data + games-action/descent1-demodata +) )" -DEPEND="opengl? ( virtual/opengl virtual/glu ) - dev-games/physfs[hog,zip] - media-libs/libsdl:0[audio,opengl?,video] - media-libs/sdl-mixer:0[timidity?]" -RDEPEND="${DEPEND} - cdinstall? ( games-action/descent1-data )" +S=${WORKDIR}/${MY_P} -S=${WORKDIR}/${PN}_v${PV}-src +RESTRICT=mirror src_unpack() { - unpack ${PN}_v${PV}-src.tar.gz + unpack ${MY_P}.tar.gz +} + +src_prepare() { + DOCS=({CHANGELOG,COPYING,INSTALL,README,RELEASE-NOTES}.txt) + edos2unix ${DOCS[@]} } src_compile() { escons \ verbosebuild=1 \ sharepath="${GAMES_DATADIR}/d${DV}x" \ - sdlmixer=1 \ $(use_scons debug) \ $(use_scons ipv6) \ + $(use_scons music sdlmixer) \ + $(use_scons opengl) \ || die } src_install() { - - local DOCS=({CHANGELOG,COPYING,INSTALL,README,RELEASE-NOTES}.txt) - edos2unix ${DOCS[@]} || die - dodoc ${DOCS[@]} || die + dodoc ${DOCS[@]} insinto "${GAMES_DATADIR}/d${DV}x" - # None of the following zip files need to be extracted. - if use linguas_de ; then - doins "${DISTDIR}"/d${DV}xr-briefings-ger.zip || die - fi - if use opl3 ; then - doins "${DISTDIR}"/d${DV}xr-opl3-music.zip || die - fi - if use sc55 ; then - doins "${DISTDIR}"/d${DV}xr-sc55-music.zip || die - fi - if use textures ; then - doins "${DISTDIR}"/d${DV}xr-hires.zip || die - fi + use opl3-musicpack && doins "${DISTDIR}"/d${DV}xr-opl3-music.dxa + use sc55-musicpack && doins "${DISTDIR}"/d${DV}xr-sc55-music.dxa + use linguas_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.dxa + use textures && doins "${DISTDIR}"/d${DV}xr-hires.dxa - doicon "${S}/${PN}.xpm" || die + doicon "${S}/${PN}.xpm" - local EXE=${PN} - newgamesbin ${EXE} ${EXE} || die - make_desktop_entry ${PN} "Descent ${DV} Rebirth" || die + dogamesbin d${DV}x-rebirth + make_desktop_entry d${DV}x-rebirth "Descent ${DV} Rebirth" prepgamesdirs } pkg_postinst() { games_pkg_postinst - if ! use cdinstall ; then + + if ! use data ; then echo - elog "To play the full game enable USE=\"cdinstall\" or manually " + elog "To play the game enable USE=\"data\" or manually " elog "copy the files to ${GAMES_DATADIR}/d${DV}x." - elog "Use bzcat /usr/share/doc/${PF}/INSTALL.txt.bz2 for details." + elog "See /usr/share/doc/${PF}/INSTALL.txt.bz2 for details." echo fi } diff --git a/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild b/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild new file mode 100644 index 0000000..eaecb2f --- /dev/null +++ b/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit eutils games scons-utils + +DV=1 +MY_P=${PN}_v${PV}-src +DESCRIPTION="Descent Rebirth - enhanced Descent ${DV} engine" +HOMEPAGE="http://www.dxx-rebirth.com/" +SRC_URI="http://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz + opl3-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-opl3-music.dxa ) + sc55-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-sc55-music.dxa ) + linguas_de? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-briefings-ger.dxa ) + textures? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-hires.dxa )" + +LICENSE="D1X GPL-2 public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+data debug ipv6 linguas_de +music +opengl opl3-musicpack sc55-musicpack +textures" + +REQUIRED_USE="?? ( opl3-musicpack sc55-musicpack ) + opl3-musicpack? ( music ) + sc55-musicpack? ( music )" + +RDEPEND="dev-games/physfs[hog,zip] + media-libs/libsdl:0[X,audio,joystick,opengl?,video] + music? ( + media-libs/sdl-mixer:0[timidity] + ) + opengl? ( + virtual/opengl + virtual/glu + )" +DEPEND="${RDEPEND}" +PDEPEND="data? ( || ( + games-action/descent1-data + games-action/descent1-demodata +) )" + +S=${WORKDIR}/${MY_P} + +RESTRICT=mirror + +src_unpack() { + unpack ${MY_P}.tar.gz +} + +src_prepare() { + DOCS=({CHANGELOG,COPYING,INSTALL,README,RELEASE-NOTES}.txt) + edos2unix ${DOCS[@]} +} + +src_compile() { + escons \ + verbosebuild=1 \ + sharepath="${GAMES_DATADIR}/d${DV}x" \ + $(use_scons debug) \ + $(use_scons ipv6) \ + $(use_scons music sdlmixer) \ + $(use_scons opengl) \ + || die +} + +src_install() { + dodoc ${DOCS[@]} + + insinto "${GAMES_DATADIR}/d${DV}x" + + use opl3-musicpack && doins "${DISTDIR}"/d${DV}xr-opl3-music.dxa + use sc55-musicpack && doins "${DISTDIR}"/d${DV}xr-sc55-music.dxa + use linguas_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.dxa + use textures && doins "${DISTDIR}"/d${DV}xr-hires.dxa + + doicon "${S}/${PN}.xpm" + + dogamesbin d${DV}x-rebirth + make_desktop_entry d${DV}x-rebirth "Descent ${DV} Rebirth" + prepgamesdirs +} + +pkg_postinst() { + games_pkg_postinst + + if ! use data ; then + echo + elog "To play the game enable USE=\"data\" or manually " + elog "copy the files to ${GAMES_DATADIR}/d${DV}x." + elog "See /usr/share/doc/${PF}/INSTALL.txt.bz2 for details." + echo + fi +} diff --git a/games-action/d1x-rebirth/metadata.xml b/games-action/d1x-rebirth/metadata.xml index f7ff227..026edc8 100644 --- a/games-action/d1x-rebirth/metadata.xml +++ b/games-action/d1x-rebirth/metadata.xml @@ -2,20 +2,20 @@ games - -Descent 1 is a classic first-person shooter released in 1995 by Interplay -and Parallax. It was one of the first games with true 3-dimensional -graphics, movement, and light sourcing. D1X-Rebirth is a modification of the -Descent 1 source that was released by Parallax and is based on the D1X source. - + + Descent 1 is a classic first-person shooter released in 1995 by Interplay + and Parallax. It was one of the first games with true 3-dimensional + graphics, movement, and light sourcing. D1X-Rebirth is a modification of the + Descent 1 source that was released by Parallax and is based on the D1X source. + Provides German translations for the game's - briefings, robot descriptions, and outro of the original campaign - Include alternate version of the game's music, recorded - with the Yamaha YMF262 OPL3 soundchip - Include alternate version of the game's music, recorded - with the Roland Sound Canvas SC-55 MIDI module + briefings, robot descriptions, and outro of the original campaign + Include alternate version of the game's + music, recorded with the Yamaha YMF262 OPL3 soundchip + Include alternate version of the game's + music, recorded with the Roland Sound Canvas SC-55 MIDI module Include high resolution (640x480) backgrounds, - briefing images and fonts + briefing images and fonts diff --git a/games-action/d2x-rebirth/d2x-rebirth-0.57.1.ebuild b/games-action/d2x-rebirth/d2x-rebirth-0.57.1.ebuild deleted file mode 100644 index 6673d7d..0000000 --- a/games-action/d2x-rebirth/d2x-rebirth-0.57.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" - -inherit games scons-utils - -DESCRIPTION="Descent Rebirth - enhanced Descent 2 engine" -HOMEPAGE="http://www.dxx-rebirth.com/" -SRC_URI="mirror://sourceforge/dxx-rebirth/${PN}_v${PV}-src.tar.gz - linguas_de? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.zip ) - music_awe32? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-awe32enh-music.zip ) - music_opl3? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.zip ) - music_sc55? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.zip )" - -LICENSE="D1X GPL-2 as-is" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug editor ipv6 linguas_de music_awe32 music_opl3 music_sc55 opengl" - -DEPEND="dev-games/physfs[hog,mvl,zip] - media-libs/libsdl:0 - media-libs/sdl-mixer:0[vorbis]" -RDEPEND="${DEPEND} - opengl? ( virtual/opengl virtual/glu )" - -S=${WORKDIR}/${PN}_v${PV}-src - -src_unpack() { - # We need unpack only sources. Keep zipped mods intact! - unpack ${PN}_v${PV}-src.tar.gz -} - -src_compile() { - scons ${MAKEOPTS} \ - sharepath="${GAMES_DATADIR}/d2x" \ - sdlmixer=1 \ - use_tracker=1 \ - use_udp=1 \ - $(use_scons debug) \ - $(use_scons editor) \ - $(use_scons opengl) \ - $(use_scons ipv6) -} - -src_install() { - edos2unix {INSTALL,README}.txt - dodoc {INSTALL,README}.txt - insinto "${GAMES_DATADIR}/d2x" - use linguas_de && doins "${DISTDIR}"/d2xr-briefings-ger.zip - use music_awe32 && doins "${DISTDIR}"/d2xr-awe32enh-music.zip - use music_opl3 && doins "${DISTDIR}"/d2xr-opl3-music.zip - use music_sc55 && doins "${DISTDIR}"/d2xr-sc55-music.zip - doicon ${PN}.xpm - - dogamesbin d2x-rebirth - make_desktop_entry d2x-rebirth "Descent 2 Rebirth" ${PN} - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - elog "You need to copy data-files from original Descent 2 installation" - elog "to ${GAMES_DATADIR}/d2x. Please read " - elog "/usr/share/doc/${PF}/INSTALL.txt for more info." - elog "You can emerge games-action/descent2-demodata (for Demo) or" - elog "games-action/descent2-data (if you have original Descent 2 CD)." -} diff --git a/games-action/d2x-rebirth/d2x-rebirth-0.57.3.ebuild b/games-action/d2x-rebirth/d2x-rebirth-0.57.3.ebuild index afb417c..04e2243 100644 --- a/games-action/d2x-rebirth/d2x-rebirth-0.57.3.ebuild +++ b/games-action/d2x-rebirth/d2x-rebirth-0.57.3.ebuild @@ -1,82 +1,92 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="5" +EAPI=5 + inherit eutils games scons-utils DV=2 +MY_P=${PN}_v${PV}-src DESCRIPTION="Descent Rebirth - enhanced Descent ${DV} engine" HOMEPAGE="http://www.dxx-rebirth.com/" -SRC_URI="mirror://sourceforge/dxx-rebirth/${PN}_v${PV}-src.tar.gz - opl3? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-opl3-music.zip ) - sc55? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-sc55-music.zip ) - linguas_de? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-briefings-ger.zip )" +SRC_URI="mirror://sourceforge/dxx-rebirth/${MY_P}.tar.gz + opl3-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-opl3-music.dxa ) + sc55-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-sc55-music.dxa ) + linguas_de? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-briefings-ger.dxa )" -LICENSE="D1X GPL-2 as-is" +LICENSE="D1X GPL-2 public-domain" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="cdinstall debug ipv6 linguas_de +opengl opl3 sc55 +timidity" +IUSE="+data debug ipv6 linguas_de +music +opengl opl3-musicpack sc55-musicpack" + +REQUIRED_USE="?? ( opl3-musicpack sc55-musicpack ) + opl3-musicpack? ( music ) + sc55-musicpack? ( music )" + +RDEPEND="dev-games/physfs[hog,mvl,zip] + media-libs/libsdl:0[X,audio,joystick,opengl?,video] + music? ( + media-libs/sdl-mixer:0[timidity,vorbis] + ) + opengl? ( + virtual/opengl + virtual/glu + )" +DEPEND="${RDEPEND}" +PDEPEND="data? ( || ( + games-action/descent2-data + games-action/descent2-demodata +) )" -DEPEND="opengl? ( virtual/opengl virtual/glu ) - dev-games/physfs[hog,mvl,zip] - media-libs/libsdl:0[audio,opengl?,video] - media-libs/sdl-mixer:0[timidity?]" -RDEPEND="${DEPEND} - cdinstall? ( games-action/descent2-data ) - !cdinstall? ( games-action/descent2-demodata )" +S=${WORKDIR}/${MY_P} -S=${WORKDIR}/${PN}_v${PV}-src +RESTRICT=mirror src_unpack() { - unpack ${PN}_v${PV}-src.tar.gz + unpack ${MY_P}.tar.gz +} + +src_prepare() { + DOCS=({CHANGELOG,COPYING,INSTALL,README,RELEASE-NOTES}.txt) + edos2unix ${DOCS[@]} } src_compile() { escons \ verbosebuild=1 \ sharepath="${GAMES_DATADIR}/d${DV}x" \ - sdlmixer=1 \ $(use_scons debug) \ $(use_scons ipv6) \ + $(use_scons music sdlmixer) \ + $(use_scons opengl) \ || die } src_install() { - - local DOCS=({CHANGELOG,COPYING,INSTALL,README,RELEASE-NOTES}.txt) - edos2unix ${DOCS[@]} || die - dodoc ${DOCS[@]} || die + dodoc ${DOCS[@]} insinto "${GAMES_DATADIR}/d${DV}x" - # None of the following zip files need to be extracted. - if use linguas_de ; then - doins "${DISTDIR}"/d${DV}xr-briefings-ger.zip || die - fi - if use opl3 ; then - doins "${DISTDIR}"/d${DV}xr-opl3-music.zip || die - fi - if use sc55 ; then - doins "${DISTDIR}"/d${DV}xr-sc55-music.zip || die - fi + use opl3-musicpack && doins "${DISTDIR}"/d${DV}xr-opl3-music.dxa + use sc55-musicpack && doins "${DISTDIR}"/d${DV}xr-sc55-music.dxa + use linguas_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.dxa - doicon "${S}/${PN}.xpm" || die + doicon "${S}/${PN}.xpm" - local EXE=${PN} - newgamesbin ${EXE} ${EXE} || die - make_desktop_entry ${PN} "Descent ${DV} Rebirth" || die + dogamesbin d${DV}x-rebirth + make_desktop_entry d${DV}x-rebirth "Descent ${DV} Rebirth" prepgamesdirs } pkg_postinst() { games_pkg_postinst - if ! use cdinstall ; then + + if ! use data ; then echo - elog "The Descent ${DV} Demo data has been installed." - elog "To play the full game enable USE=\"cdinstall\" or manually " + elog "To play the game enable USE=\"data\" or manually " elog "copy the files to ${GAMES_DATADIR}/d${DV}x." - elog "Use bzcat /usr/share/doc/${PF}/INSTALL.txt.bz2 for details." + elog "See /usr/share/doc/${PF}/INSTALL.txt.bz2 for details." echo fi } diff --git a/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild b/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild new file mode 100644 index 0000000..29555e1 --- /dev/null +++ b/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit eutils games scons-utils + +DV=2 +MY_P=${PN}_v${PV}-src +DESCRIPTION="Descent Rebirth - enhanced Descent ${DV} engine" +HOMEPAGE="http://www.dxx-rebirth.com/" +SRC_URI="http://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz + opl3-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-opl3-music.dxa ) + sc55-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-sc55-music.dxa ) + linguas_de? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-briefings-ger.dxa )" + +LICENSE="D1X GPL-2 public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+data debug ipv6 linguas_de +music +opengl opl3-musicpack sc55-musicpack" + +REQUIRED_USE="?? ( opl3-musicpack sc55-musicpack ) + opl3-musicpack? ( music ) + sc55-musicpack? ( music )" + +RDEPEND="dev-games/physfs[hog,mvl,zip] + media-libs/libsdl:0[X,audio,joystick,opengl?,video] + music? ( + media-libs/sdl-mixer:0[timidity,vorbis] + ) + opengl? ( + virtual/opengl + virtual/glu + )" +DEPEND="${RDEPEND}" +PDEPEND="data? ( || ( + games-action/descent2-data + games-action/descent2-demodata +) )" + +S=${WORKDIR}/${MY_P} + +RESTRICT=mirror + +src_unpack() { + unpack ${MY_P}.tar.gz +} + +src_prepare() { + DOCS=({CHANGELOG,COPYING,INSTALL,README,RELEASE-NOTES}.txt) + edos2unix ${DOCS[@]} +} + +src_compile() { + escons \ + verbosebuild=1 \ + sharepath="${GAMES_DATADIR}/d${DV}x" \ + $(use_scons debug) \ + $(use_scons ipv6) \ + $(use_scons music sdlmixer) \ + $(use_scons opengl) \ + || die +} + +src_install() { + dodoc ${DOCS[@]} + + insinto "${GAMES_DATADIR}/d${DV}x" + + use opl3-musicpack && doins "${DISTDIR}"/d${DV}xr-opl3-music.dxa + use sc55-musicpack && doins "${DISTDIR}"/d${DV}xr-sc55-music.dxa + use linguas_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.dxa + + doicon "${S}/${PN}.xpm" + + dogamesbin d${DV}x-rebirth + make_desktop_entry d${DV}x-rebirth "Descent ${DV} Rebirth" + prepgamesdirs +} + +pkg_postinst() { + games_pkg_postinst + + if ! use data ; then + echo + elog "To play the game enable USE=\"data\" or manually " + elog "copy the files to ${GAMES_DATADIR}/d${DV}x." + elog "See /usr/share/doc/${PF}/INSTALL.txt.bz2 for details." + echo + fi +} diff --git a/games-action/d2x-rebirth/metadata.xml b/games-action/d2x-rebirth/metadata.xml index 278acf5..2fd949c 100644 --- a/games-action/d2x-rebirth/metadata.xml +++ b/games-action/d2x-rebirth/metadata.xml @@ -15,9 +15,9 @@ Provides German translations for the game's briefings, robot descriptions, and outro of the original campaign - Include alternate version of the game's music, recorded - with the Yamaha YMF262 OPL3 soundchip - Include alternate version of the game's music, recorded - with the Roland Sound Canvas SC-55 MIDI module + Include alternate version of the game's + music, recorded with the Yamaha YMF262 OPL3 soundchip + Include alternate version of the game's + music, recorded with the Roland Sound Canvas SC-55 MIDI module diff --git a/games-action/d2x-xl/d2x-xl-1.16.15.ebuild b/games-action/d2x-xl/d2x-xl-1.16.15.ebuild index 7347c58..f766f6b 100644 --- a/games-action/d2x-xl/d2x-xl-1.16.15.ebuild +++ b/games-action/d2x-xl/d2x-xl-1.16.15.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="5" +EAPI=5 inherit autotools eutils flag-o-matic toolchain-funcs games @@ -87,19 +87,17 @@ src_configure() { local DEBUG_CONF="--disable-debug --enable-release" use debug && DEBUG_CONF="--enable-debug --disable-release" - egamesconf ${DEBUG_CONF} --with-opengl || die + egamesconf ${DEBUG_CONF} --with-opengl } src_install() { - if use icon; then - newicon "${PN}_1_48x48x32.png" "${PN}.png" || die - fi + use icon && newicon "${PN}_1_48x48x32.png" "${PN}.png" - dogamesbin "${PN}" || die + dogamesbin "${PN}" make_desktop_entry "${PN}" "D2X-XL" "${PN}" # Unpack D2X-XL data files. - dodir "${DIR}" || die + dodir "${DIR}" cd "${D}${DIR}" || die unpack "${DATA_FILE}" diff --git a/games-action/descent1-data/descent1-data-1.0-r1.ebuild b/games-action/descent1-data/descent1-data-1.0-r1.ebuild index 2a19d96..f6e268f 100644 --- a/games-action/descent1-data/descent1-data-1.0-r1.ebuild +++ b/games-action/descent1-data/descent1-data-1.0-r1.ebuild @@ -2,28 +2,21 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="5" +EAPI=5 +CDROM_OPTIONAL="yes" inherit cdrom eutils games -MY_PV=${PV/./} - MY_EXE="setup_descent_1_2.exe" DESCRIPTION="Data files for Descent 1" HOMEPAGE="http://www.interplay.com/games/support.php?id=263" SRC_URI="http://www.dxx-rebirth.com/download/dxx/res/d1datapt.zip !cdinstall? ( $MY_EXE )" -# Don't have a method of applying the ver 1.2 patch in Linux -# http://www.interplay.com/support/product.asp?GameID=109 -# mirror://3dgamers/descent2/d2ptch${MY_PV}.exe -# See readme.txt LICENSE="${PN}" SLOT="0" KEYWORDS="amd64 x86" -PROPERTIES="" -CDROM_OPTIONAL="yes" RESTRICT="!cdinstall? ( fetch )" IUSE="+cdinstall doc" @@ -36,7 +29,8 @@ DEPEND="app-arch/unzip S=${WORKDIR} dir=${GAMES_DATADIR}/d1x -# Function to handle copying and renaming files from installation directory +# Function to handle copying and renaming files from installation directory; +# Allows support of installation sources using capitalized file names copy_file() { local dest="${2}" local f=$(basename "${1}") @@ -121,10 +115,9 @@ src_prepare() { fi } - src_install() { insinto "${dir}" - doins * || die "doins * failed" + doins * insinto "${dir}/missions" doins missions/* diff --git a/games-action/descent2-data/descent2-data-1.0-r2.ebuild b/games-action/descent2-data/descent2-data-1.0-r2.ebuild index a852fc5..324e4f1 100644 --- a/games-action/descent2-data/descent2-data-1.0-r2.ebuild +++ b/games-action/descent2-data/descent2-data-1.0-r2.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="5" +EAPI=5 inherit cdrom eutils games -MY_PV=${PV/./} +# Not possible to apply official 1.2 patch under Linux, so provide our own +# http://www.interplay.com/support/support.php?id=104 +# Should only be needed for original DOS CD-ROM release +MY_PATCH="http://totktonada.ru/gentoo/distfiles/d2xptch12.tgz" +# For GOG install MY_EXE="setup_descent_1_2.exe" DESCRIPTION="Data files for Descent 2" HOMEPAGE="http://www.interplay.com/games/support.php?id=104" -SRC_URI="!cdinstall? ( $MY_EXE )" -# Don't have a method of applying the ver 1.2 patch in Linux -# http://www.interplay.com/support/product.asp?GameID=109 -# mirror://3dgamers/descent2/d2ptch${MY_PV}.exe +SRC_URI="cdinstall? ( $MY_PATCH ) + !cdinstall? ( $MY_EXE )" # See readme.txt LICENSE="${PN}" @@ -34,6 +36,9 @@ IUSE="+cdinstall doc vertigo videos" RDEPEND="!