From b4a3d1e6e8881c2fb00813de8c1fb5bd8e68b527 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Mon, 10 May 2021 23:42:30 +0300 Subject: [PATCH] Upgrade requirements... --- games-emulation/gens-gs/Manifest | 1 - games-emulation/gens-gs/files/amd64.patch | 44 ------------- .../gens-gs/files/gtk_build_fix.patch | 14 ---- games-emulation/gens-gs/files/libtool.patch | 9 --- games-emulation/gens-gs/gens-gs-7-r4.ebuild | 66 ------------------- profiles/desktop/package.accept_keywords | 9 ++- 6 files changed, 6 insertions(+), 137 deletions(-) delete mode 100644 games-emulation/gens-gs/Manifest delete mode 100644 games-emulation/gens-gs/files/amd64.patch delete mode 100644 games-emulation/gens-gs/files/gtk_build_fix.patch delete mode 100644 games-emulation/gens-gs/files/libtool.patch delete mode 100644 games-emulation/gens-gs/gens-gs-7-r4.ebuild diff --git a/games-emulation/gens-gs/Manifest b/games-emulation/gens-gs/Manifest deleted file mode 100644 index d7dd9654..00000000 --- a/games-emulation/gens-gs/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gens-gs-r7.tar.gz 3525070 SHA256 6320cd7bee85472891e1e29b21731d2c8180d04db67ee21256491f3f9ad145c1 SHA512 8089ec6c1753481f6c3e0721b4d94fa933ef3211e871ab45b54be58107df7c39ed32f5125b2630f46e45df9604a5291220521aace2d149b73a3932b313b4bbaa WHIRLPOOL 36917fb3ccdd926af6fe505e0d946e6271a41643c736122080b219e3cf5eb49eba8643d16595bbecda27c71c9a09eaee40bf4adec17edd196925bbceb34d2c98 diff --git a/games-emulation/gens-gs/files/amd64.patch b/games-emulation/gens-gs/files/amd64.patch deleted file mode 100644 index c70890e3..00000000 --- a/games-emulation/gens-gs/files/amd64.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ur ./gens-gs-r7/src/cbob/Makefile.am ./gens-gs-r7-amd64/src/cbob/Makefile.am ---- ./gens-gs-r7/src/cbob/Makefile.am 2009-10-12 01:08:43.000000000 +0400 -+++ ./gens-gs-r7-amd64/src/cbob/Makefile.am 2014-03-21 21:35:03.188561520 +0400 -@@ -10,7 +10,7 @@ - # cross-compiling for Win32. - # NOTE: This will only work with gcc. - cbob.o: cbob.c -- $(build_alias)-gcc -o cbob.o -c ${srcdir}/cbob.c -+ $(CC) -o cbob.o -c ${srcdir}/cbob.c - - cbob$(EXEEXT): cbob.o -- $(build_alias)-gcc -o cbob$(EXEEXT) cbob.o -+ $(CC) -o cbob$(EXEEXT) cbob.o -diff -ur ./gens-gs-r7/src/starscream/Makefile.am ./gens-gs-r7-amd64/src/starscream/Makefile.am ---- ./gens-gs-r7/src/starscream/Makefile.am 2009-11-02 03:11:43.000000000 +0300 -+++ ./gens-gs-r7-amd64/src/starscream/Makefile.am 2014-03-21 21:34:36.571017240 +0400 -@@ -17,9 +17,9 @@ - # cross-compiling for Win32. - # NOTE: This will only work with gcc. - star_m68k$(EXEEXT): -- $(build_alias)-gcc -o star_m68k$(EXEEXT) ${srcdir}/star_m68k.c -+ $(CC) -o star_m68k$(EXEEXT) ${srcdir}/star_m68k.c - star_s68k$(EXEEXT): -- $(build_alias)-gcc -o star_s68k$(EXEEXT) ${srcdir}/star_s68k.c -+ $(CC) -o star_s68k$(EXEEXT) ${srcdir}/star_s68k.c - - main68k.asm: star_m68k$(EXEEXT) - ./star_m68k$(EXEEXT) main68k.asm -hog -name main68k_ -diff -ur ./gens-gs-r7/src/starscream/Makefile.in ./gens-gs-r7-amd64/src/starscream/Makefile.in ---- ./gens-gs-r7/src/starscream/Makefile.in 2014-03-21 21:34:10.838491057 +0400 -+++ ./gens-gs-r7-amd64/src/starscream/Makefile.in 2014-03-21 21:34:36.571017240 +0400 -@@ -642,9 +642,9 @@ - # cross-compiling for Win32. - # NOTE: This will only work with gcc. - star_m68k$(EXEEXT): -- $(build_alias)-gcc -o star_m68k$(EXEEXT) ${srcdir}/star_m68k.c -+ $(CC) -o star_m68k$(EXEEXT) ${srcdir}/star_m68k.c - star_s68k$(EXEEXT): -- $(build_alias)-gcc -o star_s68k$(EXEEXT) ${srcdir}/star_s68k.c -+ $(CC) -o star_s68k$(EXEEXT) ${srcdir}/star_s68k.c - - main68k.asm: star_m68k$(EXEEXT) - ./star_m68k$(EXEEXT) main68k.asm -hog -name main68k_ -Только в ./gens-gs-r7-amd64/src/starscream: Makefile.in.orig diff --git a/games-emulation/gens-gs/files/gtk_build_fix.patch b/games-emulation/gens-gs/files/gtk_build_fix.patch deleted file mode 100644 index faa5419a..00000000 --- a/games-emulation/gens-gs/files/gtk_build_fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 7a5bac4..92a150b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -195,9 +195,6 @@ ifdef( - ) - AC_DEFINE(GENS_UI_GTK, 1, Enable the GTK+ UI) - --# TODO: Disable deprecated GTK+ features. --GTK_CFLAGS="$GTK_CFLAGS -DGTK_DISABLE_DEPRECATED -DDISABLE_DEPRECATED -DGSEAL_ENABLE" -- - #elif test x$ui = xqt4; then - # - # Qt4 diff --git a/games-emulation/gens-gs/files/libtool.patch b/games-emulation/gens-gs/files/libtool.patch deleted file mode 100644 index 088ef173..00000000 --- a/games-emulation/gens-gs/files/libtool.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -ur ./gens-gs-r7/src/gens/Makefile.unix.inc.am ./gens-gs-r7-r1/src/gens/Makefile.unix.inc.am ---- ./gens-gs-r7/src/gens/Makefile.unix.inc.am 2009-11-22 20:42:02.000000000 +0300 -+++ ./gens-gs-r7-r1/src/gens/Makefile.unix.inc.am 2014-03-22 22:33:10.758229054 +0400 -@@ -139,3 +139,5 @@ - if GENS_OPENGL - gens_LDADD += @GL_LIBS@ - endif -+ -+gens_LDADD += -ldl -lX11 diff --git a/games-emulation/gens-gs/gens-gs-7-r4.ebuild b/games-emulation/gens-gs/gens-gs-7-r4.ebuild deleted file mode 100644 index 81cc32b3..00000000 --- a/games-emulation/gens-gs/gens-gs-7-r4.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit autotools eutils flag-o-matic games - -MY_PV="r${PV}" - -DESCRIPTION="A Gens fork which aims to clean up the source code and combine features from other forks" -HOMEPAGE="http://info.sonicretro.org/Gens/GS" -SRC_URI="http://www.soniccenter.org/gerbilsoft/gens/${MY_PV}/${PN}-${MY_PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="opengl" - -RDEPEND="opengl? ( - virtual/opengl[abi_x86_32] - ) - - >=media-libs/libsdl-1.2[opengl?,abi_x86_32] - x11-libs/gtk+:2[abi_x86_32] - - !games-emulation/gens -" -DEPEND="${RDEPEND} - >=dev-lang/nasm-0.98 -" - -S="${WORKDIR}/${PN}-r${PV}" - -PATCHES=( - "${FILESDIR}/gtk_build_fix.patch" - "${FILESDIR}/amd64.patch" - "${FILESDIR}/libtool.patch" -) -DOCS=( "ChangeLog.txt" ) - -src_prepare() { - base_src_prepare - - sed -i '1i#define OF(x) x' src/extlib/minizip/ioapi.h - - append-ldflags -Wl,-z,noexecstack - eautoreconf -} - -src_configure() { - use amd64 && multilib_toolchain_setup x86 - - egamesconf \ - $(use_with opengl) \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - || die "econf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - einstalldocs - - make_desktop_entry gens "Gens/GS" "/usr/share/games/gens/gensgs_48x48.png" - prepgamesdirs -} diff --git a/profiles/desktop/package.accept_keywords b/profiles/desktop/package.accept_keywords index f606cd88..e2262ee9 100644 --- a/profiles/desktop/package.accept_keywords +++ b/profiles/desktop/package.accept_keywords @@ -32,6 +32,7 @@ app-office/libreoffice-l10n ~amd64 app-text/par ~amd64