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-puzzle/enigma/Manifest | 5 - games-puzzle/enigma/enigma-1.21-r3.ebuild | 75 --------------- games-puzzle/enigma/files/enigma-1.21-build.patch | 110 ---------------------- games-puzzle/enigma/files/enigma-1.21-gcc6.patch | 25 ----- games-puzzle/enigma/metadata.xml | 11 --- 5 files changed, 226 deletions(-) delete mode 100644 games-puzzle/enigma/Manifest delete mode 100644 games-puzzle/enigma/enigma-1.21-r3.ebuild delete mode 100644 games-puzzle/enigma/files/enigma-1.21-build.patch delete mode 100644 games-puzzle/enigma/files/enigma-1.21-gcc6.patch delete mode 100644 games-puzzle/enigma/metadata.xml (limited to 'games-puzzle/enigma') diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest deleted file mode 100644 index 95e29c1ff023..000000000000 --- a/games-puzzle/enigma/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX enigma-1.21-build.patch 3543 BLAKE2B bb4cd5fc8105b15cf913e8a5f6baeb58cba93965a422a7bd514fc4eea848f73f65853595da023e3458a48f861d7a42f1300dfd90418600f4432c327114ab4f17 SHA512 accfb31abaadbee476961f38cc2f76a1fceac4befbf4721d4e08061a3509d05f2e534b4f8f69f1765e082a4ed4f70ccbba0c73c4479a49ee1cfde4c1ae1cdcc4 -AUX enigma-1.21-gcc6.patch 927 BLAKE2B 279415c5cf96e9f4db37b29b4555fe2d66ce82c3c04199281c175176bab812351a342633888c524558d4f9362ccd1b1602fd7fc100e062e45bbac85fe966e06f SHA512 d0eb1f356370431e3b3b96c7fa3a56ca52ed15fa94286d1b5075ba8a4b4b349deb676479bd8e045a7463f65a3885c44aab90166549850e19c510d606aed2e746 -DIST enigma-1.21.tar.gz 56409951 BLAKE2B c03cf3c66cb1df771671c6c92d5a64e66ab78c2abbf25008285dedb5db10fb1c8daf2053c15a09147e00f0a22a7882e47b1c6ed66588b2397deec084456af1b9 SHA512 0cca56a193f0f416e0fde02caf2e30b61eef506b6c62e151ff575f5c130f1e2e778d77149007b114ebaeec3a3e793434328555cb5190954a0ae13ed6cee229f0 -EBUILD enigma-1.21-r3.ebuild 1503 BLAKE2B 3e1a2bc825ed265e7cb362c9d42b73e01157123c48552406ed6ce52844759189292da998da668c6791f96eb18900d40f26aad125ec482a0a100e79e44ab352ed SHA512 052f053424ddafe241002e78a8107eafe412048113bd0d97f8ca0351d7fb3fd0fb30d021ec2b76ebc57ec9ed1a176559128afdfd517d59c95f25c3ebf1010ae2 -MISC metadata.xml 334 BLAKE2B 8e61a1119a930895b0773b8865550fde4bf532532ea4e904d537a6f4f93a27580841d121ff246bc4f9f60849a2224bedaf91bcb2e8ce3aa0b2a6ebee51dff1a8 SHA512 885fc4263252767f8861f2d45dc11a319cb5b0a7a9eccdf073a0433ba4908d97f7a590a96ae542372e53f16780a41cee4ee80556c0cedffbf34f6e4bcadeacc6 diff --git a/games-puzzle/enigma/enigma-1.21-r3.ebuild b/games-puzzle/enigma/enigma-1.21-r3.ebuild deleted file mode 100644 index bdecef930251..000000000000 --- a/games-puzzle/enigma/enigma-1.21-r3.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools gnome2-utils - -DESCRIPTION="Puzzle game similar to Oxyd" -HOMEPAGE="http://www.nongnu.org/enigma/" -SRC_URI="mirror://sourceforge/enigma-game/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls" - -COMMON_DEPS=" - media-libs/sdl-ttf - media-libs/libsdl[video] - media-libs/sdl-mixer - media-libs/sdl-image[jpeg,png] - media-libs/libpng:0= - sys-libs/zlib - net-misc/curl - || ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] ) - net-libs/enet:= - nls? ( virtual/libintl ) -" -DEPEND="${COMMON_DEPS} - sys-devel/gettext -" -RDEPEND="${COMMON_DEPS} - media-fonts/dejavu - x11-misc/xdg-utils -" - -src_prepare() { - default - cp /usr/share/gettext/config.rpath . - eapply "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${P}-gcc6.patch - sed -i \ - -e "s:DOCDIR:\"/usr/share/doc/${P}/html\":" \ - src/main.cc || die - eautoreconf -} - -src_configure() { - econf \ - --with-system-enet \ - $(use_enable nls) -} - -src_install() { - HTML_DOCS="doc/*" DOCS="ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING" \ - default - dosym \ - /usr/share/fonts/dejavu/DejaVuSansCondensed.ttf \ - /usr/share/${PN}/fonts/DejaVuSansCondensed.ttf - dosym \ - /usr/share/fonts/dejavu/DejaVuSans.ttf \ - /usr/share/${PN}/fonts/vera_sans.ttf - doman doc/enigma.6 -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-puzzle/enigma/files/enigma-1.21-build.patch b/games-puzzle/enigma/files/enigma-1.21-build.patch deleted file mode 100644 index 6d5e91ca76e4..000000000000 --- a/games-puzzle/enigma/files/enigma-1.21-build.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -ru enigma-1.21.orig/Makefile.am enigma-1.21/Makefile.am ---- enigma-1.21.orig/Makefile.am 2014-12-19 16:26:06.000000000 -0500 -+++ enigma-1.21/Makefile.am 2015-02-06 18:20:22.239518323 -0500 -@@ -3,12 +3,9 @@ - # tools -> lib-src/lua - # src -> tools, lib-src - # --SUBDIRS = m4 lib-src tools intl src data doc po etc -+SUBDIRS = m4 lib-src tools intl src data po etc - EXTRA_DIST = enigma CHANGES ACKNOWLEDGEMENTS - --docdir = @datadir@/doc/enigma --doc_DATA = README CHANGES COPYING ACKNOWLEDGEMENTS -- - ACLOCAL_AMFLAGS = -I m4 - - .PHONY: tolua -diff -ru enigma-1.21.orig/configure.ac enigma-1.21/configure.ac ---- enigma-1.21.orig/configure.ac 2014-12-19 16:26:06.000000000 -0500 -+++ enigma-1.21/configure.ac 2015-02-06 18:20:22.282516643 -0500 -@@ -342,7 +342,6 @@ - CXXFLAGS="$CXXFLAGS -O2 -ffast-math -fomit-frame-pointer" - AC_MSG_RESULT(yes) - else -- CXXFLAGS="$CXXFLAGS -g" - AC_MSG_RESULT(no) - fi - -diff -ru enigma-1.21.orig/etc/Makefile.am enigma-1.21/etc/Makefile.am ---- enigma-1.21.orig/etc/Makefile.am 2014-12-19 16:26:05.000000000 -0500 -+++ enigma-1.21/etc/Makefile.am 2015-02-06 18:25:44.131945494 -0500 -@@ -1,18 +1,18 @@ - # if !MINGW32 - # Comply with xdg icon theme specification --icondir = $(prefix)/share/icons/hicolor/48x48/apps -+icondir = /usr/share/icons/hicolor/48x48/apps - icon_DATA = enigma.png - - # Backwards-compatible global search location for images --pixmapdir = $(prefix)/share/pixmaps -+pixmapdir = /usr/share/pixmaps - pixmap_DATA = enigma.png - - # Install .desktop file in xdg standard location --desktopdir = $(prefix)/share/applications -+desktopdir = /usr/share/applications - desktop_DATA = enigma.desktop - - # Install AppData file --appdatadir = $(prefix)/share/appdata -+appdatadir = /usr/share/appdata - dist_appdata_DATA = enigma.appdata.xml - # endif !MINGW32 - -diff -ru enigma-1.21.orig/etc/enigma.desktop enigma-1.21/etc/enigma.desktop ---- enigma-1.21.orig/etc/enigma.desktop 2014-12-19 16:26:05.000000000 -0500 -+++ enigma-1.21/etc/enigma.desktop 2015-02-06 18:20:22.282516643 -0500 -@@ -1,5 +1,5 @@ - [Desktop Entry] --Version=1.21 -+Version=1.0 - Name=Enigma - Name[be]=Enigma - Name[cs]=Enigma -@@ -44,5 +44,5 @@ - StartupNotify=false - Icon=enigma - Type=Application --Categories=Application;Game;PuzzleGame; -+Categories=Game;X-PuzzleGame; - -diff -ru enigma-1.21.orig/po/Makefile.in.in enigma-1.21/po/Makefile.in.in ---- enigma-1.21.orig/po/Makefile.in.in 2014-12-19 16:26:06.000000000 -0500 -+++ enigma-1.21/po/Makefile.in.in 2015-02-06 18:20:22.283516604 -0500 -@@ -25,12 +25,12 @@ - exec_prefix = @exec_prefix@ - datarootdir = @datarootdir@ - datadir = @datadir@ --localedir = $(datadir)/locale -+localedir = /usr/share/locale - gettextsrcdir = $(datadir)/gettext/po - - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ --MKINSTALLDIRS = @MKINSTALLDIRS@ -+MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs - #install_sh@ -d - mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) - -diff -ru enigma-1.21.orig/src/Makefile.am enigma-1.21/src/Makefile.am ---- enigma-1.21.orig/src/Makefile.am 2014-12-19 16:24:38.000000000 -0500 -+++ enigma-1.21/src/Makefile.am 2015-02-06 18:20:22.283516604 -0500 -@@ -12,7 +12,7 @@ - CXXFLAGS = @CXXFLAGS@\ - -DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \ - -DDOCDIR=\"$(docdir)\" \ -- -DLOCALEDIR=\"$(localedir_enigma)\" \ -+ -DLOCALEDIR=\"/usr/share/locale\" \ - -I$(top_srcdir)/lib-src/zipios++ \ - -I$(top_builddir)/lib-src/zipios++ \ - -I$(top_srcdir)/lib-src/lua \ -@@ -440,7 +440,7 @@ - - else # not MINGW32 - -- localedir_enigma := $(datadir)/locale -+ localedir_enigma := /usr/share/locale - mingw_ldadd = - - endif diff --git a/games-puzzle/enigma/files/enigma-1.21-gcc6.patch b/games-puzzle/enigma/files/enigma-1.21-gcc6.patch deleted file mode 100644 index fd72dbc89065..000000000000 --- a/games-puzzle/enigma/files/enigma-1.21-gcc6.patch +++ /dev/null @@ -1,25 +0,0 @@ -Bug: https://bugs.gentoo.org/610778 - -From e0f31f63ba4252ced7128d3ceec2bc668e8681f4 Mon Sep 17 00:00:00 2001 -From: Legimet -Date: Sat, 13 Aug 2016 23:41:27 -0400 -Subject: [PATCH] Fix build error with GCC 6, caused by comparing - basic_ifstream to NULL - ---- - src/lev/Proxy.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lev/Proxy.cc b/src/lev/Proxy.cc -index 6d58c0ba..69f54a20 100644 ---- a/src/lev/Proxy.cc -+++ b/src/lev/Proxy.cc -@@ -933,7 +933,7 @@ namespace enigma { namespace lev { - } else if (haveLocalCopy) { - // plain file - basic_ifstream ifs(absExtPath.c_str(), ios::binary | ios::in); -- if (ifs != NULL) -+ if (ifs) - Readfile(ifs, extCode); - else - haveLocalCopy = false; diff --git a/games-puzzle/enigma/metadata.xml b/games-puzzle/enigma/metadata.xml deleted file mode 100644 index 31c04074be24..000000000000 --- a/games-puzzle/enigma/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - - enigma-game - - -- cgit v1.2.3