summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2010-01-19 06:13:47 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2010-01-19 06:13:47 +0000
commit11bd6982d827b822fa10ea147f66d0d5adae9277 (patch)
tree747776c42d8c161a9c63a5237c263a0a0c127823 /games-misc
parentVersion bump, drop old. (diff)
downloadgentoo-2-11bd6982d827b822fa10ea147f66d0d5adae9277.tar.gz
gentoo-2-11bd6982d827b822fa10ea147f66d0d5adae9277.tar.bz2
gentoo-2-11bd6982d827b822fa10ea147f66d0d5adae9277.zip
Honor CFLAGS, CXXFLAGS, CC and CXX; fix perms on GAMES_STATEDIR
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'games-misc')
-rw-r--r--games-misc/bsd-games/ChangeLog6
-rw-r--r--games-misc/bsd-games/bsd-games-2.17-r4.ebuild21
2 files changed, 18 insertions, 9 deletions
diff --git a/games-misc/bsd-games/ChangeLog b/games-misc/bsd-games/ChangeLog
index c67f5b69b11e..6e9e1bdcc262 100644
--- a/games-misc/bsd-games/ChangeLog
+++ b/games-misc/bsd-games/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-misc/bsd-games
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.42 2010/01/18 11:11:02 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.43 2010/01/19 06:13:47 mr_bones_ Exp $
+
+ 19 Jan 2010; Michael Sterrett <mr_bones_@gentoo.org>
+ bsd-games-2.17-r4.ebuild:
+ Honor CFLAGS, CXXFLAGS, CC and CXX; fix perms on GAMES_STATEDIR
18 Jan 2010; Tupone Alfredo <tupone@gentoo.org> bsd-games-2.17-r4.ebuild:
Documentation installed in /usr/share/doc/${PF}
diff --git a/games-misc/bsd-games/bsd-games-2.17-r4.ebuild b/games-misc/bsd-games/bsd-games-2.17-r4.ebuild
index 60f9743f3764..243c704d604f 100644
--- a/games-misc/bsd-games/bsd-games-2.17-r4.ebuild
+++ b/games-misc/bsd-games/bsd-games-2.17-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r4.ebuild,v 1.6 2010/01/18 20:27:29 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r4.ebuild,v 1.7 2010/01/19 06:13:47 mr_bones_ Exp $
EAPI=2
inherit eutils games
@@ -46,16 +46,20 @@ src_prepare() {
wargames/wargames \
|| die "sed wargames failed"
+ sed -i \
+ -e '/^CC :=/d' \
+ -e '/^CXX :=/d' \
+ -e '/^CFLAGS/s/OPTIMIZE/CFLAGS/' \
+ -e '/^CXXFLAGS/s/OPTIMIZE/CXXFLAGS/' \
+ Makeconfig.in \
+ || die 'sed failed'
+
cp "${FILESDIR}"/config.params-gentoo config.params
echo bsd_games_cfg_usrlibdir=\"$(games_get_libdir)\" >> ./config.params
echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params
echo bsd_games_cfg_docdir=\"/usr/share/doc/${PF}\" >> ./config.params
}
-src_compile() {
- emake OPTIMIZE="${CFLAGS}" || die "emake failed"
-}
-
src_test() {
addwrite /dev/full
emake -j1 check || die "make check failed"
@@ -72,7 +76,7 @@ do_statefile() {
src_install() {
dodir "${GAMES_BINDIR}" "${GAMES_STATEDIR}" /usr/share/man/man{1,6}
- make DESTDIR="${D}" install || die "make install failed"
+ emake DESTDIR="${D}" install || die "emake install failed"
dodoc AUTHORS BUGS ChangeLog ChangeLog.0 \
README PACKAGING SECURITY THANKS TODO YEAR2000
@@ -98,8 +102,6 @@ src_install() {
build_game sail && do_statefile saillog
build_game snake && do_statefile snake.log && do_statefile snakerawscores
build_game tetris && do_statefile tetris-bsd.scores
- # state dirs
- chmod -R ug+rw "${D}/${GAMES_STATEDIR}"/*
# extra docs
build_game atc && { docinto atc ; dodoc atc/BUGS; }
@@ -117,4 +119,7 @@ src_install() {
prepalldocs
prepgamesdirs
+
+ # state dirs
+ chmod -R ug+rw "${D}/${GAMES_STATEDIR}"/*
}