From 789df6d85b151afd12798f37517bb7d85033de1b Mon Sep 17 00:00:00 2001 From: "Azamat H. Hackimov" Date: Fri, 21 May 2021 00:04:57 +0300 Subject: games-util/grfcodec: drop unused DEPEND, fix HOMEPAGE Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Azamat H. Hackimov Signed-off-by: James Le Cuirot --- games-util/grfcodec/Manifest | 1 - .../grfcodec/files/grfcodec-6.0.6-gcc10.patch | 12 ----- games-util/grfcodec/grfcodec-6.0.6.ebuild | 53 ---------------------- .../grfcodec/grfcodec-6.0.6_p20210310.ebuild | 7 +-- 4 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch delete mode 100644 games-util/grfcodec/grfcodec-6.0.6.ebuild diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest index 972ea1e84610..4cd8f5110c37 100644 --- a/games-util/grfcodec/Manifest +++ b/games-util/grfcodec/Manifest @@ -1,2 +1 @@ -DIST grfcodec-6.0.6-source.tar.xz 166820 BLAKE2B ba81e31477fb15bb5273add4d993ee7de88cfd47fd8300743e97c4abd19b0daf736d78b5bafc82569ff110757131501c07d7365a4e7ffde8d3a7fcc2e277bada SHA512 543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480 DIST grfcodec-6.0.6_p20210310.tar.gz 205795 BLAKE2B 24d803e208b2fc465ae71611c0c0fb2737bfa8c5a28375bc08a6220581d7b07bb2f2a390e2ddb7f4beb8a80951862473919d41bce83364af70b6dc646f0f3f8e SHA512 10f4ec28c69d87e397f0fb5b497dbefce8fcd826731d3a0a864cbbd333b7df188ab0087445644ad245aeff65a8b6563dfdfa657ac1a2248e56e296c01f7d58a8 diff --git a/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch b/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch deleted file mode 100644 index baf84a435f69..000000000000 --- a/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nrup a/src/command.cpp b/src/command.cpp ---- a/src/command.cpp 2015-05-09 04:59:46.000000000 -0600 -+++ b/src/command.cpp 2019-09-24 11:37:06.667911307 -0600 -@@ -303,7 +303,7 @@ bool parse_comment(const string&line){ - uint val=find_command(command_part,beaut),togglebit; - if(val!=(uint)-1&&val!=OFF)_commandState.beautifier=true; - switch(val){ -- case -1: -+ case -1u: - IssueMessage(0,COMMAND_INVALID_ARG,gen[BEAUTIFY].name); - return true; - case OFF:_commandState.beautifier=false;break; diff --git a/games-util/grfcodec/grfcodec-6.0.6.ebuild b/games-util/grfcodec/grfcodec-6.0.6.ebuild deleted file mode 100644 index 6949b2d473d6..000000000000 --- a/games-util/grfcodec/grfcodec-6.0.6.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [ "${PV%9999}" != "${PV}" ] ; then - SCM=mercurial - EHG_REPO_URI="http://hg.openttdcoop.org/${PN}" -fi - -inherit toolchain-funcs ${SCM} - -DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files" -HOMEPAGE="https://dev.openttdcoop.org/projects/grfcodec" -[[ -z ${SCM} ]] && SRC_URI="https://binaries.openttd.org/extra/${PN}/${PV}/${P}-source.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="" - -RDEPEND="media-libs/libpng:0" -DEPEND=" - ${RDEPEND} - !games-util/nforenum - dev-lang/perl - dev-libs/boost -" - -PATCHES=("${FILESDIR}/${PN}-6.0.6-gcc10.patch") - -src_prepare() { - default - - # Set up Makefile.local so that we respect CXXFLAGS/LDFLAGS - cat > Makefile.local <<-__EOF__ - CXX=$(tc-getCXX) - BOOST_INCLUDE=/usr/include - CXXFLAGS=${CXXFLAGS} - LDOPT=${LDFLAGS} - UPX= - V=1 - FLAGS= - EXE= - __EOF__ - sed -i -e 's/-O2//g' Makefile || die -} - -src_install() { - dobin grfcodec grfid grfstrip nforenum - doman docs/*.1 - dodoc changelog.txt docs/*.txt -} diff --git a/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild b/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild index 29b89e829a39..cab32f9d8228 100644 --- a/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild +++ b/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild @@ -8,18 +8,15 @@ inherit cmake COMMIT=045774dee7cab1a618a3e0d9b39bff78a12b6efa DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files" -HOMEPAGE="https://dev.openttdcoop.org/projects/grfcodec" +HOMEPAGE="https://github.com/OpenTTD/grfcodec" SRC_URI="https://github.com/OpenTTD/grfcodec/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="" RDEPEND="media-libs/libpng:0" -DEPEND=" - ${RDEPEND} - dev-lang/perl +DEPEND="${RDEPEND} dev-libs/boost " -- cgit v1.2.3-65-gdbad