commit: c23c7ac9592dc6e225c669dcaa9cb0d3eaafbc78 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Nov 19 13:31:58 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> 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} }
