gentoo resync : 28.04.2021

3 files changed, 113 insertions, 85 deletions

diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest
index 95e29c1ff023..295dfc52a94e 100644
--- a/games-puzzle/enigma/Manifest
+++ b/games-puzzle/enigma/Manifest
@@ -1,5 +1,5 @@
-AUX enigma-1.21-build.patch 3543 BLAKE2B bb4cd5fc8105b15cf913e8a5f6baeb58cba93965a422a7bd514fc4eea848f73f65853595da023e3458a48f861d7a42f1300dfd90418600f4432c327114ab4f17 SHA512 accfb31abaadbee476961f38cc2f76a1fceac4befbf4721d4e08061a3509d05f2e534b4f8f69f1765e082a4ed4f70ccbba0c73c4479a49ee1cfde4c1ae1cdcc4
+AUX enigma-1.21-build.patch 3720 BLAKE2B 508ed523ac95a0cb2c111ff518cd2c2ca51891c3f841b9bca1c7e8efefaa673a51a6074e6cfdc38d144475628c20b881b8f3f4bc25ca06285501549f9143e9bd SHA512 6fd279e38f3793fa73543cf5b7b6ead34c429eac620b5e5c4b33616bfd12913993e8e6eac22d93fb2d1f18507c810dcd026281f3cb9f0a4f2bfcddb7a3b813b9
 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
+EBUILD enigma-1.21-r3.ebuild 1244 BLAKE2B a4583aa421ae6aa3fb5ca337434234a8b4e216c5a814f65a3597554fdd103966185b6368c0a2a930aaccd6e694b0d201e49c0f49ae31eb496471de4639c34585 SHA512 afbaa15e0aa927ebf92bb6c9a1ec956b7bea9fe8432fc8b3ab110c03bb38540cc98a38bd4530b7f894a778be40dd7918bda6e7942195670a8931e847f423fe7c
 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
index bdecef930251..a073345f7235 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 6d5e91ca76e4..421ac8b7ae75 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.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
+--- 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.000000000 -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,49 @@ 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.000000000 -0500
-+++ enigma-1.21/etc/Makefile.am	2015-02-06 18:25:44.131945494 -0500
+@@ -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
@@ -52,26 +82,34 @@ diff -ru enigma-1.21.orig/etc/Makefile.am enigma-1.21/etc/Makefile.am
  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;
+--- 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
  
-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
+ 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@
@@ -87,14 +125,15 @@ diff -ru enigma-1.21.orig/po/Makefile.in.in enigma-1.21/po/Makefile.in.in
  #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 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -11,8 +11,8 @@
+ 
  CXXFLAGS = @CXXFLAGS@\
  	-DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
- 	-DDOCDIR=\"$(docdir)\" \
+-	-DDOCDIR=\"$(docdir)\" \
 -	-DLOCALEDIR=\"$(localedir_enigma)\" \
++	-DDOCDIR=\"$(htmldir)\" \
 +	-DLOCALEDIR=\"/usr/share/locale\" \
  	-I$(top_srcdir)/lib-src/zipios++  \
  	-I$(top_builddir)/lib-src/zipios++ \