From: "Patrice Clement" <monsieurp@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-roguelike/nethack/
Date: Sat, 24 Oct 2015 15:33:11 +0000 (UTC) [thread overview]
Message-ID: <1445254554.824393e2fca2997956887f9cf21cec26ac69c01a.monsieurp@gentoo> (raw)
commit: 824393e2fca2997956887f9cf21cec26ac69c01a
Author: Luis Ressel <aranea <AT> aixah <DOT> de>
AuthorDate: Thu Oct 15 19:19:51 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 11:35:54 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=824393e2
games-roguelike/nethack: Remove old revisions
games-roguelike/nethack/nethack-3.4.3-r3.ebuild | 218 ----------------------
games-roguelike/nethack/nethack-3.4.3-r4.ebuild | 231 ------------------------
2 files changed, 449 deletions(-)
diff --git a/games-roguelike/nethack/nethack-3.4.3-r3.ebuild b/games-roguelike/nethack/nethack-3.4.3-r3.ebuild
deleted file mode 100644
index c4a490f..0000000
--- a/games-roguelike/nethack/nethack-3.4.3-r3.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs flag-o-matic user
-
-MY_PV=${PV//.}
-DESCRIPTION="The ultimate old-school single player dungeon exploration game"
-HOMEPAGE="http://www.nethack.org/"
-SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz"
-
-LICENSE="nethack"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5
- X? (
- x11-libs/libXaw
- x11-libs/libXpm
- x11-libs/libXt
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- X? (
- x11-proto/xproto
- x11-apps/bdftopcf
- x11-apps/mkfontdir
- )"
-
-BINDIR="/usr/games/bin"
-HACKDIR="/usr/share/games/${PN}"
-STATEDIR="/var/games/${PN}"
-
-NETHACK_GROUP="gamestat"
-
-pkg_setup() {
- enewgroup gamestat 36
-}
-
-src_prepare() {
- # This copies the /sys/unix Makefile.*s to their correct places for
- # seding and compiling.
- cd "sys/unix" || die "Could not go into sys/unix directory"
- source setup.sh || die
-
- cd ../.. || die "Failed to get back to main directory"
- epatch \
- "${FILESDIR}"/${PV}-gentoo-paths.patch \
- "${FILESDIR}"/${PV}-default-options.patch \
- "${FILESDIR}"/${PV}-bison.patch \
- "${FILESDIR}"/${PV}-macos.patch \
- "${FILESDIR}"/${P}-gibc210.patch \
- "${FILESDIR}"/${P}-recover.patch
-
- epatch_user
-
- mv doc/recover.6 doc/nethack-recover.6 || die "Could not rename recover.6 to nethack-recover.6"
-
- sed -i \
- -e "s:GENTOO_STATEDIR:${STATEDIR}:" include/unixconf.h \
- || die "setting statedir"
- sed -i \
- -e "s:GENTOO_HACKDIR:${HACKDIR}:" include/config.h \
- || die "setting hackdir"
- # set the default pager from the environment bug #52122
- if [[ -n "${PAGER}" ]] ; then
- sed -i \
- -e "115c\#define DEF_PAGER \"${PAGER}\"" \
- include/unixconf.h \
- || die "setting statedir"
- # bug #57410
- sed -i \
- -e "s/^DATNODLB =/DATNODLB = \$(DATHELP)/" Makefile \
- || die "sed Makefile failed"
- fi
-
- # sys-libs/ncurses[tinfo]
- sed -i \
- -e '/^WINTTYLIB/s| = .*| = '"$(
- $(tc-getPKG_CONFIG) --libs ncurses
- )"'|g' \
- src/Makefile || die
-
- if use X ; then
- epatch "${FILESDIR}/${PV}-X-support.patch"
- fi
-}
-
-src_compile() {
- local lflags="${LDFLAGS}"
-
- cd "${S}"/src || die "Failed to enter src directory"
- append-flags -I../include
-
- emake \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LFLAGS="${lflags}" \
- ../util/makedefs
- emake \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LFLAGS="${lflags}"
- cd "${S}"/util || die "Failed to enter util directory"
- emake \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LFLAGS="${lflags}" \
- recover
-}
-
-src_install() {
- emake \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LFLAGS="-L/usr/X11R6/lib" \
- GAMEPERM=02755 \
- GAMEUID="root" GAMEGRP="${NETHACK_GROUP}" \
- PREFIX="${D}/usr" \
- GAMEDIR="${D}/${HACKDIR}" \
- SHELLDIR="${D}/${BINDIR}" \
- install
-
- # We keep this stuff in STATEDIR instead so tidy up.
- rm -rf "${D}/${HACKDIR}/"{recover,save}
-
- exeinto "${BINDIR}"
- newexe util/recover recover-nethack
-
- # The final nethack is a sh script. This fixes the hard-coded
- # HACKDIR directory so it doesn't point to ${D}/usr/share/nethackdir
- sed -i \
- -e "s:^\(HACKDIR=\).*:\1${HACKDIR}:" \
- "${D}/${BINDIR}/nethack" \
- || die "sed /${BINDIR}/nethack failed"
-
- doman doc/*.6
- dodoc doc/*.txt
-
- # Can be copied to ~/.nethackrc to set options
- # Add this to /etc/.skel as well, thats the place for default configs
- insinto "${HACKDIR}"
- doins "${FILESDIR}/dot.nethackrc"
-
- local windowtypes="tty"
- use X && windowtypes="${windowtypes} x11"
- set -- ${windowtypes}
- sed -i \
- -e "s:GENTOO_WINDOWTYPES:${windowtypes}:" \
- -e "s:GENTOO_DEFWINDOWTYPE:$1:" \
- "${D}${HACKDIR}/dot.nethackrc" \
- || die "sed ${HACKDIR}/dot.nethackrc failed"
- insinto /etc/skel
- newins "${D}/${HACKDIR}/dot.nethackrc" .nethackrc
-
- if use X ; then
- # install nethack fonts
- cd "${S}/win/X11" || die "Failed to enter win/X11 directory"
- bdftopcf -o nh10.pcf nh10.bdf || die "Converting fonts failed"
- bdftopcf -o ibm.pcf ibm.bdf || die "Converting fonts failed"
- insinto "${HACKDIR}/fonts"
- doins *.pcf
- cd "${D}/${HACKDIR}/fonts" || die "Failed to enter fonts directory"
- mkfontdir || die "The action mkfontdir ${HACKDIR}/fonts failed"
-
- # copy nethack x application defaults
- cd "${S}/win/X11" || die "Failed to enter win/X11 directory again"
- insinto /etc/X11/app-defaults
- newins NetHack.ad NetHack
- sed -i \
- -e 's:^!\(NetHack.tile_file.*\):\1:' \
- "${D}/etc/X11/app-defaults/NetHack" \
- || die "sed /etc/X11/app-defaults/NetHack failed"
- fi
-
- keepdir "${STATEDIR}/save"
- rm "${D}/${HACKDIR}/"{logfile,perm,record}
- make_desktop_entry nethack "Nethack"
-
- fowners -R "root:${NETHACK_GROUP}" "${STATEDIR}"
- fperms -R 660 "${STATEDIR}"
- fperms 770 "${STATEDIR}" "${STATEDIR}/save"
-
- # FIXME: main executable in /usr/games/share
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-3.4.3-r3" ; then
- migration=true
-
- # preserve STATEDIR/{logfile,record} (previous ebuild rev mistakenly removes it)
- cp "${ROOT}/${STATEDIR}/"{logfile,record} "$T" # nonfatal
- fi
-}
-
-pkg_postinst() {
- # we don't want to overwrite existing files, as they contain user data
- cd "${ROOT}/${STATEDIR}" || die "Failed to enter ${STATEDIR} directory"
- local files="logfile perm record"
-
- touch $files && \
- chmod 660 $files && \
- chown root:"${NETHACK_GROUP}" $files || \
- die "Adjustment of file permissions in "${ROOT}/${STATEDIR}" failed"
-
- if [[ -v migration ]] ; then
- cp "$T/"{logfile,record} "${ROOT}/${STATEDIR}" # nonfatal
-
- chown -R root:"${NETHACK_GROUP}" "${ROOT}/${STATEDIR}" && \
- chmod -R 660 "${ROOT}/${STATEDIR}" && \
- chmod 770 "${ROOT}/${STATEDIR}" "${ROOT}/${STATEDIR}/save" || \
- die "Adjustment of file permissions in "${ROOT}/${STATEDIR}" failed"
- fi
-
- elog "You may want to look at /etc/skel/.nethackrc for interesting options"
-}
diff --git a/games-roguelike/nethack/nethack-3.4.3-r4.ebuild b/games-roguelike/nethack/nethack-3.4.3-r4.ebuild
deleted file mode 100644
index 7e82eb8..0000000
--- a/games-roguelike/nethack/nethack-3.4.3-r4.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs flag-o-matic user
-
-MY_PV=${PV//.}
-DESCRIPTION="The ultimate old-school single player dungeon exploration game"
-HOMEPAGE="http://www.nethack.org/"
-SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz"
-
-LICENSE="nethack"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5
- X? (
- x11-libs/libXaw
- x11-libs/libXpm
- x11-libs/libXt
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- X? (
- x11-proto/xproto
- x11-apps/bdftopcf
- x11-apps/mkfontdir
- )"
-
-BINDIR="/usr/games/bin"
-HACKDIR="/usr/share/games/${PN}"
-STATEDIR="/var/games/${PN}"
-
-NETHACK_GROUP="gamestat"
-
-pkg_setup() {
- enewgroup gamestat 36
-}
-
-src_prepare() {
- # This copies the /sys/unix Makefile.*s to their correct places for
- # seding and compiling.
- cd "sys/unix" || die "Could not go into sys/unix directory"
- source setup.sh || die
-
- cd ../.. || die "Failed to get back to main directory"
- epatch \
- "${FILESDIR}"/${PV}-gentoo-paths.patch \
- "${FILESDIR}"/${PV}-default-options.patch \
- "${FILESDIR}"/${PV}-bison.patch \
- "${FILESDIR}"/${PV}-macos.patch \
- "${FILESDIR}"/${P}-gibc210.patch \
- "${FILESDIR}"/${P}-recover.patch
-
- epatch_user
-
- mv doc/recover.6 doc/nethack-recover.6 || die "Could not rename recover.6 to nethack-recover.6"
-
- sed -i \
- -e "s:GENTOO_STATEDIR:${STATEDIR}:" include/unixconf.h \
- || die "setting statedir"
- sed -i \
- -e "s:GENTOO_HACKDIR:${HACKDIR}:" include/config.h \
- || die "setting hackdir"
- # set the default pager from the environment bug #52122
- if [[ -n "${PAGER}" ]] ; then
- sed -i \
- -e "115c\#define DEF_PAGER \"${PAGER}\"" \
- include/unixconf.h \
- || die "setting statedir"
- # bug #57410
- sed -i \
- -e "s/^DATNODLB =/DATNODLB = \$(DATHELP)/" Makefile \
- || die "sed Makefile failed"
- fi
-
- # sys-libs/ncurses[tinfo]
- sed -i \
- -e '/^WINTTYLIB/s| = .*| = '"$(
- $(tc-getPKG_CONFIG) --libs ncurses
- )"'|g' \
- src/Makefile || die
-
- if use X ; then
- epatch "${FILESDIR}/${PV}-X-support.patch"
- fi
-}
-
-src_compile() {
- local lflags="${LDFLAGS}"
-
- cd "${S}"/src || die "Failed to enter src directory"
- append-flags -I../include
-
- emake \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LFLAGS="${lflags}" \
- ../util/makedefs
- emake \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LFLAGS="${lflags}"
- cd "${S}"/util || die "Failed to enter util directory"
- emake \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LFLAGS="${lflags}" \
- recover
-}
-
-src_install() {
- emake \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LFLAGS="-L/usr/X11R6/lib" \
- GAMEPERM=02755 \
- GAMEUID="root" GAMEGRP="${NETHACK_GROUP}" \
- PREFIX="${D}/usr" \
- GAMEDIR="${D}/${HACKDIR}" \
- SHELLDIR="${D}/${BINDIR}" \
- install
-
- # We keep this stuff in STATEDIR instead so tidy up.
- rm -rf "${D}/${HACKDIR}/"{nethack,recover,save}
-
- exeinto "${BINDIR}"
- newexe src/nethack nethack-bin
- newexe util/recover recover-nethack
-
- # The final nethack is a sh script. This fixes the hard-coded
- # HACKDIR directory so it doesn't point to ${D}/usr/share/nethackdir
- # and points HACK to BINDIR/nethack-bin (see above)
- sed -i \
- -e "s:^\(HACKDIR=\).*$:\1${HACKDIR}:;
- s:^\(HACK=\).*$:\1${BINDIR}/nethack-bin:" \
- "${D}/${BINDIR}/nethack" \
- || die "sed /${BINDIR}/nethack failed"
-
- doman doc/*.6
- dodoc doc/*.txt
-
- # Can be copied to ~/.nethackrc to set options
- # Add this to /etc/.skel as well, thats the place for default configs
- insinto "${HACKDIR}"
- doins "${FILESDIR}/dot.nethackrc"
-
- local windowtypes="tty"
- use X && windowtypes="${windowtypes} x11"
- set -- ${windowtypes}
- sed -i \
- -e "s:GENTOO_WINDOWTYPES:${windowtypes}:" \
- -e "s:GENTOO_DEFWINDOWTYPE:$1:" \
- "${D}${HACKDIR}/dot.nethackrc" \
- || die "sed ${HACKDIR}/dot.nethackrc failed"
- insinto /etc/skel
- newins "${D}/${HACKDIR}/dot.nethackrc" .nethackrc
-
- if use X ; then
- # install nethack fonts
- cd "${S}/win/X11" || die "Failed to enter win/X11 directory"
- bdftopcf -o nh10.pcf nh10.bdf || die "Converting fonts failed"
- bdftopcf -o ibm.pcf ibm.bdf || die "Converting fonts failed"
- insinto "${HACKDIR}/fonts"
- doins *.pcf
- cd "${D}/${HACKDIR}/fonts" || die "Failed to enter fonts directory"
- mkfontdir || die "The action mkfontdir ${HACKDIR}/fonts failed"
-
- # copy nethack x application defaults
- cd "${S}/win/X11" || die "Failed to enter win/X11 directory again"
- insinto /etc/X11/app-defaults
- newins NetHack.ad NetHack
- sed -i \
- -e 's:^!\(NetHack.tile_file.*\):\1:' \
- "${D}/etc/X11/app-defaults/NetHack" \
- || die "sed /etc/X11/app-defaults/NetHack failed"
- fi
-
- keepdir "${STATEDIR}/save"
- rm "${D}/${HACKDIR}/"{logfile,perm,record}
- make_desktop_entry nethack "Nethack"
-
- fowners -R "root:${NETHACK_GROUP}" "${STATEDIR}"
- fperms -R 660 "${STATEDIR}"
- fperms 770 "${STATEDIR}" "${STATEDIR}/save"
-
- fowners "root:${NETHACK_GROUP}" ${BINDIR}/nethack-bin
- fperms g+s ${BINDIR}/nethack-bin
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-3.4.3-r3" ; then
- migration=true
-
- # preserve STATEDIR/{logfile,record}
- # (previous ebuild rev mistakenly removes it)
- for f in "${ROOT}/${STATEDIR}/"{logfile,record} ; do
- if [[ -e "$f" ]] ; then
- cp "$f" "$T" || die "Failed to preserve ${ROOT}/${STATEDIR} files"
- else
- touch "$T/$f" || die "Failed to preserve ${ROOT}/${STATEDIR} files"
- fi
- done
- fi
-}
-
-pkg_postinst() {
- cd "${ROOT}/${STATEDIR}" || die "Failed to enter ${STATEDIR} directory"
-
- if [[ -v migration ]] ; then
- cp "$T/"{logfile,record} . || \
- die "Failed to preserve ${ROOT}/${STATEDIR} files"
-
- chown -R root:"${NETHACK_GROUP}" . && \
- chmod -R 660 . && \
- chmod 770 . save || \
- die "Adjustment of file permissions in ${ROOT}/${STATEDIR} failed"
- fi
-
- # we don't want to overwrite existing files, as they contain user data
- local files="logfile perm record"
-
- touch $files && \
- chmod 660 $files && \
- chown root:"${NETHACK_GROUP}" $files || \
- die "Adjustment of file permissions in "${ROOT}/${STATEDIR}" failed"
-
- elog "You may want to look at /etc/skel/.nethackrc for interesting options"
-}
next reply other threads:[~2015-10-24 15:33 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-24 15:33 Patrice Clement [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-03-17 5:57 [gentoo-commits] repo/gentoo:master commit in: games-roguelike/nethack/ Sam James
2020-03-29 11:45 Mikle Kolyada
2020-03-29 11:45 Mikle Kolyada
2020-01-25 10:56 Stefan Strogin
2019-12-17 18:59 Stefan Strogin
2019-07-16 9:17 Ulrich Müller
2019-04-18 3:30 Aaron Bauman
2019-03-13 22:20 Sergei Trofimovich
2018-08-23 20:11 Michał Górny
2018-02-11 10:53 Michał Górny
2017-12-15 7:36 Jeroen Roovers
2017-03-31 9:40 Michael Weber
2016-02-13 3:56 Ian Delaney
2016-02-09 7:18 Ian Delaney
2016-02-09 7:18 Ian Delaney
2016-02-09 7:18 Ian Delaney
2016-01-16 2:39 Ian Delaney
2016-01-16 2:39 Ian Delaney
2015-10-24 15:33 Patrice Clement
2015-10-24 15:33 Patrice Clement
2015-10-24 15:33 Patrice Clement
2015-10-24 15:33 Patrice Clement
2015-10-24 15:33 Patrice Clement
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445254554.824393e2fca2997956887f9cf21cec26ac69c01a.monsieurp@gentoo \
--to=monsieurp@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox