gentoo resync : 25.11.2020

3 files changed, 55 insertions, 16 deletions

diff --git a/games-rpg/wastesedge/Manifest b/games-rpg/wastesedge/Manifest
index 72317d4f1f11..f86c39503d05 100644
--- a/games-rpg/wastesedge/Manifest
+++ b/games-rpg/wastesedge/Manifest
@@ -1,3 +1,4 @@
-DIST wastesedge-src-0.3.5.tar.gz 10749912 BLAKE2B ec4cd1135cd09c92937c8749905872b635e72575662bb7c1e188281e47ec0a285045aced378659fed20942c4bc7e67f11fa95e1cf0fe220c0be0f3b6527aa754 SHA512 d4c77eb1bde2c28002e4f56a6bfa5f816ea53de7061b5e60635f15c670ff45c3a18e3316b92007f74033a62538503f14b67e1175cf22c718c22ca1021dc7af3b
-EBUILD wastesedge-0.3.5-r2.ebuild 937 BLAKE2B 3c4806fb544b7c9ee8abb65c25956af20beed59a9d9e3d3b1b29afe946f3648b26425306a4ff9378a00f69db8591ebe6ad0b70b2a901c506d315c23aedaab478 SHA512 9c75eb782246696718968d431e4be17ab15b7d96f5a5a6f8224029a74bc31579803aee0f0eea53519b9243e9f316c04a513efbc0cd1af069141f9109cd58f93b
+AUX wastesedge-0.3.8_version-handling.patch 1136 BLAKE2B f3278c8d1fb37b662d5b8d4fd0235968642c003af868029bb3b62c7c399505301860f9b2ad17642f547de9fecb73a81cbd6df7ea804c0647d2622c2ca2c5569b SHA512 5df47cfb2a91a848a244fa0cea7c6ca58afde75737d974bdfd452cf02541d766385885be5d7b3889667a481894758361bc66cd778794224b09035e83ac3e011a
+DIST wastesedge-src-0.3.8.tar.gz 20779629 BLAKE2B 40a63298ea9b704407fcac244f22a3e26190fec37cb0dae0e18e55478d866a215a6be6e1bd08ef2d303894aca2edd09e7b299ae9c2da21d999f47c6d799fde83 SHA512 410e01d803b6ff72c4c0d8f035c5e3228c2311bc200359ecb748be63474ae0afb8609cc9daed940670d02190fa3c047ea2a2cd116b7680398cdcc7523a64c386
+EBUILD wastesedge-0.3.8.ebuild 866 BLAKE2B 1a3d8b5d7b3b84555ce361ef95d246a8b3aaff8297db847cbad0e1769036db5e4bc445b540206eaa4195aca386febf6adaeb303da41f821ee4c0cc0a98a9a2e5 SHA512 91186ea598dad6fd642470338b1ef03a937fababa41e2cd7c7bbc453b4a93716a23b77a37b416b723ef89751731f05aa5d69dfa1bd4ce7a77d1ca33416af1401
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/wastesedge/files/wastesedge-0.3.8_version-handling.patch b/games-rpg/wastesedge/files/wastesedge-0.3.8_version-handling.patch
new file mode 100644
index 000000000000..33f3eedad1e5
--- /dev/null
+++ b/games-rpg/wastesedge/files/wastesedge-0.3.8_version-handling.patch
@@ -0,0 +1,35 @@
+From b3987b74cc6ff89187b95c692a4aacc13db98564 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Wed, 9 Sep 2020 20:01:41 +0300
+Subject: [PATCH] Rework adonthell version handling
+
+---
+ configure.ac | 11 +++--------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 76d87bd..fff8268 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,15 +46,10 @@ fi
+ 
+ dnl Checking for the proper version
+ AC_MSG_CHECKING(for Adonthell's version)
+-$adonthell_binary -v &> adonthell.ver
+ 
+-changequote(<<, >>)
+-adonthell_major_ver=`sed 's/\([0-9]*\)\.[0-9]*\.[0-9]*/\1/p; d' adonthell.ver`
+-adonthell_minor_ver=`sed 's/[0-9]*\.\([0-9]*\)\.[0-9]*/\1/p; d' adonthell.ver`
+-adonthell_micro_ver=`sed 's/[0-9]*\.[0-9]*\.\([0-9]*\)/\1/p; d' adonthell.ver` 
+-changequote([, ])
+-
+-rm -f adonthell.ver
++adonthell_major_ver=$($adonthell_binary -v | cut -d'.' -f1)
++adonthell_minor_ver=$($adonthell_binary -v | cut -d'.' -f2)
++adonthell_micro_ver=$($adonthell_binary -v | cut -d'.' -f3)
+ 
+ adonthellver="$adonthell_major_ver.$adonthell_minor_ver.$adonthell_micro_ver"
+ 
+-- 
+2.26.2
+
diff --git a/games-rpg/wastesedge/wastesedge-0.3.5-r2.ebuild b/games-rpg/wastesedge/wastesedge-0.3.8.ebuild
index 1e576c82d444..1138036c0acd 100644
--- a/games-rpg/wastesedge/wastesedge-0.3.5-r2.ebuild
+++ b/games-rpg/wastesedge/wastesedge-0.3.8.ebuild
@@ -1,35 +1,38 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1
+EAPI=7
 
-DESCRIPTION="role playing game to showcase the adonthell engine"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools python-single-r1 xdg
+
+DESCRIPTION="Role playing game to showcase the adonthell engine"
 HOMEPAGE="http://adonthell.nongnu.org/download/"
 SRC_URI="https://savannah.nongnu.org/download/adonthell/${PN}-src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+
 IUSE="nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="userpriv"
 
 RDEPEND="${PYTHON_DEPS}
-	>=games-rpg/adonthell-0.3.5-r2[${PYTHON_SINGLE_USEDEP}]
+	>=games-rpg/adonthell-0.3.8[${PYTHON_SINGLE_USEDEP}]
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}/${P}_version-handling.patch" )
+DOCS=( AUTHORS ChangeLog NEWS PLAYING README )
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf \
 		$(use_enable nls) \
 		--with-adonthell-binary="/usr/bin/adonthell"
 }
-
-src_install() {
-	emake DESTDIR="${D}" pixmapdir=/usr/share/pixmaps install
-	dodoc AUTHORS ChangeLog NEWS PLAYING README
-	make_desktop_entry adonthell-wastesedge "Waste's Edge" wastesedge_32x32
-}