From 83f1450abb347289b3f993653ffc7ca51690118e Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 7 Feb 2020 15:08:49 +0100
Subject: games-kids/childsplay: Switch to PYTHON_MULTI_USEDEP API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 games-kids/childsplay/childsplay-0.90.2-r1.ebuild | 147 ---------------------
 games-kids/childsplay/childsplay-0.90.2-r2.ebuild | 149 ++++++++++++++++++++++
 2 files changed, 149 insertions(+), 147 deletions(-)
 delete mode 100644 games-kids/childsplay/childsplay-0.90.2-r1.ebuild
 create mode 100644 games-kids/childsplay/childsplay-0.90.2-r2.ebuild

(limited to 'games-kids')

diff --git a/games-kids/childsplay/childsplay-0.90.2-r1.ebuild b/games-kids/childsplay/childsplay-0.90.2-r1.ebuild
deleted file mode 100644
index 3c535ad41d94..000000000000
--- a/games-kids/childsplay/childsplay-0.90.2-r1.ebuild
+++ /dev/null
@@ -1,147 +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 suite of educational games for young children"
-HOMEPAGE="http://childsplay.sourceforge.net/"
-PLUGINS_VERSION="0.90"
-PLUGINS_LFC_VERSION="0.90"
-SRC_URI="mirror://sourceforge/childsplay/${P}.tgz
-	mirror://sourceforge/childsplay/${PN}_plugins-${PLUGINS_VERSION}.tgz
-	mirror://sourceforge/childsplay/${PN}_plugins_lfc-${PLUGINS_LFC_VERSION}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
-	media-libs/sdl-image[gif,jpeg,png]
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer[vorbis]
-	media-libs/libogg"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	games_pkg_setup
-}
-
-src_prepare() {
-	local DIR
-
-	# Copy the plugins into the main package.
-	mv ../${PN}_plugins-${PLUGINS_VERSION}/Data/AlphabetSounds Data || die
-	mv ../${PN}_plugins-${PLUGINS_VERSION}/add-score.py . || die
-	for DIR in ${PN}_plugins-${PLUGINS_VERSION} ${PN}_plugins_lfc-${PLUGINS_LFC_VERSION}; do
-		mv ../${DIR}/Data/*.icon.png Data/icons || die
-		cp -r ../${DIR}/lib/* lib || die
-		mv ../${DIR}/assetml/${PN}/* assetml/${PN} || die
-		rm -rf ../${DIR}
-	done
-	gunzip man/childsplay.6.gz
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	python_fix_shebang .
-}
-
-src_install() {
-	local fn
-
-	# The following variables are based on Childsplay's INSTALL.sh
-	_LOCALEDIR=/usr/share/locale
-	_ASSETMLDIR=/usr/share/assetml
-	_SCOREDIR=${GAMES_STATEDIR}
-	_SCOREFILE=${_SCOREDIR}/childsplay.score
-	_CPDIR=$(games_get_libdir)/childsplay
-	_SHAREDIR=${GAMES_DATADIR}/childsplay
-	_LIBDIR=${_CPDIR}/lib
-	_MODULESDIR=${_LIBDIR}
-	_SHARELIBDATADIR=${_SHAREDIR}/lib
-	_SHAREDATADIR=${_SHAREDIR}/Data
-	_RCDIR=${_SHARELIBDATADIR}/ConfigData
-	_HOME_DIR_NAME=.childsplay
-	_CHILDSPLAYRC=childsplayrc
-
-	dodir \
-		"${_CPDIR}" \
-		"${_LIBDIR}" \
-		"${_SHAREDIR}" \
-		"${_SHARELIBDATADIR}" \
-		"${_SCOREDIR}" \
-		"${_LOCALEDIR}" \
-		"${_ASSETMLDIR}"
-
-	# create BASEPATH.py
-	cat >BASEPATH.py <<EOF
-## Automated file--please do not edit
-LOCALEDIR="${_LOCALEDIR}"
-ASSETMLDIR="${_ASSETMLDIR}"
-SCOREDIR="${_SCOREDIR}"
-SCOREFILE="${_SCOREFILE}"
-CPDIR="${_CPDIR}"
-SHAREDIR="${_SHAREDIR}"
-LIBDIR="${_LIBDIR}"
-MODULESDIR="${_MODULESDIR}"
-SHARELIBDATADIR="${_SHARELIBDATADIR}"
-SHAREDATADIR="${_SHAREDATADIR}"
-RCDIR="${_RCDIR}"
-HOME_DIR_NAME="${_HOME_DIR_NAME}"
-CHILDSPLAYRC="${_CHILDSPLAYRC}"
-EOF
-
-	# copy software and data
-	cp -r *.py "${D}/${_CPDIR}" || die "cp failed"
-	cp -r Data "${D}/${_SHAREDIR}" || die "cp failed"
-	rm "${D}/${_SHAREDIR}/Data/childsplay.score"  # this copy won't be used
-
-	for fn in $(ls lib); do
-		if [[ -d lib/${fn} ]] ; then
-			cp -r lib/${fn} "${D}/${_SHARELIBDATADIR}" || die
-		else
-			cp lib/${fn} "${D}/${_LIBDIR}" || die
-		fi
-	done
-
-	if [[ ${LINGUAS+set} ]]; then
-		for lang in $LINGUAS; do
-			[[ -d locale/$lang ]] && cp -r locale/$lang "${D}/${_LOCALEDIR}"
-		done
-	else
-		cp -r locale/* "${D}/${_LOCALEDIR}" || die
-	fi
-	cp -r assetml/* "${D}/${_ASSETMLDIR}" || die
-
-	# initialize the score file
-	cp Data/childsplay.score "${D}/${_SCOREFILE}" || die
-	SCORE_GAMES="Packid,Numbers,Soundmemory,Fallingletters,Findsound,Findsound2,Billiard"
-	${PYTHON} add-score.py "${D}/${_SCOREDIR}" $SCORE_GAMES
-
-	# translate for the letters game
-	${PYTHON} letters-trans.py "${D}/${_ASSETMLDIR}" << EOF
-Q
-EOF
-
-	doman man/childsplay.6
-	dodoc doc/README* doc/Changelog doc/copyright
-
-	# Make a launcher.
-	dogamesbin "${FILESDIR}"/childsplay
-	sed -i \
-		-e "s:GENTOO_DIR:${_CPDIR}:" \
-		-e "s:python:${PYTHON}:" \
-		"${D}${GAMES_BINDIR}"/childsplay \
-		|| die "sed failed"
-
-	python_optimize "${D}${_CPDIR}"
-
-	newicon assetml/childsplay/childsplay-images/chpl-icon-48.png ${PN}.png
-	make_desktop_entry childsplay Childsplay
-
-	prepgamesdirs
-	fperms g+w "${_SCOREFILE}"
-}
diff --git a/games-kids/childsplay/childsplay-0.90.2-r2.ebuild b/games-kids/childsplay/childsplay-0.90.2-r2.ebuild
new file mode 100644
index 000000000000..a0714b344639
--- /dev/null
+++ b/games-kids/childsplay/childsplay-0.90.2-r2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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 suite of educational games for young children"
+HOMEPAGE="http://childsplay.sourceforge.net/"
+PLUGINS_VERSION="0.90"
+PLUGINS_LFC_VERSION="0.90"
+SRC_URI="mirror://sourceforge/childsplay/${P}.tgz
+	mirror://sourceforge/childsplay/${PN}_plugins-${PLUGINS_VERSION}.tgz
+	mirror://sourceforge/childsplay/${PN}_plugins_lfc-${PLUGINS_LFC_VERSION}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygame[${PYTHON_MULTI_USEDEP}]
+	')
+	media-libs/sdl-image[gif,jpeg,png]
+	media-libs/sdl-ttf
+	media-libs/sdl-mixer[vorbis]
+	media-libs/libogg"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	games_pkg_setup
+}
+
+src_prepare() {
+	local DIR
+
+	# Copy the plugins into the main package.
+	mv ../${PN}_plugins-${PLUGINS_VERSION}/Data/AlphabetSounds Data || die
+	mv ../${PN}_plugins-${PLUGINS_VERSION}/add-score.py . || die
+	for DIR in ${PN}_plugins-${PLUGINS_VERSION} ${PN}_plugins_lfc-${PLUGINS_LFC_VERSION}; do
+		mv ../${DIR}/Data/*.icon.png Data/icons || die
+		cp -r ../${DIR}/lib/* lib || die
+		mv ../${DIR}/assetml/${PN}/* assetml/${PN} || die
+		rm -rf ../${DIR}
+	done
+	gunzip man/childsplay.6.gz
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	python_fix_shebang .
+}
+
+src_install() {
+	local fn
+
+	# The following variables are based on Childsplay's INSTALL.sh
+	_LOCALEDIR=/usr/share/locale
+	_ASSETMLDIR=/usr/share/assetml
+	_SCOREDIR=${GAMES_STATEDIR}
+	_SCOREFILE=${_SCOREDIR}/childsplay.score
+	_CPDIR=$(games_get_libdir)/childsplay
+	_SHAREDIR=${GAMES_DATADIR}/childsplay
+	_LIBDIR=${_CPDIR}/lib
+	_MODULESDIR=${_LIBDIR}
+	_SHARELIBDATADIR=${_SHAREDIR}/lib
+	_SHAREDATADIR=${_SHAREDIR}/Data
+	_RCDIR=${_SHARELIBDATADIR}/ConfigData
+	_HOME_DIR_NAME=.childsplay
+	_CHILDSPLAYRC=childsplayrc
+
+	dodir \
+		"${_CPDIR}" \
+		"${_LIBDIR}" \
+		"${_SHAREDIR}" \
+		"${_SHARELIBDATADIR}" \
+		"${_SCOREDIR}" \
+		"${_LOCALEDIR}" \
+		"${_ASSETMLDIR}"
+
+	# create BASEPATH.py
+	cat >BASEPATH.py <<EOF
+## Automated file--please do not edit
+LOCALEDIR="${_LOCALEDIR}"
+ASSETMLDIR="${_ASSETMLDIR}"
+SCOREDIR="${_SCOREDIR}"
+SCOREFILE="${_SCOREFILE}"
+CPDIR="${_CPDIR}"
+SHAREDIR="${_SHAREDIR}"
+LIBDIR="${_LIBDIR}"
+MODULESDIR="${_MODULESDIR}"
+SHARELIBDATADIR="${_SHARELIBDATADIR}"
+SHAREDATADIR="${_SHAREDATADIR}"
+RCDIR="${_RCDIR}"
+HOME_DIR_NAME="${_HOME_DIR_NAME}"
+CHILDSPLAYRC="${_CHILDSPLAYRC}"
+EOF
+
+	# copy software and data
+	cp -r *.py "${D}/${_CPDIR}" || die "cp failed"
+	cp -r Data "${D}/${_SHAREDIR}" || die "cp failed"
+	rm "${D}/${_SHAREDIR}/Data/childsplay.score"  # this copy won't be used
+
+	for fn in $(ls lib); do
+		if [[ -d lib/${fn} ]] ; then
+			cp -r lib/${fn} "${D}/${_SHARELIBDATADIR}" || die
+		else
+			cp lib/${fn} "${D}/${_LIBDIR}" || die
+		fi
+	done
+
+	if [[ ${LINGUAS+set} ]]; then
+		for lang in $LINGUAS; do
+			[[ -d locale/$lang ]] && cp -r locale/$lang "${D}/${_LOCALEDIR}"
+		done
+	else
+		cp -r locale/* "${D}/${_LOCALEDIR}" || die
+	fi
+	cp -r assetml/* "${D}/${_ASSETMLDIR}" || die
+
+	# initialize the score file
+	cp Data/childsplay.score "${D}/${_SCOREFILE}" || die
+	SCORE_GAMES="Packid,Numbers,Soundmemory,Fallingletters,Findsound,Findsound2,Billiard"
+	${PYTHON} add-score.py "${D}/${_SCOREDIR}" $SCORE_GAMES
+
+	# translate for the letters game
+	${PYTHON} letters-trans.py "${D}/${_ASSETMLDIR}" << EOF
+Q
+EOF
+
+	doman man/childsplay.6
+	dodoc doc/README* doc/Changelog doc/copyright
+
+	# Make a launcher.
+	dogamesbin "${FILESDIR}"/childsplay
+	sed -i \
+		-e "s:GENTOO_DIR:${_CPDIR}:" \
+		-e "s:python:${PYTHON}:" \
+		"${D}${GAMES_BINDIR}"/childsplay \
+		|| die "sed failed"
+
+	python_optimize "${D}${_CPDIR}"
+
+	newicon assetml/childsplay/childsplay-images/chpl-icon-48.png ${PN}.png
+	make_desktop_entry childsplay Childsplay
+
+	prepgamesdirs
+	fperms g+w "${_SCOREFILE}"
+}
-- 
cgit v1.2.3-65-gdbad