* [gentoo-commits] repo/gentoo:master commit in: games-misc/opengfx/, games-misc/opengfx/files/
@ 2020-11-26 21:16 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2020-11-26 21:16 UTC (permalink / raw
To: gentoo-commits
commit: ca9bfce44b4111957fffb8e8d778bdc6aa92a38a
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 20:59:27 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 21:16:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca9bfce4
games-misc/opengfx: drop old versions
Closes: https://bugs.gentoo.org/674352
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-misc/opengfx/Manifest | 2 --
.../opengfx/files/opengfx-0.5.4-Makefile.patch | 31 -------------------
.../opengfx/files/opengfx-0.5.5-Makefile.patch | 22 -------------
games-misc/opengfx/opengfx-0.5.4-r1.ebuild | 36 ----------------------
games-misc/opengfx/opengfx-0.5.5.ebuild | 35 ---------------------
5 files changed, 126 deletions(-)
diff --git a/games-misc/opengfx/Manifest b/games-misc/opengfx/Manifest
index 268fa543ff2..58d2808cd62 100644
--- a/games-misc/opengfx/Manifest
+++ b/games-misc/opengfx/Manifest
@@ -1,3 +1 @@
-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
DIST opengfx-0.6.0-source.tar.xz 9693320 BLAKE2B cb1d25fb038b3b481c0abe206426b5843c2f7b81b7cf81a525ebf8b217359c5ea50c0e1ee1ed37d5093a0186231a1e1b9134624a8b69362f6733c6c13d5e1500 SHA512 275b9040e6938bdd5bee2d39361e0b78f447a8e497cc8ff018c7874dc16a357870f8b560999ebb2f2f0b275644c7c9ce85c964875f5a798e2ec45e62a8bc768f
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 169df96684c..00000000000
--- 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 dca9615140d..00000000000
--- 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 72fd656ad79..00000000000
--- 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 dc39acc0d27..00000000000
--- 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}
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-misc/opengfx/, games-misc/opengfx/files/
@ 2022-06-27 9:29 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-06-27 9:29 UTC (permalink / raw
To: gentoo-commits
commit: de3e91765a77f55343625472af32cf0e57cdb8f0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 27 09:16:51 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 09:27:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de3e9176
games-misc/opengfx: fix build w/o sys-apps/which
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../opengfx/files/opengfx-7.1-no-which.patch | 30 ++++++++++++++++++++++
games-misc/opengfx/opengfx-7.1.ebuild | 6 ++++-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/games-misc/opengfx/files/opengfx-7.1-no-which.patch b/games-misc/opengfx/files/opengfx-7.1-no-which.patch
new file mode 100644
index 000000000000..616d2af41078
--- /dev/null
+++ b/games-misc/opengfx/files/opengfx-7.1-no-which.patch
@@ -0,0 +1,30 @@
+https://github.com/OpenTTD/OpenGFX/pull/80
+--- a/Makefile
++++ b/Makefile
+@@ -97,7 +97,7 @@ GREP ?= grep
+ PYTHON ?= python
+
+ # Graphics processing
+-GIMP ?= $(shell which gimp)
++GIMP ?= $(shell command -v gimp)
+ GIMP_FLAGS ?= -n -i
+
+ # NML
+@@ -116,7 +116,7 @@ ifdef PNML_FILES
+ endif
+
+ # GRF tools
+-GRFID ?= $(shell which grfid)
++GRFID ?= $(shell command -v grfid)
+ GRFID_FLAGS ?= -m
+ MUSA ?= musa.py
+ # The license is set via bananas.ini, do not supply a "custom" license.
+@@ -606,7 +606,7 @@ endif
+ ifeq ($(shell echo "$(OSTYPE)" | cut -d_ -f1),MINGW32)
+ # If CC has been set to the default implicit value (cc), check if it can be used. Otherwise use a saner default.
+ ifeq "$(origin CC)" "default"
+- CC=$(shell which cc 2>/dev/null && echo "cc" || echo "gcc")
++ CC=$(shell command -v cc 2>/dev/null && echo "cc" || echo "gcc")
+ endif
+ WIN_VER = $(shell echo "$(OSTYPE)" | cut -d- -f2 | cut -d. -f1)
+ ifeq ($(WIN_VER),5)
diff --git a/games-misc/opengfx/opengfx-7.1.ebuild b/games-misc/opengfx/opengfx-7.1.ebuild
index 937e35cb1573..23ef30961b89 100644
--- a/games-misc/opengfx/opengfx-7.1.ebuild
+++ b/games-misc/opengfx/opengfx-7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,6 +24,10 @@ DEPEND="
DOCS=( "README.md" "changelog.txt" )
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.1-no-which.patch
+)
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-06-27 9:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-26 21:16 [gentoo-commits] repo/gentoo:master commit in: games-misc/opengfx/, games-misc/opengfx/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2022-06-27 9:29 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox