[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/files/, games-util/grfcodec/

2023-08-13 Thread Matthew Smith 
commit: 741f310b2c9fd757ce4f2f7384d07953fd0c3dff
Author: Matthew Smith  gentoo  org>
AuthorDate: Sun Aug 13 08:43:28 2023 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sun Aug 13 08:44:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=741f310b

games-util/grfcodec: fix incompatibility with OpenTTD

Closes: https://bugs.gentoo.org/912189
Signed-off-by: Matthew Smith  gentoo.org>

 .../files/grfcodec-6.0.6_p20230811-action-5.patch  | 30 ++
 ...1.ebuild => grfcodec-6.0.6_p20230811-r1.ebuild} |  3 +++
 2 files changed, 33 insertions(+)

diff --git a/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-action-5.patch 
b/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-action-5.patch
new file mode 100644
index ..333c9f5ed2e9
--- /dev/null
+++ b/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-action-5.patch
@@ -0,0 +1,30 @@
+Bug: https://bugs.gentoo.org/912189
+Upstream: https://github.com/OpenTTD/grfcodec/pull/23
+
+From de32367a6896c9f310fa48929e29643beaa08af4 Mon Sep 17 00:00:00 2001
+From: Matthew Smith 
+Date: Sun, 13 Aug 2023 09:30:01 +0100
+Subject: [PATCH] data: Fix Action5 table
+
+The alternative sprite counts were added into the action 5 table, but
+the counts were not updated. This caused all of the types defined after
+type 0x09 to be mis-read.
+
+Fixes: d5a7b850bcef30c0bfd17ceeb4a18c431770f468
+--- a/src/data.cpp
 b/src/data.cpp
+@@ -170,9 +170,9 @@ NDF_HEADER(0x04, 17),
+ /*06*/ OFFSET,  OPTIONS(2), 0x4A, 0x5A,
+ /*07*/  OPTIONS(1), 0x5D,
+ /*08*/ OFFSET,  OPTIONS(1), 0x41,
+-/*09*/ OFFSET,  OPTIONS(1), 0x06, 0x12,
++/*09*/ OFFSET,  OPTIONS(2), 0x06, 0x12,
+ /*0A*/ OFFSET | RECOLOUR | WORD, OPTIONS(1), W(0x100),
+-/*0B*/ OFFSET,  OPTIONS(1), 0x71, 0x77,
++/*0B*/ OFFSET,  OPTIONS(2), 0x71, 0x77,
+ /*0C*/  OPTIONS(1), 0x85,
+ /*0D*/  OPTIONS(2), 0x10, 0x12,
+ /*0E*/ MIXED,   OPTIONS(1), 0x00,
+-- 
+2.41.0
+

