commit: cdaf165f0d6d197d8327e05cd97a70f8d135f68f
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 07:45:44 2015 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 07:46:18 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdaf165f
version bump with Makefile patch update by Lars Wendler (bug #563634)
Package-Manager: portage-2.2.20.1
games-misc/opengfx/Manifest | 1 +
.../opengfx/files/opengfx-0.5.2-Makefile.patch | 5 ++-
...Makefile.patch => opengfx-0.5.3-Makefile.patch} | 22 +++----------
games-misc/opengfx/opengfx-0.5.3.ebuild | 38 ++++++++++++++++++++++
4 files changed, 45 insertions(+), 21 deletions(-)
diff --git a/games-misc/opengfx/Manifest b/games-misc/opengfx/Manifest
index bc6cfc5..39ecdc3 100644
--- a/games-misc/opengfx/Manifest
+++ b/games-misc/opengfx/Manifest
@@ -1,2 +1,3 @@
DIST opengfx-0.5.1-source.tar.xz 9553608 SHA256
5737760de04034504dbf552f75a45d713a59659dca4bfbdd4e215429c148d7a9 SHA512
30dee5ae2065d76205d21c911b875777878fc66c3df159ca49d8745db843bc8c00f9d022670ceb872f20bc8b64d41fbe3f12cb8ce3b3eb0e8b9c30a6e5bfde04
WHIRLPOOL
f387e474ad8d1fa6b43adfce00df64a388702d5f21350ad60a76d25577aba18af798ba7cc4cb8a0ab06d49f76c48f7f59757cdb384e3630d5ff7d63b9a47da4b
DIST opengfx-0.5.2-source.tar.xz 9639176 SHA256
fba70b19e9e69e1f51a0b36675e25c5ec90157dc842de9a405c0d5700f36e647 SHA512
d42d819bec314c3e29c68e8bbb60e40c5d43ff52878f5e771edd49b27d8dabe7406a8c5050797934dc4ba78a30e1fd543482c8ea86a3e562670ce71c04e50d22
WHIRLPOOL
4fa6ebf69e2d7495658fd799329fac3127363e2d3265ecdd85f2ed2d20689a675120b669335308ef15da2b6e6b1a818d93fe8dad691134bd3894b45c523b64b4
+DIST opengfx-0.5.3-source.tar.xz 9638892 SHA256
28d253ffa7a3618f7c4efb3b1076bc652204c2412d3cee57a6b9ffc13bda4014 SHA512
41b41192dcf95e2ac03e7028f55aca486c13a8709a62fe5970918494b0009ee07118e0d04d10426fea35ee82c842d28fc58f8c258df2e8ebe0b17e40c892f829
WHIRLPOOL
309c8e5ef1fb83328712c0516c55ecbc53f75117a1fc2aedbe9e61db05bf14ffe4f9fec6ff6a1f50dfc408735de3d5b754d97b026957b02271b213ffc32a9872
diff --git a/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch
b/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch
index ee301b8..b683500 100644
--- a/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch
+++ b/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch
@@ -1,6 +1,5 @@
-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
+--- opengfx-0.5.2-source.orig/Makefile
++++ opengfx-0.5.2-source/Makefile
@@ -99,8 +99,8 @@
AWK ?= awk
GREP ?= grep
diff --git a/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch
b/games-misc/opengfx/files/opengfx-0.5.3-Makefile.patch
similarity index 65%
copy from games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch
copy to games-misc/opengfx/files/opengfx-0.5.3-Makefile.patch
index ee301b8..169df96 100644
--- a/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch
+++ b/games-misc/opengfx/files/opengfx-0.5.3-Makefile.patch
@@ -1,11 +1,10 @@
-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
+--- opengfx-0.5.3-source/Makefile
++++ opengfx-0.5.3-source/Makefile
@@ -99,8 +99,8 @@
AWK ?= awk
GREP ?= grep
PYTHON ?= python
--UNIX2DOS ?= unix2dos
+-UNIX2DOS ?= $(shell which 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 "")
@@ -21,20 +20,7 @@ diff -ru opengfx-0.5.2-source.orig/Makefile
opengfx-0.5.2-source/Makefile
# 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 @@
+@@ -719,7 +719,7 @@
$(_E)
endif
$(_E) "Release:"
diff --git a/games-misc/opengfx/opengfx-0.5.3.ebuild
b/games-misc/opengfx/opengfx-0.5.3.ebuild
new file mode 100644
index 0000000..49a9825
--- /dev/null
+++ b/games-misc/opengfx/opengfx-0.5.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.4.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
+}
