[gentoo-commits] repo/gentoo:master commit in: games-rpg/eternal-lands-data/, profiles/
commit: 73eec1bc4df97275bacc36cc85e9827baa340336
Author: Michał Górny gentoo org>
AuthorDate: Sat Sep 28 11:30:03 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Sep 28 11:31:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73eec1bc
games-rpg/eternal-lands-data: Remove last-rited pkg
Closes: https://bugs.gentoo.org/549890
Signed-off-by: Michał Górny gentoo.org>
games-rpg/eternal-lands-data/Manifest | 3 -
.../eternal-lands-data-1.9.3-r1.ebuild | 99 --
games-rpg/eternal-lands-data/metadata.xml | 20 -
profiles/package.mask | 6 --
4 files changed, 128 deletions(-)
diff --git a/games-rpg/eternal-lands-data/Manifest
b/games-rpg/eternal-lands-data/Manifest
deleted file mode 100644
index 81ae74fd449..000
--- a/games-rpg/eternal-lands-data/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST EL_sound_191.zip 43002046 BLAKE2B
450fd0fbff0fefbbffb1154ecb3e1e97ec8eb447d961e1442900af629c612c5a6f14f673a0c2820f7403b79ae0b4920a17f1e2a1b3457a5cc47daca0deb54bca
SHA512
cc4103d6cdafffcf3926f0e90ca2555b09b22d9e00947f9e1790cfa5b7c945cff16f935ede886b498ac86028b77e8f1ead6eecab2d59848100233eed373c1310
-DIST el_linux_193.zip 67104165 BLAKE2B
8e83cc00ef766f829793880952cf852adc7081a095ee3cee4f483c6fff7f9c0a293556483506fe4d09b5681ea7b7c5796e876a92e06f739d92b5fba1e7129f51
SHA512
95de984998bfc27525b7986895d1154a74c6e4dbffb9bf115c1284213acf56a470967b55e0507ed6aacd67f972bce4689aa7cffb9acd16d92bf448f195dc4f0c
-DIST el_music_full-20060803.zip 65511882 BLAKE2B
618fe476473f00371f50f9249a11aaa7b9da28caae41e072f6cf6a5d74d640b58182586f92a770bef45c80f19c1b46408b6ac2625972ba804d4c1967f01546c6
SHA512
dbd24cb20331d3640b3a5891faaf88aa0e71ba0564dfde347f2ea0fcb7e0f2700f1324ee8e988c551efb943183bbc823d4ee0373ed2b1f6d0300df76e25a524c
diff --git a/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
b/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
deleted file mode 100644
index cdcd0ac6284..000
--- a/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MUSIC_DATE="20060803"
-
-MY_PV="${PV//_/}"
-MY_PV="${MY_PV//./}"
-MY_PN="${PN%*-data}"
-DESCRIPTION="An online MMORPG written in C and SDL"
-HOMEPAGE="http://www.eternal-lands.com";
-SRC_URI="http://www.eternal-lands.com/el_linux_193.zip
- music? ( mirror://gentoo/el_music_full-${MUSIC_DATE}.zip )
- sound? ( http://www.eternallands.co.uk/EL_sound_191.zip )"
-# WARNING: The music file is held at
-# http://www.eternal-lands.com/page/music.php
-# We only mirror it so that it is versioned by the date we mirrored it
-# AND prefixed with el_ so as not cause any conflicts. Maybe oneday they will
-# version their music, maybe not.
-
-LICENSE="eternal_lands"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="bloodsuckermaps music sound"
-
-DEPEND="app-arch/unzip
- !bloodsuckermaps? ( !games-rpg/eternal-lands-bloodsucker )"
-
-PDEPEND="bloodsuckermaps? (
>=games-rpg/eternal-lands-bloodsucker-3.0_p20110618 )"
-
-# Maybe one day upstream will do things in a consistent way.
-S="${WORKDIR}/el_linux"
-
-src_prepare() {
- # Move our music files to the correct directory
- if use music ; then
- mkdir music || die
- mv ../*.ogg ../*.pll music || die
- fi
-
- # Fix assertion error with >=libxml2-2.9 (see bug #449352)
- xmllint --noent actor_defs/actor_defs.xml > actor_defs.xml || die
"Failed parsing actor_defs.xml"
- mv actor_defs.xml actor_defs || die
- eapply_user
-}
-
-src_install() {
- # These are provided by eternal-lands ebuild
-
- rm license.txt
- rm commands.lst
-
- # don't install maps if using alternate maps
- if use bloodsuckermaps ; then
- rm maps/anitora.dds maps/cave1.dds maps/cont2map10.dds
- rm maps/cont2map11.dds maps/cont2map12.dds maps/cont2map13.dds
- rm maps/cont2map14.dds maps/cont2map15.dds maps/cont2map16.dds
- rm maps/cont2map17.dds maps/cont2map18.dds maps/cont2map19.dds
- rm maps/cont2map1.dds maps/cont2map20.dds maps/cont2map21.dds
- rm maps/cont2map22.dds maps/cont2map23.dds maps/cont2map24.dds
- rm maps/cont2map2.dds maps/cont2map3.dds maps/cont2map4.dds
- rm maps/cont2map5.dds maps/cont2map6.dds maps/cont2map7.dds
- rm maps/cont2map8.dds maps/cont2map9.dds maps/irilion.dds
- rm maps/legend.dds maps/map11.dds maps/map12.dds
- rm maps/map13.dds maps/map14f.dds maps/map15f.dds
- rm maps/map2.dds maps/map3.dds maps/map4f.dds
- rm maps/map5nf.dds maps/map6nf.dds maps/map7.dds
- rm maps/map8.dds maps/map9f.dds maps/s
[gentoo-commits] repo/gentoo:master commit in: games-rpg/eternal-lands-data/
commit: 9129d0c03be21ff0fed2cf3156dbef95394e8ef3
Author: Marty E. Plummer startmail com>
AuthorDate: Sun Mar 25 15:10:57 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon Mar 26 19:52:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9129d0c0
games-rpg/eternal-lands-data: EAPI bump
Removed games.eclass and bumped to EAPI=6.
Should not present a problem, since its just flat
data.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7614
.../eternal-lands-data-1.9.3-r1.ebuild | 28 ++
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
b/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
index 5a4e5d454bc..cdcd0ac6284 100644
--- a/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
+++ b/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=2
-
-inherit games
+EAPI=6
MUSIC_DATE="20060803"
@@ -24,10 +22,10 @@ SRC_URI="http://www.eternal-lands.com/el_linux_193.zip
LICENSE="eternal_lands"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="music sound bloodsuckermaps"
+IUSE="bloodsuckermaps music sound"
DEPEND="app-arch/unzip
- !bloodsuckermaps? ( !games-rpg/eternal-lands-bloodsucker )"
+ !bloodsuckermaps? ( !games-rpg/eternal-lands-bloodsucker )"
PDEPEND="bloodsuckermaps? (
>=games-rpg/eternal-lands-bloodsucker-3.0_p20110618 )"
@@ -37,13 +35,14 @@ S="${WORKDIR}/el_linux"
src_prepare() {
# Move our music files to the correct directory
if use music ; then
- mkdir music
+ mkdir music || die
mv ../*.ogg ../*.pll music || die
fi
# Fix assertion error with >=libxml2-2.9 (see bug #449352)
xmllint --noent actor_defs/actor_defs.xml > actor_defs.xml || die
"Failed parsing actor_defs.xml"
- mv actor_defs.xml actor_defs
+ mv actor_defs.xml actor_defs || die
+ eapply_user
}
src_install() {
@@ -72,32 +71,29 @@ src_install() {
fi
insopts -m 0660
- insinto "${GAMES_DATADIR}/${MY_PN}"
+ insinto /usr/share/games/eternal-lands
doins -r 2dobjects 3dobjects actor_defs animations maps meshes \
particles skeletons shaders textures languages shaders skybox \
*.lst 3dobjects.txt *.xml \
|| die "doins failed"
if use music ; then
- doins -r music || die "doins music failed"
+ doins -r music
fi
# Removed sound from above - need to handle sound support
cd "${WORKDIR}"
if use sound ; then
- doins -r sound || die "doins sound failed"
+ doins -r sound
fi
-
- prepgamesdirs
}
pkg_postinst() {
- games_pkg_postinst
# Ensure that the files are writable by the game group for auto
# updating.
- chmod -R g+rw "${ROOT}/${GAMES_DATADIR}/${MY_PN}"
+ chmod -R g+rw "${EROOT}"usr/share/games/eternal-lands || die
# Make sure new files stay in games group
- find "${ROOT}/${GAMES_DATADIR}/${MY_PN}" -type d -exec chmod g+sx {} \;
+ find "${EROOT}"usr/share/games/eternal-lands -type d -exec chmod g+sx
{} \; || die
}
