[gentoo-commits] proj/gamerlay:master commit in: games-puzzle/2048-qt/

[Vadim Misbakh-Soloviov]

commit:     f99117e369bd1e35181324f263ff6d089405bbd2
Author:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  8 08:36:50 2020 +0000
Commit:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Wed Jan  8 08:36:50 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=f99117e3

2048-qt: bump&fix

Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>

 games-puzzle/2048-qt/2048-qt-0.1.5-r1.ebuild | 48 -----------------------
 games-puzzle/2048-qt/2048-qt-0.1.6.ebuild    | 58 ++++++++++++++++++++++++++++
 games-puzzle/2048-qt/2048-qt-9999.ebuild     | 58 ++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+), 48 deletions(-)

diff --git a/games-puzzle/2048-qt/2048-qt-0.1.5-r1.ebuild b/games-puzzle/2048-qt/2048-qt-0.1.5-r1.ebuild
deleted file mode 100644
index 86a7aad..0000000
--- a/games-puzzle/2048-qt/2048-qt-0.1.5-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit games qmake-utils
-
-DESCRIPTION="A Qt-based version of the game 2048"
-HOMEPAGE="https://github.com/xiaoyong/2048-Qt"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz"
-
-LICENSE="LGPL-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtquickcontrols[widgets]
-	x11-themes/hicolor-icon-theme"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/2048-Qt-${PV}"
-
-src_configure(){
-	local myeqmakeargs=(
-		${PN}.pro
-		PREFIX="${EPREFIX}/usr"
-		DESKTOPDIR="${EPREFIX}/usr/share/applications"
-		ICONDIR="${EPREFIX}/usr/share/pixmaps"
-	)
-	eqmake5 ${myeqmakeargs[@]}
-}
-
-src_install(){
-	dogamesbin ${PN}
-	insinto /usr/share/icons/hicolor
-	doins -r icons/*
-	insinto /usr/share/applications
-	doins ${PN}.desktop
-	doman man/${PN}.6
-}
-
-pkg_postinst(){
-	elog "IMPORTANT: Add your user to the games group, and restart your current session."
-	elog "After that, you can play. Enjoy!"
-}

diff --git a/games-puzzle/2048-qt/2048-qt-0.1.6.ebuild b/games-puzzle/2048-qt/2048-qt-0.1.6.ebuild
new file mode 100644
index 0000000..4e0dcac
--- /dev/null
+++ b/games-puzzle/2048-qt/2048-qt-0.1.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils desktop xdg
+
+DESCRIPTION="A Qt-based version of the game 2048"
+HOMEPAGE="https://github.com/xiaoyong/2048-Qt"
+
+if [[ ${PV} == *9999* ]];then
+	inherit git-r3
+	EGIT_REPO_URI="${HOMEPAGE}"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/2048-Qt-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtquickcontrols[widgets]
+	x11-themes/hicolor-icon-theme"
+RDEPEND="${DEPEND}"
+
+src_configure(){
+	local myeqmakeargs=(
+		${PN}.pro
+		PREFIX="${EPREFIX}/usr"
+		DESKTOPDIR="${EPREFIX}/usr/share/applications"
+		ICONDIR="${EPREFIX}/usr/share/pixmaps"
+	)
+	eqmake5 ${myeqmakeargs[@]}
+}
+
+src_install(){
+	dobin ${PN}
+	for size in 16x16 32x32 48x48 256x256;do
+		doicon -s $size res/icons/$size/apps/${PN}.png
+	done
+	doicon res/icons/scalable/apps/${PN}.svg
+	domenu res/${PN}.desktop
+	doman res/man/${PN}.6
+}
+
+pkg_postinst(){
+	xdg_icon_cache_update
+}
+
+pkg_postrm(){
+	xdg_icwon_cache_update
+}

diff --git a/games-puzzle/2048-qt/2048-qt-9999.ebuild b/games-puzzle/2048-qt/2048-qt-9999.ebuild
new file mode 100644
index 0000000..4e0dcac
--- /dev/null
+++ b/games-puzzle/2048-qt/2048-qt-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils desktop xdg
+
+DESCRIPTION="A Qt-based version of the game 2048"
+HOMEPAGE="https://github.com/xiaoyong/2048-Qt"
+
+if [[ ${PV} == *9999* ]];then
+	inherit git-r3
+	EGIT_REPO_URI="${HOMEPAGE}"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/2048-Qt-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtquickcontrols[widgets]
+	x11-themes/hicolor-icon-theme"
+RDEPEND="${DEPEND}"
+
+src_configure(){
+	local myeqmakeargs=(
+		${PN}.pro
+		PREFIX="${EPREFIX}/usr"
+		DESKTOPDIR="${EPREFIX}/usr/share/applications"
+		ICONDIR="${EPREFIX}/usr/share/pixmaps"
+	)
+	eqmake5 ${myeqmakeargs[@]}
+}
+
+src_install(){
+	dobin ${PN}
+	for size in 16x16 32x32 48x48 256x256;do
+		doicon -s $size res/icons/$size/apps/${PN}.png
+	done
+	doicon res/icons/scalable/apps/${PN}.svg
+	domenu res/${PN}.desktop
+	doman res/man/${PN}.6
+}
+
+pkg_postinst(){
+	xdg_icon_cache_update
+}
+
+pkg_postrm(){
+	xdg_icwon_cache_update
+}