commit: e97b29e92bb3bf437205bf3de5a8196d7c71b737 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat Jun 7 22:04:23 2025 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat Jun 7 22:04:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e97b29e9
games-puzzle/enigma: Drop old 1.21-r3 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> games-puzzle/enigma/Manifest | 1 - games-puzzle/enigma/enigma-1.21-r3.ebuild | 64 ---------- games-puzzle/enigma/files/enigma-1.21-build.patch | 149 ---------------------- games-puzzle/enigma/files/enigma-1.21-gcc6.patch | 25 ---- 4 files changed, 239 deletions(-) diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest index d765365cca8b..4f6c734ba026 100644 --- a/games-puzzle/enigma/Manifest +++ b/games-puzzle/enigma/Manifest @@ -1,2 +1 @@ DIST Enigma-1.30-src.tar.gz 43653520 BLAKE2B 28486f51fcec7f41212e06f192acd346f7a5eef74b941685cc27314ef9d68d8ffc35d4f438ac0fc9b4464e13ad8ecb04a0bf7042a8c06bf4f7b9adfe34e53ad8 SHA512 57c6d642538b7bce6a748e1e1bce641dcc1dcd627a4e2c4dfe5d1271bf9df624075914c04fc6cddc1b1118585e4f111d79c8c8a54a1a6b93a8bedfb1aa9f2ef6 -DIST enigma-1.21.tar.gz 56409951 BLAKE2B c03cf3c66cb1df771671c6c92d5a64e66ab78c2abbf25008285dedb5db10fb1c8daf2053c15a09147e00f0a22a7882e47b1c6ed66588b2397deec084456af1b9 SHA512 0cca56a193f0f416e0fde02caf2e30b61eef506b6c62e151ff575f5c130f1e2e778d77149007b114ebaeec3a3e793434328555cb5190954a0ae13ed6cee229f0 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 c5087bd921fd..000000000000 --- a/games-puzzle/enigma/enigma-1.21-r3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools xdg - -DESCRIPTION="Puzzle game similar to Oxyd" -HOMEPAGE="http://www.nongnu.org/enigma/"; -SRC_URI="https://downloads.sourceforge.net/enigma-game/${P}.tar.gz"; - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls" - -RDEPEND=" - media-fonts/dejavu - 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="${RDEPEND}" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-build.patch - "${FILESDIR}"/${P}-gcc6.patch -) - -src_prepare() { - default - - eautoreconf - config_rpath_update . -} - -src_configure() { - econf \ - --with-system-enet \ - $(use_enable nls) -} - -src_install() { - HTML_DOCS=( doc/. ) - DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING ) - default - doman doc/enigma.6 - - dosym \ - ../../fonts/dejavu/DejaVuSansCondensed.ttf \ - /usr/share/enigma/fonts/DejaVuSansCondensed.ttf - dosym \ - ../../fonts/dejavu/DejaVuSans.ttf \ - /usr/share/enigma/fonts/vera_sans.ttf -} 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 421ac8b7ae75..000000000000 --- a/games-puzzle/enigma/files/enigma-1.21-build.patch +++ /dev/null @@ -1,149 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -67,6 +67,7 @@ - AC_PROG_CXX - AC_PROG_CPP - AC_PROG_RANLIB -+AM_PROG_AR - PKG_PROG_PKG_CONFIG - - dnl do not add the AC_PROG_CXX default CXXFLAGS -@@ -342,7 +343,6 @@ - CXXFLAGS="$CXXFLAGS -O2 -ffast-math -fomit-frame-pointer" - AC_MSG_RESULT(yes) - else -- CXXFLAGS="$CXXFLAGS -g" - AC_MSG_RESULT(no) - fi - -@@ -421,14 +421,17 @@ - dnl ---------------------------------------------------------- - - AC_MSG_CHECKING(whether to use system enet) --AC_ARG_WITH(system-enet, -- AS_HELP_STRING(--with-system-enet, Use system enet), system_enet=$withval, -- system_enet=no --) -+AC_ARG_WITH([system-enet], [ -+ AS_HELP_STRING([--with-system-enet], [Use system enet])], [ -+ system_enet=$withval], [ -+ system_enet=no]) -+AC_MSG_RESULT([${system_enet}]) -+ - AM_CONDITIONAL([SYSTEM_ENET], [test "x$system_enet" = xyes]) --AM_COND_IF([SYSTEM_ENET], -- PKG_CHECK_MODULES(LIBENET, [libenet], ,AC_MSG_ERROR([libenet not found!])), -- AC_CONFIG_SUBDIRS([lib-src/enet])) -+AM_COND_IF([SYSTEM_ENET], [ -+ PKG_CHECK_MODULES([LIBENET], [libenet])], [ -+ AC_CONFIG_SUBDIRS([lib-src/enet]) -+]) - - - ---- a/etc/enigma.desktop -+++ b/etc/enigma.desktop -@@ -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; - ---- a/etc/Makefile.am -+++ b/etc/Makefile.am -@@ -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 - ---- a/lib-src/zipios++/configure.ac -+++ b/lib-src/zipios++/configure.ac -@@ -37,6 +37,7 @@ - AC_PROG_CPP - AC_PROG_INSTALL - AC_PROG_RANLIB -+AM_PROG_AR - - dnl Checks for libraries. - AC_CHECK_LIB(z, inflate, [cv_libz=yes], [cv_libz=no]) ---- a/Makefile.am -+++ b/Makefile.am -@@ -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 ---- a/po/Makefile.in.in -+++ b/po/Makefile.in.in -@@ -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) - ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -11,8 +11,8 @@ - - CXXFLAGS = @CXXFLAGS@\ - -DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \ -- -DDOCDIR=\"$(docdir)\" \ -- -DLOCALEDIR=\"$(localedir_enigma)\" \ -+ -DDOCDIR=\"$(htmldir)\" \ -+ -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 <[email protected]> -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<char> ifs(absExtPath.c_str(), ios::binary | ios::in); -- if (ifs != NULL) -+ if (ifs) - Readfile(ifs, extCode); - else - haveLocalCopy = false;
