gentoo resync : 17.06.2021

6 files changed, 40 insertions, 47 deletions

diff --git a/games-arcade/abe/Manifest b/games-arcade/abe/Manifest
index c38d779980d8..9b16e885abcd 100644
--- a/games-arcade/abe/Manifest
+++ b/games-arcade/abe/Manifest
@@ -1,7 +1,7 @@
-AUX abe-1.1-doublefree.patch 250 BLAKE2B 8d39ae1dd2ba1cc77f3bddc726f6811c232ee30a094531b394e54e6be96af73e280ee4934344d980a7638a545e0e1817ff7b6296f3820475e3394f2b546228eb SHA512 ca3091783c409a02a0aedf22e41829ff9198b2385cf474f9b365d4acdc2806a1ee952741816df7e658e5c48282b45d5e7577db9def01eb24448d5c579c5985ca
-AUX abe-1.1-format-security.patch 2601 BLAKE2B b918881d0de19eafca8da7a9cc47efdc52bfdc68e5f5c75591093db3045fe2bd47872b0f7e73b3c734de49e38b6d45ec9b268c60bfe14cf0690bac321469232e SHA512 9750a765fc46d70c9b322a7ddc363b4680a6f16ebc9a9ccd0c164d7cb61fa4618969db31d9fdf26d5fa993ac2a285db09a67563c5b286131981bc7f3e9a37712
-AUX abe-1.1-format.patch 506 BLAKE2B 9c91f56e58701d26b3a5809b6a764bd1acc38f4628849171f06d61e2eec1f9ffb3076f0e35c4dd26199f110c679a8c66c4a05d297a1d62d3845cb28e47ee642c SHA512 e0ddbaad3034ab28198ddf8fd7cbebc0648c1a4d30e4d597c90fe3c9327194de579da92d5acbd1a6ab99a50f11c8967f4a5cdda00776f404175f060f8e210c24
-AUX abe-1.1-settings.patch 336 BLAKE2B 093ab417049ce54d012557fd7df9dc59ebd6e6095b0983d465aba0813ae6bfbd2c1c76e5d82bd734481781289c26619ef4bd4cb3651b08655030d36adbb35e4e SHA512 a609ec800165859854a132cca4dc1a12407746b832eae2326889212bcf155076f89ceb980e9cf6c678cdd9f160368c915e617d72b7d26bde2ec7fb23a7c05218
+AUX abe-1.1-doublefree.patch 267 BLAKE2B 67b66d4bbca2cfc18630ad7bc9c456e7737a442566049e614676744d83e1fc6d0811b9adb82d9ea715ccfbb70bfadf94b3b111755083fd855dc10775f64bf4e6 SHA512 d6eb436272c3b14cdeb543ca7379c07f656478788e0cc189e31332cf077e1bc0def4efdbfff79c63b825ba32efa428d1b9bb21d14fb31b0eeec75007b004951a
+AUX abe-1.1-format-security.patch 2571 BLAKE2B b8c4ffb1db42b6f5fcf0881d3b1ebac4d35da3d9c5922964ed4cf14c34e0df2488505b2be675a6d0c96621d1abb3a31dc14652d942d3e534314ebaa80fc6bc75 SHA512 94523134c4ad3bb840d9dd8fd216e16a60912c7d82c975c860a15c8cf82a5f8c3c796863926e19b1c82eabbfb15089f2a144142c92a64d3effb768b55dd57204
+AUX abe-1.1-format.patch 539 BLAKE2B 21ca61c24861ed4daace9fa9b87eba30154e5287f0798141f3edafb0db1b5a3014c825aab225a9c146dcbbebb34baa89c660f8e11b3db4d8bdebd1d45953cfd3 SHA512 3a366be92a54b5727bae3783be38550d77efb289f39bc0bb9b6be0a8516f0e28db6b0c7aac84c9a96c3115f2d350681abab26514f9bea434a2b1d9446d1069ba
+AUX abe-1.1-settings.patch 289 BLAKE2B e4500e3a13b9f9e73f6dc27c7eae887d922dc71124bf12f934ed576a2d21cd73eb876e144f944d974a8a0422c902e0962fb58eefd71c0e388fa9fa768e109eb6 SHA512 f6feb687ab7c658dd5a084b75ff300f3ff755959cf0aee8d0859a008d37d90a82715b405fba45b5c5d8538f4df2fd0ea52c77cd2b9c7cd3b1c3774cb3b2e7aa6
 DIST abe-1.1.tar.gz 3321075 BLAKE2B 2ab51bd9103e8954bbc27eceb81b4bb845ec84ee249f21aaefdc59df87689f865d3b62a8c2db9584b8361303028174b1a96b60e0caf88ee857f8ad0d3cd3d920 SHA512 6106fce9c72554596ac3f94551326381e98c0d40f7a5aa8ae7aeadaa234c113733e8df717bd1b18d2ba835f689982e859607c9d88ab2d59790ec00833a4e48c7
