[gentoo-commits] repo/gentoo:master commit in: games-puzzle/enigma/, games-puzzle/enigma/files/

2021-04-11 Thread David Seifert 
commit: b2a9d180b52ee4b2c0e02f4370d0f2a755af4d44
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr 11 15:49:16 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr 11 15:49:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2a9d180

games-puzzle/enigma: Run AM_PROG_AR

* Also port to EAPI 7

Closes: https://bugs.gentoo.org/779862
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 games-puzzle/enigma/enigma-1.21-r3.ebuild |  61 +---
 games-puzzle/enigma/files/enigma-1.21-build.patch | 108 --
 2 files changed, 86 insertions(+), 83 deletions(-)

diff --git a/games-puzzle/enigma/enigma-1.21-r3.ebuild 
b/games-puzzle/enigma/enigma-1.21-r3.ebuild
index bdecef93025..a073345f723 100644
--- a/games-puzzle/enigma/enigma-1.21-r3.ebuild
+++ b/games-puzzle/enigma/enigma-1.21-r3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools gnome2-utils
+EAPI=7
+
+inherit autotools xdg
 
 DESCRIPTION="Puzzle game similar to Oxyd"
 HOMEPAGE="http://www.nongnu.org/enigma/;
@@ -13,7 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-COMMON_DEPS="
+RDEPEND="
+   media-fonts/dejavu
media-libs/sdl-ttf
media-libs/libsdl[video]
media-libs/sdl-mixer
@@ -23,25 +25,22 @@ COMMON_DEPS="
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}
+   nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPS}
-   media-fonts/dejavu
-   x11-misc/xdg-utils
-"
+   virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-build.patch
+   "${FILESDIR}"/${P}-gcc6.patch
+)
 
 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
+   config_rpath_update .
 }
 
 src_configure() {
@@ -51,25 +50,15 @@ src_configure() {
 }
 
 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
+   HTML_DOCS=( doc/.  )
+   DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING )
+   default
doman doc/enigma.6
-}
-
-pkg_preinst() {
-   gnome2_icon_savelist
-}
 
-pkg_postinst() {
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   gnome2_icon_cache_update
+   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
index 6d5e91ca76e..1e9e44f9b95 100644
--- a/games-puzzle/enigma/files/enigma-1.21-build.patch
+++ b/games-puzzle/enigma/files/enigma-1.21-build.patch
@@ -1,24 +1,14 @@
-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.0 -0500
-+++ enigma-1.21/Makefile.am2015-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
+--- 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
  
--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.0 -0500
-+++ enigma-1.21/configure.ac   2015-02-06 18:20:22.282516643 -0500
-@@ -342,7 +342,6 @@
+ 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
@@ -26,9 +16,24 @@ diff -ru enigma-1.21.orig/configure.ac 
enigma-1.21/configure.ac
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.0 -0500
-+++ enigma-1.21/etc/Makefile.am

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/enigma/, games-puzzle/enigma/files/

2017-07-22 Thread Michael Palimaka 
commit: 3d36088eda7dd478b36d30344429eaa6e160ca77
Author: Peter Levine  gmail  com>
AuthorDate: Sun Jul 23 01:05:47 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jul 23 01:25:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d36088e

games-puzzle/enigma: Fix building with GCC-6

Bug: https://bugs.gentoo.org/show_bug.cgi?id=610778
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 games-puzzle/enigma/enigma-1.21-r2.ebuild|  5 +++--
 games-puzzle/enigma/files/enigma-1.21-gcc6.patch | 25 
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/games-puzzle/enigma/enigma-1.21-r2.ebuild 
b/games-puzzle/enigma/enigma-1.21-r2.ebuild
index 4a7f98d9af4..af0c5543f04 100644
--- a/games-puzzle/enigma/enigma-1.21-r2.ebuild
+++ b/games-puzzle/enigma/enigma-1.21-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -31,7 +31,8 @@ RDEPEND="${COMMON_DEPS}
 
 src_prepare() {
cp /usr/share/gettext/config.rpath .
-   epatch "${FILESDIR}"/${P}-build.patch
+   epatch "${FILESDIR}"/${P}-build.patch \
+   "${FILESDIR}"/${P}-gcc6.patch
sed -i \
-e "s:DOCDIR:\"/usr/share/doc/${P}/html\":" \
src/main.cc || die

diff --git a/games-puzzle/enigma/files/enigma-1.21-gcc6.patch 
b/games-puzzle/enigma/files/enigma-1.21-gcc6.patch
new file mode 100644
index 000..fd72dbc8906
--- /dev/null
+++ b/games-puzzle/enigma/files/enigma-1.21-gcc6.patch
@@ -0,0 +1,25 @@
+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;