version bump (bug #555968)

(Portage version: 2.2.20/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 93 insertions, 3 deletions

diff --git a/games-misc/opengfx/ChangeLog b/games-misc/opengfx/ChangeLog
index 0e50796bb7b9..518e87b78e8d 100644
--- a/games-misc/opengfx/ChangeLog
+++ b/games-misc/opengfx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-misc/opengfx
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/opengfx/ChangeLog,v 1.40 2015/01/27 07:49:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/opengfx/ChangeLog,v 1.41 2015/07/29 01:46:07 mr_bones_ Exp $
+
+*opengfx-0.5.2 (29 Jul 2015)
+
+  29 Jul 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/opengfx-0.5.2-Makefile.patch, +opengfx-0.5.2.ebuild,
+  files/opengfx-0.5.1-gcc48.patch:
+  version bump (bug #555968)
 
   27 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org>
   -files/opengfx-0.4.7-gcc48.patch, -opengfx-0.4.7.ebuild:
diff --git a/games-misc/opengfx/files/opengfx-0.5.1-gcc48.patch b/games-misc/opengfx/files/opengfx-0.5.1-gcc48.patch
index 78b512e71cec..51a32c8766b7 100644
--- a/games-misc/opengfx/files/opengfx-0.5.1-gcc48.patch
+++ b/games-misc/opengfx/files/opengfx-0.5.1-gcc48.patch
@@ -1,5 +1,5 @@
---- scripts/Makefile.nml.old	2013-05-09 20:09:52.992038666 +0200
-+++ scripts/Makefile.nml	2013-05-09 20:10:36.942970903 +0200
+--- scripts/Makefile.nml.old
++++ scripts/Makefile.nml
 @@ -14,11 +14,11 @@
  
  %.src.dep: $(SRC_DIR)/%.pnml
diff --git a/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch b/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch
new file mode 100644
index 000000000000..ee301b8190f4
--- /dev/null
+++ b/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch
@@ -0,0 +1,45 @@
+diff -ru opengfx-0.5.2-source.orig/Makefile opengfx-0.5.2-source/Makefile
+--- opengfx-0.5.2-source.orig/Makefile	2015-04-12 12:57:17.000000000 -0400
++++ opengfx-0.5.2-source/Makefile	2015-07-28 21:13:46.496708233 -0400
+@@ -99,8 +99,8 @@
+ AWK            ?= awk
+ GREP           ?= grep
+ PYTHON         ?= python
+-UNIX2DOS       ?= unix2dos
+-UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null && echo "-q" || echo "")
++UNIX2DOS       ?= $(shell which unix2dos 2>/dev/null)
++UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null >&2 && echo "-q" || echo "")
+ 
+ # Graphics processing
+ GIMP           ?= gimp
+@@ -196,7 +196,7 @@
+ endif
+ 
+ # Days of commit since 2000-1-1 00-00
+-REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print (date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days")
++REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print ((date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days)")
+ 
+ # Filename addition, if we're not building the default branch
+ REPO_BRANCH_STRING ?= $(shell if [ "$(REPO_BRANCH)" = "$(DEFAULT_BRANCH_NAME)" ]; then echo ""; else echo "-$(REPO_BRANCH)"; fi)
+@@ -377,7 +377,11 @@
+ 		| sed -e "s/$(REPLACE_REVISION)/$(NEWGRF_VERSION)/" \
+ 		| sed -e "s/$(REPLACE_FILENAME)/$(OUTPUT_FILENAME)/" \
+ 		> $@
+-	$(_V) [ -z "$(UNIX2DOS)" ] || $(UNIX2DOS) $(UNIX2DOS_FLAGS) $@
++ifeq ($(UNIX2DOS),)
++	$(_E) Warning: unix2dos not available. $@ keeps current eol style.
++else
++	$(_V) $(UNIX2DOS) $(UNIX2DOS_FLAGS) $@
++endif
+ 
+ clean::
+ 	$(_E) "[CLEAN DOC]"
+@@ -714,7 +718,7 @@
+ 	$(_E)
+ endif
+ 	$(_E) "Release:"
+-	$(_E) "bananas:     Upload bundle to BaNaNaS
++	$(_E) "bananas:     Upload bundle to BaNaNaS"
+ 	$(_E)
+ 	$(_E) "Valid command line variables are:"
+ 	$(_E) "Helper programmes:"
diff --git a/games-misc/opengfx/opengfx-0.5.2.ebuild b/games-misc/opengfx/opengfx-0.5.2.ebuild
new file mode 100644
index 000000000000..664632cde2ae
--- /dev/null
+++ b/games-misc/opengfx/opengfx-0.5.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/opengfx/opengfx-0.5.2.ebuild,v 1.1 2015/07/29 01:46:07 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="OpenGFX data files for OpenTTD"
+HOMEPAGE="http://bundles.openttdcoop.org/opengfx/"
+SRC_URI="http://bundles.openttdcoop.org/opengfx/releases/${PV}/${P}-source.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+RESTRICT="test" # nml version affects the checksums that the test uses (bug #451444)
+
+DEPEND=">=games-util/nml-0.3.0
+	games-util/grfcodec"
+RDEPEND=""
+
+S=${WORKDIR}/${P}-source
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+}
+
+src_compile() {
+	GIMP= emake help  # print out the env to make bug reports better
+	GIMP= _V= emake bundle_tar
+}
+
+src_install() {
+	insinto "${GAMES_DATADIR}/openttd/data/"
+	doins *.grf opengfx.obg
+	dodoc docs/{changelog.txt,readme.txt}
+	prepgamesdirs
+}