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-strategy/ja2-stracciatella/Manifest | 7 - .../ja2-stracciatella/files/ja2-convert.sh | 16 -- .../ja2-stracciatella-0.12.1_p7072-gcc6.patch | 13 -- .../ja2-stracciatella-0.12.1_p7072-makefile.patch | 179 --------------------- .../ja2-stracciatella-0.12.1_p7072.ebuild | 87 ---------- games-strategy/ja2-stracciatella/metadata.xml | 12 -- 6 files changed, 314 deletions(-) delete mode 100644 games-strategy/ja2-stracciatella/Manifest delete mode 100644 games-strategy/ja2-stracciatella/files/ja2-convert.sh delete mode 100644 games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch delete mode 100644 games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch delete mode 100644 games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild delete mode 100644 games-strategy/ja2-stracciatella/metadata.xml (limited to 'games-strategy/ja2-stracciatella') diff --git a/games-strategy/ja2-stracciatella/Manifest b/games-strategy/ja2-stracciatella/Manifest deleted file mode 100644 index c5c81c574245..000000000000 --- a/games-strategy/ja2-stracciatella/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX ja2-convert.sh 411 BLAKE2B 5b6f0682475d1cdacd914f9b0656e35608631e814ac54be81f19cfa39565e9d334499ec658095d3071fa2eb7c9200a81fe5650e4eea16a2077c86dd3edae2261 SHA512 478a8e94c10d69c18812a42fdc6766b77ef743793df38665677e9a878743a770a5565fed1a487e992ce0609d0fa371fb027ee55a9e01c32c283ad75f8a62c09d -AUX ja2-stracciatella-0.12.1_p7072-gcc6.patch 526 BLAKE2B 22567919e68d467447befb3bb3a42bd64a80df24166375f0925d8d7237bb4471daa1a7a617a193ed9b3320c4fa1ae2bfd37116bc91aae0cb41fd5ca56abfa7f4 SHA512 15aabca2fc0e9d7cab0b4c7ed471eda8029e073250959f038a714eccbddddc1a0dc0aab54e7f45dd988347b52346386e90e75c29025698c9d7814c3fb10a5b1f -AUX ja2-stracciatella-0.12.1_p7072-makefile.patch 3666 BLAKE2B 11c110649dce7650a315511edbff12036ad2a257d7d4c3d4da5a14a7d3ae0e9949fc2c8b5f435789a3090cf2a200f4b1d9e2175a1fa94466eaa6e1c209bfcee7 SHA512 07cd2f1367bd9dbad9bc6ec3d633fc77bf337dddf69d69da7c297722c1684c9c80e88b918b89dc2e02e83160b224cf7b22f6e21fce2de525ee480a513c64cd99 -DIST editor.slf.gz 134265 BLAKE2B 0a379a2340ad717b2be913eb7368a73232a231e7cf2753f2569bfe3027f51e5e4b8aac8cb15982b6d46161529054c3f15ae11849faae42ed34c8d4dbb4aa52c3 SHA512 243e3bf5e7298c3a71b330985f5c4d4df3e4cb43df32c823d835353d6309a64f62679c3d0634ca162f6484f7cbf366627e57b1d967188c13940db8933a5f03f2 -DIST ja2-stracciatella-0.12.1_p7072.tar.xz 2118832 BLAKE2B 229cd30891216ba305f8b81764b57edf4179bb09a783d2619242c6e3cbeb29f131cb1901934364d952b54796c8398985a54cbf465d36f737c438958c145dcdb1 SHA512 9269c9e2e179d705b6d83dfac56c604eaefbe5bffe5c16e3f26c1209d3842bbac22db19362e51acf0c6602d64a283d2ec4fa19b0f37d1cddfb013f686c936411 -EBUILD ja2-stracciatella-0.12.1_p7072.ebuild 2109 BLAKE2B 184b1753465260dcdd0d175f0b9b6c1af01ff3486111cd4f6fb2f1d08ec000a231feee8ca62c65f66f0fed2e67e9e8eab6892d78c753d046d5ea19bb597cbfd2 SHA512 3974587fbc679732a92cab1b7418fb90f4cbf9d7aa8f0e8c28c4bfae106379bc13c8184fa0680c604af3af1dfd83c8af9b630416c3267c61da0de1013f756d11 -MISC metadata.xml 402 BLAKE2B 4329f4f00399517a6c54e94930d5ecaebd78d2321fb479f3de4faf42783ea8c3e081fca8b16e129d6351fc6e2d5e47b17273198ea1da851578dfa59091900736 SHA512 7f56ace0297b3af4c5d4f386428d9341bb7ca462370abf4c8b4814fce550b724f40f97d876b350ab8b1dd8f0c6916e20ca90a32de07d400739bfa40e004d1dbf diff --git a/games-strategy/ja2-stracciatella/files/ja2-convert.sh b/games-strategy/ja2-stracciatella/files/ja2-convert.sh deleted file mode 100644 index 4f337ca75351..000000000000 --- a/games-strategy/ja2-stracciatella/files/ja2-convert.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# Convert names of data-files to lower-case - -# location of the data-files -GAMES_DATADIR=@GAMES_DATADIR@ - -cd "${GAMES_DATADIR}" || exit 1 - -# convert to lowercase -find . -exec sh -c 'echo "${1}" -lower="`echo "${1}" | tr [:upper:] [:lower:]`" -[ -d `dirname "${lower}"` ] || mkdir `dirname ${lower}` -[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \; - -# remove leftover -rm -r ./TILECACHE ./STSOUNDS diff --git a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch deleted file mode 100644 index 2661b19d6c77..000000000000 --- a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch +++ /dev/null @@ -1,13 +0,0 @@ -Bug: https://bugs.gentoo.org/600082 - ---- a/Build/Laptop/BobbyRGuns.cc -+++ b/Build/Laptop/BobbyRGuns.cc -@@ -700,7 +700,7 @@ - //center picture in frame - ETRLEObject const& pTrav = uiImage->SubregionProperties(0); - UINT32 const usWidth = pTrav.usWidth; -- INT16 const sCenX = PosX + abs(BOBBYR_GRID_PIC_WIDTH - usWidth) / 2 - pTrav.sOffsetX; -+ INT16 const sCenX = PosX + (BOBBYR_GRID_PIC_WIDTH - usWidth) / 2 - pTrav.sOffsetX; - INT16 const sCenY = PosY + 8; - - //blt the shadow of the item diff --git a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch deleted file mode 100644 index 0475773bd361..000000000000 --- a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch +++ /dev/null @@ -1,179 +0,0 @@ -From: Julian Ospald -Date: Tue May 8 19:16:08 UTC 2012 -Subject: build system - ---- Makefile -+++ Makefile -@@ -16,106 +16,94 @@ - MANPREFIX ?= $(PREFIX) - - INSTALL ?= install --INSTALL_PROGRAM ?= $(INSTALL) -m 555 -s --INSTALL_MAN ?= $(INSTALL) -m 444 --INSTALL_DATA ?= $(INSTALL) -m 444 -+INSTALL_PROGRAM ?= $(INSTALL) -m 755 -+INSTALL_MAN ?= $(INSTALL) -m 644 -+INSTALL_DATA ?= $(INSTALL) -m 644 - -+# compiler CFLAGS -+CFLAGS += -std=gnu99 - -+# sdl-flags - SDL_CONFIG ?= sdl-config - ifndef CFLAGS_SDL - CFLAGS_SDL := $(shell $(SDL_CONFIG) --cflags) - endif - ifndef LDFLAGS_SDL --LDFLAGS_SDL := $(shell $(SDL_CONFIG) --libs) -+LIBS_SDL := $(shell $(SDL_CONFIG) --libs) - endif - -+# LIBS -+LIBS += $(LIBS_SDL) -+LIBS += -lm -+ -+ifdef WITH_ZLIB -+LIBS += -lz -+endif - --CFLAGS += $(CFLAGS_SDL) --CFLAGS += -I Build --CFLAGS += -I Build/Tactical --CFLAGS += -I Build/Strategic --CFLAGS += -I Build/Editor --CFLAGS += -I Build/Res --CFLAGS += -I Build/Laptop --CFLAGS += -I Build/Utils --CFLAGS += -I Build/TileEngine --CFLAGS += -I Build/TacticalAI --CFLAGS += -I sgp -- --#CFLAGS += -Wall --#CFLAGS += -W --CFLAGS += -Wpointer-arith --CFLAGS += -Wreturn-type --CFLAGS += -Wunused-label --CFLAGS += -Wunused-variable --CFLAGS += -Wwrite-strings - --CFLAGS += -DJA2 -+# preprocessor flags -+CPPFLAGS += $(CFLAGS_SDL) -+CPPFLAGS += -I Build -+CPPFLAGS += -I Build/Tactical -+CPPFLAGS += -I Build/Strategic -+CPPFLAGS += -I Build/Editor -+CPPFLAGS += -I Build/Res -+CPPFLAGS += -I Build/Laptop -+CPPFLAGS += -I Build/Utils -+CPPFLAGS += -I Build/TileEngine -+CPPFLAGS += -I Build/TacticalAI -+CPPFLAGS += -I sgp - -+CPPFLAGS += -DJA2 - - ifdef WITH_DEMO -- CFLAGS += -DJA2DEMO -+ CPPFLAGS += -DJA2DEMO - endif - - ifdef WITH_DEMO_ADS - ifndef WITH_DEMO - $(error WITH_DEMO_ADS needs WITH_DEMO) - endif -- CFLAGS += -DJA2DEMOADS -+ CPPFLAGS += -DJA2DEMOADS - endif - - ifdef WITH_FIXMES -- CFLAGS += -DWITH_FIXMES -+ CPPFLAGS += -DWITH_FIXMES - endif - - ifdef WITH_MAEMO -- CFLAGS += -DWITH_MAEMO -+ CPPFLAGS += -DWITH_MAEMO - endif - - ifdef WITH_SOUND_DEBUG -- CFLAGS += -DWITH_SOUND_DEBUG -+ CPPFLAGS += -DWITH_SOUND_DEBUG - endif - - ifdef _DEBUG -- CFLAGS += -D_DEBUG -+ CPPFLAGS += -D_DEBUG - ifndef JA2TESTVERSION - JA2TESTVERSION := yes - endif - endif - - ifdef JA2TESTVERSION -- CFLAGS += -DJA2TESTVERSION -+ CPPFLAGS += -DJA2TESTVERSION - ifndef JA2BETAVERSION - JA2BETAVERSION := yes - endif - endif - - ifdef JA2BETAVERSION --CFLAGS += -DJA2BETAVERSION -DSGP_DEBUG -DFORCE_ASSERTS_ON -DSGP_VIDEO_DEBUGGING -+CPPFLAGS += -DJA2BETAVERSION -DSGP_DEBUG -DFORCE_ASSERTS_ON -DSGP_VIDEO_DEBUGGING - endif - - ifdef JA2EDITOR --CFLAGS += -DJA2EDITOR -+CPPFLAGS += -DJA2EDITOR - endif - --CFLAGS += -D$(LNG) -- --CFLAGS += -DSGPDATADIR=\"$(SGPDATADIR)\" -- --CCFLAGS += $(CFLAGS) --CCFLAGS += -std=gnu99 --CCFLAGS += -Werror-implicit-function-declaration --CCFLAGS += -Wimplicit-int --CCFLAGS += -Wmissing-prototypes -+CPPFLAGS += -D$(LNG) -+CPPFLAGS += -DSGPDATADIR=\"$(SGPDATADIR)\" - --CXXFLAGS += $(CFLAGS) -- --LDFLAGS += $(LDFLAGS_SDL) --LDFLAGS += -lm -- --ifdef WITH_ZLIB --LDFLAGS += -lz --endif - - SRCS := - SRCS += Build/AniViewScreen.cc -@@ -468,7 +456,7 @@ - .SUFFIXES: - .SUFFIXES: .c .cc .d .o - --Q ?= @ -+Q = - - all: $(BINARY) - -@@ -476,15 +464,15 @@ - - $(BINARY): $(OBJS) - @echo '===> LD $@' -- $(Q)$(CXX) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $@ -+ $(Q)$(CXX) $(CXXFLAGS) $(OBJS) $(LDFLAGS) -o $@ $(LIBS) - - .c.o: - @echo '===> CC $<' -- $(Q)$(CC) $(CCFLAGS) -c -MMD -o $@ $< -+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -MMD -o $@ $< - - .cc.o: - @echo '===> CXX $<' -- $(Q)$(CXX) $(CXXFLAGS) -c -MMD -o $@ $< -+ $(Q)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -MMD -o $@ $< - - clean distclean: - @echo '===> CLEAN' diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild deleted file mode 100644 index 4da66d2c406f..000000000000 --- a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils games - -DESCRIPTION="A port of Jagged Alliance 2 to SDL" -HOMEPAGE="https://ja2-stracciatella.github.io/" -SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz - http://tron.homeunix.org/ja2/editor.slf.gz" - -LICENSE="SFI-SCLA" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cdinstall editor ru-gold zlib" - -DEPEND="media-libs/libsdl[X,sound,video] - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND} - cdinstall? ( games-strategy/ja2-stracciatella-data )" - -LANGS="l10n_de +l10n_en l10n_fr l10n_it l10n_nl l10n_pl l10n_ru" -IUSE="$IUSE $LANGS" -REQUIRED_USE="^^ ( ${LANGS//+/} )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-makefile.patch - epatch "${FILESDIR}"/${P}-gcc6.patch - - sed \ - -e "s:/some/place/where/the/data/is:${GAMES_DATADIR}/ja2:" \ - -i sgp/FileMan.cc || die - - sed \ - -e "s:@GAMES_DATADIR@:${GAMES_DATADIR}/ja2/data:" \ - "${FILESDIR}"/ja2-convert.sh > "${T}"/ja2-convert || die -} - -src_compile() { - local myconf - - case ${L10N} in - de) myconf="LNG=GERMAN" ;; - nl) myconf="LNG=DUTCH" ;; - fr) myconf="LNG=FRENCH" ;; - it) myconf="LNG=ITALIAN" ;; - pl) myconf="LNG=POLISH" ;; - ru) myconf="LNG=$(usex ru-gold RUSSIAN_GOLD RUSSIAN)" ;; - en) myconf="LNG=ENGLISH" ;; - *) die "wat" ;; - esac - elog "Chosen language is ${myconf#LNG=}" - - use editor && myconf+=" JA2EDITOR=yes JA2BETAVERSION=yes" - use zlib && myconf+=" WITH_ZLIB=yes" - - emake ${myconf} -} - -src_install() { - dogamesbin ja2 "${T}"/ja2-convert - - if use editor; then - insinto "${GAMES_DATADIR}"/ja2/data - doins "${WORKDIR}"/editor.slf - fi - - make_desktop_entry ja2 ${PN} - doman ja2.6 - - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - - elog "You need ja2 in the chosen language, otherwise set it in package.use!" - - if ! use cdinstall ; then - elog "You need to copy all files from the Data directory of" - elog "Jagged Alliance 2 installation to" - elog "${GAMES_DATADIR}/ja2/data " - elog "Make sure the filenames are lowercase. You may want to run the" - elog "script": - elog "${GAMES_BINDIR}/ja2-convert" - fi -} diff --git a/games-strategy/ja2-stracciatella/metadata.xml b/games-strategy/ja2-stracciatella/metadata.xml deleted file mode 100644 index 3db7ad1de988..000000000000 --- a/games-strategy/ja2-stracciatella/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - - Adds necessary file to run the editor - Support for russian gold ja2 version - - -- cgit v1.2.3