diff --git a/games-util/grfcodec/grfcodec-6.0.6_p20230811.ebuild 
b/games-util/grfcodec/grfcodec-6.0.6_p20230811-r1.ebuild
similarity index 95%
rename from games-util/grfcodec/grfcodec-6.0.6_p20230811.ebuild
rename to games-util/grfcodec/grfcodec-6.0.6_p20230811-r1.ebuild
index 9effc99b535d..600aa5d3e4a8 100644
--- a/games-util/grfcodec/grfcodec-6.0.6_p20230811.ebuild
+++ b/games-util/grfcodec/grfcodec-6.0.6_p20230811-r1.ebuild
@@ -22,6 +22,9 @@ DEPEND="${RDEPEND}
 PATCHES=(
# Bug #894648
"${FILESDIR}"/${P}-no-fortify-source.patch
+
+   # Bug #912189
+   "${FILESDIR}"/${P}-action-5.patch
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/, games-util/grfcodec/files/

2023-08-11 Thread Matthew Smith 
commit: 091a3e710fc969183bbe7c4d92c8e198fae76691
Author: Matthew Smith  gentoo  org>
AuthorDate: Fri Aug 11 07:05:20 2023 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Fri Aug 11 07:25:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=091a3e71

games-util/grfcodec: add 6.0.6_p20230811

Also, stop defining _FORTIFY_SOURCE.

Closes: https://bugs.gentoo.org/894648
Signed-off-by: Matthew Smith  gentoo.org>

 games-util/grfcodec/Manifest   |  1 +
 ...rfcodec-6.0.6_p20230811-no-fortify-source.patch | 19 ++
 .../grfcodec/grfcodec-6.0.6_p20230811.ebuild   | 43 ++
 3 files changed, 63 insertions(+)

diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest
index 4cd8f5110c37..06a4a62fcc28 100644
--- a/games-util/grfcodec/Manifest
+++ b/games-util/grfcodec/Manifest
@@ -1 +1,2 @@
 DIST grfcodec-6.0.6_p20210310.tar.gz 205795 BLAKE2B 
24d803e208b2fc465ae71611c0c0fb2737bfa8c5a28375bc08a6220581d7b07bb2f2a390e2ddb7f4beb8a80951862473919d41bce83364af70b6dc646f0f3f8e
 SHA512 
10f4ec28c69d87e397f0fb5b497dbefce8fcd826731d3a0a864cbbd333b7df188ab0087445644ad245aeff65a8b6563dfdfa657ac1a2248e56e296c01f7d58a8
+DIST grfcodec-6.0.6_p20230811.tar.gz 205324 BLAKE2B 
00d36b6785d00edec061cc0f0a695225a78c487bc66c4521f0f3da1050304bc382ed78d1df8dff8602b35b167505388ad993c46f01ac39960c131a6f5c7264eb
 SHA512 
95a883636720ad1fdd0a2e17cba60b6cde15b5fe0337cfe2330db75d60e9a2bdb1dea3c06bb8f8acace8989b6abaf6d1845b30c5bc5f6c76f34e5aa76f36ddd4

diff --git 
a/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-no-fortify-source.patch 
b/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-no-fortify-source.patch
new file mode 100644
index ..ce71610a0cad
--- /dev/null
+++ b/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-no-fortify-source.patch
@@ -0,0 +1,19 @@
+From a6e90d5121cfd312df535d90d1b939d9f9c616a1 Mon Sep 17 00:00:00 2001
+From: Matthew Smith 
+Date: Fri, 11 Aug 2023 07:59:54 +0100
+Subject: [PATCH] build: Remove -D_FORTIFY_SOURCE=2
+
+Bug: https://bugs.gentoo.org/894648
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -47,7 +47,6 @@ endif()
+ # it does not appear to support the $<> tags.
+ add_compile_options(
+ "$<$:-D_DEBUG>"
+-"$<$>:-D_FORTIFY_SOURCE=2>" # FORTIFY_SOURCE should 
only be used in non-debug builds (requires -O1+)
+ )
+ if(MINGW)
+ add_link_options(
+-- 
+2.41.0
+

diff --git a/games-util/grfcodec/grfcodec-6.0.6_p20230811.ebuild 
b/games-util/grfcodec/grfcodec-6.0.6_p20230811.ebuild
new file mode 100644
index ..9effc99b535d
--- /dev/null
+++ b/games-util/grfcodec/grfcodec-6.0.6_p20230811.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake vcs-snapshot
+
+COMMIT=d5a7b850bcef30c0bfd17ceeb4a18c431770f468
+
+DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's 
GRF files"
+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"
+
+RDEPEND="media-libs/libpng:="
+DEPEND="${RDEPEND}
+   dev-libs/boost"
+
+PATCHES=(
+   # Bug #894648
+   "${FILESDIR}"/${P}-no-fortify-source.patch
+)
+
+src_configure() {
+   local mycmakeargs=(
+   # Make sure we don't use git by accident.
+   # Build system does not care much if it's
+   # executed successfully and populates
+   # YEARS / VERSION with empty values.
+   -DGIT_EXECUTABLE=/bin/do-not-use-git-executable
+   )
+
+   cmake_src_configure
+}
+
+src_install() {
+   dobin "${BUILD_DIR}"/{grfcodec,grfid,grfstrip,nforenum}
+   doman docs/*.1
+   dodoc changelog.txt docs/*.txt
+}

[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/

2022-12-18 Thread Ionen Wolkens 
commit: 82af7d1ec93c45ce307b075c1628c37805fa36ec
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Dec 19 07:02:22 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Dec 19 07:11:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82af7d1e

games-util/grfcodec: drop 6.0.6_p20210310

Signed-off-by: Ionen Wolkens  gentoo.org>

 .../grfcodec/grfcodec-6.0.6_p20210310.ebuild   | 41 --
 1 file changed, 41 deletions(-)

diff --git a/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild 
b/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild
deleted file mode 100644
index cab32f9d8228..
--- a/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-COMMIT=045774dee7cab1a618a3e0d9b39bff78a12b6efa
-
-DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's 
GRF files"
-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"
-
-RDEPEND="media-libs/libpng:0"
-DEPEND="${RDEPEND}
-   dev-libs/boost
-"
-
-S="${WORKDIR}/grfcodec-${COMMIT}"
-
-src_configure() {
-   local mycmakeargs=(
-   # Make sure we don't use git by accident.
-   # Build system does not care much if it's
-   # executed successfully and populates
-   # YEARS / VERSION with empty values.
-   -DGIT_EXECUTABLE=/bin/do-not-use-git-executable
-   )
-
-   cmake_src_configure
-}
-
-src_install() {
-   dobin "${BUILD_DIR}"/{grfcodec,grfid,grfstrip,nforenum}
-   doman docs/*.1
-   dodoc changelog.txt docs/*.txt
-}

[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/files/6.0.6_p20210310/, games-util/grfcodec/

2022-10-08 Thread David Seifert 
commit: 810cbfa3961719466326528a442a8d114e1f6fd6
Author: David Seifert  gentoo  org>
AuthorDate: Sat Oct  8 14:58:38 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Oct  8 14:58:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=810cbfa3

games-util/grfcodec: update EAPI 7 -> 8

Bug: https://bugs.gentoo.org/715910
Bug: https://bugs.gentoo.org/859310
Signed-off-by: David Seifert  gentoo.org>

 .../0001-Remove-brittle-apWrapper-code.patch   | 144 +
 .../6.0.6_p20210310/0002-Fix-ODR-violations.patch  |  63 +
 .../grfcodec/grfcodec-6.0.6_p20210310-r1.ebuild|  40 ++
 3 files changed, 247 insertions(+)

diff --git 
a/games-util/grfcodec/files/6.0.6_p20210310/0001-Remove-brittle-apWrapper-code.patch
 
b/games-util/grfcodec/files/6.0.6_p20210310/0001-Remove-brittle-apWrapper-code.patch
new file mode 100644
index ..e702f00160ce
--- /dev/null
+++ 
b/games-util/grfcodec/files/6.0.6_p20210310/0001-Remove-brittle-apWrapper-code.patch
@@ -0,0 +1,144 @@
+From 9e928c98c8ad0767607bc421b14ac289cdc6e536 Mon Sep 17 00:00:00 2001
+From: David Seifert 
+Date: Sat, 8 Oct 2022 16:29:43 +0200
+Subject: [PATCH 1/2] Remove brittle `apWrapper` code
+
+* This causes issues on musl, and generally doesn't make the
+  code any simpler, while also creating lots of opportunities
+  for undefined behavior.
+
+Bug: https://bugs.gentoo.org/715910
+---
+ src/messages.cpp | 14 ++
+ src/sanity.cpp   |  4 +++-
+ src/sanity_defines.h | 23 ---
+ src/strings.cpp  |  9 +
+ 4 files changed, 18 insertions(+), 32 deletions(-)
+
+diff --git a/src/messages.cpp b/src/messages.cpp
+index 385f217..3794f66 100644
+--- a/src/messages.cpp
 b/src/messages.cpp
+@@ -60,8 +60,11 @@ void ManualConsoleMessages(){
+ }
+ 
+ string mysprintf(const char*str,...){
+-  WrapAp(str);
+-  return myvsprintf(str,ap);
++  va_list ap;
++  va_start(ap, str);
++  string result = myvsprintf(str,ap);
++  va_end(ap);
++  return result;
+ }
+ 
+ #if defined DEBUG || defined _DEBUG
+@@ -69,8 +72,11 @@ static RenumMessageId curMessage;
+ #endif
+ 
+ string IssueMessage(int minSan,RenumMessageId id,...){
+-  WrapAp(id);
+-  return vIssueMessage(minSan,id,ap);
++  va_list ap;
++  va_start(ap, id);
++  string result = vIssueMessage(minSan,id,ap);
++  va_end(ap);
++  return result;
+ }
+ 
+ string vIssueMessage(int minSan,RenumMessageId id,va_list& arg_ptr){
+diff --git a/src/sanity.cpp b/src/sanity.cpp
+index 844d840..0793a63 100644
+--- a/src/sanity.cpp
 b/src/sanity.cpp
+@@ -151,13 +151,15 @@ void Before8(int action){
+ }
+ 
+ bool CheckLength(int alen,int elen,RenumMessageId message,...){
+-  WrapAp(message);
++  va_list ap;
++  va_start(ap, message);
+   if(alenelen)
+   vIssueMessage(WARNING2,message,ap);
++  va_end(ap);
+   return false;
+ }
+ 
+diff --git a/src/sanity_defines.h b/src/sanity_defines.h
+index d094f21..47f9c5f 100644
+--- a/src/sanity_defines.h
 b/src/sanity_defines.h
+@@ -22,7 +22,6 @@
+ #ifndef _RENUM_SANITY_DEFS_H_INCLUDED_
+ #define _RENUM_SANITY_DEFS_H_INCLUDED_
+ 
+-#include 
+ #include "message_mgr.h"
+ 
+ bool CheckLength(int,int,RenumMessageId,...);
+@@ -70,26 +69,4 @@ typedef auto_array Guintp;
+   type&operator[](uint x){return _p[x];}\
+   type operator[](uint x)const{return _p[x];}\
+ 
+-class apWrapper{
+-private:
+-  va_list _ap;
+-public:
+-  ~apWrapper(){va_end(_ap);}
+-  operator va_list&(){return _ap;}
+-  operator const va_list&()const{return _ap;}
+-#ifdef __va_copy
+-  va_list&operator=(va_list&ap){
+-  __va_copy(_ap,ap);
+-  return _ap;
+-  }
+-#else
+-  va_list const&operator=(va_list const&ap){
+-  return _ap=ap;
+-  }
+-#endif
+-};
+-#define WrapAp(v)\
+-  apWrapper ap;\
+-  va_start((va_list&)ap,v);
+-
+ #endif//_RENUM_SANITY_DEFS_H_INCLUDED_
+diff --git a/src/strings.cpp b/src/strings.cpp
+index 2512734..e184825 100644
+--- a/src/strings.cpp
 b/src/strings.cpp
+@@ -23,6 +23,7 @@
+ #include
+ #include
+ #include
++#include
+ 
+ using namespace std;
+ 
+@@ -396,15 +397,15 @@ static const uchar stackSize[]={0,1,2,2,4,2,8};
+ 
+ string MakeStack(int items,...){
+   string ret;
+-  WrapAp(items);
++  va_list ap;
++  va_start(ap, items);
+   uint item;
+   for(int i=0;i
+Date: Sat, 8 Oct 2022 16:29:44 +0200
+Subject: [PATCH 2/2] Fix ODR violations
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* When compiling with `-flto`, ODR violations pop up:
+
+  src/escapes.h:98:1: error: type ‘struct esc’ violates the C++ One Definition 
Rule [-Werror=odr]
+ 98 | START_ESCAPES()
+| ^
+  src/escapes.h:98:1: note: a different type is defined in another translation 
unit
+ 98 | START_ESCAPES()
+| ^
+  src/escapes.h:98:1: note: th

[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/, games-util/grfcodec/files/

2021-06-28 Thread James Le Cuirot 
commit: 789df6d85b151afd12798f37517bb7d85033de1b
Author: Azamat H. Hackimov  gmail  com>
AuthorDate: Thu May 20 21:04:57 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Jun 28 22:12:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=789df6d8

games-util/grfcodec: drop unused DEPEND, fix HOMEPAGE

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Azamat H. Hackimov  gmail.com>
Signed-off-by: James Le Cuirot  gentoo.org>

 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(-)

diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest
index 972ea1e8461..4cd8f5110c3 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 baf84a435f6..000
--- 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.0 -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 6949b2d473d..000
--- 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%}" != "${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 29b89e829a3..cab32f9d822 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

[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/

2021-05-07 Thread Sergei Trofimovich 
commit: f80a745a69eaad680c12650913c2c2939b8aaa50
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri May  7 18:56:23 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri May  7 18:56:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f80a745a

games-util/grfcodec: don't rely on git presence

Reported-by: Lars Wendler (Polynomial-C)
Closes: https://bugs.gentoo.org/788724
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild | 12 
 1 file changed, 12 insertions(+)

diff --git a/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild 
b/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild
index d4fd24bff44..29b89e829a3 100644
--- a/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild
+++ b/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild
@@ -25,6 +25,18 @@ DEPEND="
 
 S="${WORKDIR}/grfcodec-${COMMIT}"
 
+src_configure() {
+   local mycmakeargs=(
+   # Make sure we don't use git by accident.
+   # Build system does not care much if it's
+   # executed successfully and populates
+   # YEARS / VERSION with empty values.
+   -DGIT_EXECUTABLE=/bin/do-not-use-git-executable
+   )
+
+   cmake_src_configure
+}
+
 src_install() {
dobin "${BUILD_DIR}"/{grfcodec,grfid,grfstrip,nforenum}
doman docs/*.1

[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/

2021-05-07 Thread Sam James 
commit: 7390ecf22d4e3f3ae67b1fba92f668b98a4394ca
Author: Sam James  gentoo  org>
AuthorDate: Fri May  7 13:50:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  7 14:37:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7390ecf2

games-util/grfcodec: add github remote-id

Signed-off-by: Sam James  gentoo.org>

 games-util/grfcodec/metadata.xml | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/games-util/grfcodec/metadata.xml b/games-util/grfcodec/metadata.xml
index 78274e0fa55..bf012280328 100644
--- a/games-util/grfcodec/metadata.xml
+++ b/games-util/grfcodec/metadata.xml
@@ -1,8 +1,11 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-
-   ga...@gentoo.org
-   Gentoo Games Project
-
+   
+   ga...@gentoo.org
+   Gentoo Games Project
+   
+   
+   OpenTTD/grfcodec
+

[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/

2021-05-04 Thread Sergei Trofimovich 
commit: 172484738977669f94baf90e9f09f2917cccfb3b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue May  4 07:19:25 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue May  4 07:19:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17248473

games-util/grfcodec: bump up to latest 20210310 snapshot

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/786528
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-util/grfcodec/Manifest   |  1 +
 .../grfcodec/grfcodec-6.0.6_p20210310.ebuild   | 32 ++
 2 files changed, 33 insertions(+)

diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest
index 94bff3af1d2..972ea1e8461 100644
--- a/games-util/grfcodec/Manifest
+++ b/games-util/grfcodec/Manifest
@@ -1 +1,2 @@
 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/grfcodec-6.0.6_p20210310.ebuild 
b/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild
new file mode 100644
index 000..d4fd24bff44
--- /dev/null
+++ b/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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";
+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
+   dev-libs/boost
+"
+
+S="${WORKDIR}/grfcodec-${COMMIT}"
+
+src_install() {
+   dobin "${BUILD_DIR}"/{grfcodec,grfid,grfstrip,nforenum}
+   doman docs/*.1
+   dodoc changelog.txt docs/*.txt
+}

[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/

2020-11-26 Thread Conrad Kostecki 
commit: a3813bfdddab26a02bf9f4a5659c38a96dc2355e
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Thu Nov 26 20:55:39 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Nov 26 21:16:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3813bfd

games-util/grfcodec: add ~arm64 and ~ppc keyword

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 games-util/grfcodec/grfcodec-6.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-util/grfcodec/grfcodec-6.0.6.ebuild 
b/games-util/grfcodec/grfcodec-6.0.6.ebuild
index 2c4927b3755..6949b2d473d 100644
--- a/games-util/grfcodec/grfcodec-6.0.6.ebuild
+++ b/games-util/grfcodec/grfcodec-6.0.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://dev.openttdcoop.org/projects/grfcodec";
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/libpng:0"

[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/, games-util/grfcodec/files/

2020-10-22 Thread James Le Cuirot 
commit: 33caed6639914466158fa7c7a16b8e09773a473e
Author: Matt Smith  offtopica  uk>
AuthorDate: Sat Oct 17 13:53:18 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Oct 22 21:08:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33caed66

games-util/grfcodec: Fix build failure with GCC 10

Patch taken from Fedora's grfcodec package.

Closes: https://bugs.gentoo.org/707758
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Matt Smith  offtopica.uk>
Closes: https://github.com/gentoo/gentoo/pull/17954
Signed-off-by: James Le Cuirot  gentoo.org>

 games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch | 12 
 games-util/grfcodec/grfcodec-6.0.6.ebuild|  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch 
b/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch
new file mode 100644
index 000..baf84a435f6
--- /dev/null
+++ b/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch
@@ -0,0 +1,12 @@
+diff -Nrup a/src/command.cpp b/src/command.cpp
+--- a/src/command.cpp  2015-05-09 04:59:46.0 -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
index ebfb9b894f6..2c4927b3755 100644
--- a/games-util/grfcodec/grfcodec-6.0.6.ebuild
+++ b/games-util/grfcodec/grfcodec-6.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,8 @@ DEPEND="
dev-libs/boost
 "
 
+PATCHES=("${FILESDIR}/${PN}-6.0.6-gcc10.patch")
+
 src_prepare() {
default

[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/

2018-05-26 Thread David Seifert 
commit: 6a0db938441d1c3097e1fc30ab3cf477b61388f5
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat May 26 08:52:03 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat May 26 09:54:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a0db938

games-util/grfcodec: use HTTPs

 games-util/grfcodec/grfcodec-6.0.6.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-util/grfcodec/grfcodec-6.0.6.ebuild 
b/games-util/grfcodec/grfcodec-6.0.6.ebuild
index b63971bba94..ebfb9b894f6 100644
--- a/games-util/grfcodec/grfcodec-6.0.6.ebuild
+++ b/games-util/grfcodec/grfcodec-6.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,8 +11,8 @@ fi
 inherit toolchain-funcs ${SCM}
 
 DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's 
GRF files"
-HOMEPAGE="http://dev.openttdcoop.org/projects/grfcodec";
-[[ -z ${SCM} ]] && 
SRC_URI="http://binaries.openttd.org/extra/${PN}/${PV}/${P}-source.tar.xz";
+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"

[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/

2017-12-20 Thread David Seifert 
commit: 17d0ad828995c51e09c34fc1d2309d94e05971a7
Author: David Seifert  gentoo  org>
AuthorDate: Wed Dec 20 21:30:33 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Dec 21 01:56:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17d0ad82

games-util/grfcodec: Remove old

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 games-util/grfcodec/Manifest  |  1 -
 games-util/grfcodec/grfcodec-6.0.5.ebuild | 49 ---
 2 files changed, 50 deletions(-)

diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest
index cfc059a71e1..94bff3af1d2 100644
--- a/games-util/grfcodec/Manifest
+++ b/games-util/grfcodec/Manifest
@@ -1,2 +1 @@
-DIST grfcodec-6.0.5-source.tar.xz 166788 BLAKE2B 
ed562752efe12b0fe220ed7bd9518d5ba5d4cdbe763aee99ff59e305d046aafd3414159083d9d91cba7ac7d015f359d40c768eef681549cb545b2978d4b38cf0
 SHA512 
b578c6d53b69a1d43d59039f26a028e1437536102150fc2bddfff349ef3c7f720ee31e682ccc5df892c2660e167663c2ab12c3fa63c720022ab14d0645d0bf99
 DIST grfcodec-6.0.6-source.tar.xz 166820 BLAKE2B 
ba81e31477fb15bb5273add4d993ee7de88cfd47fd8300743e97c4abd19b0daf736d78b5bafc82569ff110757131501c07d7365a4e7ffde8d3a7fcc2e277bada
 SHA512 
543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480

diff --git a/games-util/grfcodec/grfcodec-6.0.5.ebuild 
b/games-util/grfcodec/grfcodec-6.0.5.ebuild
deleted file mode 100644
index 9d29d1e632b..000
--- a/games-util/grfcodec/grfcodec-6.0.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [ "${PV%}" != "${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="http://dev.openttdcoop.org/projects/grfcodec";
-[[ -z ${SCM} ]] && 
SRC_URI="http://binaries.openttd.org/extra/${PN}/${PV}/${P}-source.tar.xz";
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE=""
-
-[[ -n ${SCM} ]] && S=${WORKDIR}/${PN}
-
-RDEPEND="media-libs/libpng:0"
-DEPEND="${RDEPEND}
-   !games-util/nforenum
-   dev-lang/perl
-   dev-libs/boost"
-
-src_prepare() {
-# 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
-}

[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/

2017-10-03 Thread Sergei Trofimovich 
commit: 37979ca877754f90d9cb39632f62abb66ec2ed04
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Oct  3 08:19:57 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Oct  3 08:19:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37979ca8

games-util/grfcodec: stable 6.0.6 for ppc64, bug #632188

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc64"

 games-util/grfcodec/grfcodec-6.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-util/grfcodec/grfcodec-6.0.6.ebuild 
b/games-util/grfcodec/grfcodec-6.0.6.ebuild
index ddd443c66a2..58ce0e2db8d 100644
--- a/games-util/grfcodec/grfcodec-6.0.6.ebuild
+++ b/games-util/grfcodec/grfcodec-6.0.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://dev.openttdcoop.org/projects/grfcodec";
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc64 x86"
 IUSE=""
 
 RDEPEND="media-libs/libpng:0"

[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/

2017-09-29 Thread Michael Palimaka 
commit: 768a4609d98cced362cb4d81e53f65e66bca5323
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Sep 30 06:03:34 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Sep 30 06:03:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=768a4609

games-util/grfcodec: stabilise 6.0.6 for amd64/x86

Bug: https://bugs.gentoo.org/632188
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 games-util/grfcodec/grfcodec-6.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-util/grfcodec/grfcodec-6.0.6.ebuild 
b/games-util/grfcodec/grfcodec-6.0.6.ebuild
index b63971bba94..ddd443c66a2 100644
--- a/games-util/grfcodec/grfcodec-6.0.6.ebuild
+++ b/games-util/grfcodec/grfcodec-6.0.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://dev.openttdcoop.org/projects/grfcodec";
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE=""
 
 RDEPEND="media-libs/libpng:0"

[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/

2017-05-05 Thread Lars Wendler 
commit: 862a2711bc6621a45b845d326c9efedef267adca
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri May  5 12:35:26 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri May  5 12:35:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862a2711

games-util/grfcodec: Bump to version 6.0.6 (bug #614996).

This also fixes the gcc-6 issue reported in bug #594146.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-util/grfcodec/Manifest  |  1 +
 games-util/grfcodec/grfcodec-6.0.6.ebuild | 51 +++
 2 files changed, 52 insertions(+)

diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest
index f66bb2e757b..c6a789491c6 100644
--- a/games-util/grfcodec/Manifest
+++ b/games-util/grfcodec/Manifest
@@ -1 +1,2 @@
 DIST grfcodec-6.0.5-source.tar.xz 166788 SHA256 
db149e98095de107a8d6f715f03376380f201ea158e0cdc53585d9a1b5cbe8a2 SHA512 
b578c6d53b69a1d43d59039f26a028e1437536102150fc2bddfff349ef3c7f720ee31e682ccc5df892c2660e167663c2ab12c3fa63c720022ab14d0645d0bf99
 WHIRLPOOL 
d36ea24172724821fdcb10bf80630ba8adf822675b78e6df414395b1b210fa792c864bfb7e11d8c1e9a38e89d33d9aec91ec3f6c4a5951e9f8301f8b3fbacb38
+DIST grfcodec-6.0.6-source.tar.xz 166820 SHA256 
53ef18b810114d8f41b87aad8bafea0e98b1df55a6d4c5e27551337cedab4d21 SHA512 
543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480
 WHIRLPOOL 
7b374769db83b68e12ff458533eab47072c72d5793d5aa7e40b02e34d5c6e42231c3bac1b21d2970e7314a8118cd102501658f2ced5d06607ca2b5c8b203a43b

diff --git a/games-util/grfcodec/grfcodec-6.0.6.ebuild 
b/games-util/grfcodec/grfcodec-6.0.6.ebuild
new file mode 100644
index 000..132a9c6cc76
--- /dev/null
+++ b/games-util/grfcodec/grfcodec-6.0.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [ "${PV%}" != "${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="http://dev.openttdcoop.org/projects/grfcodec";
+[[ -z ${SCM} ]] && 
SRC_URI="http://binaries.openttd.org/extra/${PN}/${PV}/${P}-source.tar.xz";
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libpng:0"
+DEPEND="
+   ${RDEPEND}
+   !games-util/nforenum
+   dev-lang/perl
+   dev-libs/boost
+"
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/

2017-01-20 Thread David Seifert 
commit: 7e59928db0527a03a9636c004ed5ee69ca1d6d8b
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jan 20 15:47:01 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jan 20 16:20:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e59928d

games-util/grfcodec: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3564

 games-util/grfcodec/Manifest  |  1 -
 games-util/grfcodec/grfcodec-6.0.4.ebuild | 50 ---
 2 files changed, 51 deletions(-)

diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest
index 576b9cc..f66bb2e 100644
--- a/games-util/grfcodec/Manifest
+++ b/games-util/grfcodec/Manifest
@@ -1,2 +1 @@
-DIST grfcodec-6.0.4-source.tar.xz 165756 SHA256 
7ec1f903cc48b73be9192a23f3fa14dc2a024d8edc4d2dfafa245e700e650cdb SHA512 
cfbbd1cfae7f2d2ba08ca32d8af68f6885c15dddb6ab941bed32d6c15bf9581e0b4ba19a16a5e48e6d6e070438732df232d3f3f008d42baad77a93f931ad0331
 WHIRLPOOL 
6cbd33a2aa503c858b1b5eeabd8d201e54d68ea618369b464de05f262236303e4f5960119ba86ed792c076c354ce757c804f01a6e1f90d552be276f26004028d
 DIST grfcodec-6.0.5-source.tar.xz 166788 SHA256 
db149e98095de107a8d6f715f03376380f201ea158e0cdc53585d9a1b5cbe8a2 SHA512 
b578c6d53b69a1d43d59039f26a028e1437536102150fc2bddfff349ef3c7f720ee31e682ccc5df892c2660e167663c2ab12c3fa63c720022ab14d0645d0bf99
 WHIRLPOOL 
d36ea24172724821fdcb10bf80630ba8adf822675b78e6df414395b1b210fa792c864bfb7e11d8c1e9a38e89d33d9aec91ec3f6c4a5951e9f8301f8b3fbacb38

diff --git a/games-util/grfcodec/grfcodec-6.0.4.ebuild 
b/games-util/grfcodec/grfcodec-6.0.4.ebuild
deleted file mode 100644
index 8947223..
--- a/games-util/grfcodec/grfcodec-6.0.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [ "${PV%}" != "${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="http://dev.openttdcoop.org/projects/grfcodec";
-[[ -z ${SCM} ]] && 
SRC_URI="http://binaries.openttd.org/extra/${PN}/${PV}/${P}-source.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE=""
-
-[[ -n ${SCM} ]] && S=${WORKDIR}/${PN}
-
-DEPEND="!games-util/nforenum
-   dev-lang/perl
-   dev-libs/boost
-   media-libs/libpng:0"
-RDEPEND=""
-
-src_prepare() {
-# 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
-}

[gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/

2016-04-04 Thread Michael Sterrett 
commit: 5d33b2db27bf26fb9af220b069e53991469328c9
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Apr  5 01:15:22 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Apr  5 01:15:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d33b2db

games-util/grfcodec: version bump

Package-Manager: portage-2.2.26

 games-util/grfcodec/Manifest  |  1 +
 games-util/grfcodec/grfcodec-6.0.5.ebuild | 50 +++
 2 files changed, 51 insertions(+)

diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest
index 0f67260..576b9cc 100644
--- a/games-util/grfcodec/Manifest
+++ b/games-util/grfcodec/Manifest
@@ -1 +1,2 @@
 DIST grfcodec-6.0.4-source.tar.xz 165756 SHA256 
7ec1f903cc48b73be9192a23f3fa14dc2a024d8edc4d2dfafa245e700e650cdb SHA512 
cfbbd1cfae7f2d2ba08ca32d8af68f6885c15dddb6ab941bed32d6c15bf9581e0b4ba19a16a5e48e6d6e070438732df232d3f3f008d42baad77a93f931ad0331
 WHIRLPOOL 
6cbd33a2aa503c858b1b5eeabd8d201e54d68ea618369b464de05f262236303e4f5960119ba86ed792c076c354ce757c804f01a6e1f90d552be276f26004028d
+DIST grfcodec-6.0.5-source.tar.xz 166788 SHA256 
db149e98095de107a8d6f715f03376380f201ea158e0cdc53585d9a1b5cbe8a2 SHA512 
b578c6d53b69a1d43d59039f26a028e1437536102150fc2bddfff349ef3c7f720ee31e682ccc5df892c2660e167663c2ab12c3fa63c720022ab14d0645d0bf99
 WHIRLPOOL 
d36ea24172724821fdcb10bf80630ba8adf822675b78e6df414395b1b210fa792c864bfb7e11d8c1e9a38e89d33d9aec91ec3f6c4a5951e9f8301f8b3fbacb38

diff --git a/games-util/grfcodec/grfcodec-6.0.5.ebuild 
b/games-util/grfcodec/grfcodec-6.0.5.ebuild
new file mode 100644
index 000..5b6d009
--- /dev/null
+++ b/games-util/grfcodec/grfcodec-6.0.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [ "${PV%}" != "${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="http://dev.openttdcoop.org/projects/grfcodec";
+[[ -z ${SCM} ]] && 
SRC_URI="http://binaries.openttd.org/extra/${PN}/${PV}/${P}-source.tar.xz";
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+[[ -n ${SCM} ]] && S=${WORKDIR}/${PN}
+
+RDEPEND="media-libs/libpng:0"
+DEPEND="${RDEPEND}
+   !games-util/nforenum
+   dev-lang/perl
+   dev-libs/boost"
+
+src_prepare() {
+# 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
+}