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 E8E0258973 for ; Wed, 20 Jan 2016 07:20:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52DA621C0A5; Wed, 20 Jan 2016 07:20:05 +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 7DBC021C0A5 for ; Wed, 20 Jan 2016 07:20:04 +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 97671340845 for ; Wed, 20 Jan 2016 07:20:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 14C01106A for ; Wed, 20 Jan 2016 07:19:59 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1453265624.a4485befd670ac1d079816140690a1647bfdc549.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/ppsspp/metadata.xml games-emulation/ppsspp/ppsspp-1.1.0.ebuild games-emulation/ppsspp/ppsspp-1.1.1.ebuild games-emulation/ppsspp/ppsspp-9999.ebuild X-VCS-Directories: games-emulation/ppsspp/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: a4485befd670ac1d079816140690a1647bfdc549 X-VCS-Branch: master Date: Wed, 20 Jan 2016 07:19:59 +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: 7b539102-1865-49ec-9171-5ba3d21ebf04 X-Archives-Hash: 814e794d0985b597b602717c220f3f55 commit: a4485befd670ac1d079816140690a1647bfdc549 Author: RobinDX gmail com> AuthorDate: Wed Jan 20 04:53:15 2016 +0000 Commit: Ian Delaney gentoo org> CommitDate: Wed Jan 20 04:53:44 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4485bef games-emulation/ppsspp:add qt5 support games-emulation/ppsspp/metadata.xml | 1 + games-emulation/ppsspp/ppsspp-1.1.0.ebuild | 30 +++++++++++++++++++++++++--- games-emulation/ppsspp/ppsspp-1.1.1.ebuild | 32 ++++++++++++++++++++++++++---- games-emulation/ppsspp/ppsspp-9999.ebuild | 32 ++++++++++++++++++++++++++---- 4 files changed, 84 insertions(+), 11 deletions(-) diff --git a/games-emulation/ppsspp/metadata.xml b/games-emulation/ppsspp/metadata.xml index 51a6852..be7e8b7 100644 --- a/games-emulation/ppsspp/metadata.xml +++ b/games-emulation/ppsspp/metadata.xml @@ -8,6 +8,7 @@ Adds support for the Qt GUI/Application Toolkit version 4.x + Adds support for the Qt GUI/Application Toolkit version 5.x Adds support for Simple Direct Layer (media library) diff --git a/games-emulation/ppsspp/ppsspp-1.1.0.ebuild b/games-emulation/ppsspp/ppsspp-1.1.0.ebuild index 6bc431f..38dc392 100644 --- a/games-emulation/ppsspp/ppsspp-1.1.0.ebuild +++ b/games-emulation/ppsspp/ppsspp-1.1.0.ebuild @@ -14,9 +14,9 @@ EGIT_COMMIT="v${PV}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="qt4 +sdl" +IUSE="qt4 qt5 +sdl" REQUIRED_USE=" - ?? ( qt4 sdl ) + ?? ( qt4 qt5 sdl ) " RDEPEND="" @@ -36,6 +36,15 @@ DEPEND=" dev-qt/qtmultimedia:4 dev-qt/qt-mobility[multimedia] ) + qt5? ( + dev-qt/qtsvg:5 + dev-qt/qtgui:5 + dev-qt/qtcore:5 + dev-qt/qtopengl:5 + dev-qt/qtmultimedia:5 + dev-qt/qtwidgets + dev-qt/qt-mobility[multimedia] + ) " src_unpack() { @@ -44,8 +53,10 @@ src_unpack() { if use qt4 ; then cd "${WORKDIR}"/"${P}"/Qt || die qt4-r2_src_unpack + elif use qt5 ; then + cd "${WORKDIR}"/"${P}"/Qt || die + qt4-r2_src_unpack fi - cp /usr/portage/distfiles/ppsspp-icon.png "${WORKDIR}"/"${P}"/ } src_prepare() { @@ -56,6 +67,9 @@ src_prepare() { if use qt4 ; then cd "${WORKDIR}"/"${P}"/Qt || die qt4-r2_src_prepare + elif use qt5 ; then + cd "${WORKDIR}"/"${P}"/Qt || die + qt4-r2_src_prepare else cmake-utils_src_prepare fi @@ -66,6 +80,10 @@ src_configure() { cd "${WORKDIR}"/"${P}"/Qt || die qt4-r2_src_configure eqmake4 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro + elif use qt5 ; then + cd "${WORKDIR}"/"${P}"/Qt || die + qt4-r2_src_configure + eqmake5 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro else cmake-utils_src_configure fi @@ -75,6 +93,9 @@ src_compile() { if use qt4 ; then cd "${WORKDIR}"/"${P}"/Qt || die qt4-r2_src_compile + elif use qt5 ; then + cd "${WORKDIR}"/"${P}"/Qt || die + qt4-r2_src_compile else cmake-utils_src_compile fi @@ -84,6 +105,9 @@ src_install() { if use qt4 ; then exeinto /usr/games/bin newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp + elif use qt5 ; then + exeinto /usr/games/bin + newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp else exeinto /usr/games dobin "${FILESDIR}"/ppsspp diff --git a/games-emulation/ppsspp/ppsspp-1.1.1.ebuild b/games-emulation/ppsspp/ppsspp-1.1.1.ebuild index 6de52a1..38dc392 100644 --- a/games-emulation/ppsspp/ppsspp-1.1.1.ebuild +++ b/games-emulation/ppsspp/ppsspp-1.1.1.ebuild @@ -8,15 +8,15 @@ inherit eutils cmake-utils qt4-r2 git-r3 DESCRIPTION="A PSP emulator written in C++." HOMEPAGE="http://www.ppsspp.org/" -EGIT_REPO_URI="git://github.com/hrydgard/ppsspp.git" +EGIT_REPO_URI="git://github.com/hrydgard/${PN}.git" EGIT_COMMIT="v${PV}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="qt4 +sdl" +IUSE="qt4 qt5 +sdl" REQUIRED_USE=" - ?? ( qt4 sdl ) + ?? ( qt4 qt5 sdl ) " RDEPEND="" @@ -36,6 +36,15 @@ DEPEND=" dev-qt/qtmultimedia:4 dev-qt/qt-mobility[multimedia] ) + qt5? ( + dev-qt/qtsvg:5 + dev-qt/qtgui:5 + dev-qt/qtcore:5 + dev-qt/qtopengl:5 + dev-qt/qtmultimedia:5 + dev-qt/qtwidgets + dev-qt/qt-mobility[multimedia] + ) " src_unpack() { @@ -44,8 +53,10 @@ src_unpack() { if use qt4 ; then cd "${WORKDIR}"/"${P}"/Qt || die qt4-r2_src_unpack + elif use qt5 ; then + cd "${WORKDIR}"/"${P}"/Qt || die + qt4-r2_src_unpack fi - cp /usr/portage/distfiles/ppsspp-icon.png "${WORKDIR}"/"${P}"/ } src_prepare() { @@ -56,6 +67,9 @@ src_prepare() { if use qt4 ; then cd "${WORKDIR}"/"${P}"/Qt || die qt4-r2_src_prepare + elif use qt5 ; then + cd "${WORKDIR}"/"${P}"/Qt || die + qt4-r2_src_prepare else cmake-utils_src_prepare fi @@ -66,6 +80,10 @@ src_configure() { cd "${WORKDIR}"/"${P}"/Qt || die qt4-r2_src_configure eqmake4 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro + elif use qt5 ; then + cd "${WORKDIR}"/"${P}"/Qt || die + qt4-r2_src_configure + eqmake5 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro else cmake-utils_src_configure fi @@ -75,6 +93,9 @@ src_compile() { if use qt4 ; then cd "${WORKDIR}"/"${P}"/Qt || die qt4-r2_src_compile + elif use qt5 ; then + cd "${WORKDIR}"/"${P}"/Qt || die + qt4-r2_src_compile else cmake-utils_src_compile fi @@ -84,6 +105,9 @@ src_install() { if use qt4 ; then exeinto /usr/games/bin newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp + elif use qt5 ; then + exeinto /usr/games/bin + newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp else exeinto /usr/games dobin "${FILESDIR}"/ppsspp diff --git a/games-emulation/ppsspp/ppsspp-9999.ebuild b/games-emulation/ppsspp/ppsspp-9999.ebuild index d9166bb..fdfb52b 100644 --- a/games-emulation/ppsspp/ppsspp-9999.ebuild +++ b/games-emulation/ppsspp/ppsspp-9999.ebuild @@ -8,14 +8,14 @@ inherit eutils cmake-utils qt4-r2 git-r3 DESCRIPTION="A PSP emulator written in C++." HOMEPAGE="http://www.ppsspp.org/" -EGIT_REPO_URI="git://github.com/hrydgard/ppsspp.git" +EGIT_REPO_URI="git://github.com/hrydgard/${PN}.git" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="qt4 +sdl" +IUSE="qt4 qt5 +sdl" REQUIRED_USE=" - ?? ( qt4 sdl ) + ?? ( qt4 qt5 sdl ) " RDEPEND="" @@ -35,6 +35,15 @@ DEPEND=" dev-qt/qtmultimedia:4 dev-qt/qt-mobility[multimedia] ) + qt5? ( + dev-qt/qtsvg:5 + dev-qt/qtgui:5 + dev-qt/qtcore:5 + dev-qt/qtopengl:5 + dev-qt/qtmultimedia:5 + dev-qt/qtwidgets + dev-qt/qt-mobility[multimedia] + ) " src_unpack() { @@ -43,8 +52,10 @@ src_unpack() { if use qt4 ; then cd "${WORKDIR}"/"${P}"/Qt || die qt4-r2_src_unpack + elif use qt5 ; then + cd "${WORKDIR}"/"${P}"/Qt || die + qt4-r2_src_unpack fi - cp /usr/portage/distfiles/ppsspp-icon.png "${WORKDIR}"/"${P}"/ } src_prepare() { @@ -55,6 +66,9 @@ src_prepare() { if use qt4 ; then cd "${WORKDIR}"/"${P}"/Qt || die qt4-r2_src_prepare + elif use qt5 ; then + cd "${WORKDIR}"/"${P}"/Qt || die + qt4-r2_src_prepare else cmake-utils_src_prepare fi @@ -65,6 +79,10 @@ src_configure() { cd "${WORKDIR}"/"${P}"/Qt || die qt4-r2_src_configure eqmake4 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro + elif use qt5 ; then + cd "${WORKDIR}"/"${P}"/Qt || die + qt4-r2_src_configure + eqmake5 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro else cmake-utils_src_configure fi @@ -74,6 +92,9 @@ src_compile() { if use qt4 ; then cd "${WORKDIR}"/"${P}"/Qt || die qt4-r2_src_compile + elif use qt5 ; then + cd "${WORKDIR}"/"${P}"/Qt || die + qt4-r2_src_compile else cmake-utils_src_compile fi @@ -83,6 +104,9 @@ src_install() { if use qt4 ; then exeinto /usr/games/bin newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp + elif use qt5 ; then + exeinto /usr/games/bin + newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp else exeinto /usr/games dobin "${FILESDIR}"/ppsspp