gentoo resync : 30.06.2019

3 files changed, 54 insertions, 66 deletions

diff --git a/games-fps/etqw-data/Manifest b/games-fps/etqw-data/Manifest
index 7c6214fe2f0c..ce7b86e9aca4 100644
--- a/games-fps/etqw-data/Manifest
+++ b/games-fps/etqw-data/Manifest
@@ -1,2 +1,2 @@
-EBUILD etqw-data-1.0.ebuild 1301 BLAKE2B d8d4e6fb5ccb3df9e3f336c16a87cceba197236e8bc91b3fdfffc4c184a553cb2b95be9801af42b6d0248816279efaf3aba51f2efce0d1d392c9ba6a690848ff SHA512 f17c60fc3705f86d052082d1806e7a3f1e9450469bbbe4c4b4d72e7f4fb357361cfa46cd596be6cca54bcc4e618b4aa09e35c9509f981b65d11362ca00687147
+EBUILD etqw-data-1.0-r1.ebuild 931 BLAKE2B 6a529cb05255c9a9bf2baccde726e10f0974272937e8f69aa534bcc17c7bbfe616986298c611bf982c13691c7ced98a36f7af696d4b1cddb366d0b00886b29fc SHA512 fdc7f4605d63d3e3539bc345e94e6765f0181f9087800e4121daea913adec2af07be27aad54ec36afe21298b02c425553a9b1676055255d83c2c4860298ee2b2
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-fps/etqw-data/etqw-data-1.0-r1.ebuild b/games-fps/etqw-data/etqw-data-1.0-r1.ebuild
new file mode 100644
index 000000000000..6f5806dd98a1
--- /dev/null
+++ b/games-fps/etqw-data/etqw-data-1.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cdrom
+
+DESCRIPTION="Enemy Territory: Quake Wars data files"
+HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/ETQWFrontPage/"
+SRC_URI=""
+
+LICENSE="ETQW"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="videos"
+
+S="${WORKDIR}"
+
+src_install() {
+	local dir=/opt/etqw
+
+	cdrom_get_cds Setup/Data/base/DEU:Setup/Data/base/POL:Setup/Data/base
+
+	cd "${CDROM_ROOT}"/Setup/Data/base
+	insinto "${dir}"/base
+	doins pak00{0..4}.pk4
+	doins -r megatextures
+
+	case ${CDROM_SET} in
+		0)
+			doins \
+				zpak_english000.pk4 \
+				DEU/zpak_german000.pk4 \
+				ESP/zpak_spanish000.pk4 \
+				FRA/zpak_french000.pk4
+			;;
+		1)
+			doins \
+				POL/zpak_polish000.pk4 \
+				RUS/zpak_russian000.pk4
+			;;
+		2)
+			doins zpak_english000.pk4
+			;;
+	esac
+
+	if use videos ; then
+		case ${CDROM_SET} in
+			0|2)
+				doins -r video
+				;;
+		esac
+	fi
+}
diff --git a/games-fps/etqw-data/etqw-data-1.0.ebuild b/games-fps/etqw-data/etqw-data-1.0.ebuild
deleted file mode 100644
index 048efa9cd245..000000000000
--- a/games-fps/etqw-data/etqw-data-1.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils cdrom games
-
-DESCRIPTION="Enemy Territory: Quake Wars data files"
-HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/"
-SRC_URI=""
-
-LICENSE="ETQW"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="videos"
-
-S=${WORKDIR}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/etqw
-
-	cdrom_get_cds Setup/Data/base/DEU:Setup/Data/base/POL:Setup/Data/base
-
-	cd "${CDROM_ROOT}"/Setup/Data/base
-	insinto "${dir}"/base
-	doins pak00{0..4}.pk4 || die "doins pak failed"
-	doins -r megatextures || die "doins megatextures failed"
-
-	case ${CDROM_SET} in
-		0)
-			doins \
-				zpak_english000.pk4 \
-				DEU/zpak_german000.pk4 \
-				ESP/zpak_spanish000.pk4 \
-				FRA/zpak_french000.pk4 \
-				|| die "doins zpak failed"
-			;;
-		1)
-			doins \
-				POL/zpak_polish000.pk4 \
-				RUS/zpak_russian000.pk4 \
-				|| die "doins zpak failed"
-			;;
-		2)
-			doins zpak_english000.pk4 || die "doins zpak failed"
-			;;
-	esac
-
-	if use videos ; then
-		case ${CDROM_SET} in
-			0|2)
-				doins -r video || die "doins video failed"
-				;;
-		esac
-	fi
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "This is just the data portion of the game. You will need to install"
-	elog "games-fps/etqw-bin to play it."
-}