Version bump to latest release and remove overshadowed version. Needed for new openttd.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

5 files changed, 72 insertions, 196 deletions

diff --git a/games-util/grfcodec/ChangeLog b/games-util/grfcodec/ChangeLog
index 0021932d1059..76b1bbaa5eff 100644
--- a/games-util/grfcodec/ChangeLog
+++ b/games-util/grfcodec/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-util/grfcodec
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/grfcodec/ChangeLog,v 1.10 2011/07/23 16:42:43 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/grfcodec/ChangeLog,v 1.11 2012/04/17 12:24:17 scarabeus Exp $
+
+*grfcodec-6.0.0 (17 Apr 2012)
+
+  17 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> +grfcodec-6.0.0.ebuild,
+  -files/grfcodec-0_pre2306-build.patch, -grfcodec-0_pre2306.ebuild:
+  Version bump to latest release and remove overshadowed version. Needed for new
+  openttd.
 
   23 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> grfcodec-5.1.1.ebuild:
   ppc/ppc64 stable wrt #375387
diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest
index 31e9f8e4526c..41e70e9e44ff 100644
--- a/games-util/grfcodec/Manifest
+++ b/games-util/grfcodec/Manifest
@@ -1,19 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX grfcodec-0_pre2306-build.patch 4238 RMD160 4c812ee95856da695405720b49729cf55807a8f4 SHA1 38f0050f9b6accef554b274a56067103ab114bda SHA256 d75602f67e0a4430dd6af88d7ecf5a95786d959d10212de72f6c1a8e1b9c5e5b
 DIST grfcodec-5.1.1-source.tar.gz 192888 RMD160 d93ebb63688dd3de9afa2a91eef218f8dfc7d6bc SHA1 6e6d4008644eef9241240d2a11c2e6d09441c01e SHA256 1adce0117ed72b65e5e51f2e23e59683369ccc3193d3fc1ed56f5938fbf55f05
-DIST grfcodec-r2306-source.tar.bz2 78345 RMD160 9c2833a2e8f465957b24232bd93c020faaaf72e7 SHA1 d66518e6dc98555d9f242309c1c5adef1f2dbea0 SHA256 b7ea9c6ba4c2c3b5236f64190e6c4af4f449ab2b020823d98fedd78654299602
-EBUILD grfcodec-0_pre2306.ebuild 985 RMD160 e2f12bc2bc42875569e2f94cac4bb4c773acd0fa SHA1 6fb58dfbe5228ccbf342edbcd98b6b58908ce7a2 SHA256 7c75e994c190185144cddfeddc3ff37848b93555d6f90cd4d86e9a929acbb378
+DIST grfcodec-6.0.0-source.tar.xz 174004 RMD160 96bb38368c9a1f839848be1aab83906d5490bb30 SHA1 8f27bd9d50cdfea402b561ce5b10eeaa0b11aa14 SHA256 ab25a673a75a78c334d6722b6fb2b22ff5273938e9522cecc7b9bcef10f9dd34
 EBUILD grfcodec-5.1.1.ebuild 1291 RMD160 c30913219f00cc681b0cb311eca3c10e0e8f5154 SHA1 00b70c6ac8434434947686d563f811dd0dea6275 SHA256 ea5c7041c78caed92cf65161fb7c48f88730cdc730623e01d60a1f2b61b3d28c