-EBUILD abe-1.1-r1.ebuild 1483 BLAKE2B 03c1fcf92b858d6ea82a7c27a50be6f63c33ee516f48114cb5f3b1ceb55d0693eb962aba581536aacc70a1830cb78acb28608f47e55494fd783cec5b90810f17 SHA512 d8ed339e87e23c6eeda805b15d978988a01d1c881dd6d7de770e9e26b5cd6d352ec20a335e0a24ad06337d5d78a3dfc498c0e754d076adfe2ef59132c22b02f6
+EBUILD abe-1.1-r1.ebuild 994 BLAKE2B 7f96af52d6c9348d46e0959d83b118c6e246bf28cd12775c0716cb0acc2f5a9c874f1034cf213a2146eac24376cd77ff8b3a4b37a6ff037b03a59705566167be SHA512 53de8b68aca883f63aa756bfb4dcb87e8cdae302c7daf32ddfcc06521c2c53d58bc5185da9a2deae7bec3b75a930e68f61be499cbd647070b35f0661277a38f8
 MISC metadata.xml 326 BLAKE2B a19b06620dabc908c6b71603bf229a0bbfb5fc8cd604580394c13ddd522ef52261985942321a18b8ce643fee8ad5ff15c915aac3861264111f4dcbefe8406d56 SHA512 85695bf3253d22818b913db2dad61277afe8062258c1b5b80ab9604261304b9f5dd39a50a9565ee4361ea793eff0fa23562c4a20bb9ea63a3296514c33ec1788
diff --git a/games-arcade/abe/abe-1.1-r1.ebuild b/games-arcade/abe/abe-1.1-r1.ebuild
index 9e2dbd751738..db902811eb95 100644
--- a/games-arcade/abe/abe-1.1-r1.ebuild
+++ b/games-arcade/abe/abe-1.1-r1.ebuild
@@ -1,64 +1,50 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit desktop toolchain-funcs
 
-DESCRIPTION="A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game"
+DESCRIPTION="Scrolling, platform-jumping, key-collecting, ancient pyramid exploring game"
 HOMEPAGE="http://abe.sourceforge.net/"
 SRC_URI="mirror://sourceforge/abe/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	x11-libs/libXi
-	media-libs/sdl-mixer[vorbis]"
-RDEPEND=${DEPEND}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	unpack ./images/images.tar
-}
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer[vorbis]
+	x11-libs/libXi"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
-	# From Fedora:
-	# Enable changing the video settings.  Sent upstream 2 Apr 2006:
-	# https://sourceforge.net/p/abe/bugs/1/
 	"${FILESDIR}"/${P}-settings.patch
-
-	# Fix a double free() bug.  Sent upstream 15 Mar 2011:
-	# https://sourceforge.net/p/abe/patches/1/
 	"${FILESDIR}"/${P}-doublefree.patch
-
-	# Fix an incorrect printf format specifier.  Sent upstream 15 Mar 2011:
-	# https://sourceforge.net/p/abe/patches/2/
 	"${FILESDIR}"/${P}-format.patch
