version bump (bug #388297)

Package-Manager: portage-2.1.10.11/cvs/Linux i686

5 files changed, 121 insertions, 4 deletions

diff --git a/games-fps/lsdldoom/ChangeLog b/games-fps/lsdldoom/ChangeLog
index fea229599628..4b163f03448e 100644
--- a/games-fps/lsdldoom/ChangeLog
+++ b/games-fps/lsdldoom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/lsdldoom
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/ChangeLog,v 1.13 2008/02/15 01:04:11 wolf31o2 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/ChangeLog,v 1.14 2011/10/26 17:15:07 mr_bones_ Exp $
+
+*lsdldoom-1.5 (26 Oct 2011)
+
+  26 Oct 2011; Michael Sterrett <mr_bones_@gentoo.org> +lsdldoom-1.5.ebuild,
+  +files/lsdldoom-1.5-paths.patch, metadata.xml:
+  version bump (bug #388297)
 
   15 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   lsdldoom-1.4.4.4.ebuild:
diff --git a/games-fps/lsdldoom/Manifest b/games-fps/lsdldoom/Manifest
index 6f1bb022fbec..826b294c1cd2 100644
--- a/games-fps/lsdldoom/Manifest
+++ b/games-fps/lsdldoom/Manifest
@@ -2,7 +2,10 @@ AUX 1.4.4.4-gcc34.patch 1612 RMD160 c9829e58f4292a4fa966e81ab31067eccaa62c02 SHA
 AUX 1.4.4.4-gentoo-paths.patch 1525 RMD160 840ca212b5ea67cec81b3671c9abf2819c96c3e8 SHA1 aec403593b827bdf8da161bac70365271cc306d0 SHA256 cfa4df317d36283a6823f98012daa8578bf4ff9e712257a11272a1d24a2b8561
 AUX lsdldoom-1.4.4.4-gcc41.patch 477 RMD160 74ee799c5664112cd6ce7dec3fbec2b329b3fd3f SHA1 28d156980f0daa569e345c60fe68c4bf418f7418 SHA256 18f5c1d5fe98bcf97a81a4c02171beeccae34b29f0eca3b2f352677468e710b8
 AUX lsdldoom-1.4.4.4-keys.patch 316 RMD160 fd532c971654b390e901d4f0bc2489d97edc6c5d SHA1 b33f13d70564fdc0a2d8efc1f0ba007451d0626c SHA256 b7ef13e74e5bfea1b31c32c19f9eaafa6f39147a0179620e7d652e849a5bd049
+AUX lsdldoom-1.5-paths.patch 2315 RMD160 a256dfa5c1d79b03392100fb8a3f8437fc27fdac SHA1 7affaa03761ddbc68bb1ef9aee6441f76c9f55ae SHA256 1802d087e060618d9b99ac2d23a501b831631c90d20e6950710e286e7859fcd6
 DIST lsdldoom-1.4.4.4.tar.gz 916884 RMD160 92438a234b4642f320364308737e20f232d7da82 SHA1 a97919a0a3bac2c4f7e097752a793088879f6280 SHA256 6c29560a3a87b351f81717bd79c2cff124df0e68b807a7a365af15317a47d83c
+DIST lsdldoom-1.5.tar.gz 1227060 RMD160 31f847a302ded5ca38713c0b36287861d2297bb9 SHA1 7000f4c1e22efd0654b4a05b4da4980914421de4 SHA256 2e780775a1f31e3ee30e3d02b7f6b35409ec986fbfec07139b19ab48bdcf3ed8
 EBUILD lsdldoom-1.4.4.4-r1.ebuild 1230 RMD160 eb5074163b39287cce8d2611e080bc693a745964 SHA1 287cf2c9d036e0ae0b342f964c9d958d30e40342 SHA256 bb6b37d8fd325cc2340a26121caea5f03efc12ccfbd92897d3b5b558e67af0f9
-MISC ChangeLog 2299 RMD160 a538aa41131f448eab5e016683868024a7ea42cc SHA1 7d874ffeef3024d2f2045dc4d27477415d8e2d89 SHA256 e5c60d4e996889fa0de633e44122c0f55029bf87ac7e95b29b85eb6bd8251e61
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+EBUILD lsdldoom-1.5.ebuild 953 RMD160 d41c5605aa45a34a959c6c0be87ca1d8e5f1292e SHA1 c4a0ec24d3d8bd5ddd703be423f353f1c6eddc0a SHA256 32aa8f16eac18cb86efd5ccaa60b7d246b1bbb45a406e6277b88b8ca63c778fb
+MISC ChangeLog 2485 RMD160 a0e36372a515103171a5ab4dc6a1bdbafefca83c SHA1 2748f47f90d453107c1bddf28537dfe0851adc36 SHA256 11eef7bee402730efaf800bf0517b6bebbca8aae9f8ebc136dcac8e56e0a35ce
+MISC metadata.xml 395 RMD160 97fd0fe29f878a2ec97da16f7870cda92af7f214 SHA1 3a05d1afb4fdc80f5b8ed27e1a1a0fcc5f5f62c6 SHA256 23cee97d90e5047920b4130e2787fdade3fb398616ddfa80967440a69796308f
diff --git a/games-fps/lsdldoom/files/lsdldoom-1.5-paths.patch b/games-fps/lsdldoom/files/lsdldoom-1.5-paths.patch
new file mode 100644
index 000000000000..686e3450a620
--- /dev/null
+++ b/games-fps/lsdldoom/files/lsdldoom-1.5-paths.patch
@@ -0,0 +1,64 @@
+diff -urN lsdldoom-1.5.orig//Makefile.in lsdldoom-1.5/Makefile.in
+--- lsdldoom-1.5.orig//Makefile.in	2011-10-23 22:17:01.582705152 -0700
++++ lsdldoom-1.5/Makefile.in	2011-10-23 22:18:00.846237242 -0700
+@@ -209,7 +209,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(prefix)/share/doc/@PACKAGE@
++docdir = /usr/share/doc/$(PF)
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+diff -urN lsdldoom-1.5.orig//configure lsdldoom-1.5/configure
+--- lsdldoom-1.5.orig//configure	2011-10-23 22:17:01.544700322 -0700
++++ lsdldoom-1.5/configure	2011-10-23 22:18:00.829235080 -0700
+@@ -5689,10 +5689,10 @@
+ then exec_prefix=$prefix
+ fi
+ 
+-gamesdir=$prefix/games
++gamesdir=$bindir
+ exp_gamesdir=`eval "echo $gamesdir"`
+ exp_datadir=`eval "echo $datadir"`
+-waddir=$exp_datadir/games/doom
++waddir=$exp_datadir/doom-data
+ cat >>confdefs.h <<_ACEOF
+ #define DOOMWADDIR "$waddir"
+ _ACEOF
+diff -urN lsdldoom-1.5.orig//data/Makefile.in lsdldoom-1.5/data/Makefile.in
+--- lsdldoom-1.5.orig//data/Makefile.in	2011-10-23 22:17:01.634711762 -0700
++++ lsdldoom-1.5/data/Makefile.in	2011-10-23 22:18:00.844236988 -0700
+@@ -188,7 +188,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-waddir = $(datadir)/games/doom
++waddir = $(datadir)/doom-data
+ wad_DATA = boomlump.wad
+ EXTRA_DIST = boomlump.wad
+ all: all-am
+diff -urN lsdldoom-1.5.orig//doc/Makefile.in lsdldoom-1.5/doc/Makefile.in
+--- lsdldoom-1.5.orig//doc/Makefile.in	2011-10-23 22:17:00.348548297 -0700
++++ lsdldoom-1.5/doc/Makefile.in	2011-10-23 22:18:00.840236480 -0700
+@@ -158,7 +158,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(prefix)/share/doc/@PACKAGE@
++docdir = /usr/share/doc/$(PF)
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+diff -urN lsdldoom-1.5.orig//src/Makefile.in lsdldoom-1.5/src/Makefile.in
+--- lsdldoom-1.5.orig//src/Makefile.in	2011-10-23 22:17:01.041636386 -0700
++++ lsdldoom-1.5/src/Makefile.in	2011-10-23 22:18:00.835235845 -0700
+@@ -242,7 +242,7 @@
+ # Process this file with automake to produce Makefile.in
+ #
+ #
+-gamesdir = $(prefix)/games
++gamesdir = $(bindir)
+ games_PROGRAMS = @BUILD_SDLDOOM@ @BUILD_SERVER@
+ @I386_ASM_FALSE@ASMS = 
+ @I386_ASM_TRUE@ASMS = drawspan.S drawcol.S drawasm.h
diff --git a/games-fps/lsdldoom/lsdldoom-1.5.ebuild b/games-fps/lsdldoom/lsdldoom-1.5.ebuild
new file mode 100644
index 000000000000..761fdfed137f
--- /dev/null
+++ b/games-fps/lsdldoom/lsdldoom-1.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/lsdldoom-1.5.ebuild,v 1.1 2011/10/26 17:15:07 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils games
+
+DESCRIPTION="Port of ID's doom to SDL"
+HOMEPAGE="http://jesshaas.com/lsdldoom/"
+SRC_URI="http://jesshaas.com/lsdldoom/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="+net +shareware freedoom"
+
+DEPEND="media-libs/libsdl[video]
+	media-libs/sdl-mixer
+	net? ( media-libs/sdl-net )"
+RDEPEND="${DEPEND}
+	shareware? ( games-fps/doom-data )
+	freedoom? ( games-fps/freedoom )"
+
+PATCHES=( "${FILESDIR}"/${P}-paths.patch )
+
+src_configure() {
+	# cpu-opt -> just adds -mcpu crap to CFLAGS
+	egamesconf \
+		--disable-dependency-tracking \
+		--disable-cpu-opt \
+		$(use_enable net net-game)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	prepalldocs
+	dodoc ChangeLog
+	prepgamesdirs
+}
diff --git a/games-fps/lsdldoom/metadata.xml b/games-fps/lsdldoom/metadata.xml
index d3c2cc926f0b..26853b0e7729 100644
--- a/games-fps/lsdldoom/metadata.xml
+++ b/games-fps/lsdldoom/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
+<use>
+	<flag name='net'>Enables network game support</flag>
+	<flag name='shareware'>Install <pkg>games-fps/doom-data</pkg> for shareware wad file</flag>
+	<flag name='freedoom'>Install <pkg>games-fps/freedoom</pkg> wad file</flag>
+</use>
 </pkgmetadata>