[gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsxr/, games-emulation/pcsxr/files/

[Michał Górny]

commit:     2b72d627cafdde2e840708ef32045fe91f638c95
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 17:26:48 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 17:54:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b72d627

games-emulation/pcsxr: Clean up old

 .../pcsxr/files/pcsxr-1.9.94-install-paths.patch   | 223 ---------------------
 games-emulation/pcsxr/pcsxr-1.9.94.ebuild          | 101 ----------
 2 files changed, 324 deletions(-)

diff --git a/games-emulation/pcsxr/files/pcsxr-1.9.94-install-paths.patch b/games-emulation/pcsxr/files/pcsxr-1.9.94-install-paths.patch
deleted file mode 100644
index adf2866..00000000
--- a/games-emulation/pcsxr/files/pcsxr-1.9.94-install-paths.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-From a5b0086e76672083f91ddb4d0350cc99c19604fb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
-Date: Wed, 11 Dec 2013 17:12:58 +0100
-Subject: [PATCH 1/2] Fix install paths for Gentoo.
-
----
- data/Makefile.am              | 2 +-
- gui/Makefile.am               | 6 +++---
- libpcsxcore/Makefile.am       | 2 +-
- pixmaps/Makefile.am           | 2 +-
- plugins/bladesio1/Makefile.am | 6 +++---
- plugins/dfcdrom/Makefile.am   | 6 +++---
- plugins/dfinput/Makefile.am   | 6 +++---
- plugins/dfnet/Makefile.am     | 6 +++---
- plugins/dfsound/Makefile.am   | 6 +++---
- plugins/dfxvideo/Makefile.am  | 6 +++---
- plugins/peopsxgl/Makefile.am  | 8 ++++----
- 11 files changed, 28 insertions(+), 28 deletions(-)
-
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 8f1ce6a..9df8e87 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -1,7 +1,7 @@
- glade_DATA = pcsxr.ui
- gladedir = $(datadir)/pcsxr
- 
--desktopdir = $(datadir)/applications
-+desktopdir = $(datarootdir)/applications
- desktop_DATA = pcsxr.desktop
- 
- EXTRA_DIST = $(glade_DATA) pcsxr.desktop
-diff --git a/gui/Makefile.am b/gui/Makefile.am
-index 5feb39e..6146ef0 100644
---- a/gui/Makefile.am
-+++ b/gui/Makefile.am
-@@ -1,10 +1,10 @@
- AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${datadir}/pcsxr/\" \
--	-DPIXMAPDIR=\"${datadir}/pixmaps/\" \
--	-DLOCALE_DIR=\"${datadir}/locale/\" \
-+	-DPIXMAPDIR=\"${datarootdir}/pixmaps/\" \
-+	-DLOCALE_DIR=\"${datarootdir}/locale/\" \
- 	$(GTK3_CFLAGS) \
- 	-I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \
- 	-DPSEMU_DATA_DIR=\"${datadir}/psemu\" \
--	-DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\"
-+	-DDEF_PLUGIN_DIR=\"${libdir}/psemu\"
- 
- bin_PROGRAMS = pcsxr
- 
-diff --git a/libpcsxcore/Makefile.am b/libpcsxcore/Makefile.am
-index 1ae5389..9571ea3 100644
---- a/libpcsxcore/Makefile.am
-+++ b/libpcsxcore/Makefile.am
-@@ -1,4 +1,4 @@
--AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
-+AM_CPPFLAGS = -DLOCALE_DIR=\"${datarootdir}/locale/\" \
- 	-I$(top_srcdir)/include
- 
- noinst_LIBRARIES = libpcsxcore.a
-diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
-index e77fda4..f7e10da 100644
---- a/pixmaps/Makefile.am
-+++ b/pixmaps/Makefile.am
-@@ -1,7 +1,7 @@
- pixmapdir = "$(datadir)/pcsxr"
- pixmap_DATA = pcsxr.png iso-open.png iso-reopen.png cd.png cdr.png gpu.png memcard.png pad.png play.png sio1.png spu.png
- 
--icondir = "$(datadir)/pixmaps"
-+icondir = "$(datarootdir)/pixmaps"
- icon_DATA = pcsxr-icon.png
- 
- EXTRA_DIST = pcsxr.png iso-open.png iso-reopen.png cd.png cdr.png gpu.png memcard.png pad.png play.png sio1.png spu.png pcsxr-icon.png
-diff --git a/plugins/bladesio1/Makefile.am b/plugins/bladesio1/Makefile.am
-index 5b7fee4..75d9588 100644
---- a/plugins/bladesio1/Makefile.am
-+++ b/plugins/bladesio1/Makefile.am
-@@ -1,12 +1,12 @@
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libBladeSio1.la
- 
- libBladeSio1_la_SOURCES = cfg.c sio1.c sio1.h fifo.c fifo.h connection.c connection.h
- libBladeSio1_la_LDFLAGS = -module -avoid-version
- 
--AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
-+AM_CPPFLAGS = -DLOCALE_DIR=\"${datarootdir}/locale/\" \
- 	-DDATADIR=\"${datadir}/psemu/\" \
- 	$(GTK3_CFLAGS) \
- 	-I../../libpcsxcore -I../../include
-diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am
-index b4c729f..297b4f9 100644
---- a/plugins/dfcdrom/Makefile.am
-+++ b/plugins/dfcdrom/Makefile.am
-@@ -1,5 +1,5 @@
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libDFCdrom.la
- 
-@@ -21,7 +21,7 @@ libDFCdrom_la_CFLAGS += -DUSE_LIBCDIO=1 $(LIBCDIO_CFLAGS)
- libDFCdrom_la_LIBADD += $(LIBCDIO_LIBS)
- endif
- 
--AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
-+AM_CPPFLAGS = -DLOCALE_DIR=\"${datarootdir}/locale/\" \
- 	-DDATADIR=\"${datadir}/psemu/\" \
- 	$(GTK3_CFLAGS) \
- 	-I../../libpcsxcore -I../../include
-diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am
-index f270ca7..0f7f9b5 100644
---- a/plugins/dfinput/Makefile.am
-+++ b/plugins/dfinput/Makefile.am
-@@ -1,5 +1,5 @@
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libDFInput.la
- 
-@@ -7,7 +7,7 @@ libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c util.c util.h
- libDFInput_la_LDFLAGS = -module -avoid-version 
- libDFInput_la_LIBADD = -lpthread -lX11 $(SDL2_LIBS) $(SDL_LIBS)
- 
--AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
-+AM_CPPFLAGS = -DLOCALE_DIR=\"${datarootdir}/locale/\" \
- 	-DDATADIR=\"${datadir}/psemu/\" \
- 	$(GTK3_CFLAGS) \
- 	-I../../include -I../../libpcsxcore $(SDL2_CFLAGS) $(SDL_CFLAGS)
-diff --git a/plugins/dfnet/Makefile.am b/plugins/dfnet/Makefile.am
-index 004df63..fff3dba 100644
---- a/plugins/dfnet/Makefile.am
-+++ b/plugins/dfnet/Makefile.am
-@@ -1,12 +1,12 @@
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libDFNet.la
- 
- libDFNet_la_SOURCES = dfnet.c dfnet.h unix.c cfg.c
- libDFNet_la_LDFLAGS = -module -avoid-version
- 
--AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
-+AM_CPPFLAGS = -DLOCALE_DIR=\"${datarootdir}/locale/\" \
- 	-DDATADIR=\"${datadir}/psemu/\" \
- 	$(GTK3_CFLAGS) \
- 	-I../../libpcsxcore -I../../include
-diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am
-index 5325555..15515b8 100644
---- a/plugins/dfsound/Makefile.am
-+++ b/plugins/dfsound/Makefile.am
-@@ -1,7 +1,7 @@
- AM_CPPFLAGS = -I../../include
- 
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libDFSound.la
- 
-@@ -46,7 +46,7 @@ libDFSound_la_CPPFLAGS += -DUSENULL=1
- endif
- 
- bin_PROGRAMS = cfgDFSound
--cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
-+cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datarootdir}/locale/\" \
- 	-DDATADIR=\"${datadir}/psemu/\" \
- 	$(GTK3_CFLAGS) $(AM_CPPFLAGS)
- cfgDFSound_SOURCES = spucfg-0.1df/main.c
-diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am
-index 2af76fd..0515690 100644
---- a/plugins/dfxvideo/Makefile.am
-+++ b/plugins/dfxvideo/Makefile.am
-@@ -6,14 +6,14 @@ SUFFIXES = .asm
- 	$(LIBTOOL) --tag=CC --mode=compile \
- 	$(STRIP_FPIC) $(NASM) -f elf -d ELF -I${srcdir}/ $<
- 
--AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
-+AM_CPPFLAGS = -DLOCALE_DIR=\"${datarootdir}/locale/\" \
- 	-DDATADIR=\"${datadir}/psemu/\" \
- 	$(GTK3_CFLAGS)\
- 	-I../../libpcsxcore \
- 	-I../../include
- 
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libDFXVideo.la
- 
-diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am
-index 99c9554..e3af49f 100644
---- a/plugins/peopsxgl/Makefile.am
-+++ b/plugins/peopsxgl/Makefile.am
-@@ -1,11 +1,11 @@
--AM_CPPFLAGS = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
--	-DLOCALE_DIR=\"${datadir}/locale/\" \
-+AM_CPPFLAGS = -DPIXMAPDIR=\"${datarootdir}/pixmaps/\" \
-+	-DLOCALE_DIR=\"${datarootdir}/locale/\" \
- 	-DDATADIR=\"${datadir}/psemu/\" \
- 	$(GTK3_CFLAGS) \
- 	-I../../libpcsxcore -I../../include
- 
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libpeopsxgl.la
- 
--- 
-1.8.5.1
-

