games-strategy/moo2-data: Update for games.eclass removal.

None of the existing ebuilds work anymore with games.eclass gone,
so respin this ebuild based on the latest GOG download and remove
the old versions.

diff --git a/games-strategy/moo2-data/Manifest b/games-strategy/moo2-data/Manifest
index cdcb5df5516e461a42745bf6e95d73de39954da6..6511104bea64a112a0b1f083fd0290b789ffaf91 100644 (file)
--- a/games-strategy/moo2-data/Manifest
+++ b/games-strategy/moo2-data/Manifest
@@ -1,6 +1,2 @@
-DIST gog_master_of_orion_2_2.0.0.5.sh 187179625 SHA256 9814e44097ce1d1725c8d94a2b9743508da12d23713b44d02471e0cb95e396f8 SHA512 15131369737a633598c288a22a760941fab53005865dd376ac6edd938b36a594fcf082d1b822fcafeae095999b9144087ac249607de967c88f59b5591b026d87 WHIRLPOOL 286122525b4f4b02b41196d4b73f13b4c9a2a76978404ac9b160a99e08b7297cdb4f51468cca31c273e0b6969a8522b995b2725c2e826225f609792f8e9cf558
-DIST setup_master_of_orion12_2.0.0.16.exe 168800072 SHA256 b3ca9d4a470170f5906d8f4d2c6cbbeb9d908712bf59a188a7ef60c8912b8e9c SHA512 c8b98e7f92979ca5d3dfe5ed422e4909a5896fb8c0774a5d46bb0ad8ba5df711b34cec15ee3c25ce0b0074d1640c770d0914a71fb55c4a9780599ecd86f913f3 WHIRLPOOL b1550a08f32e05a323b91974409c31722aacd749e59bf30eb7e4fb485bd04f18a8e5b36ed5a749b796cfd0610691506b653c86b7742c8aaa710e87b8cd190e25
-DIST setup_master_of_orion2_2.1.0.17.exe 163850520 SHA256 124d61f4b093fb0d00f05b390de5903223e18751bd218173eb9fbbf32dffa5d8 SHA512 02dca502de88d3247b53041ba61cc8a1fb31c23fd55cfbdfe54624378887ad0878a8a1721274dae8c18528a04eb9240916bf6782ae6fe8dd200498b5ed8980a6 WHIRLPOOL 7460a9f6f634b1593b810610d0efdab70f4ced02b40e0fd5235ae7e9423c7d075b76acb70d8da62e8c9be8b41f9cb7cb0728a0507d27ce143567b64ae0592b7b
-EBUILD moo2-data-1.31-r1.ebuild 489 SHA256 ef3c0f69811c3ff99a6d781767dcbbd7f36a4f3a9129dfefa01e99f8b59ac3c5 SHA512 2d4fd8a2b94477526ee8491a8e63d2af70a9a7e8d047d144db8b342d2f16d642070d62c6336cbdfa2336bffa290d65b6220337c62160380d8c93b4e83ab453ae WHIRLPOOL 2a50b47ae3f2ce79bf592526e7dda093c2fc611e3a18baba49bd28a24d59bb66a6ea405658ebf92c8553d594ea86fb04c7d781870a480fa6693bdd8fa773cf64
-EBUILD moo2-data-1.31-r2.ebuild 556 SHA256 b971b6de42ed12520200cbf798e90c4eb2bc6b14e74296f6ad56cab66a67c3ba SHA512 3bda5160dd0cdb87182705e89f92c1f38c92e7010c76011d8f29d0afbe0e6122c4bee87d24bf0659748a81f0ee648fccd68e5c9a34f7d5fbb2d2e7005924481b WHIRLPOOL 4e60d675dc1411872b8a070aa9f6a5b5402820a6266e4563418828d836b26e1b4d8f8442a5c131cf0ecd62a0d69fe3cc8388e07907bc597e652a193a4103dbde
-EBUILD moo2-data-1.31.ebuild 504 SHA256 c6d31542593ed21b60127e67bec5807e902024f65609784663dc261e62095adf SHA512 ac24db9b7ea516dfc7aab31b371efb936bdb2b99c846fe3148cd59791d826998a47aeddaa52d07fe6289869eb1c2e3fc74bb17e0cc0bca5899951815ba9cc286 WHIRLPOOL 0dea9a2a45e6d3ed3f20089c4f68010113aa14a720d259da1304a6adb53ace7f3920f8ec4ebd2c516ecaeb7f52d2912a1230171d1196fb5e8d2aefe614e79a28
+DIST gog_master_of_orion_2_2.0.0.6.sh 187179637 BLAKE2B 600130e05ce8092ff32f68041292e125db69fdee659d4043e0093022e6afa2b144eda8b5ed61fdff4a4caaef8c1ea044286ac6c1a71d2db17d3aa3fa313ccdd5 SHA512 2a972b3d8db04f2f52cfae64b8b2e041d0fb2b0084103f35814db123daf5d530e6309e2fe364fe5435d26e893cedcb2592efcb4deb90cd7b1445173e92f82a0b
+EBUILD moo2-data-1.31-r3.ebuild 1028 BLAKE2B e1cdbb945031296979ae43fb2f86bcb463581ed9023bf9a9fd10b665695c5ec938748432ebaf572279f46a2b366a37226d7699f941a14ef4d86b116cf9f2a941 SHA512 d839415a150b5faff0b4ee9cc968a93d56231c5f4fab9b23ed713a00717e32dee97881535793a048b9db686e47ed6af2958b6d83a007fae6e5c52e83b87f39e0