-MISC ChangeLog 1575 RMD160 b18c1bca41f2bec6b4ba8e45ad10452d9c11f22a SHA1 d1ddcb21e51bfebfef87d16adb882a14f7275c6e SHA256 d29b511086471cdbab9bf1fbed7fada8f6b5721f2f3801c563a3cd9d1e90e7a8
+EBUILD grfcodec-6.0.0.ebuild 1135 RMD160 eadf76a1ba0747828586cd4673be7eb561da95e6 SHA1 cdb4fe032a6a43f1f321fe36ee37896ad860cccb SHA256 9f46c0b5a4f2ab946ba77d2d17cb70774bae7144b2bc8624d81a4be46ceb86ac
+MISC ChangeLog 1846 RMD160 f68f2ea0c820b340073226c3bde621fba6f6cf65 SHA1 8061b20259d257a5342fb9df8331b2a31c1f6c4b SHA256 e63ca2200fbbc8f6887661d016fbf6c8543228b9dd8e8ab782c88cdce63d2f73
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4q+gwACgkQIiMqcbOVdxQEWwP/YoWrNqOgrBGtn+s3pDu0uI0M
-3d2iuyk2DqDCrnX2sdSK3vttAh/mCkdD2fm35iXIq4ZMQcKp2e+vAQNfMZodTb9q
-AXCJAQuJ3wyvCgy0obsvhSLzryQEa1Y4+Ze9YUiJjFGWAH609hDEjkOCn0rTGSzG
-7HwRVHD9NGhv1bk/V3U=
-=yx60
+iQIcBAEBAgAGBQJPjWEKAAoJEOSiRoyO7jvoMWoQAIULAVUcSn6n4UVMAdiXRVkO
+BocjAm0HqxBUaD+Zds6dCKEak6LEBZAkVQouAYKqsfJGXKbKA6lnftNKnXNQXnk/
+YU9/X6f6nNytK5/AtMbAXKWrWes7VuT79NDq1KW84imacc+6xsOYEdoaUDOdX3f9
+AhUblF5tgUtqkrGsCJZS8PZCQxFcNvi6bxwBwdRi2DTERM42tnvYZkB1Ox/gw9t9
+4JpBN8ioKIp8gpYDy+/BmXZH/nDqlvmwoFwt/02HkkRvXs5u2vJfGqcZRJyRPec/
+SWydJp5ZKRlvMYdCv2jbdKTMb+ZnE/7GobB+FZvj1VJ7bv4jUVIthdeUL4phBntn
+kSe7wBL7g45BYHMvUvCDax1ChcwyNrkIL2TdleFR9xbz5zH2xuEbKPZqJn9XugOQ
+aie+kt5EZCTWE01s1x7T8bSbMroAAYU0mUQi76YBecUp5iWcpo09BOGycIIsnIp0
+XmhcfOqxdY5JMmRMILde5pSTwqcS4WlNEYL8vqe5XReiyoZNuY8xyA7UoTdSIAvp
+/QuXohuWW0nPR6Laao0ars9MDRgNkHuAjo6jbztnV4oGAXEKuU9b4lkaZ9uhT5KF
+o3qtbVwAl5bWVZXkch827MtCo4Xz8fLeEbHm+YtEmembGUU6vW1J89nQqML3Lm05
+kTmO945UMOqqAqqv/gua
+=NLny
 -----END PGP SIGNATURE-----
