From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 73FFD1396DA for ; Sun, 19 Nov 2017 13:34:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8B76E0DFE; Sun, 19 Nov 2017 13:34:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 97985E0DFE for ; Sun, 19 Nov 2017 13:34:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 83A9E341646 for ; Sun, 19 Nov 2017 13:34:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B1C1A044 for ; Sun, 19 Nov 2017 13:34:52 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1511098476.c23c7ac9592dc6e225c669dcaa9cb0d3eaafbc78.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/armagetronad/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild X-VCS-Directories: games-action/armagetronad/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: c23c7ac9592dc6e225c669dcaa9cb0d3eaafbc78 X-VCS-Branch: master Date: Sun, 19 Nov 2017 13:34:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5d3cb497-120b-4583-90a8-2bafa048d586 X-Archives-Hash: 9635a73cd11ea97aa459e11514e06b4a commit: c23c7ac9592dc6e225c669dcaa9cb0d3eaafbc78 Author: David Seifert gentoo org> AuthorDate: Sun Nov 19 13:31:58 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Nov 19 13:34:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c23c7ac9 games-action/armagetronad: Minor touchups Closes: https://bugs.gentoo.org/588104 Package-Manager: Portage-2.3.14, Repoman-2.3.6 .../armagetronad/armagetronad-0.2.8.3.3-r1.ebuild | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild index 7aa64769890..9147b211160 100644 --- a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild +++ b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 + inherit eutils gnome2-utils DESCRIPTION="Fast-paced 3D lightcycle game based on Tron" @@ -16,15 +17,12 @@ IUSE="dedicated sound" RDEPEND=" dev-libs/libxml2 !dedicated? ( - media-libs/libpng:0 - media-libs/libsdl[X,opengl,video] + media-libs/libpng:0= + media-libs/libsdl[X,opengl,video,sound?] media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl - sound? ( - media-libs/libsdl[sound] - media-libs/sdl-mixer - ) + sound? ( media-libs/sdl-mixer ) )" DEPEND=${RDEPEND} @@ -38,7 +36,6 @@ src_prepare() { src_configure() { # --enable-games just messes up paths econf \ - --docdir=/usr/share/doc/${PF} \ $(use_enable dedicated) \ $(use_enable sound music) \ --disable-sysinstall \ @@ -48,12 +45,10 @@ src_configure() { } src_install() { - # FIXME: is the -j1 needed? https://bugs.gentoo.org/588104 - emake -j1 DESTDIR="${D}" install - einstalldocs + default # misplaced desktop-file/icons - rm -rf "${ED%/}${GAMES_DATADIR}"/armagetronad/desktop + rm -r "${ED%/}"/usr/share/${PN}/desktop || die doicon -s 48 desktop/icons/large/armagetronad.png make_desktop_entry ${PN} }