From 0cf2f20608308acdf3cb922c3736446bbd8f3388 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:58:29 +0100 Subject: gentoo resync : 14.07.2018 --- games-roguelike/scourge/Manifest | 8 --- .../files/scourge-0.21.1-automake-1.13.patch | 11 ---- .../files/scourge-0.21.1-freetype_pkgconfig.patch | 34 ----------- .../scourge/files/scourge-0.21.1-gcc47.patch | 12 ---- .../scourge/files/scourge-0.21.1-gcc6.patch | 34 ----------- games-roguelike/scourge/metadata.xml | 11 ---- games-roguelike/scourge/scourge-0.21.1-r1.ebuild | 68 ---------------------- 7 files changed, 178 deletions(-) delete mode 100644 games-roguelike/scourge/Manifest delete mode 100644 games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch delete mode 100644 games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch delete mode 100644 games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch delete mode 100644 games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch delete mode 100644 games-roguelike/scourge/metadata.xml delete mode 100644 games-roguelike/scourge/scourge-0.21.1-r1.ebuild (limited to 'games-roguelike/scourge') diff --git a/games-roguelike/scourge/Manifest b/games-roguelike/scourge/Manifest deleted file mode 100644 index 309f169a6bf7..000000000000 --- a/games-roguelike/scourge/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX scourge-0.21.1-automake-1.13.patch 288 BLAKE2B e9e9673b357b9ba5b52f5404d7587dfad3eac5bc714a201c9d94cbe6a113cfcd9ef58fc40a34d48c49cd6bfd3cb781a0000f5d00d18b9fe0e3e623d9940e2195 SHA512 24b212c1053fa3445507cc6808abd37cabf43997275f003eb929d7c0671663919b984c2491dc33083d20a09cd67d8e695140ff6957e662ba66f43ddbaf167394 -AUX scourge-0.21.1-freetype_pkgconfig.patch 1083 BLAKE2B a65038dfb1fb031e7566317236c3de2d2b9d50e7903013d92c793420b8c006f3677071ced8361c04c85b717f45c03b7cd2388b18d44801515b7b39a341eef3af SHA512 22dede3318061683ee3fcc2d1b5cb910cb7657d356c14ea7fffaa19921a3393364c9c4b9d12ccb0e0149599dcebeef2abf9127a47c6987cd77d9090b8961f590 -AUX scourge-0.21.1-gcc47.patch 517 BLAKE2B 30a3d2ebec5e25ce4ca9757821996d2a4e8155573b93ec76b2cded90ab4ec102e5796e21854524d3405b10ed798ddca064a2d3c6b11542ddfe2867fe30aae7f8 SHA512 69bca46c3bfad70e42736119da38d7dafba6c589231bdac5ef2591e617ea516337ebf4ed8a547e8da52412711d0eb84f2abae5652ffc19a882fea69f48a4b880 -AUX scourge-0.21.1-gcc6.patch 601 BLAKE2B 78114f97ac4258cde239926c7012568f76b33c7b0fe3e6a52fc0550910f547e6e70e262ab70ecb89052d126406f94a693432ec2c9a9dd05d828c461b9d822ea8 SHA512 521f5ab76423925cef7f2ead25c947fb042bda67d82c6ccdcf55757d9412c017a8eb3ca7ecb09ffd369cd69fcac919c5ed6928b5c1d16149d64b0b03a70a2104 -DIST scourge-0.21.1.data.tar.gz 142093436 BLAKE2B 68e4cc0bfb40e9a92bc38b3db75f36df665974595ba4978cc34e077901522ece9ec5e15203ad9ab5044a61484d6850367306eb60a0da5d168a33e03130fe5774 SHA512 3701aba0f70d71aeb0e185e808e34cea62a637809a9b4c14fd19bdfbf91d36cf8dafa2a4cfddc3ee493827b40eea657fcdddc8277c57a635bc8ca8e3286376be -DIST scourge-0.21.1.src.tar.gz 8146157 BLAKE2B ed48b29a54df1b8c7444ac2985ad069f82568b1e7a5aa98e922fb4fcf10c48840c2c38361a4bf15044c71547cd41d06fdd270b379ae0827b9b5f8063b92c1d18 SHA512 e530a8f7bddc1969a02a8b9a8b272f6f60d2c4830d23d96fc671cb79a2c4097fb9c5c0c262004a8157448b601bf58f9bbff95dd6d98275a28d3d404c339ce2ad -EBUILD scourge-0.21.1-r1.ebuild 1430 BLAKE2B 253248fbd84dd5ffdbdd468bf703e53f08e0dcf948bd62b59dd6c4ab6ae082d95d3ec8ec16a2ad44e45626c2a1f19d689f54f4e94fcb086c49ff8d736e0c049d SHA512 2a17aaa637feff2d8a5b511c6b7fc2a982b21a6357256ae32d7bcc2193212e93669e036873386cdfdd64b4d45627c067967247cf61060cdea00eabf72d8e39a7 -MISC metadata.xml 330 BLAKE2B 126bd0ac9b4d619acfe8978859d29f75e84e445fef6c96117d18d8fc93ad58e69c55096ed3c0e47e1907354bffe3f9e08ce105eedd183c65afe70ea7ce3dec46 SHA512 d47d4afa0adafc93aa43d05190f0a65ac486b6ad4aee54bac96b2f99da7c4a55c6df99b512e4c113c2b4232b8ae294f58966b06081eb89d31fc20b8d9de2e07b diff --git a/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch b/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch deleted file mode 100644 index 5c2bc202f384..000000000000 --- a/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -4,7 +4,7 @@ - dnl Process this file with autoconf to produce a configure script. - AC_INIT(src/scourge.h) - AM_INIT_AUTOMAKE(scourge, "0.21") --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - dnl internationalization macros - AC_GNU_SOURCE diff --git a/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch b/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch deleted file mode 100644 index d41ee1a44439..000000000000 --- a/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: scourge/configure.in -=================================================================== ---- scourge/configure.in (revision 3411) -+++ scourge/configure.in (working copy) -@@ -56,6 +56,7 @@ - # Set up binreloc (for a relocatable autopackage file) - AM_BINRELOC - -+PKG_PROG_PKG_CONFIG - dnl -------------------------------------------------------------------------- - dnl General options - dnl -------------------------------------------------------------------------- -@@ -413,19 +414,9 @@ - FREETYPE_LIBS=`/sw/lib/freetype2/bin/freetype-config --libs` - have_FREETYPE=yes - else --AC_MSG_CHECKING([for freetype-config library]) -- --AC_PATH_PROG(FREETYPE, freetype-config, no) -- --if test "$FREETYPE" = "no"; then -- AC_MSG_ERROR(Cannot find freetype2: Is freetype-config in path?) -- have_FREETYPE=no --else -- FREETYPE_CFLAGS=`freetype-config --cflags` -- FREETYPE_LIBS=`freetype-config --libs` -- have_FREETYPE=yes -+ PKG_CHECK_MODULES(FREETYPE, freetype2, have_FREETYPE=yes, -+ AC_MSG_ERROR(Cannot find freetype2)) - fi --fi - - LIBS="$saved_LIBS" - TR_LIBS="$TR_LIBS $FREETYPE_LIBS" diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch deleted file mode 100644 index 6f3f7b3e2a65..000000000000 --- a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/squirrel/squtils.h 2012-08-30 18:06:43.474037926 +0200 -+++ b/src/squirrel/squtils.h 2012-08-30 18:14:13.300261523 +0200 -@@ -8,6 +8,9 @@ - #define SQ_FREE(__ptr,__size) sq_vm_free(__ptr,__size); - #define SQ_REALLOC(__ptr,__oldsize,__size) sq_vm_realloc(__ptr,__oldsize,__size); - -+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size); -+void sq_vm_free(void *p,SQUnsignedInteger size); -+ - //sqvector mini vector class, supports objects by value - template class sqvector - { diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch b/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch deleted file mode 100644 index fed15f45ed7e..000000000000 --- a/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch +++ /dev/null @@ -1,34 +0,0 @@ -Bug: https://bugs.gentoo.org/610492 -Upstream ticket: https://sourceforge.net/p/scourge/patches/3/ - ---- a/src/equip.cpp -+++ b/src/equip.cpp -@@ -595,7 +595,7 @@ - } - } - if ( !found ) { -- specialSkill = false; -+ specialSkill = NULL; - canvas->setTooltip( "" ); - } - glDisable( GL_BLEND ); ---- a/src/render/map.cpp -+++ b/src/render/map.cpp -@@ -3154,7 +3154,7 @@ - if ( shape ) - return shape; - } -- return false; -+ return NULL; - } - if ( y1 == y2 ) { - if ( x1 > x2 ) SWAP( x1, x2 ); -@@ -3163,7 +3163,7 @@ - if ( shape ) - return shape; - } -- return false; -+ return NULL; - } - - diff --git a/games-roguelike/scourge/metadata.xml b/games-roguelike/scourge/metadata.xml deleted file mode 100644 index ea7a44ebb6c5..000000000000 --- a/games-roguelike/scourge/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - - scourge - - diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild deleted file mode 100644 index 5eeec7c52315..000000000000 --- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools desktop wxwidgets - -DESCRIPTION="A graphical rogue-like adventure game" -HOMEPAGE="https://sourceforge.net/projects/scourge/" -SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz - mirror://sourceforge/${PN}/${P}.data.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - media-libs/freetype:2 - media-libs/libsdl[joystick,video] - media-libs/sdl-image[png] - media-libs/sdl-mixer[vorbis] - media-libs/sdl-net - media-libs/sdl-ttf - virtual/libintl - virtual/opengl - virtual/glu" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -S="${WORKDIR}/${PN}" - -PATCHES=( - "${FILESDIR}"/${P}-gcc47.patch - "${FILESDIR}"/${P}-gcc6.patch - "${FILESDIR}"/${P}-automake-1.13.patch - "${FILESDIR}"/${P}-freetype_pkgconfig.patch -) - -src_prepare() { - default - - # bug #257601 - sed -i \ - -e '/AC_CHECK_HEADERS.*glext/ s:):, [#include ] ):' \ - configure.in || die - sed -i \ - -e '/snprintf/s/tmp, 256/tmp, sizeof(tmp)/' \ - src/scourgehandler.cpp || die - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-data-dir=/usr/share/${PN} - --localedir=/usr/share/locale - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - insinto /usr/share/${PN} - doins -r ../scourge_data/* - doicon assets/scourge.png - make_desktop_entry scourge S.C.O.U.R.G.E. -} -- cgit v1.2.3