version bump

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

5 files changed, 170 insertions, 2 deletions

diff --git a/games-strategy/liquidwar6/ChangeLog b/games-strategy/liquidwar6/ChangeLog
index caebbc8d80b1..4409e9e9c6d1 100644
--- a/games-strategy/liquidwar6/ChangeLog
+++ b/games-strategy/liquidwar6/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/liquidwar6
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/ChangeLog,v 1.2 2013/09/30 12:17:37 hasufell Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/ChangeLog,v 1.3 2014/01/08 16:53:56 hasufell Exp $
+
+*liquidwar6-0.2.3551 (08 Jan 2014)
+
+  08 Jan 2014; Julian Ospald <hasufell@gentoo.org> +liquidwar6-0.2.3551.ebuild,
+  +files/liquidwar6-0.2.3551-ldconfig.patch,
+  +files/liquidwar6-0.2.3551-paths.patch:
+  version bump
 
   30 Sep 2013; Julian Ospald <hasufell@gentoo.org>
   liquidwar6-0.0.13_beta.ebuild:
diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.2.3551-ldconfig.patch b/games-strategy/liquidwar6/files/liquidwar6-0.2.3551-ldconfig.patch
new file mode 100644
index 000000000000..d1a6685ca606
--- /dev/null
+++ b/games-strategy/liquidwar6/files/liquidwar6-0.2.3551-ldconfig.patch
@@ -0,0 +1,18 @@
+commit 1bd3596545912f2e47b8848df3fb5d99195d299a
+Author: hasufell <hasufell@gentoo.org>
+Date:   Wed Jan 8 17:21:09 2014 +0100
+
+    don't run ldconfig
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f319a74..47463c1 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -65,7 +65,6 @@ EXTRA_DIST = scriptpo.c indent.sh scriptpo-update.sh stamp.sh clean.sh dtou.sh u
+ SUBDIRS = lib
+ 
+ install-exec-local:
+-	if which id && which ldconfig && test `id -u` -eq 0 && test "$(prefix)" != "/usr"; then ldconfig; fi # Run ldconfig automatically if we're root
+ 	if test -x $(DESTDIR)$(bindir)/liquidwar6; then mv $(DESTDIR)$(bindir)/liquidwar6 $(DESTDIR)$(bindir)/@PACKAGE_TARNAME@-@LW6_VERSION_BASE@; ln -s @PACKAGE_TARNAME@-@LW6_VERSION_BASE@ $(DESTDIR)$(bindir)/liquidwar6; fi
+ 
+ uninstall-local:
diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.2.3551-paths.patch b/games-strategy/liquidwar6/files/liquidwar6-0.2.3551-paths.patch
new file mode 100644
index 000000000000..c77251d3f999
--- /dev/null
+++ b/games-strategy/liquidwar6/files/liquidwar6-0.2.3551-paths.patch
@@ -0,0 +1,31 @@
+commit b121fe3d9fb7e5fc52f592482e02b6a28430435f
+Author: hasufell <hasufell@gentoo.org>
+Date:   Wed Jan 8 17:23:56 2014 +0100
+
+    respect datarootdir
+
+diff --git a/data/icon/Makefile.am b/data/icon/Makefile.am
+index 0bca199..ae5cf79 100644
+--- a/data/icon/Makefile.am
++++ b/data/icon/Makefile.am
+@@ -19,6 +19,6 @@
+ # Contact author        : ufoot@ufoot.org
+ 
+ pkgdata_DATA = liquidwar6.png liquidwar6.xpm
+-pkgdatadir = $(datadir)/pixmaps
++pkgdatadir = $(datarootdir)/pixmaps
+ EXTRA_DIST = $(pkgdata_DATA) liquidwar6.ico liquidwar6.icns
+ 
+diff --git a/pkg/Makefile.am b/pkg/Makefile.am
+index 6fc2957..ac86bb8 100644
+--- a/pkg/Makefile.am
++++ b/pkg/Makefile.am
+@@ -19,7 +19,7 @@
+ # Contact author        : ufoot@ufoot.org
+ 
+ pkgdata_DATA = liquidwar6.desktop
+-pkgdatadir = $(datadir)/applications
++pkgdatadir = $(datarootdir)/applications
+ EXTRA_DIST =  $(pkgdata_DATA) liquidwar6.spec liquidwar6d 406FFCAB.gnupg.txt FD409E94.gnupg.txt
+ 
+ distclean-local:
diff --git a/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild b/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild
new file mode 100644
index 000000000000..c613cfb9804f
--- /dev/null
+++ b/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild,v 1.1 2014/01/08 16:53:56 hasufell Exp $
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs games
+
+MY_PV=${PV/_beta/beta}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Unique multiplayer wargame between liquids"
+HOMEPAGE="http://www.gnu.org/software/liquidwar6/"
+SRC_URI="http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${MY_P}.tar.gz
+	maps? ( http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${PN}-extra-maps-${MY_PV}.tar.gz )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gles2 gtk libcaca +maps nls +ogg openmp readline test"
+
+# yes, cunit is rdep
+RDEPEND="dev-db/sqlite:3
+	dev-libs/expat
+	dev-scheme/guile
+	dev-util/cunit
+	media-libs/freetype:2
+	media-libs/libpng:0
+	media-libs/libsdl[X,opengl,video]
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-ttf
+	net-misc/curl
+	sys-devel/libtool:2
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg
+	virtual/opengl
+	libcaca? ( media-libs/libcaca )
+	gles2? ( media-libs/mesa[gles2] )
+	gtk? ( x11-libs/gtk+:2 )
+	nls? ( virtual/libintl
+		virtual/libiconv )
+	ogg? (
+		media-libs/libsdl[X,audio,opengl,video]
+		media-libs/sdl-mixer[vorbis]
+	)
+	readline? ( sys-libs/ncurses
+		sys-libs/readline )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_P}
+S_MAPS=${WORKDIR}/${PN}-extra-maps-${MY_PV}
+
+pkg_setup() {
+	if use openmp; then
+		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
+			ewarn "OpenMP is not available in your current selected gcc"
+			die "need openmp capable gcc"
+		fi
+	fi
+	games_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{ldconfig,paths}.patch
+
+	sed -i \
+		-e 's/-Werror//' \
+		configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# configure fails with cunit disabled
+	egamesconf \
+		$(use_enable nls) \
+		--enable-cunit \
+		$(use_enable gtk) \
+		--enable-mod-gl1 \
+		$(use_enable gles2 mod-gles2) \
+		$(use_enable libcaca mod-caca) \
+		$(use_enable openmp) \
+		$(use_enable ogg mod-ogg) \
+		$(use_enable !ogg silent) \
+		$(use_enable readline console) \
+		--disable-static \
+		--datarootdir=/usr/share \
+		--mandir=/usr/share/man \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html
+
+	if use maps; then
+		cd "${S_MAPS}" || die
+		egamesconf
+	fi
+}
+
+src_compile() {
+	default
+	use doc && emake html
+	use maps && emake -C "${S_MAPS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use maps && emake -C "${S_MAPS}" DESTDIR="${D}" install
+	prune_libtool_files --all
+	prepgamesdirs
+}
diff --git a/games-strategy/liquidwar6/metadata.xml b/games-strategy/liquidwar6/metadata.xml
index 75c9bbca1269..5c17f8cae605 100644
--- a/games-strategy/liquidwar6/metadata.xml
+++ b/games-strategy/liquidwar6/metadata.xml
@@ -8,6 +8,7 @@
 	</maintainer>
 	<use>
 		<flag name='doc'>Convert the info pages to html</flag>
+		<flag name='gles2'>Enable OpenGL ES 2.0 support</flag>
 		<flag name='gtk'>Used to display error/critical messages</flag>
 		<flag name='maps'>Install extra maps</flag>
 		<flag name='ogg'>Enable mod-ogg via <pkg>media-libs/sdl-mixer</pkg>