gentoo resync : 29.06.2021

4 files changed, 3 insertions, 74 deletions

diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest
index 0ee41943244c..621cf052eb63 100644
--- a/games-util/grfcodec/Manifest
+++ b/games-util/grfcodec/Manifest
@@ -1,6 +1,3 @@
-AUX grfcodec-6.0.6-gcc10.patch 507 BLAKE2B 7f09d9e6468f059780e1253a32431c88b8a980276b81f02b50c72a8650b05da1709d951cccc71daa7c6109b8ebb80450073cfc1057997cb7ffb008f964b7281d SHA512 27e4055efe874d7833d98feb45af84717120188a805307915f0f0a05adf696960a75662f0f1a67a46b0e0780f3d85646cb626b33559db77a925c20ef750fceb0
-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
-EBUILD grfcodec-6.0.6.ebuild 1124 BLAKE2B ccf5665273b0727d1223b1c4e645b6e2bdac0a6fd55641d2db4e530345f3f059fc1774ac0915392819c52dd3402e3c57e7cdce1602ad4afbc870362682b56085 SHA512 33a61952110c28c6d93c4aaee794d7fa417b97b16f435ee84df5641b631b964ab15f4bb798a4880119816dc917ba3f59a67b341067994d63ee22afeb29917d02
-EBUILD grfcodec-6.0.6_p20210310.ebuild 1018 BLAKE2B edd3adf61744987690a3eedf7ef0ced8b24335184d8d8a9ce75236f1b32a21c847d51245489ae4a55de5501f399ed1bbc8297d45fb40ac77a160f9b6ad7a9c0d SHA512 14bdda3732229d7f65d49e1b9cb0a4cdc243a91671a869d06338de28940f236984d3b741cb3fa5a640c1326bae8fbf9c1eceef5fe0e78f539b46ca1cfa2549e8
+EBUILD grfcodec-6.0.6_p20210310.ebuild 983 BLAKE2B 75e40e140c37f55cf355ecb12ec78ff4087d0a8a1646d7652550e137c468a59ce36f0bcaffb7918a9ef0b7235705e2cb8e3fc9edb2c9254c7c9b587ec434345c SHA512 ea2f87fcc530b8d7f09a91bb57f9e5589796879a216f9b4cfcbe47dcb353d9d8865aee3430f6e3331b7baf6ff1457ebd0a8cd1137c167a2b4d15d46351d0a53a
 MISC metadata.xml 334 BLAKE2B 6aac57d4c64ff83b34ab382ba81351f74e87457333e01ff7de2859ded4748d644d034eba6e1a213dc7f14102e818f176d85e4a31b094e216dd41a7bcd3c0b5e0 SHA512 659659be9dc501963eec44e09b087b454049ba509ab24ad82f825155e3b34fea276eefc467c7b292e0396cebe39d57886e703a5e905516cddd0eeff566047bc1
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
 "