[gentoo-commits] proj/gamerlay:master commit in: games-rpg/machinarium/, games-rpg/machinarium/files/

[Azamat H. Hackimov]

commit:     057301c2bf92e67eac8bc0750d6190dcd5d1fe11
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sat Feb 29 12:37:44 2020 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Sat Feb 29 12:50:26 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=057301c2

games-rpg/machinarium: update package

Migrate from deprecated eclass.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>

 games-rpg/machinarium/files/Machinarium.png     | Bin 338463 -> 11185 bytes
 games-rpg/machinarium/machinarium-1.0-r1.ebuild |  80 +++++++++++++++++++++
 games-rpg/machinarium/machinarium-1.0.ebuild    |  90 ------------------------
 games-rpg/machinarium/metadata.xml              |  13 ++--
 4 files changed, 86 insertions(+), 97 deletions(-)

diff --git a/games-rpg/machinarium/files/Machinarium.png b/games-rpg/machinarium/files/Machinarium.png
index 78a9e13..8b79c99 100644
Binary files a/games-rpg/machinarium/files/Machinarium.png and b/games-rpg/machinarium/files/Machinarium.png differ

diff --git a/games-rpg/machinarium/machinarium-1.0-r1.ebuild b/games-rpg/machinarium/machinarium-1.0-r1.ebuild
new file mode 100644
index 0000000..ef34188
--- /dev/null
+++ b/games-rpg/machinarium/machinarium-1.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils multilib-minimal
+
+DESCRIPTION="Point-and-click adventure about robot in steam-punk world"
+HOMEPAGE="http://machinarium.net/"
+
+SLOT="0"
+LICENSE="all-rights-reserved"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="fetch mirror"
+IUSE=""
+
+MY_PN="${PN/ma/Ma}"
+SRC_URI="${MY_PN}_full_en.tar.gz"
+
+RDEPEND="
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	dev-libs/atk[${MULTILIB_USEDEP}]
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/glib[${MULTILIB_USEDEP}]
+	dev-libs/libffi[${MULTILIB_USEDEP}]
+	dev-libs/nspr[${MULTILIB_USEDEP}]
+	dev-libs/nss[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	media-libs/libpng-compat:1.5[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+	x11-libs/libdrm[${MULTILIB_USEDEP}]
+	x11-libs/libICE[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXau[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage[${MULTILIB_USEDEP}]
+	x11-libs/libXdmcp[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXinerama[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXt[${MULTILIB_USEDEP}]
+	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	x11-libs/pango[${MULTILIB_USEDEP}]
+	x11-libs/pixman[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+pkg_nofetch() {
+	ewarn
+	ewarn "Place ${A} to ${DISTDIR}"
+	ewarn
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	exeinto "${dir}"
+	doexe "${MY_PN}"
+	rm "${MY_PN}"
+	doins -r *
+
+	make_wrapper "${PN}" "./${MY_PN}" "${dir}"
+	doicon "${FILESDIR}/${MY_PN}.png"
+	make_desktop_entry "${PN}" "${MY_PN}" "${MY_PN}"
+}

diff --git a/games-rpg/machinarium/machinarium-1.0.ebuild b/games-rpg/machinarium/machinarium-1.0.ebuild
deleted file mode 100644
index 223eb7b..0000000
--- a/games-rpg/machinarium/machinarium-1.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit games multilib
-
-DESCRIPTION="Point-and-click adventure about robot in steam-punk world"
-HOMEPAGE="http://machinarium.net/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="fetch mirror"
-IUSE="multilib"
-
-MY_PN="${PN/ma/Ma}"
-SRC_URI="${MY_PN}_full_en.tar.gz"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib
-	dev-libs/libffi
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/fontconfig
-	media-libs/freetype:2
-	=media-libs/libpng-1.5*
-	virtual/opengl
-	sys-apps/util-linux
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+
-	x11-libs/libdrm
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXxf86vm
-	x11-libs/pango
-	x11-libs/pixman
-	amd64? (
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-gtklibs
-		app-emulation/emul-linux-x86-opengl
-		app-emulation/emul-linux-x86-xlibs
-	)
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-REQUIRED_USE="amd64? ( multilib )"
-pkg_nofetch() {
-	ewarn
-	ewarn "Place ${A} to ${DISTDIR}"
-	ewarn
-}
-
-src_install() {
-	local dir="${GAMES_PREFIX_OPT}/${PN}"
-
-	insinto "${dir}"
-	exeinto "${dir}"
-	doexe "${MY_PN}"
-	rm "${MY_PN}"
-	doins -r *
-
-	games_make_wrapper "${PN}" "./${MY_PN}" "${dir}"
-	doicon "${FILESDIR}/${MY_PN}.png"
-	make_desktop_entry "${PN}" "${MY_PN}" "${MY_PN}"
-
-	prepgamesdirs
-}

diff --git a/games-rpg/machinarium/metadata.xml b/games-rpg/machinarium/metadata.xml
index 23da526..460d202 100644
--- a/games-rpg/machinarium/metadata.xml
+++ b/games-rpg/machinarium/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
- <email>mva@×××.name</email>
- <description>
-	If you have any issues, please contact me, or try to find me in IRC on Freenode, OFTC or RusNet.
- </description> 
- <name>Vadim A. Misbakh-Soloviov</name>
+<maintainer type="person">
+<email>mva@×××.name</email>
+<description>
+If you have any issues, please contact me, or try to find me in IRC on Freenode, OFTC or RusNet.
+</description> 
+<name>Vadim A. Misbakh-Soloviov</name>
 </maintainer>
-<longdescription>FIXME</longdescription> 
 <use>
 </use>
 </pkgmetadata>