7 files changed, 58 insertions, 130 deletions
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index f416271b4976..f800421d1835 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/opengfx/Manifest b/games-misc/opengfx/Manifest
index 36cd0557040d..9428d3ef7c06 100644
--- a/games-misc/opengfx/Manifest
+++ b/games-misc/opengfx/Manifest
@@ -1,7 +1,3 @@
-AUX opengfx-0.5.4-Makefile.patch 1349 BLAKE2B 25fc35e4d11055ee2d69847f857bd542fbc8bb662d18bf3a03e639517e0a7a8ed9748829d339ce76d8c6457baf2dc51e3d40106f9f959b864629e0db8a01e339 SHA512 f2cd513b6b244fcdd522e488c3becd27164f622f0bc723bd1f704ce1e76419ac628425cf3fc437beb50f851735923e85eae8a3f70e828f58edff4d632784bbf9
-AUX opengfx-0.5.5-Makefile.patch 762 BLAKE2B 6cf44cd3e36301444bb2717c3d57df457b9ef166ad765b4b7da3847027957b8200a1919736c421fffc30e972f88c980aefcc3b58aeac092e3e2aee21800998b2 SHA512 2c9c07e668d303920d6fb28747444361346980d68892ea5dbaf552d13ae91f2ab4613c44d2eb26a6c687b967564020e7641da0b9c9989b335682741ca6632cb2
-DIST opengfx-0.5.4-source.tar.xz 9638204 BLAKE2B bff7e5f7f72b62584c280ce2af2ad53df40027a7075ea5858a53f45a71be07db480cf61a603fc8e5df69b8c7d73284bf92e430a3fe130ae34ad1a921d8603925 SHA512 42f8438c747b42a77cf9d86c5da60ce3ce84ed347d714c345f3871806f9e35f2ed4729b445e0ee319f3e2edd53458dfbaad5ca42e389c3a2e800bce19223cdb1
-DIST opengfx-0.5.5-source.tar.xz 9639584 BLAKE2B 49af829802adf3756e89728697ea796b98422bd0e314cd21d34910f8f7428963c2d4799a933e861ae344a2e83dd748289bbe501bccb77aba647b484ed07de376 SHA512 952fb52e19bd790e335a9df0f11fa29b2fc570b49903419904956cc65883adde93d432160b16682366ab8b973b7852d2d30f574f1840f6fbd082e1addbe5bfe8
-EBUILD opengfx-0.5.4-r1.ebuild 841 BLAKE2B 44791a0c997e533d882600c0fdc551b7190f9208d5220a9637872c47215ca98e19a28c8e10892f8ded7701f1c2e710a3ffc694e74917d5d45c987b649a7d00ec SHA512 83f4faf5bf14dd7c7d3ffc11b9666a5dcb976f6abd2634869ad01c31b21f4ba33cf9699f5233dd4d735feb5941de1bd727858bab4ec9548bd56184013c3d9299
-EBUILD opengfx-0.5.5.ebuild 832 BLAKE2B 8e4426971a0f105d16580a05c075a8bab8e1cf3c458f1411737f4e8ba55f7f9cf1c6da25f2a358bde1ad0c0913e3b8c86ff9801e38013bedc7298bb3a273295f SHA512 c4a838d4b4e3373f5fe55dbba66e7fe7c12956e7318d0a4a3e1bb2c2e618dad7c284450f6655ac9e006410274f063e3b3283ec2ca931697725779cecc849351b
+DIST opengfx-0.6.0-source.tar.xz 9693320 BLAKE2B cb1d25fb038b3b481c0abe206426b5843c2f7b81b7cf81a525ebf8b217359c5ea50c0e1ee1ed37d5093a0186231a1e1b9134624a8b69362f6733c6c13d5e1500 SHA512 275b9040e6938bdd5bee2d39361e0b78f447a8e497cc8ff018c7874dc16a357870f8b560999ebb2f2f0b275644c7c9ce85c964875f5a798e2ec45e62a8bc768f
+EBUILD opengfx-0.6.0.ebuild 907 BLAKE2B d8735c660e9966316a17fefcbbea22cf664756554dabd2fb62e6c8518a32e3e9ead95dc9c093a7265ffa90b17f87e510e32c787d135902b97a13cde21cb612a0 SHA512 db264a6e5ddf87064c0629fd798a6f0d02440a1278d653387b83cb60ea71118de2d800721ae5ee7f9626b9b2e3395acc2f00bed385d0313530e4699792119383
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/opengfx/files/opengfx-0.5.4-Makefile.patch b/games-misc/opengfx/files/opengfx-0.5.4-Makefile.patch
deleted file mode 100644
index 169df96684ce..000000000000
--- a/games-misc/opengfx/files/opengfx-0.5.4-Makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- opengfx-0.5.3-source/Makefile
-+++ opengfx-0.5.3-source/Makefile
-@@ -99,8 +99,8 @@
- AWK            ?= awk
- GREP           ?= grep
- PYTHON         ?= python
--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 "")
- 
- # 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)
-@@ -719,7 +719,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/files/opengfx-0.5.5-Makefile.patch b/games-misc/opengfx/files/opengfx-0.5.5-Makefile.patch
deleted file mode 100644
index dca9615140d0..000000000000
--- a/games-misc/opengfx/files/opengfx-0.5.5-Makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- opengfx-0.5.5-source/Makefile
-+++ opengfx-0.5.5-source/Makefile
-@@ -99,8 +99,8 @@
- AWK            ?= awk
- GREP           ?= grep
- PYTHON         ?= python
--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 "")
- 
- # Graphics processing
- GIMP           ?= gimp
-@@ -719,7 +719,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.4-r1.ebuild b/games-misc/opengfx/opengfx-0.5.4-r1.ebuild
deleted file mode 100644
index 72fd656ad797..000000000000
--- a/games-misc/opengfx/opengfx-0.5.4-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-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 ~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
-
-PATCHES=(
-	"${FILESDIR}/${P}-Makefile.patch"
-)
-
-src_compile() {
-	emake GIMP=""  help  # print out the env to make bug reports better
-	emake GIMP="" _V="" bundle_tar
-}
-
-src_install() {
-	insinto "/usr/share/games/openttd/data/"
-	doins *.grf opengfx.obg
-	dodoc docs/{changelog.txt,readme.txt}
-}
diff --git a/games-misc/opengfx/opengfx-0.5.5.ebuild b/games-misc/opengfx/opengfx-0.5.5.ebuild
deleted file mode 100644
index dc39acc0d275..000000000000
--- a/games-misc/opengfx/opengfx-0.5.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~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"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.5.5-Makefile.patch"
-)
-
-src_compile() {
-	emake GIMP=""  help  # print out the env to make bug reports better
-	emake GIMP="" _V="" bundle_tar
-}
-
-src_install() {
-	insinto "/usr/share/games/openttd/data/"
-	doins *.grf opengfx.obg
-	dodoc docs/{changelog.txt,readme.txt}
-}
diff --git a/games-misc/opengfx/opengfx-0.6.0.ebuild b/games-misc/opengfx/opengfx-0.6.0.ebuild
new file mode 100644
index 000000000000..7e39ffe5a490
--- /dev/null
+++ b/games-misc/opengfx/opengfx-0.6.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="OpenGFX"
+
+DESCRIPTION="OpenGFX data files for OpenTTD"
+HOMEPAGE="http://bundles.openttdcoop.org/opengfx/"
+SRC_URI="https://cdn.openttd.org/${PN}-releases/${PV}/${P}-source.tar.xz"
+S="${WORKDIR}/${P}-source"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND="
+	games-util/grfcodec
+	games-util/nml
+"
+
+DOCS=( "README.md" "changelog.txt" )
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	myemakeargs=(
+		GIMP=""
+	)
+
+	emake "${myemakeargs[@]}" all
+}
+
+src_test() {
+	myemakeargs=(
+		GIMP=""
+	)
+
+	emake "${myemakeargs[@]}" check
+}
+
+src_install() {
+	myemakeargs=(
+		DO_NOT_INSTALL_README="true"
+		DO_NOT_INSTALL_LICENSE="true"
+		DO_NOT_INSTALL_CHANGELOG="true"
+		GIMP=""
+		INSTALL_DIR="${ED}/usr/share/games/openttd/data/"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	einstalldocs
+}