diff --git a/games-strategy/moo2-data/moo2-data-1.31-r1.ebuild b/games-strategy/moo2-data/moo2-data-1.31-r1.ebuild
deleted file mode 100644 (file)
index 64b4446..0000000
--- a/games-strategy/moo2-data/moo2-data-1.31-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright © 2013, 2015 Nick Bowler
-# License GPLv3+: GNU General Public License version 3 or later.
-# There is NO WARRANTY, to the extent permitted by law.
-
-EAPI=5
-
-inherit games
-
-DESCRIPTION="Master of Orion 2 Data Files"
-SRC_URI="setup_master_of_orion2_2.1.0.17.exe"
-
-LICENSE="GOG-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="app-arch/innoextract"
-
-RESTRICT="fetch"
-
-src_unpack() {
-       innoextract -Lsd "$S" "$DISTDIR/$A"
-}
-
-src_install() {
-       insinto "$GAMES_DATADIR/$PN"
-       doins app/*.lbx
-}

diff --git a/games-strategy/moo2-data/moo2-data-1.31-r2.ebuild b/games-strategy/moo2-data/moo2-data-1.31-r2.ebuild
deleted file mode 100644 (file)
index 1a5c250..0000000
--- a/games-strategy/moo2-data/moo2-data-1.31-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright © 2013, 2015 Nick Bowler
-# License GPLv3+: GNU General Public License version 3 or later.
-# There is NO WARRANTY, to the extent permitted by law.
-
-EAPI=5
-
-inherit games
-
-DESCRIPTION="Master of Orion 2 Data Files"
-SRC_URI="gog_master_of_orion_2_2.0.0.5.sh"
-
-LICENSE="GOG-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="fetch"
-
-DEPEND="app-arch/unzip"
-
-src_unpack() {
-       ( unzip -LLqd $P "$DISTDIR/$A" || exit $(($?>1)) ) ||
-               die "Failed to extract $A"
-}
-
-src_install() {
-       insinto "$GAMES_DATADIR/$PN"
-       doins data/noarch/data/*.lbx
-
-       prepgamesdirs
-}

diff --git a/games-strategy/moo2-data/moo2-data-1.31-r3.ebuild b/games-strategy/moo2-data/moo2-data-1.31-r3.ebuild
new file mode 100644 (file)
index 0000000..868b345
--- /dev/null
+++ b/games-strategy/moo2-data/moo2-data-1.31-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright © 2013, 2015, 2021 Nick Bowler
+# License GPLv3+: GNU General Public License version 3 or any later version.
+# This is free software: you are free to change and redistribute it.
+# There is NO WARRANTY, to the extent permitted by law.
+
+EAPI=7
+
+inherit desktop
+
+DESCRIPTION="Master of Orion 2 Data Files"
+SRC_URI="gog_master_of_orion_2_2.0.0.6.sh"
+
+LICENSE="GOG-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="fetch"
+
+BDEPEND="app-arch/unzip
+       media-gfx/icoutils
+       || ( media-gfx/graphicsmagick media-gfx/imagemagick )"
+
+src_unpack () {
+       ( unzip -LLqd $P "$DISTDIR/$A" || exit $(($?>1)) ) ||
+               die "Failed to extract $A"
+}
+
+src_compile () {
+       wrestool -t 14 -x -o orion95.ico data/noarch/data/orion95.exe || die
+       convert=`has_version media-gfx/graphicsmagick && echo 'gm'`
+       convert=${convert:+"$convert "}convert
+
+       einfo "$convert"
+       $convert orion95.ico moo2.png || die
+}
+
+src_install() {
+       insinto "/usr/share/$PN"
+       doins data/noarch/data/*.lbx
+
+       doicon -s 32 moo2.png
+       newicon -s 256 data/noarch/support/icon.png moo2.png
+}

diff --git a/games-strategy/moo2-data/moo2-data-1.31.ebuild b/games-strategy/moo2-data/moo2-data-1.31.ebuild
deleted file mode 100644 (file)
index 03b3538..0000000
--- a/games-strategy/moo2-data/moo2-data-1.31.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright © 2013 Nick Bowler
-# License GPLv3+: GNU General Public License version 3 or later.
-# There is NO WARRANTY, to the extent permitted by law.
-
-EAPI=5
-
-inherit games
-
-DESCRIPTION="Master of Orion 2 Data Files"
-SRC_URI="setup_master_of_orion12_2.0.0.16.exe"
-
-LICENSE="GOG-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="app-arch/innoextract"
-
-RESTRICT="fetch"
-
-src_unpack() {
-       innoextract -Lsd "$S" "$DISTDIR/$A"
-}
-
-src_install() {
-       insinto "$GAMES_DATADIR/$PN"
-       doins app/'master of orion 2'/*.lbx
-}