commit: a27d7123ca199c7bc22b73d2874c0bb60c35d799 Author: Austin English <wizardedit <AT> gentoo <DOT> org> AuthorDate: Wed Jan 25 22:48:45 2017 +0000 Commit: Austin English <wizardedit <AT> gentoo <DOT> org> CommitDate: Wed Jan 25 23:05:05 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a27d7123
games-action/lugaru: remove deprecated games eclass Also update to EAPI 6 Gentoo-Bug: https://bugs.gentoo.org/574082 Package-Manager: Portage-2.3.2, Repoman-2.3.1 .../lugaru/files/lugaru-20151204-dir.patch | 4 +-- games-action/lugaru/files/lugaru-9999-dir.patch | 4 +-- ...ugaru-9999.ebuild => lugaru-20151204-r1.ebuild} | 36 ++++++++++------------ games-action/lugaru/lugaru-9999.ebuild | 33 +++++++++++--------- 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/games-action/lugaru/files/lugaru-20151204-dir.patch b/games-action/lugaru/files/lugaru-20151204-dir.patch index 8595084..da9310d 100644 --- a/games-action/lugaru/files/lugaru-20151204-dir.patch +++ b/games-action/lugaru/files/lugaru-20151204-dir.patch @@ -1,5 +1,5 @@ ---- Source/OpenGL_Windows.cpp.orig 2015-01-14 23:57:19.799186785 -0500 -+++ Source/OpenGL_Windows.cpp 2015-01-14 23:57:36.022643953 -0500 +--- a/Source/OpenGL_Windows.cpp 2015-01-14 23:57:19.799186785 -0500 ++++ b/Source/OpenGL_Windows.cpp 2015-01-14 23:57:36.022643953 -0500 @@ -1330,7 +1330,7 @@ // !!! FIXME: we could use a Win32 API for this. --ryan. diff --git a/games-action/lugaru/files/lugaru-9999-dir.patch b/games-action/lugaru/files/lugaru-9999-dir.patch index 8595084..da9310d 100644 --- a/games-action/lugaru/files/lugaru-9999-dir.patch +++ b/games-action/lugaru/files/lugaru-9999-dir.patch @@ -1,5 +1,5 @@ ---- Source/OpenGL_Windows.cpp.orig 2015-01-14 23:57:19.799186785 -0500 -+++ Source/OpenGL_Windows.cpp 2015-01-14 23:57:36.022643953 -0500 +--- a/Source/OpenGL_Windows.cpp 2015-01-14 23:57:19.799186785 -0500 ++++ b/Source/OpenGL_Windows.cpp 2015-01-14 23:57:36.022643953 -0500 @@ -1330,7 +1330,7 @@ // !!! FIXME: we could use a Win32 API for this. --ryan. diff --git a/games-action/lugaru/lugaru-9999.ebuild b/games-action/lugaru/lugaru-20151204-r1.ebuild similarity index 66% copy from games-action/lugaru/lugaru-9999.ebuild copy to games-action/lugaru/lugaru-20151204-r1.ebuild index 2c42553..576d94b 100644 --- a/games-action/lugaru/lugaru-9999.ebuild +++ b/games-action/lugaru/lugaru-20151204-r1.ebuild @@ -1,40 +1,39 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils cmake-utils mercurial games +EAPI=6 +inherit eutils cmake-utils -EHG_REPO_URI="https://bitbucket.org/osslugaru/lugaru/"; DESCRIPTION="3D arcade with unique fighting system and anthropomorphic characters" HOMEPAGE="https://bitbucket.org/osslugaru/lugaru/wiki/Home"; -SRC_URI="" +SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2+ free-noncomm CC-BY-SA-3.0" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=" - virtual/glu - virtual/opengl + media-libs/libpng:0 media-libs/libsdl[opengl,video] - media-libs/openal media-libs/libvorbis + media-libs/openal + sys-libs/zlib + virtual/glu virtual/jpeg:0 - media-libs/libpng:0 - sys-libs/zlib" + virtual/opengl" DEPEND="${RDEPEND} virtual/pkgconfig" -src_unpack() { - mercurial_src_unpack -} +PATCHES=( + "${FILESDIR}/${P}-dir.patch" +) src_prepare() { - epatch "${FILESDIR}/${P}-dir.patch" + default sed -i \ - -e "s:@GENTOO_DIR@:${GAMES_DATADIR}/${PN}:" \ + -e "s:@GENTOO_DIR@:/usr/share/${PN}:" \ Source/OpenGL_Windows.cpp || die } @@ -51,10 +50,9 @@ src_compile() { } src_install() { - dogamesbin "${WORKDIR}/${P}_build/lugaru" - insinto "${GAMES_DATADIR}/${PN}" + dobin "${WORKDIR}/${P}_build/lugaru" + insinto /usr/share/${PN} doins -r Data/ newicon Source/win-res/Lugaru.png ${PN}.png make_desktop_entry ${PN} Lugaru ${PN} - prepgamesdirs } diff --git a/games-action/lugaru/lugaru-9999.ebuild b/games-action/lugaru/lugaru-9999.ebuild index 2c42553..7aa42ee 100644 --- a/games-action/lugaru/lugaru-9999.ebuild +++ b/games-action/lugaru/lugaru-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils cmake-utils mercurial games +EAPI=6 +inherit eutils cmake-utils mercurial EHG_REPO_URI="https://bitbucket.org/osslugaru/lugaru/"; DESCRIPTION="3D arcade with unique fighting system and anthropomorphic characters" @@ -16,14 +16,14 @@ KEYWORDS="" IUSE="" RDEPEND=" - virtual/glu - virtual/opengl media-libs/libsdl[opengl,video] - media-libs/openal + media-libs/libpng:0 media-libs/libvorbis + media-libs/openal + sys-libs/zlib + virtual/glu virtual/jpeg:0 - media-libs/libpng:0 - sys-libs/zlib" + virtual/opengl" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -31,11 +31,15 @@ src_unpack() { mercurial_src_unpack } +PATCHES=( + "${FILESDIR}/${P}-dir.patch" +) + src_prepare() { - epatch "${FILESDIR}/${P}-dir.patch" - sed -i \ - -e "s:@GENTOO_DIR@:${GAMES_DATADIR}/${PN}:" \ - Source/OpenGL_Windows.cpp || die + default + sed -i \ + -e "s:@GENTOO_DIR@:/usr/share/${PN}:" \ + Source/OpenGL_Windows.cpp || die } src_configure() { @@ -51,10 +55,9 @@ src_compile() { } src_install() { - dogamesbin "${WORKDIR}/${P}_build/lugaru" - insinto "${GAMES_DATADIR}/${PN}" + dobin "${WORKDIR}/${P}_build/lugaru" + insinto /usr/share/${PN} doins -r Data/ newicon Source/win-res/Lugaru.png ${PN}.png make_desktop_entry ${PN} Lugaru ${PN} - prepgamesdirs }
