[gentoo-commits] proj/gamerlay:master commit in: games-action/dxx-rebirth/, games-action/dxx-rebirth/files/

2017-04-29 Thread James Le Cuirot
commit: b728de5810229591127739e01c179dee71d3b88a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Apr 29 20:02:33 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Apr 29 20:02:33 2017 +
URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=b728de58

games-action/dxx-rebirth: Improved version in Gentoo repo, removing

 .../dxx-rebirth/dxx-rebirth-0.59.100.ebuild| 126 -
 .../files/dxx-rebirth-0.59.100-flags.patch |  10 --
 .../files/dxx-rebirth-0.59.100-sharepath.patch |  11 --
 games-action/dxx-rebirth/metadata.xml  |  35 --
 4 files changed, 182 deletions(-)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
deleted file mode 100644
index b0dcf95..000
--- a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=6
-
-inherit eutils scons-utils
-
-MY_P=${PN}_v${PV}-src
-DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
-HOMEPAGE="http://www.dxx-rebirth.com/;
-SRC_URI="http://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz
-   opl3-musicpack? (
-   descent1? ( 
http://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa )
-   descent2? ( 
http://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) )
-   sc55-musicpack? (
-   descent1? ( 
http://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa )
-   descent2? ( 
http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa ) )
-   l10n_de? (
-   descent1? ( 
http://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.dxa )
-   descent2? ( 
http://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.dxa ) )
-   textures? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa 
)"
-
-RESTRICT=mirror
-
-LICENSE="D1X GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+data debug +descent1 +descent2 doc ipv6 l10n_de +music +opengl 
opl3-musicpack sc55-musicpack +textures"
-
-REQUIRED_USE="|| ( descent1 descent2 )
-   ?? ( opl3-musicpack sc55-musicpack )
-   opl3-musicpack? ( music )
-   sc55-musicpack? ( music )
-   textures ( descent1 )"
-
-DEPEND="dev-games/physfs[hog,mvl,zip]
-   media-libs/libsdl:0[X,sound,joystick,opengl?,video]
-   music? (
-   media-libs/sdl-mixer:0[midi,timidity,vorbis] )
-   opengl? (
-   virtual/opengl
-   virtual/glu )"
-RDEPEND="${DEPEND}
-   data? (
-   descent1? ( || ( games-action/descent1-data 
games-action/descent1-demodata ) )
-   descent2? ( || ( games-action/descent2-data 
games-action/descent2-demodata ) ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-   unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-   # * flags patch -- remove hardcoded '-g -O2'
-   # * sharepath patch -- change location of games' data from
-   #   /usr/share/games/{d1x,d2x}-rebirth to /usr/share/games/{d1x,d2x}
-   PATCHES=("${FILESDIR}"/${P}-{flags,sharepath}.patch)
-   default
-}
-
-src_compile() {
-   escons \
-   verbosebuild=1 \
-   prefix='/usr' \
-   debug=$(usex debug 1 0) \
-   ipv6=$(usex ipv6 1 0) \
-   sdlmixer=$(usex music 1 0) \
-   opengl=$(usex opengl 1 0)
-}
-
-src_install() {
-   if use doc; then
-   docs=({CHANGELOG,INSTALL,README,RELEASE-NOTES}.txt)
-   dodoc COPYING.txt
-   fi
-
-   for DV in 1 2; do
-   if ! use descent${DV}; then
-   continue
-   fi
-
-   PROGRAM=d${DV}x-rebirth
-
-   if use doc; then
-   docinto $PROGRAM
-   for d in ${docs[@]}; do
-   edos2unix $PROGRAM/${d}
-   dodoc $PROGRAM/${d}
-   done
-   fi
-
-   insinto "/usr/share/games/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 l10n_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.dxa
-
-   dobin $PROGRAM/$PROGRAM
-   make_desktop_entry $PROGRAM "Descent ${DV} Rebirth" $PROGRAM
-   doicon $PROGRAM/$PROGRAM.xpm
-   done
-
-   insinto "/usr/share/games/d1x"
-   use textures && doins "${DISTDIR}"/d1xr-hires.dxa
-}
-
-pkg_postinst() {
-   if ! use data; then
-   elog
-   elog "To play the game enable USE=\"data\" or manually "
-   elog "copy the files to /usr/share/{d1x,d2x}."
-   elog "See /usr/share/doc/${PF}/INSTALL.txt.bz2 for 

[gentoo-commits] proj/gamerlay:master commit in: games-action/dxx-rebirth/, games-action/dxx-rebirth/files/

2016-12-29 Thread Alexander Turenko
commit: f614d06cffc32da0b8e76570ad2a1e1035a80e60
Author: Alexander Turenko  gmail  com>
AuthorDate: Thu Dec 29 23:19:16 2016 +
Commit: Alexander Turenko  gmail  com>
CommitDate: Thu Dec 29 23:28:37 2016 +
URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=f614d06c

games-action/dxx-rebirth: version bump: 0.59.100

This is the first release shipped d1x-rebirth and d2x-rebirth as the
single package (but with two executables), so rather then update two
ebuilds separately I merged it into this one. For more information see
the release announcement:
* http://www.dxx-rebirth.com/news/dxx-rebirth-v0-60-beta-1-released/

Changes
---

Merged {d1x,d2x}-rebirth ebuilds into one named dxx-rebirth (this follows up
upstream's code bases merging). Added "descent1" and "descent2" USE flags for
controlling which game(s) install.

Updated from EAPI 5 to 6. Dropped "games" eclass using.
* https://bugs.gentoo.org/show_bug.cgi?id=574082

Migrate from LINGUAS to L10N:
* 
https://github.com/gentoo/gentoo/commit/05275527fc624b00a9aa42cc2f6d4b480af463f4

Replaced games herd in metadata.xml with me as the maintainer:
* 
https://github.com/gentoo/gentoo/commit/cfd93d768e79a349f1e762b92773190295c36980
* 
https://github.com/gentoo/gentoo/commit/8849b098c085c07e4ac1257e5b39df35d98c3c58

Updated `SConstruct` file patch to get rid of hardcoded CXXFLAGS="-g -O2".

Added `SConstruct` file patch and prefix='/usr' scons argument to looking
games' data in `/usr/share/games/{d1x,d2x}` instead of default
`/usr/local/share/games/{d1x,d2x}-rebirth` (not sure how to achieve this on the
recent version w/o patching).

Moved documentation installing to the appropriate stage (from prepare to 
install).

Changed dependency type for game data ebuilds from PDEPEND to RDEPEND as
devmanual suggests.

Added `doc` USE flag (disabled by default).

Added the message about necessary of libsdl alsa/oss/pulseaudio USE
flag.

 .../dxx-rebirth/dxx-rebirth-0.59.100.ebuild| 127 +
 .../files/dxx-rebirth-0.59.100-flags.patch |  10 ++
 .../files/dxx-rebirth-0.59.100-sharepath.patch |  11 ++
 games-action/dxx-rebirth/metadata.xml  |  35 ++
 4 files changed, 183 insertions(+)

diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild 
b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
new file mode 100644
index 000..be99ee8
--- /dev/null
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=6
+
+inherit eutils scons-utils
+
+MY_P=${PN}_v${PV}-src
+DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
+HOMEPAGE="http://www.dxx-rebirth.com/;
+SRC_URI="http://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz
+   opl3-musicpack? ( 
+   descent1? ( 
http://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa )
+   descent2? ( 
http://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) )
+   sc55-musicpack? (
+   descent1? ( 
http://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa )
+   descent2? ( 
http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa ) )
+   l10n_de? (
+   descent1? ( 
http://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.dxa )
+   descent2? ( 
http://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.dxa ) )
+   textures? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa 
)"
+
+RESTRICT=mirror
+
+LICENSE="D1X GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+data debug +descent1 +descent2 doc ipv6 l10n_de +music +opengl 
opl3-musicpack sc55-musicpack +textures"
+
+REQUIRED_USE="|| ( descent1 descent2 )
+   ?? ( opl3-musicpack sc55-musicpack )
+   opl3-musicpack? ( music )
+   sc55-musicpack? ( music )
+   textures ( descent1 )"
+
+DEPEND="dev-games/physfs[hog,mvl,zip]
+   media-libs/libsdl:0[X,sound,joystick,opengl?,video]
+   music? (
+   media-libs/sdl-mixer:0[midi,timidity,vorbis]
+   )
+   opengl? (
+   virtual/opengl
+   virtual/glu
+   )"
+RDEPEND="data? (
+   descent1? ( || ( games-action/descent1-data 
games-action/descent1-demodata ) )
+   descent2? ( || ( games-action/descent2-data 
games-action/descent2-demodata ) ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+   unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+   # * flags patch -- remove hardcoded '-g -O2'
+   # * sharepath patch -- change location of games' data from
+   #   /usr/share/games/{d1x,d2x}-rebirth to /usr/share/games/{d1x,d2x}
+   PATCHES=("${FILESDIR}"/${P}-{flags,sharepath}.patch)
+   default
+}
+
+src_compile() {
+   escons \
+   verbosebuild=1 \
+   prefix='/usr' \
+   debug=$(usex debug 1 0) \
+