* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog games.eclass
@ 2012-05-30 6:35 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 7+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-05-30 6:35 UTC (permalink / raw
To: gentoo-commits
slyfox 12/05/30 06:35:44
Modified: ChangeLog games.eclass
Log:
Allow EAPI=4.
Revision Changes Path
1.277 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.277&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.277&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.276&r2=1.277
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- ChangeLog 30 May 2012 06:15:24 -0000 1.276
+++ ChangeLog 30 May 2012 06:35:43 -0000 1.277
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.276 2012/05/30 06:15:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.277 2012/05/30 06:35:43 slyfox Exp $
+
+ 30 May 2012; Sergei Trofimovich <slyfox@gentoo.org> games.eclass:
+ Allow EAPI=4.
30 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> chromium.eclass:
Introduce chromium_suid_sandbox_check_kernel_config, deprecate
1.148 eclass/games.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.148&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.148&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?r1=1.147&r2=1.148
Index: games.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/games.eclass,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- games.eclass 27 Dec 2011 17:55:12 -0000 1.147
+++ games.eclass 30 May 2012 06:35:43 -0000 1.148
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.147 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.148 2012/05/30 06:35:43 slyfox Exp $
# devlist: {vapier,wolf31o2,mr_bones_}@gentoo.org -> games@gentoo.org
#
@@ -15,7 +15,7 @@
case ${EAPI:-0} in
0|1) EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst pkg_postinst ;;
- 2|3) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_preinst pkg_postinst ;;
+ 2|3|4) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_preinst pkg_postinst ;;
*) die "no support for EAPI=${EAPI} yet" ;;
esac
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog games.eclass
@ 2012-06-09 22:14 Julian Ospald (hasufell)
0 siblings, 0 replies; 7+ messages in thread
From: Julian Ospald (hasufell) @ 2012-06-09 22:14 UTC (permalink / raw
To: gentoo-commits
hasufell 12/06/09 22:14:03
Modified: ChangeLog games.eclass
Log:
fix for games.eclass wrt bug #336626 #c21
Revision Changes Path
1.300 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.300&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.300&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.299&r2=1.300
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- ChangeLog 9 Jun 2012 10:01:19 -0000 1.299
+++ ChangeLog 9 Jun 2012 22:14:03 -0000 1.300
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.299 2012/06/09 10:01:19 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.300 2012/06/09 22:14:03 hasufell Exp $
+
+ 09 Jun 2012; Julian Ospald <hasufell@gentoo.org> games.eclass:
+ fix for games.eclass wrt bug #336626 #c21
09 Jun 2012; Marien Zwart <marienz@gentoo.org> python.eclass:
Add pypy-1.9 to the list of supported python ABIs.
1.149 eclass/games.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.149&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.149&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?r1=1.148&r2=1.149
Index: games.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/games.eclass,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- games.eclass 30 May 2012 06:35:43 -0000 1.148
+++ games.eclass 9 Jun 2012 22:14:03 -0000 1.149
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.148 2012/05/30 06:35:43 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.149 2012/06/09 22:14:03 hasufell Exp $
# devlist: {vapier,wolf31o2,mr_bones_}@gentoo.org -> games@gentoo.org
#
@@ -92,8 +92,11 @@
fowners root:root "${dir}"
fperms 755 "${dir}"
for d in $(get_libdir) bin ; do
- fowners root:root "${dir}/${d}"
- fperms 755 "${dir}/${d}"
+ # check if dirs exist to avoid "nonfatal" option
+ if [[ -e ${d} ]] ; then
+ fowners root:root "${dir}/${d}"
+ fperms 755 "${dir}/${d}"
+ fi
done
fi
) &>/dev/null
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog games.eclass
@ 2012-07-28 15:52 Julian Ospald (hasufell)
0 siblings, 0 replies; 7+ messages in thread
From: Julian Ospald (hasufell) @ 2012-07-28 15:52 UTC (permalink / raw
To: gentoo-commits
hasufell 12/07/28 15:52:23
Modified: ChangeLog games.eclass
Log:
EAPI-4 related fix, properly check dirs existence
Revision Changes Path
1.357 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.357&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.357&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.356&r2=1.357
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- ChangeLog 26 Jul 2012 16:14:47 -0000 1.356
+++ ChangeLog 28 Jul 2012 15:52:23 -0000 1.357
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.356 2012/07/26 16:14:47 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.357 2012/07/28 15:52:23 hasufell Exp $
+
+ 28 Jul 2012; Julian Ospald <hasufell@gentoo.org> games.eclass:
+ omg, we checked the dirs in ${S} instead of ${D} which accidentially
+ worked for some ebuilds (EAPI-4 related fix)
26 Jul 2012; Fabian Groffen <grobian@gentoo.org>
+ELT-patches/sol2-ltmain/2.4.2, libtool.eclass:
1.150 eclass/games.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.150&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.150&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?r1=1.149&r2=1.150
Index: games.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/games.eclass,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- games.eclass 9 Jun 2012 22:14:03 -0000 1.149
+++ games.eclass 28 Jul 2012 15:52:23 -0000 1.150
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.149 2012/06/09 22:14:03 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.150 2012/07/28 15:52:23 hasufell Exp $
# devlist: {vapier,wolf31o2,mr_bones_}@gentoo.org -> games@gentoo.org
#
@@ -93,7 +93,7 @@
fperms 755 "${dir}"
for d in $(get_libdir) bin ; do
# check if dirs exist to avoid "nonfatal" option
- if [[ -e ${d} ]] ; then
+ if [[ -e ${D}/${dir}/${d} ]] ; then
fowners root:root "${dir}/${d}"
fperms 755 "${dir}/${d}"
fi
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog games.eclass
@ 2014-01-25 17:44 Julian Ospald (hasufell)
0 siblings, 0 replies; 7+ messages in thread
From: Julian Ospald (hasufell) @ 2014-01-25 17:44 UTC (permalink / raw
To: gentoo-commits
hasufell 14/01/25 17:44:39
Modified: ChangeLog games.eclass
Log:
set --datarootdir=/usr/share wrt #493954
Revision Changes Path
1.1132 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1132&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1132&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1131&r2=1.1132
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1131
retrieving revision 1.1132
diff -u -r1.1131 -r1.1132
--- ChangeLog 25 Jan 2014 15:23:54 -0000 1.1131
+++ ChangeLog 25 Jan 2014 17:44:39 -0000 1.1132
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1131 2014/01/25 15:23:54 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1132 2014/01/25 17:44:39 hasufell Exp $
+
+ 25 Jan 2014; Julian Ospald <hasufell@gentoo.org> games.eclass:
+ set --datarootdir=/usr/share wrt #493954
25 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
major changes depend on wrt bug 497056, vdr-plugin-2.eclass
1.155 eclass/games.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.155&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.155&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?r1=1.154&r2=1.155
Index: games.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/games.eclass,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- games.eclass 8 Apr 2013 07:36:25 -0000 1.154
+++ games.eclass 25 Jan 2014 17:44:39 -0000 1.155
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.154 2013/04/08 07:36:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.155 2014/01/25 17:44:39 hasufell Exp $
# devlist: games@gentoo.org
#
@@ -47,6 +47,11 @@
fi
fi
+ # bug 493954
+ if grep -q -s datarootdir "${ECONF_SOURCE:-.}"/configure ; then
+ _gamesconf="${_gamesconf} --datarootdir=/usr/share"
+ fi
+
econf \
--prefix="${GAMES_PREFIX}" \
--libdir="$(games_get_libdir)" \
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog games.eclass
@ 2014-02-02 12:15 Julian Ospald (hasufell)
0 siblings, 0 replies; 7+ messages in thread
From: Julian Ospald (hasufell) @ 2014-02-02 12:15 UTC (permalink / raw
To: gentoo-commits
hasufell 14/02/02 12:15:05
Modified: ChangeLog games.eclass
Log:
respect ECONF_SOURCE wrt #494210
Revision Changes Path
1.1135 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1135&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1135&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1134&r2=1.1135
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1134
retrieving revision 1.1135
diff -u -r1.1134 -r1.1135
--- ChangeLog 1 Feb 2014 18:52:32 -0000 1.1134
+++ ChangeLog 2 Feb 2014 12:15:05 -0000 1.1135
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1134 2014/02/01 18:52:32 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1135 2014/02/02 12:15:05 hasufell Exp $
+
+ 02 Feb 2014; Julian Ospald <hasufell@gentoo.org> games.eclass:
+ respect ECONF_SOURCE wrt #494210
01 Feb 2014; Ryan Hill <dirtyepic@gentoo.org> flag-o-matic.eclass:
Add -fdiagnostics* and ISA flags for 4.8 and 4.9.
1.156 eclass/games.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?r1=1.155&r2=1.156
Index: games.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/games.eclass,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- games.eclass 25 Jan 2014 17:44:39 -0000 1.155
+++ games.eclass 2 Feb 2014 12:15:05 -0000 1.156
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.155 2014/01/25 17:44:39 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.156 2014/02/02 12:15:05 hasufell Exp $
# devlist: games@gentoo.org
#
@@ -158,7 +158,7 @@
}
games_src_configure() {
- [[ -x ./configure ]] && egamesconf
+ [[ -x "${ECONF_SOURCE:-.}"/configure ]] && egamesconf
}
games_src_compile() {
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog games.eclass
@ 2014-03-12 18:54 Julian Ospald (hasufell)
0 siblings, 0 replies; 7+ messages in thread
From: Julian Ospald (hasufell) @ 2014-03-12 18:54 UTC (permalink / raw
To: gentoo-commits
hasufell 14/03/12 18:54:12
Modified: ChangeLog games.eclass
Log:
fix games.eclass to use games-misc/games-envd
Revision Changes Path
1.1175 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1175&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1175&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1174&r2=1.1175
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1174
retrieving revision 1.1175
diff -u -r1.1174 -r1.1175
--- ChangeLog 12 Mar 2014 09:29:39 -0000 1.1174
+++ ChangeLog 12 Mar 2014 18:54:12 -0000 1.1175
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1174 2014/03/12 09:29:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1175 2014/03/12 18:54:12 hasufell Exp $
+
+ 12 Mar 2014; Julian Ospald <hasufell@gentoo.org> games.eclass:
+ fix games.eclass to use games-misc/games-envd
12 Mar 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Use subslot operator deps on non-slotted PyPy.
1.157 eclass/games.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.157&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.157&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?r1=1.156&r2=1.157
Index: games.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/games.eclass,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- games.eclass 2 Feb 2014 12:15:05 -0000 1.156
+++ games.eclass 12 Mar 2014 18:54:12 -0000 1.157
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.156 2014/02/02 12:15:05 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.157 2014/03/12 18:54:12 hasufell Exp $
# devlist: games@gentoo.org
#
@@ -19,6 +19,11 @@
*) die "no support for EAPI=${EAPI} yet" ;;
esac
+if [[ ${CATEGORY}/${PN} != "games-misc/games-envd" ]] ; then
+ # environment file
+ RDEPEND="games-misc/games-envd"
+fi
+
export GAMES_PREFIX=${GAMES_PREFIX:-/usr/games}
export GAMES_PREFIX_OPT=${GAMES_PREFIX_OPT:-/opt}
export GAMES_DATADIR=${GAMES_DATADIR:-/usr/share/games}
@@ -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."
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog games.eclass
@ 2014-11-21 21:47 Julian Ospald (hasufell)
0 siblings, 0 replies; 7+ messages in thread
From: Julian Ospald (hasufell) @ 2014-11-21 21:47 UTC (permalink / raw
To: gentoo-commits
hasufell 14/11/21 21:47:16
Modified: ChangeLog games.eclass
Log:
add documentation for games.eclass, rm unnecessary exports
Revision Changes Path
1.1437 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1437&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1437&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1436&r2=1.1437
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1436
retrieving revision 1.1437
diff -u -r1.1436 -r1.1437
--- ChangeLog 21 Nov 2014 01:55:45 -0000 1.1436
+++ ChangeLog 21 Nov 2014 21:47:16 -0000 1.1437
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1436 2014/11/21 01:55:45 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1437 2014/11/21 21:47:16 hasufell Exp $
+
+ 21 Nov 2014; Julian Ospald <hasufell@gentoo.org> games.eclass:
+ add documentation for games.eclass, rm unnecessary exports
21 Nov 2014; Mike Gilbert <floppym@gentoo.org> -twisted.eclass:
Remove unused eclass.
1.159 eclass/games.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.159&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.159&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?r1=1.158&r2=1.159
Index: games.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/games.eclass,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- games.eclass 11 Jul 2014 08:21:58 -0000 1.158
+++ games.eclass 21 Nov 2014 21:47:16 -0000 1.159
@@ -1,12 +1,25 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.158 2014/07/11 08:21:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.159 2014/11/21 21:47:16 hasufell Exp $
-# devlist: games@gentoo.org
+# @ECLASS: games
+# @MAINTAINER:
+# Games team <games@gentoo.org>
+# @BLURB: Standardizing the install of games.
+# @DESCRIPTION:
+# This eclass makes sure that games are consistently handled in gentoo.
+# It installs game files by default in FHS-compatible directories
+# like /usr/share/games and sets more restrictive permissions in order
+# to avoid some security bugs.
#
-# This is the games eclass for standardizing the install of games ...
-# you better have a *good* reason why you're *not* using games.eclass
-# in a games-* ebuild
+# The installation directories as well as the user and group files are
+# installed as can be controlled by the user. See the variables like
+# GAMES_BINDIR, GAMES_USER etc. below. These are NOT supposed to be set
+# by ebuilds!
+#
+# For a general guide on writing games ebuilds, see:
+# https://wiki.gentoo.org/wiki/Project:Games/Ebuild_howto
+
if [[ -z ${_GAMES_ECLASS} ]]; then
_GAMES_ECLASS=1
@@ -24,25 +37,91 @@
RDEPEND="games-misc/games-envd"
fi
-export GAMES_PREFIX=${GAMES_PREFIX:-/usr/games}
-export GAMES_PREFIX_OPT=${GAMES_PREFIX_OPT:-/opt}
-export GAMES_DATADIR=${GAMES_DATADIR:-/usr/share/games}
-export GAMES_DATADIR_BASE=${GAMES_DATADIR_BASE:-/usr/share} # some packages auto append 'games'
-export GAMES_SYSCONFDIR=${GAMES_SYSCONFDIR:-/etc/games}
-export GAMES_STATEDIR=${GAMES_STATEDIR:-/var/games}
-export GAMES_LOGDIR=${GAMES_LOGDIR:-/var/log/games}
-export GAMES_BINDIR=${GAMES_BINDIR:-${GAMES_PREFIX}/bin}
-export GAMES_ENVD="90games"
-# if you want to use a different user/group than games.games,
-# just add these two variables to your environment (aka /etc/profile)
-export GAMES_USER=${GAMES_USER:-root}
-export GAMES_USER_DED=${GAMES_USER_DED:-games}
-export GAMES_GROUP=${GAMES_GROUP:-games}
-
+# @ECLASS-VARIABLE: GAMES_PREFIX
+# @DESCRIPTION:
+# Prefix where to install games, mostly used by GAMES_BINDIR. Games data should
+# still go into GAMES_DATADIR. May be set by the user.
+GAMES_PREFIX=${GAMES_PREFIX:-/usr/games}
+
+# @ECLASS-VARIABLE: GAMES_PREFIX_OPT
+# @DESCRIPTION:
+# Prefix where to install precompiled/blob games, usually followed by
+# package name. May be set by the user.
+GAMES_PREFIX_OPT=${GAMES_PREFIX_OPT:-/opt}
+
+# @ECLASS-VARIABLE: GAMES_DATADIR
+# @DESCRIPTION:
+# Base directory where to install game data files, usually followed by
+# package name. May be set by the user.
+GAMES_DATADIR=${GAMES_DATADIR:-/usr/share/games}
+
+# @ECLASS-VARIABLE: GAMES_DATADIR_BASE
+# @DESCRIPTION:
+# Similar to GAMES_DATADIR, but only used when a package auto appends 'games'
+# to the path. May be set by the user.
+GAMES_DATADIR_BASE=${GAMES_DATADIR_BASE:-/usr/share}
+
+# @ECLASS-VARIABLE: GAMES_SYSCONFDIR
+# @DESCRIPTION:
+# Where to install global games configuration files, usually followed by
+# package name. May be set by the user.
+GAMES_SYSCONFDIR=${GAMES_SYSCONFDIR:-/etc/games}
+
+# @ECLASS-VARIABLE: GAMES_STATEDIR
+# @DESCRIPTION:
+# Where to install/store global variable game data, usually followed by
+# package name. May be set by the user.
+GAMES_STATEDIR=${GAMES_STATEDIR:-/var/games}
+
+# @ECLASS-VARIABLE: GAMES_LOGDIR
+# @DESCRIPTION:
+# Where to store global game log files, usually followed by
+# package name. May be set by the user.
+GAMES_LOGDIR=${GAMES_LOGDIR:-/var/log/games}
+
+# @ECLASS-VARIABLE: GAMES_BINDIR
+# @DESCRIPTION:
+# Where to install the game binaries. May be set by the user. This is in PATH.
+GAMES_BINDIR=${GAMES_BINDIR:-${GAMES_PREFIX}/bin}
+
+# @ECLASS-VARIABLE: GAMES_ENVD
+# @INTERNAL
+# @DESCRIPTION:
+# The games environment file name which sets games specific LDPATH and PATH.
+GAMES_ENVD="90games"
+
+# @ECLASS-VARIABLE: GAMES_USER
+# @DESCRIPTION:
+# The USER who owns all game files and usually has write permissions.
+# May be set by the user.
+GAMES_USER=${GAMES_USER:-root}
+
+# @ECLASS-VARIABLE: GAMES_USER_DED
+# @DESCRIPTION:
+# The USER who owns all game files related to the dedicated server part
+# of a package. May be set by the user.
+GAMES_USER_DED=${GAMES_USER_DED:-games}
+
+# @ECLASS-VARIABLE: GAMES_GROUP
+# @DESCRIPTION:
+# The GROUP that owns all game files and usually does not have
+# write permissions. May be set by the user.
+# If you want games world-executable, then you can at least set this variable
+# to 'users' which is almost the same.
+GAMES_GROUP=${GAMES_GROUP:-games}
+
+# @FUNCTION: games_get_libdir
+# @DESCRIPTION:
+# Gets the directory where to install games libraries. This is in LDPATH.
games_get_libdir() {
echo ${GAMES_PREFIX}/$(get_libdir)
}
+# @FUNCTION: egamesconf
+# @USAGE: [<args>...]
+# @DESCRIPTION:
+# Games equivalent to 'econf' for autotools based build systems. It passes
+# the necessary games specific directories automatically.
egamesconf() {
# handle verbose build log pre-EAPI5
local _gamesconf
@@ -67,6 +146,12 @@
"$@"
}
+# @FUNCTION: gameswrapper
+# @USAGE: <command> [<args>...]
+# @INTERNAL
+# @DESCRIPTION:
+# Wraps an install command like dobin, dolib etc, so that
+# it has GAMES_PREFIX as prefix.
gameswrapper() {
# dont want to pollute calling env
(
@@ -77,18 +162,75 @@
)
}
+# @FUNCTION: dogamesbin
+# @USAGE: <path>...
+# @DESCRIPTION:
+# Install one or more games binaries.
dogamesbin() { gameswrapper ${FUNCNAME/games} "$@"; }
+
+# @FUNCTION: dogamessbin
+# @USAGE: <path>...
+# @DESCRIPTION:
+# Install one or more games system binaries.
dogamessbin() { gameswrapper ${FUNCNAME/games} "$@"; }
+
+# @FUNCTION: dogameslib
+# @USAGE: <path>...
+# @DESCRIPTION:
+# Install one or more games libraries.
dogameslib() { gameswrapper ${FUNCNAME/games} "$@"; }
+
+# @FUNCTION: dogameslib.a
+# @USAGE: <path>...
+# @DESCRIPTION:
+# Install one or more static games libraries.
dogameslib.a() { gameswrapper ${FUNCNAME/games} "$@"; }
+
+# @FUNCTION: dogameslib.so
+# @USAGE: <path>...
+# @DESCRIPTION:
+# Install one or more shared games libraries.
dogameslib.so() { gameswrapper ${FUNCNAME/games} "$@"; }
+
+# @FUNCTION: newgamesbin
+# @USAGE: <path> <newname>
+# @DESCRIPTION:
+# Install one games binary with a new name.
newgamesbin() { gameswrapper ${FUNCNAME/games} "$@"; }
+
+# @FUNCTION: newgamessbin
+# @USAGE: <path> <newname>
+# @DESCRIPTION:
+# Install one system games binary with a new name.
newgamessbin() { gameswrapper ${FUNCNAME/games} "$@"; }
+# @FUNCTION: games_make_wrapper
+# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
+# @DESCRIPTION:
+# Create a shell wrapper script named wrapper in installpath
+# (defaults to the games bindir) to execute target (default of wrapper) by
+# first optionally setting LD_LIBRARY_PATH to the colon-delimited
+# libpaths followed by optionally changing directory to chdir.
games_make_wrapper() { gameswrapper ${FUNCNAME/games_} "$@"; }
+# @FUNCTION: gamesowners
+# @USAGE: [<args excluding owner/group>...] <path>...
+# @DESCRIPTION:
+# Run 'chown' with the given args on the given files. Owner and
+# group are GAMES_USER and GAMES_GROUP and must not be passed
+# as args.
gamesowners() { chown ${GAMES_USER}:${GAMES_GROUP} "$@"; }
+
+# @FUNCTION: gamesperms
+# @USAGE: <path>...
+# @DESCRIPTION:
+# Run 'chmod' with games specific permissions on the given files.
gamesperms() { chmod u+rw,g+r-w,o-rwx "$@"; }
+
+# @FUNCTION: prepgamesdirs
+# @DESCRIPTION:
+# Fix all permissions/owners of files in games related directories,
+# usually called at the end of src_install().
prepgamesdirs() {
local dir f mode
for dir in \
@@ -129,6 +271,10 @@
find "${D}/${GAMES_BINDIR}" -maxdepth 1 -type f -exec chmod 750 '{}' \;
}
+# @FUNCTION: games_pkg_setup
+# @DESCRIPTION:
+# Export some toolchain specific variables and create games related groups
+# and users. This function is exported as pkg_setup().
games_pkg_setup() {
tc-export CC CXX LD AR RANLIB
@@ -145,10 +291,17 @@
&& usermod -s /bin/bash "${GAMES_USER_DED}"
}
+# @FUNCTION: games_src_configure
+# @DESCRIPTION:
+# Runs egamesconf if there is a configure file.
+# This function is exported as src_configure().
games_src_configure() {
[[ -x "${ECONF_SOURCE:-.}"/configure ]] && egamesconf
}
+# @FUNCTION: games_src_compile
+# @DESCRIPTION:
+# Runs base_src_make(). This function is exported as src_compile().
games_src_compile() {
case ${EAPI:-0} in
0|1) games_src_configure ;;
@@ -156,6 +309,9 @@
base_src_make
}
+# @FUNCTION: games_pkg_preinst
+# @DESCRIPTION:
+# Synchronizes GAMES_STATEDIR of the ebuild image with the live filesystem.
games_pkg_preinst() {
local f
@@ -171,7 +327,9 @@
done < <(find "${D}/${GAMES_STATEDIR}" -type f -printf '%P\n' 2>/dev/null)
}
-# pkg_postinst function ... warn about games group
+# @FUNCTION: games_pkg_postinst
+# @DESCRIPTION:
+# Prints some warnings and infos, also related to games groups.
games_pkg_postinst() {
if [[ -z "${GAMES_SHOW_WARNING}" ]] ; then
ewarn "Remember, in order to play games, you have to"
@@ -189,8 +347,10 @@
fi
}
-# Unpack .uz2 files for UT2003/UT2004
-# $1: directory or file to unpack
+# @FUNCTION: games_ut_unpack
+# @USAGE: <directory or file to unpack>
+# @DESCRIPTION:
+# Unpack .uz2 files for UT2003/UT2004.
games_ut_unpack() {
local ut_unpack="$1"
local f=
@@ -211,9 +371,11 @@
fi
}
-# Unpacks .umod/.ut2mod/.ut4mod files for UT/UT2003/UT2004
-# Usage: games_umod_unpack $1
-# oh, and don't forget to set 'dir' and 'Ddir'
+# @FUNCTION: games_umod_unpack
+# @USAGE: <file to unpack>
+# @DESCRIPTION:
+# Unpacks .umod/.ut2mod/.ut4mod files for UT/UT2003/UT2004.
+# Don't forget to set 'dir' and 'Ddir'.
games_umod_unpack() {
local umod=$1
mkdir -p "${Ddir}"/System
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-11-21 21:47 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-02 12:15 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog games.eclass Julian Ospald (hasufell)
-- strict thread matches above, loose matches on Subject: below --
2014-11-21 21:47 Julian Ospald (hasufell)
2014-03-12 18:54 Julian Ospald (hasufell)
2014-01-25 17:44 Julian Ospald (hasufell)
2012-07-28 15:52 Julian Ospald (hasufell)
2012-06-09 22:14 Julian Ospald (hasufell)
2012-05-30 6:35 Sergei Trofimovich (slyfox)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox