[gentoo-commits] repo/gentoo:master commit in: games-strategy/lightyears/

[gentoo-commits] repo/gentoo:master commit in: games-strategy/lightyears/

[Pacho Ramos]

commit:     7b5fd847f78e250af5054fd46701a0cf6ca9d7c2
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed May  2 18:03:18 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed May  2 19:27:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b5fd847

games-strategy/lightyears: Drop old

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 games-strategy/lightyears/lightyears-1.4-r1.ebuild | 52 ----------------------
 1 file changed, 52 deletions(-)

diff --git a/games-strategy/lightyears/lightyears-1.4-r1.ebuild b/games-strategy/lightyears/lightyears-1.4-r1.ebuild
deleted file mode 100644
index 2215ab7dc4a..00000000000
--- a/games-strategy/lightyears/lightyears-1.4-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 games
-
-DESCRIPTION="a single-player game with a science-fiction theme"
-HOMEPAGE="http://www.jwhitham.org/20kly/"
-SRC_URI="http://www.jwhitham.org/20kly/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-RDEPEND=${DEPEND}
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}"-gentoo.patch
-	sed -i \
-		-e "s:@GENTOO_LIBDIR@:$(games_get_libdir)/${PN}:" \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-		${PN} || die
-	python_fix_shebang .
-}
-
-src_install() {
-	dogamesbin ${PN}
-
-	insinto "$(games_get_libdir)/${PN}"
-	doins code/*.py
-
-	dodoc README.txt
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r audio data manual
-
-	python_optimize "${D}$(games_get_libdir)/${PN}"
-
-	newicon data/32.png ${PN}.png
-	make_desktop_entry ${PN} "Light Years Into Space"
-	prepgamesdirs
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	games_pkg_setup
-}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/lightyears/

[James Le Cuirot]

commit:     74f1923749f790d26dc46a0e92c0b308f98aabdf
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  2 21:20:31 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Aug  2 21:42:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74f19237

games-strategy/lightyears: Fix dependencies, https, EAPI 7

Closes: https://bugs.gentoo.org/685662
Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 ...ears-1.4-r2.ebuild => lightyears-1.4-r3.ebuild} | 28 +++++++++++++---------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/games-strategy/lightyears/lightyears-1.4-r2.ebuild b/games-strategy/lightyears/lightyears-1.4-r3.ebuild
similarity index 66%
rename from games-strategy/lightyears/lightyears-1.4-r2.ebuild
rename to games-strategy/lightyears/lightyears-1.4-r3.ebuild
index 7e7344951fc..4d4cfa964e4 100644
--- a/games-strategy/lightyears/lightyears-1.4-r2.ebuild
+++ b/games-strategy/lightyears/lightyears-1.4-r3.ebuild
@@ -1,34 +1,37 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 PYTHON_COMPAT=( python2_7 )
 
-inherit desktop python-single-r1
+inherit desktop python-single-r1 xdg-utils
 
 DESCRIPTION="A single-player game with a science-fiction theme"
-HOMEPAGE="http://www.jwhitham.org/20kly/"
-SRC_URI="http://www.jwhitham.org/20kly/${P}.tar.bz2"
-
+HOMEPAGE="https://www.jwhitham.org/20kly/"
+SRC_URI="https://www.jwhitham.org/20kly/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/pygame[${PYTHON_USEDEP}]
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-gentoo.patch
+)
 
 src_prepare() {
 	default
-	eapply "${FILESDIR}/${P}"-gentoo.patch
+
 	sed -i \
 		-e "s:@GENTOO_LIBDIR@:/usr/$(get_libdir)/${PN}:" \
 		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
 		${PN} || die
+
 	python_fix_shebang .
 }
 
@@ -48,3 +51,6 @@ src_install() {
 	newicon data/32.png ${PN}.png
 	make_desktop_entry ${PN} "Light Years Into Space"
 }
+
+pkg_postinst() { xdg_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }

[gentoo-commits] repo/gentoo:master commit in: games-strategy/lightyears/

[Michał Górny]

commit:     2e7faa58274789c25ccbb4b58ad8d026918d0226
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 14:12:40 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:22:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e7faa58

games-strategy/lightyears: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-strategy/lightyears/lightyears-1.4-r3.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/games-strategy/lightyears/lightyears-1.4-r3.ebuild b/games-strategy/lightyears/lightyears-1.4-r3.ebuild
index 4d4cfa964e4..e0e5bb0741d 100644
--- a/games-strategy/lightyears/lightyears-1.4-r3.ebuild
+++ b/games-strategy/lightyears/lightyears-1.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,9 @@ KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygame[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="${RDEPEND}"