diff --git a/games-util/grfcodec/files/grfcodec-0_pre2306-build.patch b/games-util/grfcodec/files/grfcodec-0_pre2306-build.patch
deleted file mode 100644
index 3cde281527c8..000000000000
--- a/games-util/grfcodec/files/grfcodec-0_pre2306-build.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 50e420c..c0e877b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -62,29 +62,32 @@ endif
- else
- INSTALLPATH=$(INSTALLPATH_MSYS_MINGW)
- endif
--else 
-+else
- INSTALLPATH=$(INSTALLPATH_LINUX)
- endif
- endif
- 
- # use 386 instructions but optimize for pentium II/III
--CFLAGS = -g -D$(TYPESIZE) -O3 -I. -O1 -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized $(CFLAGAPP)
-+CFLAGS +=  -D$(TYPESIZE)  -I.  -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized
-+CXXFLAGS +=  -D$(TYPESIZE)  -I.  -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized
- 
- ifeq ($(DEBUG),1)
- CFLAGS += -DDEBUG
-+CXXFLAGS += -DDEBUG
- endif
- 
- ifeq ($(MACHINE),mingw32)
- CFLAGS += -DMINGW
-+CXXFLAGS += -DMINGW
- endif
- 
- ifeq ($(ISCYGWIN),1)
- ifeq ($(NOCYGWIN),1)
- CFLAGS += -DMINGW -mno-cygwin
-+CXXFLAGS += -DMINGW -mno-cygwin
- endif
- endif
- 
--CXXFLAGS = $(CFLAGS)
- 
- 
- # Somewhat automatic detection of the correct boost include folder
-@@ -171,7 +174,7 @@ endif
- PAL_FILES = pals/$(subst &,.bcp pals/,$(PALORDER)).bcp
- 
- # deafult targets
--all: $(GRFCODEC) $(GRFDIFF) $(GRFMERGE)
-+all: version.h $(GRFCODEC) $(GRFDIFF) $(GRFMERGE)
- remake: clean all
- 
- ${MAKEFILELOCAL}:
-@@ -181,15 +184,15 @@ ${MAKEFILELOCAL}:
- 
- $(GRFCODEC): $(GRFCODECSRC:%.c=%.o)
- 	$(_E) [LD] $@
--	$(_C)$(CXX) -o $@ $(CFLAGS) $^ $(LDOPT)
-+	$(_C)$(CXX) -o $@ $(CXXFLAGS) $^ $(LDOPT)
- 
- $(GRFDIFF):  $(GRFDIFFSRC:%.c=%.o) grfmrg.o
- 	$(_E) [LD] $@
--	$(_C)$(CXX) -o $@ $(CFLAGS) $^ $(LDOPT)
-+	$(_C)$(CXX) -o $@ $(CXXFLAGS) $^ $(LDOPT)
- 
- $(GRFMERGE): $(GRFMERGESRC:%.c=%.o)
- 	$(_E) [LD] $@
--	$(_C)$(CXX) -o $@ $(CFLAGS) $^ $(LDOPT)
-+	$(_C)$(CXX) -o $@ $(CXXFLAGS) $^ $(LDOPT)
- 
- 
- clean:
-@@ -219,9 +222,7 @@ FORCE:
- 	$(_E) [REBUILD] $(@:%_r=%)
- 	$(_C)rm -f $(@:%_r=%)
- 	$(_C)$(MAKE) ${_S} $(@:%_r=%)
--	$(_E) [STRIP/UPX] $(@:%_r=%)
- 	$(_C)$(STRIP)  $(@:%_r=%)
--	$(_C)upx $(_Q) --best  $(@:%_r=%)
- 
- release: $(GRFCODEC)_r $(GRFDIFF)_r $(GRFMERGE)_r
- 
-@@ -230,9 +231,7 @@ grfmrgc.bin:	grfmerge.os $(GRFMERGESRC:%.c=%.os)
- 	$(_C)rm -f $@
- 	$(_E) [LD] $@
- 	$(_C)$(CC) -o $@ $(CFLAGS) -Os $^
--	$(_E) [STRIP/UPX] $@
- 	$(_C)$(STRIP) $@
--	$(_C)upx $(_Q) --best $@
- 
- grfmrg.c:	grfmrgc.bin grfmrgc.pl
- 	$(_E) [PERL] $@
-@@ -291,15 +290,18 @@ ttdpal.h:	$(PAL_FILES) pal2c.pl
- 
- %.o.d:
- 	$(_E) [CPP DEP] $@
--	$(_C)$(CC) $(CFLAGS) -DMAKEDEP -MM -MG $*.c* -MF $@
-+	$(_C)$(CC) $(CFLAGS) -DMAKEDEP -MM -MG error.c  getopt.c  grfcomm.c  grfmerge.c  path.c -MF $@
-+	$(_C)$(CXX) $(CXXFLAGS) -DMAKEDEP -MM -MG file.cc grfcodec.cc grfdiff.cc info.cc pcxfile.cc pcxsprit.cc readinfo.cc sprites.cc -MF $@
- 
- %.os.d:
- 	$(_E) [CPP DEP] $@
--	$(_C)$(CC) $(CFLAGS) -DMAKEDEP -MM -MG -MT ${subst .d,,$@} -MF $@ $*.c*
-+	$(_C)$(CC) $(CFLAGS) -DMAKEDEP -MM -MG -MT ${subst .d,,$@} -MF $@ error.c getopt.c grfcomm.c grfmerge.c path.c
-+	$(_C)$(CXX) $(CXXFLAGS) -DMAKEDEP -MM -MG -MT ${subst .d,,$@} -MF $@ file.cc grfcodec.cc grfdiff.cc info.cc pcxfile.cc pcxsprit.cc readinfo.cc sprites.cc
- 
--%.obj.d: $(wildcard %.c*)
-+%.obj.d:
- 	$(_E) [CPP DEP] $@
--	$(_C)$(CC) $(CFLAGS) -DMAKEDEP -MM -MG -MT ${subst .d,,$@} -MF $@ $*.c*
-+	$(_C)$(CC) $(CFLAGS) -DMAKEDEP -MM -MG -MT ${subst .d,,$@} -MF $@ error.c  getopt.c  grfcomm.c  grfmerge.c  path.c
-+	$(_C)$(CXX) $(CXXFLAGS) -DMAKEDEP -MM -MG -MT ${subst .d,,$@} -MF $@ file.cc grfcodec.cc grfdiff.cc info.cc pcxfile.cc pcxsprit.cc readinfo.cc sprites.cc
- 
- ifndef NO_MAKEFILE_DEP
- -include $(GRFCODECSRC:%.c=%.o.d)
-diff --git a/Makefile.common b/Makefile.common
-index c559c0a..fe99591 100644
---- a/Makefile.common
-+++ b/Makefile.common
-@@ -5,9 +5,7 @@ FORCE:
- 	$(_E) [REBUILD] $(@:%_r=%)
- 	$(_C)rm -f $(@:%_r=%)$(EXE)
- 	$(_C)make -f $(MAKEFILE) $(_S) $(@:%_r=%)
--	$(_E) [STRIP/UPX] $(@:%_r=%)
- 	$(_C)strip  $(@:%_r=%)$(REL_EXE)
--	$(_C)upx $(_Q) --best  $(@:%_r=%)$(REL_EXE)
- 
- release: grfcodec_r grfdiff_r grfmerge_r
- 
-@@ -16,9 +14,7 @@ grfmrgc.bin:	grfmerge.os $(GRFMERGESRC:%.c=%.os)
- 	$(_C)rm -f $@
- 	$(_E) [LD] $@
- 	$(_C)$(CC) -o $@ $(CFLAGS) -Os $^
--	$(_E) [STRIP/UPX] $@
- 	$(_C)strip $@
--	$(_C)upx $(_Q) --best $@
- 
- grfmrg.c:	grfmrgc.bin grfmrgc.pl
- 	$(_E) [PERL] $@
-@@ -32,7 +28,7 @@ ttdpal.h:	$(PAL_FILES) pal2c.pl
- 
- readinfo.o: readinfo.cc
- 	$(_E) [CPP] $@
--	$(BOOST_WARN)	
-+	$(BOOST_WARN)
- 	$(_C)$(CXX) -c -o $@ -MMD -MG -MF $@.d $(CXXFLAGS) $<
- 
- %.o : %.c
diff --git a/games-util/grfcodec/grfcodec-0_pre2306.ebuild b/games-util/grfcodec/grfcodec-0_pre2306.ebuild
deleted file mode 100644
index 0cfee6e6043e..000000000000
--- a/games-util/grfcodec/grfcodec-0_pre2306.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/grfcodec/grfcodec-0_pre2306.ebuild,v 1.7 2010/10/15 13:49:56 maekke Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-MY_PV=${PV/0_pre/r}
-DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files"
-HOMEPAGE="http://binaries.openttd.org/extra/grfcodec/"
-SRC_URI="http://binaries.openttd.org/extra/grfcodec/${MY_PV}/${PN}-${MY_PV}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-DEPEND="dev-lang/perl
-	dev-libs/boost"
-RDEPEND=""
-
-src_prepare() {
-	cat > Makefile.local <<-__EOF__
-		CC = $(tc-getCC)
-		CXX = $(tc-getCXX)
-		CFLAGS = ${CFLAGS}
-		CXXFLAGS = ${CXXFLAGS}
-		LDOPT = ${LDFLAGS}
-		STRIP = :
-		V = 1
-	__EOF__
-
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_install() {
-	dobin ${PN} grf{diff,merge} || die
-	dodoc *.txt Changelog || die
-}
diff --git a/games-util/grfcodec/grfcodec-6.0.0.ebuild b/games-util/grfcodec/grfcodec-6.0.0.ebuild
new file mode 100644
index 000000000000..294b518c81af
--- /dev/null
+++ b/games-util/grfcodec/grfcodec-6.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/grfcodec/grfcodec-6.0.0.ebuild,v 1.1 2012/04/17 12:24:17 scarabeus Exp $
+
+EAPI=4
+
+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="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"
+RDEPEND=""
+
+src_prepare() {
+# Set up Makefile.local so that we respect CXXFLAGS/LDFLAGS
+cat > Makefile.local <<-__EOF__
+		CXX = $(tc-getCXX)
+		CXXFLAGS = ${CXXFLAGS}
+		LDOPT = ${LDFLAGS}
+		UPX =
+		V = 1
+		FLAGS=
+	__EOF__
+}
+
+src_install() {
+	dobin ${PN} grf{diff,id,merge} nforenum
+	doman docs/*.1
+	dodoc changelog.txt docs/*.txt
+}