projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 12c8a49)
games-emulation/ppsspp: Add missing dies. Fix dependencies. Fix header.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 19 Jan 2016 20:23:13 +0000 (20:23 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 19 Jan 2016 20:25:38 +0000 (20:25 +0000)
Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
games-emulation/ppsspp/Manifest [deleted file] patch | blob | history
games-emulation/ppsspp/ppsspp-1.1.0.ebuild patch | blob | history
games-emulation/ppsspp/ppsspp-1.1.1.ebuild patch | blob | history
games-emulation/ppsspp/ppsspp-9999.ebuild patch | blob | history

diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/games-emulation/ppsspp/ppsspp-1.1.0.ebuild b/games-emulation/ppsspp/ppsspp-1.1.0.ebuild
index 458c26c404331df704c947a2c288971cde884f65..493f3cb7b762daae732c38d5f8ea621ed32c94ab 100644 (file)
--- 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 bd20d8628d43ba8b02960226f3784b5f01197a53..c68ca53d4e2280b8beeb216f4cb48c8d30b50682 100644 (file)
--- 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 742b19cc1a761e0c575be16305bcbf705ed20234..5723f53bb657af4668a67fd23cef148a8c48b575 100644 (file)
--- 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
Unnamed repository; edit this file 'description' to name the repository.