| 1 |
commit: 789df6d85b151afd12798f37517bb7d85033de1b |
| 2 |
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu May 20 21:04:57 2021 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 28 22:12:44 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=789df6d8 |
| 7 |
|
| 8 |
games-util/grfcodec: drop unused DEPEND, fix HOMEPAGE |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 11 |
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> |
| 12 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 13 |
|
| 14 |
games-util/grfcodec/Manifest | 1 - |
| 15 |
.../grfcodec/files/grfcodec-6.0.6-gcc10.patch | 12 ----- |
| 16 |
games-util/grfcodec/grfcodec-6.0.6.ebuild | 53 ---------------------- |
| 17 |
.../grfcodec/grfcodec-6.0.6_p20210310.ebuild | 7 +-- |
| 18 |
4 files changed, 2 insertions(+), 71 deletions(-) |
| 19 |
|
| 20 |
diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest |
| 21 |
index 972ea1e8461..4cd8f5110c3 100644 |
| 22 |
--- a/games-util/grfcodec/Manifest |
| 23 |
+++ b/games-util/grfcodec/Manifest |
| 24 |
@@ -1,2 +1 @@ |
| 25 |
-DIST grfcodec-6.0.6-source.tar.xz 166820 BLAKE2B ba81e31477fb15bb5273add4d993ee7de88cfd47fd8300743e97c4abd19b0daf736d78b5bafc82569ff110757131501c07d7365a4e7ffde8d3a7fcc2e277bada SHA512 543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480 |
| 26 |
DIST grfcodec-6.0.6_p20210310.tar.gz 205795 BLAKE2B 24d803e208b2fc465ae71611c0c0fb2737bfa8c5a28375bc08a6220581d7b07bb2f2a390e2ddb7f4beb8a80951862473919d41bce83364af70b6dc646f0f3f8e SHA512 10f4ec28c69d87e397f0fb5b497dbefce8fcd826731d3a0a864cbbd333b7df188ab0087445644ad245aeff65a8b6563dfdfa657ac1a2248e56e296c01f7d58a8 |
| 27 |
|
| 28 |
diff --git a/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch b/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch |
| 29 |
deleted file mode 100644 |
| 30 |
index baf84a435f6..00000000000 |
| 31 |
--- a/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,12 +0,0 @@ |
| 34 |
-diff -Nrup a/src/command.cpp b/src/command.cpp |
| 35 |
---- a/src/command.cpp 2015-05-09 04:59:46.000000000 -0600 |
| 36 |
-+++ b/src/command.cpp 2019-09-24 11:37:06.667911307 -0600 |
| 37 |
-@@ -303,7 +303,7 @@ bool parse_comment(const string&line){ |
| 38 |
- uint val=find_command(command_part,beaut),togglebit; |
| 39 |
- if(val!=(uint)-1&&val!=OFF)_commandState.beautifier=true; |
| 40 |
- switch(val){ |
| 41 |
-- case -1: |
| 42 |
-+ case -1u: |
| 43 |
- IssueMessage(0,COMMAND_INVALID_ARG,gen[BEAUTIFY].name); |
| 44 |
- return true; |
| 45 |
- case OFF:_commandState.beautifier=false;break; |
| 46 |
|
| 47 |
diff --git a/games-util/grfcodec/grfcodec-6.0.6.ebuild b/games-util/grfcodec/grfcodec-6.0.6.ebuild |
| 48 |
deleted file mode 100644 |
| 49 |
index 6949b2d473d..00000000000 |
| 50 |
--- a/games-util/grfcodec/grfcodec-6.0.6.ebuild |
| 51 |
+++ /dev/null |
| 52 |
@@ -1,53 +0,0 @@ |
| 53 |
-# Copyright 1999-2020 Gentoo Authors |
| 54 |
-# Distributed under the terms of the GNU General Public License v2 |
| 55 |
- |
| 56 |
-EAPI=6 |
| 57 |
- |
| 58 |
-if [ "${PV%9999}" != "${PV}" ] ; then |
| 59 |
- SCM=mercurial |
| 60 |
- EHG_REPO_URI="http://hg.openttdcoop.org/${PN}" |
| 61 |
-fi |
| 62 |
- |
| 63 |
-inherit toolchain-funcs ${SCM} |
| 64 |
- |
| 65 |
-DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files" |
| 66 |
-HOMEPAGE="https://dev.openttdcoop.org/projects/grfcodec" |
| 67 |
-[[ -z ${SCM} ]] && SRC_URI="https://binaries.openttd.org/extra/${PN}/${PV}/${P}-source.tar.xz" |
| 68 |
- |
| 69 |
-LICENSE="GPL-2+" |
| 70 |
-SLOT="0" |
| 71 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
| 72 |
-IUSE="" |
| 73 |
- |
| 74 |
-RDEPEND="media-libs/libpng:0" |
| 75 |
-DEPEND=" |
| 76 |
- ${RDEPEND} |
| 77 |
- !games-util/nforenum |
| 78 |
- dev-lang/perl |
| 79 |
- dev-libs/boost |
| 80 |
-" |
| 81 |
- |
| 82 |
-PATCHES=("${FILESDIR}/${PN}-6.0.6-gcc10.patch") |
| 83 |
- |
| 84 |
-src_prepare() { |
| 85 |
- default |
| 86 |
- |
| 87 |
- # Set up Makefile.local so that we respect CXXFLAGS/LDFLAGS |
| 88 |
- cat > Makefile.local <<-__EOF__ |
| 89 |
- CXX=$(tc-getCXX) |
| 90 |
- BOOST_INCLUDE=/usr/include |
| 91 |
- CXXFLAGS=${CXXFLAGS} |
| 92 |
- LDOPT=${LDFLAGS} |
| 93 |
- UPX= |
| 94 |
- V=1 |
| 95 |
- FLAGS= |
| 96 |
- EXE= |
| 97 |
- __EOF__ |
| 98 |
- sed -i -e 's/-O2//g' Makefile || die |
| 99 |
-} |
| 100 |
- |
| 101 |
-src_install() { |
| 102 |
- dobin grfcodec grfid grfstrip nforenum |
| 103 |
- doman docs/*.1 |
| 104 |
- dodoc changelog.txt docs/*.txt |
| 105 |
-} |
| 106 |
|
| 107 |
diff --git a/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild b/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild |
| 108 |
index 29b89e829a3..cab32f9d822 100644 |
| 109 |
--- a/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild |
| 110 |
+++ b/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild |
| 111 |
@@ -8,18 +8,15 @@ inherit cmake |
| 112 |
COMMIT=045774dee7cab1a618a3e0d9b39bff78a12b6efa |
| 113 |
|
| 114 |
DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files" |
| 115 |
-HOMEPAGE="https://dev.openttdcoop.org/projects/grfcodec" |
| 116 |
+HOMEPAGE="https://github.com/OpenTTD/grfcodec" |
| 117 |
SRC_URI="https://github.com/OpenTTD/grfcodec/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
| 118 |
|
| 119 |
LICENSE="GPL-2+" |
| 120 |
SLOT="0" |
| 121 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
| 122 |
-IUSE="" |
| 123 |
|
| 124 |
RDEPEND="media-libs/libpng:0" |
| 125 |
-DEPEND=" |
| 126 |
- ${RDEPEND} |
| 127 |
- dev-lang/perl |
| 128 |
+DEPEND="${RDEPEND} |
| 129 |
dev-libs/boost |
| 130 |
" |
Archives