version bump (bug #555968)

Package-Manager: portage-2.2.20/cvs/Linux x86_64

5 files changed, 98 insertions, 5 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/Manifest b/games-misc/opengfx/Manifest
index f6d42dac0ed2..6594a9eba253 100644
--- a/games-misc/opengfx/Manifest
+++ b/games-misc/opengfx/Manifest
@@ -1,5 +1,8 @@
-AUX opengfx-0.5.1-gcc48.patch 585 SHA256 9866ab3c7115b502cc058d45b5c19790e0bf2147a0d679991df529fc545e933c SHA512 44fa640d01371cd636f238b2331caea51a87af780bdbf71d395de4c8e529aae8173b16f0929ec915ffddd53a0c94c2f2a73d2951022a9d81e11a26fa5bfeeb91 WHIRLPOOL e582b90bb4c26ae9c423bc52b47f3b27743df07e7879f53fd53f17603133442a3c3452f436d7902ed22a89a8700f0653027a6a2f68c5997cbbf492657954a861
+AUX opengfx-0.5.1-gcc48.patch 513 SHA256 2f4e4da8ccf5d2b2ffdad6d14b9b6dd75702e1660631003c857e2829e69222d5 SHA512 9dc2aa87130a56c8bc396501a4abe7bc85e23a836e2c639c63c8b94d1d9a2079936fa6721c62309b74b4d8d3d956a78f8ae965a3c0bd9e664b062c137b1f7e2c WHIRLPOOL e91e463745c486864e296f641a88195a633569475179ba727bcc62cd549df03db1addfa78bf59d21151cba4470c36952eabb646aa62613795d4e7fa1fb65c5b2
+AUX opengfx-0.5.2-Makefile.patch 1871 SHA256 03be3fc9e70b56153115362e76079c30fb7e4578faedecdb65930f0fcfe1c524 SHA512 508847dc024d543ffb8b30c0aabf566b84b5744f6db952ce5991fb6f825823d4dd171a2baf4b96648da26ee4d55fa4a6984f49ee1a9bcb38cc37a06f409939f7 WHIRLPOOL 04758983b45da50dbb993cf93f77b2ad397147eb73cdb93e4a7d5d61678a248c2a5e11b71f5a83e5ff8c870dd51429d36823c4a6fdec8f70fbf96f6c0a010f0d
 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
 EBUILD opengfx-0.5.1.ebuild 1241 SHA256 b2a957c5e894e86f6f97ffadf419a75223fd7494ff198faab2c7c67fff3a7a70 SHA512 deb95ea4bfc6dba73eb65e2c1ef5b269b9091aaff7023d6045b03a45f6bf0177c170b40ab359e232888226492557d34ecffba46a68050de9e45615645e74c293 WHIRLPOOL 3c252f24d67f62fdeb1ec2dde3acff3a00cbdc52ee0fb52692de04303cc117a5c91b583b81a202b4eb3dafa927af77468754422ddbffdf64ef855a413938655f
-MISC ChangeLog 5495 SHA256 ec27628c181b1001d9af2b791a31a58ee9562d8a43faace615fb2fed34f36b0f SHA512 dc2f5eeb2847bed907128876c825445331c26fea0a0d5f476db4efe2175210144971b739e7608d4b9d33d15162654b6e0d51c44f8dde1eeef1ee12b35286fff2 WHIRLPOOL 7be6bb417ee86399a38b24df69e6c189627aa866545e23921ff5ede7948c21c1193c80194b549f14c2ba912fd25bbadbea27b6e84e31ac63aaceddddc3ea9ef3
+EBUILD opengfx-0.5.2.ebuild 990 SHA256 a79a272c42f8bf95f780b2898594793806d6922c94b49f75a5d7df04bd137ccf SHA512 6bd2895eda343263c768096b1eb1715ae4db60832d16fe3c63f264804ca81617a57d499d13638c2a6397166cea1240d55b9f079225ff1633ec907297b16497f4 WHIRLPOOL 4c126ce71a1350d1599ec83271bdeaa373a0ce63e03ece3503a2f69c2d11f49fe7934e7ad9f411cc22e79b41c5a342ca3bc6e2bf3560e72b3312a9ef856aeff6
+MISC ChangeLog 5707 SHA256 993297d930260af4737f770fa67ed7a45c37fe5f5bd73f7831fee8cfcb24f497 SHA512 b8eee35b16556115e86e249a6a519c06d36d95165a28f6f0e5d90c683e391223aa91796da41116ad6d2d9cbfd21c0ba690a6b70fcb67f3478db0aac778dbe26b WHIRLPOOL d04f651407388162cdf27d1ca88a516b635371b904bccaba1efbfb4db5876fc55882459963fd2fd30bce61d4a9cbbe0eee41d05b0a860271ea9cee9fdd73d556
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
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
+}