gentoo resync : 28.04.2021

5 files changed, 100 insertions, 80 deletions

diff --git a/games-puzzle/xlogical/Manifest b/games-puzzle/xlogical/Manifest
index fdf7fe03ce5a..dbc9cc26265d 100644
--- a/games-puzzle/xlogical/Manifest
+++ b/games-puzzle/xlogical/Manifest
@@ -1,6 +1,6 @@
-AUX xlogical-1.0.7-gcc41.patch 1121 BLAKE2B 6e1f94c128cfc771deca86da18eb924e11b611e54c4150ed39cb53aeda46257de21ff6bdfd9d1688dd6aa559900089d457107ea78eb347466792c353aacbb602 SHA512 eb98b351ae14f9c3f4f5783ef48633957c21ddb3debd7ba00e9c651be395cb11a30b6109bd26fef12845111ff320c71ef2b43bee6ec1b8748ac6ac34dd8cb87b
-AUX xlogical-1.0.7-gcc43.patch 915 BLAKE2B c99de173bbd18bec630a8c3605ad77a6d56d3e4a4bb44fab011bb6f10a6140a4d843c7768557728deddb1edddbc6abc66445f1797bf8ca5d6b108f29598374ad SHA512 59cc10ec999aff4c8f5630e534ea834ff9a8b2d27e45752abdc46df812841e40de27ca406a45278f28a3a609c021c7753a6980edfaffd3c79b1bb7cf97336209
+AUX xlogical-1.0.7-gcc41.patch 833 BLAKE2B 6a43b04affe9cc4cd9456d52b369636b68276e86a31644edec85aefb2771d6fed90108da86f2f9759329c77a53e2176979fad353c929ad7f99e30bfa5ba10f27 SHA512 aeb239382a019a7fd186030543231c29b260af3faeeda67da72a56b8a778ba5f70b16b6e1dbd3c04c1251816b91aae9c23d39dc877fd63e7ae7032431c02533d
+AUX xlogical-1.0.7-gcc43.patch 935 BLAKE2B cea7455abc9c6c953c179984b43b124157320c7dc3e5b891940811bc5b3732acb592b914e64bedb2a93f8bce73f381cfecd8eb927bf2b88d18ea2dc698085fa2 SHA512 4a1c4e259cc798a5debe917ea4981f36f04d073ce33ed317008318a891fa5d68938e4b63e8c3166f31132251f2ed2696e46eb0799afbd808eace68c2895c0f96
 DIST xlogical-1.0-7.tar.bz2 1853575 BLAKE2B 6f78f92a14313cf65f171b99c28a4377f7685bf73705a91b92fcf370ad1f3555b7aefe99e6004aa32c62cf8b71f2d754d64acadf3bda345cc8cf3e3f91647d02 SHA512 b47aadff91a7d3057fe8657bdda5c16a910f84f6d324bee82f1beba55de7faf6a599231c8d53ed68cc30f9edfe18f57f31dfc9fe06b8e03fa6120905f37c290d
 DIST xlogical_gfx.zip 347801 BLAKE2B b9c2f963e8ddc5af9fcd7adac691a71c6ee12bc3b3164ce243d076f85c36044b4aa523d27c5dd1480388ff97356ddabd3c7f2c4d223aeeff1a8660fc7c595995 SHA512 14322ae1c8fb7f50513ef47e05372c5dc1ec1b658b33c53477e6b05bbee1de0250b21127891f205d16adc386e7ce37c4b834a62794ee105754b97e49eb5d2a42
-EBUILD xlogical-1.0.7.ebuild 1457 BLAKE2B 4f75e49392f776a0ca3ce61afcb297b691b75c3c0710b383400a89ea9b5097c5f0a50a1a05e2af5fc1596feae04579d40bfd261c1c414a1d0438c6ebd34246e4 SHA512 111648c8337edf96cfa5331185d2d48f7ba06ce28bdaca43a62f2c4fc5d81c14c326d9dee2b35393ed46a0a508d367738293b6d7542160694c18c868f68f1205
+EBUILD xlogical-1.0.7-r1.ebuild 1644 BLAKE2B 8e43a6cea8ade6ade4ee77a612e9df5c88856e69a4861833dad50ce9c1c3f0283841be9e3a83b711101aed79c2ed17805f9cb1d0561f572105dee460767cf6f5 SHA512 9b9e27d903513c632542dd5dffd8bfc416ea319688999b7f47a8a571be7363e375737b79cdcd618bcaca1c46a9c247c4b1b898632b28b499f2c3d312880b030e
 MISC metadata.xml 554 BLAKE2B f7cc61f4cc79271b95e37334918f71934f91954f5a70d1601e817f6f134cd36117ed155b91a7929da537fcb7d423a627c1990c3c57f92a60fcbd6b3668329b8a SHA512 538cff1d408baf95b2d172490a3a038a8fd79edef5b8c1b64e3c495307b632870548dc0f33b6ed6bc77599d20e883a73a2c2d658b6ca85e131e404bc72e018ee
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
index 19cd188b0e0e..5c77527dc598 100644
--- a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
+++ b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
@@ -1,5 +1,5 @@
---- properties.h.old	2007-01-11 17:33:45.000000000 +0100
-+++ properties.h	2007-01-11 17:34:32.000000000 +0100
+--- a/properties.h
++++ b/properties.h
 @@ -33,9 +33,7 @@
  #include <map>
  #include <string>
@@ -10,8 +10,8 @@
  
  #include "defs.h"
  
---- anim.h.old	2007-01-11 17:36:20.000000000 +0100
-+++ anim.h	2007-01-11 17:36:37.000000000 +0100
+--- a/anim.h
++++ b/anim.h
 @@ -27,9 +27,7 @@
  // Language Includes
  #include <list>
@@ -22,8 +22,8 @@
  
  // Application Includes
  #include "graph.h"
---- exception.h.old	2007-01-11 17:37:37.000000000 +0100
-+++ exception.h	2007-01-11 17:38:21.000000000 +0100
+--- a/exception.h
++++ b/exception.h
 @@ -27,10 +27,9 @@
  
  // Language Includes
@@ -36,8 +36,8 @@
  
  #define CatchEx(aEx)		catch( CXLException aEx )
  #define ThrowEx(aError)		throw CXLException(aError,__FILE__,__LINE__)
---- gamelogic.cpp.old	2007-01-11 17:38:52.000000000 +0100
-+++ gamelogic.cpp	2007-01-11 17:39:12.000000000 +0100
+--- a/gamelogic.cpp
++++ b/gamelogic.cpp
 @@ -154,7 +154,7 @@
  		levelFile = NULL;
  	}
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
index 4b64fcd67783..594298c93d44 100644
--- a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
+++ b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
@@ -1,5 +1,5 @@
---- gamelogic.cpp
-+++ gamelogic.cpp
+--- a/gamelogic.cpp
++++ b/gamelogic.cpp
 @@ -25,6 +25,7 @@
  #include<fstream>
  #include<cstdio>
@@ -8,8 +8,8 @@
  
  #ifndef WIN32
  #include<unistd.h>
---- levelmap.cpp
-+++ levelmap.cpp
+--- a/levelmap.cpp
++++ b/levelmap.cpp
 @@ -21,6 +21,7 @@
  ////////////////////////////////////////////////////////////////////////

  

@@ -18,8 +18,8 @@
  #include <cstdio>

  #include <cctype>

  #include <cstring>

---- mapedit.cpp
-+++ mapedit.cpp
+--- a/mapedit.cpp
++++ b/mapedit.cpp
 @@ -26,6 +26,8 @@
  #include<cstdio>

  #include<list>

@@ -29,8 +29,8 @@
  

  #ifndef WIN32

  #include<unistd.h>

---- modlist.cpp
-+++ modlist.cpp
+--- a/modlist.cpp
++++ b/modlist.cpp
 @@ -22,6 +22,7 @@
  

  #include <iostream>

@@ -39,8 +39,8 @@
  

  #ifdef WIN32

  #include <afxwin.h>

---- tile_spinner.cpp
-+++ tile_spinner.cpp
+--- a/tile_spinner.cpp
++++ b/tile_spinner.cpp
 @@ -24,6 +24,7 @@
  
  
diff --git a/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild b/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..835489919edc
--- /dev/null
+++ b/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop edos2unix
+
+MY_PV=$(ver_rs 2 '-')
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="SDL logical clone"
+HOMEPAGE="https://changeling.ixionstudios.com/xlogical/"
+SRC_URI="https://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2
+	alt_gfx? ( https://changeling.ixionstudios.com/xlogical/downloads/${PN}_gfx.zip )"
+S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alt_gfx"
+
+DEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[jpeg]
+	media-libs/sdl-mixer[mod]
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+BDEPEND="alt_gfx? ( app-arch/unzip )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+)
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+
+	if use alt_gfx ; then
+		cd "${S}"/images || die
+		unpack xlogical_gfx.zip
+	fi
+}
+
+src_prepare() {
+	sed -i '/^CXXFLAGS/d' Makefile.am || die
+
+	edos2unix properties.h anim.h exception.h
+
+	default
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# localstatedir is only used for the score file
+	# NOTE: Check on bumps!
+	econf --localstatedir="/var/games"
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r ${PN}.{properties,levels} music sound images
+	find "${ED}" -name "Makefile*" -exec rm -f '{}' + || die
+
+	insinto /var/games/${PN}
+	doins ${PN}.scores
+
+	fowners root:gamestat /var/games/${PN}/${PN}.scores
+	fperms 660 /var/games/${PN}/${PN}.scores
+	fperms g+s /usr/bin/${PN}
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	make_desktop_entry ${PN} "Xlogical"
+}
diff --git a/games-puzzle/xlogical/xlogical-1.0.7.ebuild b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
deleted file mode 100644
index fd78761103c9..000000000000
--- a/games-puzzle/xlogical/xlogical-1.0.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools versionator eutils games
-
-MY_PV=$(replace_version_separator 2 '-' )
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="SDL logical clone"
-HOMEPAGE="https://changeling.ixionstudios.com/xlogical/"
-SRC_URI="https://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2
-	alt_gfx? ( http://changeling.ixionstudios.com/xlogical/downloads/xlogical_gfx.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alt_gfx"
-
-RDEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-image[jpeg]
-	media-libs/sdl-mixer[mod]"
-DEPEND="${RDEPEND}
-	alt_gfx? ( app-arch/unzip )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	if use alt_gfx ; then
-		cd "${S}/images"
-		unpack xlogical_gfx.zip
-	fi
-}
-
-src_prepare() {
-	sed -i '/^CXXFLAGS/d' Makefile.am || die
-	edos2unix properties.h anim.h exception.h
-	epatch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
-	mv configure.in configure.ac
-	eautoreconf
-}
-
-src_install() {
-	dogamesbin ${PN}
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r ${PN}.{properties,levels} music sound images
-	find "${D}" -name "Makefile*" -exec rm -f '{}' +
-
-	insinto "${GAMES_STATEDIR}"/${PN}
-	doins ${PN}.scores
-	fperms 0660 "${GAMES_STATEDIR}"/${PN}/${PN}.scores
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	make_desktop_entry ${PN} "Xlogical"
-	prepgamesdirs
-}