From 38b7258d086dd5e263c3bbe3880c8c956676bc71 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 26 Jan 2018 15:48:02 +0000 Subject: gentoo resync : 25.01.2018 --- games-emulation/Manifest.gz | Bin 9983 -> 9991 bytes games-emulation/gambatte/Manifest | 2 +- .../gambatte/gambatte-0.5.0_p20131102-r1.ebuild | 76 ++++++++++++++++ .../gambatte/gambatte-0.5.0_p20131102.ebuild | 97 --------------------- games-emulation/snes9x/Manifest | 3 +- .../snes9x/files/snes9x-1.55-build-system.patch | 63 +++++++++++++ games-emulation/snes9x/snes9x-1.55.ebuild | 17 +++- 7 files changed, 155 insertions(+), 103 deletions(-) create mode 100644 games-emulation/gambatte/gambatte-0.5.0_p20131102-r1.ebuild delete mode 100644 games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild create mode 100644 games-emulation/snes9x/files/snes9x-1.55-build-system.patch (limited to 'games-emulation') diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz index bdad14cfd37f..0ebc77cae879 100644 Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ diff --git a/games-emulation/gambatte/Manifest b/games-emulation/gambatte/Manifest index 4765c5acc79e..7a0bbb560735 100644 --- a/games-emulation/gambatte/Manifest +++ b/games-emulation/gambatte/Manifest @@ -1,3 +1,3 @@ DIST gambatte-0.5.0_p20131102.tar.xz 353212 BLAKE2B ad17289f29a00230d7ccec2825d6487ed994a6148a931254a9d5c941c5dbb643c5eb4dbd9f43decfcb86fb693f82358e795a4912c4d40258b27b0d8611961ec1 SHA512 9f27af85d2fceb128231eb3e5bf2806a1773c575990296f37eb3c0a14bca5c72f7f161cdf77f710f4ff85b2b3266db9ba098e5ef6772bc5bf7b2c97b8281999b -EBUILD gambatte-0.5.0_p20131102.ebuild 2080 BLAKE2B d8938429524def3e0f8f91d2b111773c20ca8d35b10f4473890382d14c9a3a4c72a25afd07838fffdd7ecb57e5e45557932c4ab65fc0b4d617e62eec9248f7a7 SHA512 6b3e1e48fd0e3ebe413ffce22226c79a9545d2b8982c4f5a693dfceca16f0e841e12d840a0c871e870b9fcaf14d177798652caa7766b471c1fb6638044236a57 +EBUILD gambatte-0.5.0_p20131102-r1.ebuild 1671 BLAKE2B 67666777e3dac153208f18d99b2e271659f41b93192e9b332e58aa5473fecc40fc109ec485a4c52b138043de790ba6edca742598610ec18eeef0aab2db36ed89 SHA512 b05f7481fce21327aa7a596fa80351e1325a7fd45307c1b5c1e8a94ad0049b8167dfed111629db594a693aeb99b444e23c9691142bd0607feabd016cda8ac5be MISC metadata.xml 331 BLAKE2B b739e6db5361a25503fed526b7417578fff92612b1ca90c4a6e8578bd678f3b3b69736238a9ad882a654c7c9bd66b8d1ac296899129610b23ab96918067012d8 SHA512 c46ee0b944bbf88420eb47c11f60d00a6516fe2bb28b5078e8f11857636f16381969cac9edb98d554d07d0894c224817e12560410092ca532da036e697433b1a diff --git a/games-emulation/gambatte/gambatte-0.5.0_p20131102-r1.ebuild b/games-emulation/gambatte/gambatte-0.5.0_p20131102-r1.ebuild new file mode 100644 index 000000000000..5f6d72d5af7b --- /dev/null +++ b/games-emulation/gambatte/gambatte-0.5.0_p20131102-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit scons-utils games + +DESCRIPTION="An accuracy-focused Gameboy / Gameboy Color emulator" +HOMEPAGE="https://sourceforge.net/projects/gambatte" +SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + media-libs/libsdl[X,sound,joystick,video] + sys-libs/zlib" +DEPEND="${RDEPEND} + app-arch/xz-utils" + +fix_scons() { + local i + for i; do + cat >> $i << END +import os +import SCons.Util + +if os.environ.has_key('AR'): + env['AR'] = os.environ['AR'] +if os.environ.has_key('RANLIB'): + env['RANLIB'] = os.environ['RANLIB'] +if os.environ.has_key('CC'): + env['CC'] = os.environ['CC'] +if os.environ.has_key('CFLAGS'): + env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) +if os.environ.has_key('CXX'): + env['CXX'] = os.environ['CXX'] +if os.environ.has_key('CXXFLAGS'): + env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) +if os.environ.has_key('CPPFLAGS'): + env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS']) +if os.environ.has_key('LDFLAGS'): + env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) +END + done +} + +src_prepare() { + # Fix zlib/minizip build error + sed -i \ + -e '1i#define OF(x) x' \ + libgambatte/src/file/unzip/{unzip,ioapi}.h \ + || die "sed iompi.h failed" + + fix_scons {gambatte_sdl,libgambatte}/SConstruct +} + +src_compile() { + # build core library + cd "${S}"/libgambatte || die + escons + + # build sdl frontend + cd "${S}"/gambatte_sdl || die + escons +} + +src_install() { + dogamesbin gambatte_sdl/gambatte_sdl + + dodoc README changelog + + prepgamesdirs +} diff --git a/games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild b/games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild deleted file mode 100644 index 48dec7caf06e..000000000000 --- a/games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit scons-utils qt4-r2 games - -DESCRIPTION="An accuracy-focused Gameboy / Gameboy Color emulator" -HOMEPAGE="https://sourceforge.net/projects/gambatte" -SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="qt4 +sdl" -REQUIRED_USE="|| ( qt4 sdl )" - -RDEPEND=" - sys-libs/zlib - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - media-libs/alsa-lib - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXv - ) - sdl? ( media-libs/libsdl[X,sound,joystick,video] )" -DEPEND="${RDEPEND} - app-arch/xz-utils" - -fix_scons() { - local i - for i; do - cat >> $i << END -import os -import SCons.Util - -if os.environ.has_key('AR'): - env['AR'] = os.environ['AR'] -if os.environ.has_key('RANLIB'): - env['RANLIB'] = os.environ['RANLIB'] -if os.environ.has_key('CC'): - env['CC'] = os.environ['CC'] -if os.environ.has_key('CFLAGS'): - env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) -if os.environ.has_key('CXX'): - env['CXX'] = os.environ['CXX'] -if os.environ.has_key('CXXFLAGS'): - env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) -if os.environ.has_key('CPPFLAGS'): - env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS']) -if os.environ.has_key('LDFLAGS'): - env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) -END - done -} - -src_prepare() { - # Fix zlib/minizip build error - sed -i \ - -e '1i#define OF(x) x' \ - libgambatte/src/file/unzip/{unzip,ioapi}.h \ - || die "sed iompi.h failed" - - fix_scons {gambatte_sdl,libgambatte}/SConstruct -} - -src_compile() { - # build core library - cd "${S}"/libgambatte || die - escons - - # build sdl frontend - if use sdl; then - cd "${S}"/gambatte_sdl || die - escons - fi - - # build qt frontend - if use qt4; then - cd "${S}"/gambatte_qt || die - eqmake4 ${PN}_qt.pro - emake - fi -} - -src_install() { - use sdl && dogamesbin gambatte_sdl/gambatte_sdl - use qt4 && dogamesbin gambatte_qt/bin/gambatte_qt - - dodoc README changelog - - prepgamesdirs -} diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest index 028f09a313c4..97348b86c3a2 100644 --- a/games-emulation/snes9x/Manifest +++ b/games-emulation/snes9x/Manifest @@ -1,8 +1,9 @@ AUX snes9x-1.53-cross-compile.patch 892 BLAKE2B 9fb806ad16d48d5f07f1ab84feb5f7eafa52a1157eb25675650f08c8fbab8a42318d3277efbdd45f03250df2e9187c76df43312f7ffb2f226423e757b5f6e91c SHA512 4867b9a3e3f2a65684157b26e4b0b63971d37ad5abb16125567e89bc4116482488416ca51d30f639ef63886b05431c56b75978fe073a4755c48988f5ea9eaee5 AUX snes9x-1.54.1-build.patch 1525 BLAKE2B a5c3307d2dc59b57a0bc44b80c017d0096f7e3331a041cec6cf899b660886d81617ec03e36f5d64ef104a8281f2923b7236ad21c9c26ab52fcdefc9ebeeb959c SHA512 846b72f0733c13d2f7fb943f670943d20963a9f7666c016fc7e8f4e62afeb1ad479523cfc14fa93752f175b8cd44d599e300ace7a981d604b0284052d0914d12 AUX snes9x-1.54.1-system-zlib.patch 7925 BLAKE2B 231ede4d63b3de7eba6933c05b852f269e6333f1f6db1cc631e73a9bf96fad5bf63489ca6de40c23b4b4cb29feabfc2d3759435ad0c17684911b9334f3fc234e SHA512 02026d5e59f7e016583d15996694aac41fb777541dcf426c8266a9136b59c022c3f13ea211473408d01c76b040af78d70cc5bba9d94a945823674d7f68beb482 +AUX snes9x-1.55-build-system.patch 1825 BLAKE2B eb9bf6da1d9728c3bd657701d66da72caf185facbfc51030baf532f4757a8562319bf0b4daf9ac79068c63ef9d4fbb0df5681a71ea081effd826dceae6d32448 SHA512 afbd2b70eff128f89d231b7e623775746ad52d29a3f9b9a8dbbb38aff3f5ca7dbef1f938535c69ff9578a6467a25b441215dfab275dd22f2fbd5b22ebfa19731 DIST snes9x-1.54.1.tar.gz 2186737 BLAKE2B b433a167035577ab785901acb65b9df289218fa214f664494e7f0559a1a843c9211f81bfea3add73c64c6f87e974b0964a86fa43433fa1b5c6e20a724d3aa320 SHA512 2a8fddc0b9044c0b7e10711b35c06555e280c93ddde3c101c4084f859079947acb209f2632ca08937fa2ca47932094040c4a7a60b6188354fd92f72dbdf854ed DIST snes9x-1.55.tar.gz 2252841 BLAKE2B 52b2e3d5539d95df63ef6f90c974895bc3a3dbe1e89b3a9513a8504eab308d4827f116ebc13fd89ac9c01f7394067eeddf7fd6f640fd071ee8558a6a79f2b56c SHA512 61d1d6f9c1fc4fbf6253ac7a7d214c771563d7d60238197b2f1525a58f8f9011446f400767d39ec464c69d80574a7dcd78557c8f47605df992af28cb107c0f6e EBUILD snes9x-1.54.1.ebuild 2679 BLAKE2B 2fd6a90eb94a351fcba1e698bf3730cba4719156299d258f5e5eb7b320eb1ed722a8db38e9798a56768375b58dbd6e4df593983ebfabfd2fa62631da40c715be SHA512 e15f019f095854a39b237dcaf04c6e04ef71d6a1fe63c860e2c91aa3013da22813d6d35fe02f4529acf8bca7b995eb8175aae8f8948adfff1e43a92896b2d988 -EBUILD snes9x-1.55.ebuild 2542 BLAKE2B 4c06bc430cf7c25f6629c12f831dafc6dd5ec0cce555522c18c8f6de9dda8f0f15a23f6b90338f8b660d849dd3b7e328c5319ae481a7bd90220c98d095381b8a SHA512 78fd5fc48433eebec5d117702aebe04c44f433a32e1455a17ab3999b1281f1e6f983727ce8ea657caef2675b2f4b57c6b798a3db595ae86a9decf176786f3f25 +EBUILD snes9x-1.55.ebuild 2684 BLAKE2B 44e0bc96353fb4d9cce8fde00c3de7aed84a1a08eb35ef4b55d9b53fb0ce66cfa1f2b2361737147db1102ff3ff887aa840a5babed165f15838803ad67bf14d92 SHA512 ee41e0138dd5d7e42cddbd172749db696ef3f9a8628d39fa2d823418492d07debe5e9ebe4e4429fc58f3a8afadc544056d6d9f914b1a35a1ef4ba4fabd17364b MISC metadata.xml 560 BLAKE2B ed9f05b3f484347825048ae3d45e9a880e5b7405b229b7e15f350dbc43bfec51691c21e558ae87f630ed392e19ddfa5eaf3d9d15ddb551476d13d9fbf224f97b SHA512 3922d16510b8818739e582c8faf84287dc265f810df5957dc923efab912e20f95b7fb9fc84023d481b44ce6c653f2bc00e83d6a150d9294feeb60dc8c3a2eeca diff --git a/games-emulation/snes9x/files/snes9x-1.55-build-system.patch b/games-emulation/snes9x/files/snes9x-1.55-build-system.patch new file mode 100644 index 000000000000..30811ef421e0 --- /dev/null +++ b/games-emulation/snes9x/files/snes9x-1.55-build-system.patch @@ -0,0 +1,63 @@ +--- a/gtk/configure.ac ++++ b/gtk/configure.ac +@@ -33,7 +33,7 @@ + + AM_GLIB_GNU_GETTEXT + +-snes9xlocaledir='${prefix}/${DATADIRNAME}/locale' ++snes9xlocaledir='$(localedir)' + AC_SUBST(snes9xlocaledir) + + AC_ARG_WITH(debug, +--- a/unix/configure.ac ++++ b/unix/configure.ac +@@ -56,49 +56,6 @@ + # *** Execution begins here *** + # ***************************** + +-# Remove -g and -O2 flags manually. +- +-if test "x$CFLAGS" != "x"; then +- CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`" +- CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`" +-fi +- +-if test "x$CXXFLAGS" != "x"; then +- CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`" +- CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`" +-fi +- +-# Test what compiler flags we should use. +- +-AC_ARG_ENABLE([debug], +- [AS_HELP_STRING([--enable-debug], +- [leave debug information in the final binary (default: no)])], +- [], [enable_debug="no"]) +- +-if test "x$enable_debug" = "xyes"; then +- AC_S9X_COMPILER_FLAG([-g], [g]) +- AC_S9X_COMPILER_FLAG([-O0], [o0]) +-else +- AC_S9X_COMPILER_FLAG([-O3], [o3], [ +- AC_S9X_COMPILER_FLAG([-O2], [o2], [ +- AC_S9X_COMPILER_FLAG([-O1], [o1])])]) +- AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer]) +-fi +- +-AC_ARG_ENABLE([mtune], +- [AS_HELP_STRING([--enable-mtune], +- [use the specified value for the -mtune/-mcpu flag (default: no)])], +- [], [enable_mtune="no"]) +- +-if test "x$enable_mtune" != "xno"; then +- AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune], +- [ +- AC_MSG_WARN([-mtune failed, trying -mcpu...]) +- AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu], +- [AC_MSG_ERROR([Please specify a working value for --enable-mtune.])]) +- ]) +-fi +- + AC_S9X_COMPILER_FLAG([-fno-exceptions], [no_exceptions]) + AC_S9X_COMPILER_FLAG([-fno-rtti], [no_rtti]) + AC_S9X_COMPILER_FLAG([-pedantic], [pedantic]) diff --git a/games-emulation/snes9x/snes9x-1.55.ebuild b/games-emulation/snes9x/snes9x-1.55.ebuild index cf70b572d8cf..f95ee81863fb 100644 --- a/games-emulation/snes9x/snes9x-1.55.ebuild +++ b/games-emulation/snes9x/snes9x-1.55.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit autotools flag-o-matic gnome2-utils +inherit autotools flag-o-matic gnome2-utils xdg-utils DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator" HOMEPAGE="https://github.com/snes9xgit/snes9x" @@ -40,7 +40,10 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${P}/unix" -PATCHES=( "${FILESDIR}"/${PN}-1.53-cross-compile.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-1.53-cross-compile.patch + "${FILESDIR}"/${PN}-1.55-build-system.patch +) src_prepare() { cd "${WORKDIR}"/${P} || die @@ -110,9 +113,15 @@ pkg_preinst() { } pkg_postinst() { - use gtk && gnome2_icon_cache_update + if use gtk ; then + gnome2_icon_cache_update + xdg_desktop_database_update + fi } pkg_postrm() { - use gtk && gnome2_icon_cache_update + if use gtk ; then + gnome2_icon_cache_update + xdg_desktop_database_update + fi } -- cgit v1.2.3