Re: [gentoo-dev] [RFC] games.eclass: move /etc/env.d/90games to a separate package

[hasufell]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

ebuild:
* use EAPI-5
* drop RDEPEND/DEPEND
* drop useless elog
* set homepage to games project page

eclass:
* use ${CATEGORY}/${PN} for the check
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJS7kn2AAoJEFpvPKfnPDWz5O4IAKHuUnOtQIIlkG7Le93fBLCw
axMSpepFfnY4qD1MAOWBrSt3ECbh8iArtxIImNL8FdzmIdz7YPU79SkmUqAqIpMY
bAp3vGUfwaSqK8kWYSBRtvSOAloEMncdVmROk0FDR21BnXBUnfVMY1hrlQNo4lJH
hhUCqZ/YYWIPdfYhHimguTSyH6D6wbZ/UMTlH0o0a9gRAaHj7tTo7TB0iiX/qCtr
4Gsls4Y4THY9ZI6gZKEac/3Qab3/k0UEUNlo2EEDYVbtbHQKGkJybfTwwGR0gjPV
BwICpY9Kot/nlBldO5ZyigAu7WyMjQvpgciXdN++cZ9vDgM6RvSL4Yx1yHy5Foc=
=fPXY
-----END PGP SIGNATURE-----

move /etc/env.d/90games to a separate package wrt #417383

--- eclass/games.eclass
+++ eclass/games.eclass
@@ -18,6 +18,11 @@
 	2|3|4|5) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_preinst pkg_postinst ;;
 	*) die "no support for EAPI=${EAPI} yet" ;;
 esac
+
+if [[ ${CATEGORY}/${PN} != "games-misc/gentoo-envd" ]] ; then
+	# environment file
+	RDEPEND="games-misc/gentoo-envd"
+fi
 
 export GAMES_PREFIX=${GAMES_PREFIX:-/usr/games}
 export GAMES_PREFIX_OPT=${GAMES_PREFIX_OPT:-/opt}
@@ -124,23 +129,6 @@
 	find "${D}/${GAMES_BINDIR}" -maxdepth 1 -type f -exec chmod 750 '{}' \;
 }
 
-gamesenv() {
-	local d libdirs
-
-	for d in $(get_all_libdirs) ; do
-		libdirs="${libdirs}:${GAMES_PREFIX}/${d}"
-	done
-
-	# Wish we could use doevnd here, but we dont want the env
-	# file to be tracked in the CONTENTS of every game
-	cat <<-EOF > "${ROOT}"/etc/env.d/${GAMES_ENVD}
-	LDPATH="${libdirs:1}"
-	PATH="${GAMES_BINDIR}"
-	EOF
-	gamesowners "${ROOT}"/etc/env.d/${GAMES_ENVD}
-	gamesperms  "${ROOT}"/etc/env.d/${GAMES_ENVD}
-}
-
 games_pkg_setup() {
 	tc-export CC CXX LD AR RANLIB
 
@@ -183,9 +171,8 @@
 	done < <(find "${D}/${GAMES_STATEDIR}" -type f -printf '%P\n' 2>/dev/null)
 }
 
-# pkg_postinst function ... create env.d entry and warn about games group
+# pkg_postinst function ... warn about games group
 games_pkg_postinst() {
-	gamesenv
 	if [[ -z "${GAMES_SHOW_WARNING}" ]] ; then
 		ewarn "Remember, in order to play games, you have to"
 		ewarn "be in the '${GAMES_GROUP}' group."

# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $

EAPI=5

inherit games

DESCRIPTION="Environment file for gentoo games"
HOMEPAGE="http://www.gentoo.org/proj/en/desktop/games/index.xml";
SRC_URI=""

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"

S=${WORKDIR}

pkg_setup() {
        games_pkg_setup
        if [[ -z "${REPLACING_VERSIONS}" ]] ; then
                if [[ "${EROOT%/}/etc/env.d/${GAMES_ENVD}" ]] ; then
                        rm -v "${EROOT%/}/etc/env.d/${GAMES_ENVD}" || die
                fi
        fi
}

src_prepare() {
        local d libdirs

        for d in $(get_all_libdirs) ; do
                libdirs="${libdirs}:${GAMES_PREFIX}/${d}"
        done

        cat <<-EOF > ${GAMES_ENVD} || die
        LDPATH="${libdirs:1}"
        PATH="${GAMES_BINDIR}"
        EOF
}

src_configure() { :; }

src_compile() { :; }

src_install() {
        doenvd ${GAMES_ENVD}
        gamesowners "${ED%/}"/etc/env.d/${GAMES_ENVD}
        gamesperms  "${ED%/}"/etc/env.d/${GAMES_ENVD}
}

pkg_preinst() { :; }

pkg_postinst() { :; }