From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 357BD1388BF for ; Thu, 14 Jan 2016 21:28:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1F70E07A5; Thu, 14 Jan 2016 21:28:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 66298E07A5 for ; Thu, 14 Jan 2016 21:28:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 150AC340B53 for ; Thu, 14 Jan 2016 21:28:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BB84A91 for ; Thu, 14 Jan 2016 21:28:39 +0000 (UTC) From: "Michael Sterrett" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Sterrett" Message-ID: <1452806900.ad3e10828457dbc034ace481c5bbf4b6caed8fa4.mr_bones_@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-fps/doomsday/doomsday-1.15.7.ebuild X-VCS-Directories: games-fps/doomsday/ X-VCS-Committer: mr_bones_ X-VCS-Committer-Name: Michael Sterrett X-VCS-Revision: ad3e10828457dbc034ace481c5bbf4b6caed8fa4 X-VCS-Branch: master Date: Thu, 14 Jan 2016 21:28:39 +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: f2f6c333-42fe-47ec-8288-888125eeb3ac X-Archives-Hash: 7ec95da7fc0bbefb364ceb5d251e8f13 commit: ad3e10828457dbc034ace481c5bbf4b6caed8fa4 Author: Michael Sterrett gentoo org> AuthorDate: Thu Jan 14 21:11:07 2016 +0000 Commit: Michael Sterrett gentoo org> CommitDate: Thu Jan 14 21:28:20 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad3e1082 games-fps/doomsday: use qmake-utils instead of qt5-build (bug #571918) Package-Manager: portage-2.2.26 games-fps/doomsday/doomsday-1.15.7.ebuild | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/games-fps/doomsday/doomsday-1.15.7.ebuild b/games-fps/doomsday/doomsday-1.15.7.ebuild index b453730..1b11b67 100644 --- a/games-fps/doomsday/doomsday-1.15.7.ebuild +++ b/games-fps/doomsday/doomsday-1.15.7.ebuild @@ -6,7 +6,7 @@ EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit python-r1 eutils qt5-build games +inherit python-r1 eutils qmake-utils games DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen" HOMEPAGE="http://www.dengine.net/" @@ -95,8 +95,6 @@ src_prepare() { use openal && echo "CONFIG += deng_openal" } > config_user.pri || die - - qt5-build_src_prepare } #Usage: doom_make_wrapper [args] @@ -108,12 +106,11 @@ doom_make_wrapper() { } src_configure() { - qt5-build_src_configure + eqmake5 doomsday.pro } src_install() { - qt5-build_src_install - + emake INSTALL_ROOT="${D}" install dodoc "${S}"/../README.md mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die