[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Patrice Clement" <monsieurp@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/
Date: Tue, 19 Jan 2016 20:27:22 +0000 (UTC)	[thread overview]
Message-ID: <1453235138.501b6af01b84d1bf8cdb815dc112d97d650a59b0.monsieurp@gentoo> (raw)

commit:     501b6af01b84d1bf8cdb815dc112d97d650a59b0
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 20:23:13 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 20:25:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=501b6af0

games-emulation/ppsspp: Add missing dies. Fix dependencies. Fix header.

Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 games-emulation/ppsspp/Manifest            |  0
 games-emulation/ppsspp/ppsspp-1.1.0.ebuild | 41 +++++++++++++++++-------------
 games-emulation/ppsspp/ppsspp-1.1.1.ebuild | 37 ++++++++++++++++-----------
 games-emulation/ppsspp/ppsspp-9999.ebuild  | 38 +++++++++++++++------------
 4 files changed, 68 insertions(+), 48 deletions(-)

diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
deleted file mode 100644
index e69de29..0000000

diff --git a/games-emulation/ppsspp/ppsspp-1.1.0.ebuild b/games-emulation/ppsspp/ppsspp-1.1.0.ebuild
index 458c26c..493f3cb 100644
--- a/games-emulation/ppsspp/ppsspp-1.1.0.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit eutils cmake-utils qt4-r2 git-r3
 
 DESCRIPTION="A PSP emulator for Android, Windows, Mac, Linux and Blackberry 10, 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"
@@ -20,22 +20,29 @@ REQUIRED_USE="
 "
 
 RDEPEND=""
-DEPEND="sys-libs/zlib
-	sdl? ( media-libs/libsdl )
-	sdl? ( media-libs/libsdl2 )
-	sdl? ( dev-util/cmake )
-	qt4? ( dev-qt/qtcore:4 )
-	qt4? ( dev-qt/qtgui:4 )
-	qt4? ( dev-qt/qtmultimedia:4 )
-	qt4? ( dev-qt/qtopengl:4 )
-	qt4? ( dev-qt/qtsvg:4 )
-	qt4? ( dev-qt/qt-mobility[multimedia] )"
+
+DEPEND="
+	sys-libs/zlib
+	sdl? (
+		dev-util/cmake
+		media-libs/libsdl
+		media-libs/libsdl2
+	)
+	qt4? (
+		dev-qt/qtsvg:4
+		dev-qt/qtgui:4
+		dev-qt/qtcore:4
+		dev-qt/qtopengl:4
+		dev-qt/qtmultimedia:4
+		dev-qt/qt-mobility[multimedia]
+	)
+"
 
 src_unpack() {
 	git-r3_fetch
 	git-r3_checkout
 	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt
+		cd "${WORKDIR}"/"${P}"/Qt || die
 		qt4-r2_src_unpack
 	fi
 	cp /usr/portage/distfiles/ppsspp-icon.png  "${WORKDIR}"/"${P}"/
@@ -47,7 +54,7 @@ src_prepare() {
 	epatch "$FILESDIR"/ppsspp-ffmpeg-x86.patch
 	epatch "$FILESDIR"/ppsspp-qt.patch
 	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt
+		cd "${WORKDIR}"/"${P}"/Qt || die
 		qt4-r2_src_prepare
 	else
 		cmake-utils_src_prepare
@@ -56,7 +63,7 @@ src_prepare() {
 
 src_configure() {
 	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt
+		cd "${WORKDIR}"/"${P}"/Qt || die
 		qt4-r2_src_configure
 		eqmake4 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
 	else
@@ -66,7 +73,7 @@ src_configure() {
 
 src_compile() {
 	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt
+		cd "${WORKDIR}"/"${P}"/Qt || die
 		qt4-r2_src_compile
 	else
 		cmake-utils_src_compile
@@ -78,7 +85,7 @@ src_install() {
 		exeinto /usr/games/bin
 		newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
 	else
-		/usr/games
+		exeinto /usr/games
 		dobin "${FILESDIR}"/ppsspp
 		exeinto /usr/share/games/"${PN}"
 		doexe "${WORKDIR}"/"${P}"_build/PPSSPPSDL

diff --git a/games-emulation/ppsspp/ppsspp-1.1.1.ebuild b/games-emulation/ppsspp/ppsspp-1.1.1.ebuild
index bd20d86..c68ca53 100644
--- a/games-emulation/ppsspp/ppsspp-1.1.1.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.1.1.ebuild
@@ -20,22 +20,29 @@ REQUIRED_USE="
 "
 
 RDEPEND=""
-DEPEND="sys-libs/zlib
-	sdl? ( media-libs/libsdl )
-	sdl? ( media-libs/libsdl2 )
-	sdl? ( dev-util/cmake )
-	qt4? ( dev-qt/qtcore:4 )
-	qt4? ( dev-qt/qtgui:4 )
-	qt4? ( dev-qt/qtmultimedia:4 )
-	qt4? ( dev-qt/qtopengl:4 )
-	qt4? ( dev-qt/qtsvg:4 )
-	qt4? ( dev-qt/qt-mobility[multimedia] )"
+
+DEPEND="
+	sys-libs/zlib
+	sdl? (
+		dev-util/cmake
+		media-libs/libsdl
+		media-libs/libsdl2
+	)
+	qt4? (
+		dev-qt/qtsvg:4
+		dev-qt/qtgui:4
+		dev-qt/qtcore:4
+		dev-qt/qtopengl:4
+		dev-qt/qtmultimedia:4
+		dev-qt/qt-mobility[multimedia]
+	)
+"
 
 src_unpack() {
 	git-r3_fetch
 	git-r3_checkout
 	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt
+		cd "${WORKDIR}"/"${P}"/Qt || die
 		qt4-r2_src_unpack
 	fi
 	cp /usr/portage/distfiles/ppsspp-icon.png  "${WORKDIR}"/"${P}"/
@@ -47,7 +54,7 @@ src_prepare() {
 	epatch "$FILESDIR"/ppsspp-ffmpeg-x86.patch
 	epatch "$FILESDIR"/ppsspp-qt.patch
 	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt
+		cd "${WORKDIR}"/"${P}"/Qt || die
 		qt4-r2_src_prepare
 	else
 		cmake-utils_src_prepare
@@ -56,7 +63,7 @@ src_prepare() {
 
 src_configure() {
 	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt
+		cd "${WORKDIR}"/"${P}"/Qt || die
 		qt4-r2_src_configure
 		eqmake4 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
 	else
@@ -66,7 +73,7 @@ src_configure() {
 
 src_compile() {
 	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt
+		cd "${WORKDIR}"/"${P}"/Qt || die
 		qt4-r2_src_compile
 	else
 		cmake-utils_src_compile
@@ -78,7 +85,7 @@ src_install() {
 		exeinto /usr/games/bin
 		newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
 	else
-		/usr/games
+		exeinto /usr/games
 		dobin "${FILESDIR}"/ppsspp
 		exeinto /usr/share/games/"${PN}"
 		doexe "${WORKDIR}"/"${P}"_build/PPSSPPSDL

diff --git a/games-emulation/ppsspp/ppsspp-9999.ebuild b/games-emulation/ppsspp/ppsspp-9999.ebuild
index 742b19c..5723f53 100644
--- a/games-emulation/ppsspp/ppsspp-9999.ebuild
+++ b/games-emulation/ppsspp/ppsspp-9999.ebuild
@@ -9,7 +9,6 @@ inherit eutils cmake-utils qt4-r2 git-r3
 DESCRIPTION="A PSP emulator for Android, Windows, Mac, Linux and Blackberry 10, written in C++."
 HOMEPAGE="http://www.ppsspp.org/"
 EGIT_REPO_URI="git://github.com/hrydgard/ppsspp.git"
-#EGIT_COMMIT="v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,22 +19,29 @@ REQUIRED_USE="
 "
 
 RDEPEND=""
-DEPEND="sys-libs/zlib
-	sdl? ( media-libs/libsdl )
-	sdl? ( media-libs/libsdl2 )
-	sdl? ( dev-util/cmake )
-	qt4? ( dev-qt/qtcore:4 )
-	qt4? ( dev-qt/qtgui:4 )
-	qt4? ( dev-qt/qtmultimedia:4 )
-	qt4? ( dev-qt/qtopengl:4 )
-	qt4? ( dev-qt/qtsvg:4 )
-	qt4? ( dev-qt/qt-mobility[multimedia] )"
+
+DEPEND="
+	sys-libs/zlib
+	sdl? (
+		dev-util/cmake
+		media-libs/libsdl
+		media-libs/libsdl2
+	)
+	qt4? (
+		dev-qt/qtsvg:4
+		dev-qt/qtgui:4
+		dev-qt/qtcore:4
+		dev-qt/qtopengl:4
+		dev-qt/qtmultimedia:4
+		dev-qt/qt-mobility[multimedia]
+	)
+"
 
 src_unpack() {
 	git-r3_fetch
 	git-r3_checkout
 	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt
+		cd "${WORKDIR}"/"${P}"/Qt || die
 		qt4-r2_src_unpack
 	fi
 	cp /usr/portage/distfiles/ppsspp-icon.png  "${WORKDIR}"/"${P}"/
@@ -47,7 +53,7 @@ src_prepare() {
 	epatch "$FILESDIR"/ppsspp-ffmpeg-x86.patch
 	epatch "$FILESDIR"/ppsspp-qt.patch
 	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt
+		cd "${WORKDIR}"/"${P}"/Qt || die
 		qt4-r2_src_prepare
 	else
 		cmake-utils_src_prepare
@@ -56,7 +62,7 @@ src_prepare() {
 
 src_configure() {
 	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt
+		cd "${WORKDIR}"/"${P}"/Qt || die
 		qt4-r2_src_configure
 		eqmake4 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
 	else
@@ -66,7 +72,7 @@ src_configure() {
 
 src_compile() {
 	if use qt4 ; then
-		cd "${WORKDIR}"/"${P}"/Qt
+		cd "${WORKDIR}"/"${P}"/Qt || die
 		qt4-r2_src_compile
 	else
 		cmake-utils_src_compile
@@ -78,7 +84,7 @@ src_install() {
 		exeinto /usr/games/bin
 		newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
 	else
-		/usr/games
+		exeinto /usr/games
 		dobin "${FILESDIR}"/ppsspp
 		exeinto /usr/share/games/"${PN}"
 		doexe "${WORKDIR}"/"${P}"_build/PPSSPPSDL

next             reply	other threads:[~2016-01-19 20:27 UTC|newest]

Thread overview: 78+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-19 20:27 Patrice Clement [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-01-19 20:27 [gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/ Patrice Clement
2016-01-20  7:19 Ian Delaney
2016-01-22 15:17 Michael Palimaka
2016-01-31  0:15 Patrice Clement
2016-02-02 22:27 Patrice Clement
2016-02-02 22:27 Patrice Clement
2016-02-07 13:15 Patrice Clement
2016-02-21 11:12 Patrice Clement
2016-03-22  7:37 Patrice Clement
2017-04-04 21:14 Patrice Clement
2017-06-18  7:41 Michał Górny
2017-12-14  8:47 Patrice Clement
2018-01-13 22:21 David Seifert
2018-04-18 22:26 Jonas Stein
2018-07-18 21:11 Jonas Stein
2018-08-15 10:37 Andreas Sturmlechner
2018-08-15 10:37 Andreas Sturmlechner
2018-08-15 10:37 Andreas Sturmlechner
2020-04-25 20:16 Mikle Kolyada
2020-11-28  8:45 Joonas Niilola
2020-11-28  8:45 Joonas Niilola
2020-12-11  7:58 Joonas Niilola
2021-02-17 16:30 Joonas Niilola
2021-02-17 16:30 Joonas Niilola
2021-03-08 16:51 Joonas Niilola
2021-03-11 17:06 Sam James
2021-07-05 17:59 Ionen Wolkens
2021-07-06 11:50 Ionen Wolkens
2021-11-25  2:03 Maciej Barć
2021-11-26  0:44 Maciej Barć
2022-03-01  1:34 Maciej Barć
2022-07-26 21:10 Maciej Barć
2022-08-31 15:09 Maciej Barć
2022-09-12  1:50 Maciej Barć
2022-09-12  1:50 Maciej Barć
2022-12-15 15:26 Maciej Barć
2022-12-15 15:26 Maciej Barć
2022-12-21  5:16 Maciej Barć
2022-12-21  5:16 Maciej Barć
2022-12-21  5:16 Maciej Barć
2022-12-30 18:40 Maciej Barć
2022-12-30 18:40 Maciej Barć
2023-01-01 12:30 Maciej Barć
2023-01-02 12:26 Maciej Barć
2023-01-02 12:26 Maciej Barć
2023-01-03 20:30 Maciej Barć
2023-01-03 20:30 Maciej Barć
2023-03-03 22:27 Maciej Barć
2023-03-04 21:15 Maciej Barć
2023-03-07 15:45 Sam James
2023-04-04 16:27 Maciej Barć
2023-04-04 19:32 Arthur Zamarin
2023-05-01 17:47 Maciej Barć
2023-05-05 12:03 Maciej Barć
2023-05-07 15:21 Maciej Barć
2023-05-22 17:15 Maciej Barć
2023-05-22 17:15 Maciej Barć
2023-05-22 17:15 Maciej Barć
2023-06-07 16:11 Sam James
2023-06-23 21:24 Maciej Barć
2023-06-23 21:24 Maciej Barć
2023-06-24 22:44 Sam James
2023-09-09 18:14 Maciej Barć
2023-09-13 18:31 Maciej Barć
2023-09-20 16:27 Maciej Barć
2023-09-22 14:09 Maciej Barć
2023-09-25 20:36 Maciej Barć
2023-09-25 20:36 Maciej Barć
2023-09-25 20:36 Maciej Barć
2023-09-25 20:36 Maciej Barć
2024-02-10 23:50 Maciej Barć
2024-02-10 23:50 Maciej Barć
2024-02-12 17:07 Maciej Barć
2024-02-14 17:01 Maciej Barć
2024-03-04  1:03 Maciej Barć
2024-03-15 23:53 Sam James
2024-04-11  1:38 Maciej Barć

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:458c26c dfblob:493f3cb dfblob:bd20d86 dfblob:c68ca53
dfblob:742b19c dfblob:5723f53 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1453235138.501b6af01b84d1bf8cdb815dc112d97d650a59b0.monsieurp@gentoo \
    --to=monsieurp@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox