* [gentoo-commits] repo/gentoo:master commit in: games-strategy/ja2-stracciatella/files/, games-strategy/ja2-stracciatella/
@ 2021-03-31 10:05 Sam James
0 siblings, 0 replies; only message in thread
From: Sam James @ 2021-03-31 10:05 UTC (permalink / raw
To: gentoo-commits
commit: 238b2785a72361c8a40202813023248618fe1826
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 31 08:48:18 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 31 10:04:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=238b2785
games-strategy/ja2-stracciatella: drop 0.12.1_p7072 (drop games.eclass)
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-strategy/ja2-stracciatella/Manifest | 2 -
.../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 ----------
5 files changed, 297 deletions(-)
diff --git a/games-strategy/ja2-stracciatella/Manifest b/games-strategy/ja2-stracciatella/Manifest
index de105d7e977..93b0ba8ea57 100644
--- a/games-strategy/ja2-stracciatella/Manifest
+++ b/games-strategy/ja2-stracciatella/Manifest
@@ -24,7 +24,6 @@ DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066
DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
DIST dunce-1.0.0.crate 5167 BLAKE2B 17bab325b025e06cb7c0c8eb704e4204e3080281f2603a5e5b1c4dd07f7045de875dd48a1a176b88a010824e738e372699effc6ced7e866481a6dbb173c51471 SHA512 2ef42f8be790e890342e8ae49e3bd7d71f48dfe337b89d1315469b3f3c1493069f62cd25b1953bef29f65e41e0ee893500d7d24253d0a6a735ce7ae32dc1ddc6
-DIST editor.slf.gz 134265 BLAKE2B 0a379a2340ad717b2be913eb7368a73232a231e7cf2753f2569bfe3027f51e5e4b8aac8cb15982b6d46161529054c3f15ae11849faae42ed34c8d4dbb4aa52c3 SHA512 243e3bf5e7298c3a71b330985f5c4d4df3e4cb43df32c823d835353d6309a64f62679c3d0634ca162f6484f7cbf366627e57b1d967188c13940db8933a5f03f2
DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
@@ -33,7 +32,6 @@ DIST hermit-abi-0.1.10.crate 9127 BLAKE2B 59582bd4f7ec1dc38b3df7df0ce77c6161a246
DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
DIST indexmap-1.3.2.crate 47144 BLAKE2B 70330e3a7bca371051f871b029938c1c3d6507739cdfaf348347a811a69ee923ea9f5884b6375b0b95d7f06472e18be3652ce110ae91cf723d609a01cd4f9dde SHA512 f3a618bbc0274cc9c8e25183448b1f65db11107bc72debbeb178040ab3f5609e4771df00bcd0a9b8cd5f395b982f7d031dae7c3bb8ee71d7abba19fa21534dfb
DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
-DIST ja2-stracciatella-0.12.1_p7072.tar.xz 2118832 BLAKE2B 229cd30891216ba305f8b81764b57edf4179bb09a783d2619242c6e3cbeb29f131cb1901934364d952b54796c8398985a54cbf465d36f737c438958c145dcdb1 SHA512 9269c9e2e179d705b6d83dfac56c604eaefbe5bffe5c16e3f26c1209d3842bbac22db19362e51acf0c6602d64a283d2ec4fa19b0f37d1cddfb013f686c936411
DIST ja2-stracciatella-0.17.0-editor.slf 563450 BLAKE2B 388b798efc2e6169ff0fee4c4baf0baa9c347c578a0cf15b932bfc9fd25db21da3c958c606f528f38c4d780200bb3b9e8a0a72649a03f3d7532fde499306dcde SHA512 7a177343f407dbd204586d029c04fa16b9418f27fba414fb0f3eba09dc879e628a4e0822cf53a7cae1a8efe13342392f77381b9e5be1b1933ea10ad9e4e2971b
DIST ja2-stracciatella-0.17.0.tar.gz 22101197 BLAKE2B 165e3bc76bde65f8d72e45dd90f842b683353208f7796580d8bdbcfe65df921964ab07029750be1865f549c6d4012aafaeecb4c46bf3475f8e47cfaf48bd2f36 SHA512 a83a0346c5e4ff5e1e2b1a5a44d87376930b6b52a25746e14e496e5323555a4c1ce504b7a83e621775f39b955492b45083a459e7a1e5e892ca34b387ac500b0c
DIST json_comments-0.2.0.crate 7272 BLAKE2B dfff442aba212c139340a447abe18273add4838cb11c471db73532273dcc3309c59ef9f00f773944297da9130d466b736aadc2078aed413d47ca3973a52b3a30 SHA512 da13a4849503bb1efa9d18a5d9d327f972d692b384738d6e8c36a2af832129a0ecfc59ce5352199e03b9dbb387582ae08a6a8ecdc4ab42a1c0c34a3534b85e0e
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 4f337ca7535..00000000000
--- 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 2661b19d6c7..00000000000
--- 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 0475773bd36..00000000000
--- a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-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 74f846424ca..00000000000
--- a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 ~arm64 ~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
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-03-31 10:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-31 10:05 [gentoo-commits] repo/gentoo:master commit in: games-strategy/ja2-stracciatella/files/, games-strategy/ja2-stracciatella/ Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox