gentoo resync : 28.04.2021

3 files changed, 46 insertions, 14 deletions

diff --git a/games-roguelike/adom/Manifest b/games-roguelike/adom/Manifest
index 2c5626ea69b6..e4c9de72cad6 100644
--- a/games-roguelike/adom/Manifest
+++ b/games-roguelike/adom/Manifest
@@ -1,3 +1,6 @@
 DIST adom-111-elf.tar.gz 1001683 BLAKE2B e8f263c88c910cd3df40f1bec34a32853438090d17c7f48dc3d7d2f321b3f0d24adb40bd5ec74479eb23c7b6782967d2f3e7c5e4ee445c5fb75fdbb175d8889d SHA512 7b1d8916f66273b4ab06edd2d77c30e2edce827d346451d83c677af32492c40e5c578a8450ab3cc9be7888a0052a0960306e97db408e8581700c71c1b480b128
-EBUILD adom-1.1.1-r1.ebuild 800 BLAKE2B 02c581da748f75c77828bdb96da5f7a2bc4f23e5fd395b4417b3831f7b094d68265b5870551d3ebf290db11cd62c7f304bd33befd01bd9b923744cc2ae7ae22f SHA512 1ca12a18e72594b66ad136d915ecb8efc220df497039f3f7e75e2aff01db622b121f31f2b0440754228d5685ec4583cb38e107f343371b065e036970fff62d66
+DIST adom-3.3.3_amd64.tar.gz 1821896 BLAKE2B 612372db457653530d69f2b5711df451a929c0d4a9289132631ea955eb2ba8aa637be651689638c547d2cb99e5cc854923321aead400896af3acec2d35eb4ede SHA512 7ee52b445417d8050de00cb760f9071dd212b8761beaeab2e95b3d6b711e2c5c1cece43ef03587fce7edacc400121c4d1c690a5b63266d4dbbc27a6abeb3a234
+DIST adom-3.3.3_x86.tar.gz 1894237 BLAKE2B 7dc73c162e31fc29cbab11065c8153caf42794d10a41ffb2591397dd295b4d022bcfe70c1452decea926d7f860d07c741d35a0804804c242ccb3057890958c00 SHA512 25e0af09b9585b6e9f68228ba8ef9548ea7d6bfd96f75c9cdfd5faeab8dd4042b4b6e2864de81c23ea5474c49c72feaa64ecd205c850394192b2ef0bd6b906e9
+EBUILD adom-1.1.1-r2.ebuild 730 BLAKE2B f53c621e1674da00a0570a4b28b58f8ae15fe0eef91c4ecf7778097d748e55e16bf272f07e0534ad172c779ec9ca60fc890430ee51ecfb63ebf46b615567ccd6 SHA512 14b497ebfa33a37049e443f53cdb97e87e14159f985ee5cd56e8d328b821e4c924fb7d3e18b1f20e20ed231d39fb8c6584ff64a9334d45d4652822b5be3a39d9
+EBUILD adom-3.3.3-r1.ebuild 786 BLAKE2B cacb29c7ed113fa6b5e880e417f2aa5300be51cc38bb583871aaf421669354afd36a6d763819457f9c62b7194608ed42b11b6d21433d7bfbe7bbc1ec7a95d02a SHA512 0ec82e9bd73a28c52a8eec63683ce708ac40452ae380757dccc3fc0de1e4fe8d1b6054f9ce85412f187cc5dd20deebb880d2f88b36374147b43a67a8cda07cad
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-roguelike/adom/adom-1.1.1-r1.ebuild b/games-roguelike/adom/adom-1.1.1-r2.ebuild
index 02e9d5aacfea..b67288efa3fb 100644
--- a/games-roguelike/adom/adom-1.1.1-r1.ebuild
+++ b/games-roguelike/adom/adom-1.1.1-r2.ebuild
@@ -1,36 +1,36 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit edos2unix
 
 DESCRIPTION="Ancient Domains Of Mystery rogue-like game"
 HOMEPAGE="https://www.adom.de/"
 SRC_URI="https://www.adom.de/adom/download/linux/${P//.}-elf.tar.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="adom"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip" #bug #137340
-QA_FLAGS_IGNORED="${GAMES_PREFIX_OPT:1}/bin/adom"
 
-RDEPEND="sys-libs/ncurses-compat:5[abi_x86_32(-)]"
+# bug #137340
+RESTRICT="strip"
+QA_FLAGS_IGNORED="/opt/bin/adom"
 
-S=${WORKDIR}/${PN}
+RDEPEND="sys-libs/ncurses-compat:5[abi_x86_32(-)]"
 
 src_install() {
-	exeinto "${GAMES_PREFIX_OPT}/bin"
+	exeinto /opt/bin
 	doexe adom
 
-	keepdir "${GAMES_STATEDIR}/${PN}"
-	echo "${GAMES_STATEDIR}/${PN}" > adom_ds.cfg
 	insinto /etc
+	echo "${EPREFIX}"/var/lib/${PN} > adom_ds.cfg || die
 	doins adom_ds.cfg
 
 	edos2unix adomfaq.txt
 	dodoc adomfaq.txt manual.doc readme.1st
 
-	prepgamesdirs
-	fperms g+w "${GAMES_STATEDIR}/${PN}"
+	keepdir /var/lib/${PN}
+	fperms g+w /var/lib/${PN}
 }
diff --git a/games-roguelike/adom/adom-3.3.3-r1.ebuild b/games-roguelike/adom/adom-3.3.3-r1.ebuild
new file mode 100644
index 000000000000..3104784a259b
--- /dev/null
+++ b/games-roguelike/adom/adom-3.3.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}_linux_debian"
+
+DESCRIPTION="Ancient Domains Of Mystery rogue-like game"
+HOMEPAGE="https://www.adom.de/"
+SRC_URI="x86? ( https://www.adom.de/home/download/current/${MY_P}_32_${PV}.tar.gz -> ${P}_x86.tar.gz )
+	amd64? ( https://www.adom.de/home/download/current/${MY_P}_64_${PV}.tar.gz -> ${P}_amd64.tar.gz )"
+S="${WORKDIR}"/adom
+
+LICENSE="adom"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip" # The executable is pre-stripped
+
+QA_FLAGS_IGNORED="/opt/bin/adom"
+RDEPEND="sys-libs/ncurses-compat:5[abi_x86_32(-)]"
+
+DOCS=( "docs/adomfaq.txt" "docs/credits.txt" "docs/manual.txt" "docs/readme1st.txt" )
+
+src_install() {
+	exeinto /opt/bin
+	doexe adom
+
+	einstalldocs
+}