-
-	# Fix build failure with -Werror=format-security
 	"${FILESDIR}"/${P}-format-security.patch
 )
 
 src_prepare() {
 	default
-	sed -i \
-		-e "/^TR_CFLAGS/d" \
-		-e "/^TR_CXXFLAGS/d" \
-		configure || die
+
+	sed -i '/^TR_CFLAGS/d;/^TR_CXXFLAGS/d' configure || die
 }
 
 src_configure() {
-	econf --with-data-dir=/usr/share/${PN}
+	tc-export CC CXX
+
+	econf --with-data-dir="${EPREFIX}"/usr/share/${PN}
 }
 
 src_install() {
 	dobin src/abe
+
 	insinto /usr/share/${PN}
-	doins -r images sounds maps
-	newicon tom1.bmp abe.bmp
-	make_desktop_entry abe "Abe's Amazing Adventure" /usr/share/pixmaps/abe.bmp
+	doins -r images maps sounds
+
+	make_desktop_entry abe "Abe's Amazing Adventure" applications-games
+
 	einstalldocs
 }
diff --git a/games-arcade/abe/files/abe-1.1-doublefree.patch b/games-arcade/abe/files/abe-1.1-doublefree.patch
index ce7389d97100..82d49031844c 100644
--- a/games-arcade/abe/files/abe-1.1-doublefree.patch
+++ b/games-arcade/abe/files/abe-1.1-doublefree.patch
@@ -1,5 +1,7 @@
---- a/src/Main.c.orig	2005-03-05 09:20:04.000000000 -0700
-+++ b/src/Main.c	2011-03-14 10:08:31.846413904 -0600
+Fix a double free() bug.  Sent upstream 15 Mar 2011:
+https://sourceforge.net/p/abe/patches/1/
+--- a/src/Main.c
++++ b/src/Main.c
 @@ -35,8 +35,6 @@
      for(i = 0; modes[i]; ++i)
        printf("\t%d x %d\n", modes[i]->w, modes[i]->h);
diff --git a/games-arcade/abe/files/abe-1.1-format-security.patch b/games-arcade/abe/files/abe-1.1-format-security.patch
index ad88b4b60486..9f98b080f53d 100644
--- a/games-arcade/abe/files/abe-1.1-format-security.patch
+++ b/games-arcade/abe/files/abe-1.1-format-security.patch
@@ -1,5 +1,6 @@
---- ./src/Game.c.orig	2005-03-05 09:20:04.000000000 -0700
-+++ ./src/Game.c	2013-11-20 12:30:00.000000000 -0700
+Fix build failure with -Werror=format-security
+--- ./src/Game.c
++++ ./src/Game.c
 @@ -6,21 +6,14 @@ Game game;
  
  // path_sprintf should not be used by other .c files, as it does not fit for them.
diff --git a/games-arcade/abe/files/abe-1.1-format.patch b/games-arcade/abe/files/abe-1.1-format.patch
index 529534745712..eed86f83483d 100644
--- a/games-arcade/abe/files/abe-1.1-format.patch
+++ b/games-arcade/abe/files/abe-1.1-format.patch
@@ -1,5 +1,7 @@
---- a/src/MapIO.c.orig	2005-03-05 09:20:04.000000000 -0700
-+++ b/src/MapIO.c	2011-03-14 10:15:33.166949366 -0600
+Fix an incorrect printf format specifier. Sent upstream 15 Mar 2011:
+https://sourceforge.net/p/abe/patches/2/
+--- a/src/MapIO.c
++++ b/src/MapIO.c
 @@ -93,7 +93,7 @@
    // compression step 1: read compressed data from disk
    // FIXME: what would be nicer is to only allocate as much mem as used on disk.
diff --git a/games-arcade/abe/files/abe-1.1-settings.patch b/games-arcade/abe/files/abe-1.1-settings.patch
index ea5809f7386a..c0471a03388a 100644
--- a/games-arcade/abe/files/abe-1.1-settings.patch
+++ b/games-arcade/abe/files/abe-1.1-settings.patch
@@ -1,6 +1,8 @@
-diff -Naur --exclude '*.swp' abe-1.1/src/Menu.c abe-1.1.new/src/Menu.c
---- abe-1.1/src/Menu.c	2005-03-05 08:20:04.000000000 -0800
-+++ abe-1.1.new/src/Menu.c	2006-04-02 15:04:37.000000000 -0700
+From Fedora:
+Enable changing the video settings.Sent upstream 2 Apr 2006:
+https://sourceforge.net/p/abe/bugs/1/
+--- a/src/Menu.c
++++ b/src/Menu.c
 @@ -116,7 +116,7 @@
    if(n == SOUND_ENABLED || n == MUSIC_ENABLED)
      return sound_loaded;