[gentoo-commits] repo/gentoo:master commit in: games-roguelike/nethack/

[Patrice Clement]

commit:     4f28038d4ce6cfa11a205e2c86730796a98c3b25
Author:     Luis Ressel <aranea <AT> aixah <DOT> de>
AuthorDate: Thu Oct 15 22:42:02 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=4f28038d

games-roguelike/nethack: Minor cleanup

* Drop \ after && and ||
* Drop reference to old X11 libdir

 games-roguelike/nethack/nethack-3.4.3-r5.ebuild | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/games-roguelike/nethack/nethack-3.4.3-r5.ebuild 
b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
index b8cfdfd..6762a44 100644
--- a/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
+++ b/games-roguelike/nethack/nethack-3.4.3-r5.ebuild
@@ -116,7 +116,6 @@ src_install() {
        emake \
                CC="$(tc-getCC)" \
                CFLAGS="${CFLAGS}" \
-               LFLAGS="-L/usr/X11R6/lib" \
                GAMEPERM=02755 \
                GAMEUID="root" GAMEGRP="${NETHACK_GROUP}" \
                PREFIX="${D}/usr" \
@@ -209,21 +208,21 @@ pkg_postinst() {
        cd "${ROOT}/${STATEDIR}" || die "Failed to enter ${STATEDIR} directory"
 
        if [[ -v migration ]] ; then
-               cp "$T/"{logfile,record} . || \
+               cp "$T/"{logfile,record} . ||
                die "Failed to preserve ${ROOT}/${STATEDIR} files"
 
-               chown -R root:"${NETHACK_GROUP}" . && \
-               chmod -R 660 . && \
-               chmod 770 . save || \
+               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 || \
+       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"