diff --git a/games-emulation/pcsxr/pcsxr-1.9.94.ebuild b/games-emulation/pcsxr/pcsxr-1.9.94.ebuild
deleted file mode 100644
index fb5c544..00000000
--- a/games-emulation/pcsxr/pcsxr-1.9.94.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils games
-
-DESCRIPTION="PCSX-Reloaded: a fork of PCSX, the discontinued Playstation emulator"
-HOMEPAGE="http://pcsxr.codeplex.com"
-# codeplex doesn't support direct downloads but GPL-2 doesn't mind me
-# mirroring it.
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.zip"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="alsa cdio ffmpeg nls openal opengl oss pulseaudio +sdl"
-
-# pcsxr supports both SDL1 and SDL2 but uses the newer version installed
-# since SDL is not properly slotted in Gentoo, just fix it on SDL2
-
-RDEPEND="dev-libs/glib:2=
-	media-libs/libsdl:0=[joystick]
-	sys-libs/zlib:0=
-	x11-libs/gtk+:3=
-	x11-libs/libX11:0=
-	x11-libs/libXext:0=
-	x11-libs/libXtst:0=
-	x11-libs/libXv:0=
-	alsa? ( media-libs/alsa-lib:0= )
-	cdio? ( dev-libs/libcdio:0= )
-	ffmpeg? ( virtual/ffmpeg:0= )
-	nls? ( virtual/libintl:0= )
-	openal? ( media-libs/openal:0= )
-	opengl? ( virtual/opengl:0=
-		x11-libs/libXxf86vm:0= )
-	pulseaudio? ( media-sound/pulseaudio:0= )
-	sdl? ( media-libs/libsdl:0=[sound] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/intltool
-	x11-proto/videoproto
-	nls? ( sys-devel/gettext:0 )
-	x86? ( dev-lang/nasm )"
-
-REQUIRED_USE="?? ( alsa openal oss pulseaudio sdl )"
-
-# it's only the .po file check that fails :)
-RESTRICT=test
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-disable-sdl2.patch
-		"${FILESDIR}"/${P}-install-paths.patch
-	)
-
-	epatch "${PATCHES[@]}"
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	local sound_backend
-
-	if use alsa; then
-		sound_backend=alsa
-	elif use oss; then
-		sound_backend=oss
-	elif use pulseaudio; then
-		sound_backend=pulseaudio
-	elif use sdl; then
-		sound_backend=sdl
-	elif use openal; then
-		sound_backend=openal
-	else
-		sound_backend=null
-	fi
-
-	local myeconfargs=(
-		--datarootdir="${EPREFIX%/}"/usr/share
-
-		$(use_enable nls)
-		$(use_enable cdio libcdio)
-		$(use_enable opengl)
-		$(use_enable ffmpeg ccdda)
-		--enable-sound=${sound_backend}
-	)
-
-	egamesconf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-
-	dodoc doc/{keys,tweaks}.txt
-	prepgamesdirs
-}