summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <nyhm@gentoo.org>2007-04-02 15:23:58 +0000
committerTristan Heaven <nyhm@gentoo.org>2007-04-02 15:23:58 +0000
commitfea3e2de60b22e680bc3ce48faae2a0f26622e02 (patch)
tree22f52bdd18a852b1312f5716e679eb12f26ddf5f /games-emulation/mupen64
parentFixed commit strait into stable. Some other modifications mentioned in bug #1... (diff)
downloadgentoo-2-fea3e2de60b22e680bc3ce48faae2a0f26622e02.tar.gz
gentoo-2-fea3e2de60b22e680bc3ce48faae2a0f26622e02.tar.bz2
gentoo-2-fea3e2de60b22e680bc3ce48faae2a0f26622e02.zip
rm old revisions
(Portage version: 2.1.2.3)
Diffstat (limited to 'games-emulation/mupen64')
-rw-r--r--games-emulation/mupen64/files/digest-mupen64-0.5-r23
-rw-r--r--games-emulation/mupen64/files/digest-mupen64-0.5-r33
-rw-r--r--games-emulation/mupen64/files/mupen64-0.5-paths.patch112
-rw-r--r--games-emulation/mupen64/files/mupen64-0.5-sdl-ttf.patch28
-rw-r--r--games-emulation/mupen64/metadata.xml4
-rw-r--r--games-emulation/mupen64/mupen64-0.5-r2.ebuild94
-rw-r--r--games-emulation/mupen64/mupen64-0.5-r3.ebuild89
-rw-r--r--games-emulation/mupen64/mupen64-0.5-r4.ebuild9
8 files changed, 7 insertions, 335 deletions
diff --git a/games-emulation/mupen64/files/digest-mupen64-0.5-r2 b/games-emulation/mupen64/files/digest-mupen64-0.5-r2
deleted file mode 100644
index f5e4ac023a01..000000000000
--- a/games-emulation/mupen64/files/digest-mupen64-0.5-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 11f994bed40e00fad5b82333b553e421 mupen64_src-0.5.tar.bz2 1981046
-RMD160 da916bc77f2f06ed92630332545dc3ee5ae1ff51 mupen64_src-0.5.tar.bz2 1981046
-SHA256 1b8e4188ab7a94d8125b77aed8725ee348c24818622b881adfe16be510487dfd mupen64_src-0.5.tar.bz2 1981046
diff --git a/games-emulation/mupen64/files/digest-mupen64-0.5-r3 b/games-emulation/mupen64/files/digest-mupen64-0.5-r3
deleted file mode 100644
index f5e4ac023a01..000000000000
--- a/games-emulation/mupen64/files/digest-mupen64-0.5-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 11f994bed40e00fad5b82333b553e421 mupen64_src-0.5.tar.bz2 1981046
-RMD160 da916bc77f2f06ed92630332545dc3ee5ae1ff51 mupen64_src-0.5.tar.bz2 1981046
-SHA256 1b8e4188ab7a94d8125b77aed8725ee348c24818622b881adfe16be510487dfd mupen64_src-0.5.tar.bz2 1981046
diff --git a/games-emulation/mupen64/files/mupen64-0.5-paths.patch b/games-emulation/mupen64/files/mupen64-0.5-paths.patch
deleted file mode 100644
index f6bd21fcdaa4..000000000000
--- a/games-emulation/mupen64/files/mupen64-0.5-paths.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- main/gui_gtk/main_gtk.c
-+++ main/gui_gtk/main_gtk.c
-@@ -1881,7 +1881,7 @@
- unsigned char byte;
- dest = fopen(temp, "wb");
- strcpy(orig, WITH_HOME);
-- strcat(orig, "share/mupen64/mupen64.ini");
-+ strcat(orig, "lib/mupen64/mupen64.ini");
- src = fopen(orig, "rb");
- while(fread(&byte, 1, 1, src))
- fwrite(&byte, 1, 1, dest);
-@@ -1893,7 +1893,7 @@
- strcpy(temp, g_WorkingDir);
- strcat(temp, "lang");
- strcpy(orig, WITH_HOME);
-- strcat(orig, "share/mupen64/lang");
-+ strcat(orig, "lib/mupen64/lang");
- symlink(orig, temp);
-
- /*strcpy(temp, g_WorkingDir);
-@@ -1906,14 +1906,14 @@
- strcat(temp, "plugins");
- mkdir(temp, 0700);
- strcpy(orig, WITH_HOME);
-- strcat(orig, "share/mupen64/plugins");
-+ strcat(orig, "lib/mupen64/plugins");
- dir = opendir(orig);
- while((entry = readdir(dir)) != NULL)
- {
- if(strcmp(entry->d_name + strlen(entry->d_name) - 3, ".so"))
- {
- strcpy(orig, WITH_HOME);
-- strcat(orig, "share/mupen64/plugins/");
-+ strcat(orig, "lib/mupen64/plugins/");
- strcat(orig, entry->d_name);
- src = fopen(orig, "rb");
- if(src == NULL) continue;
-@@ -1939,7 +1939,7 @@
- strcat(temp, "plugins/");
- strcat(temp, entry->d_name);
- strcpy(orig, WITH_HOME);
-- strcat(orig, "share/mupen64/plugins/");
-+ strcat(orig, "lib/mupen64/plugins/");
- strcat(orig, entry->d_name);
- symlink(orig, temp);
- }
---- main/main.c
-+++ main/main.c
-@@ -37,6 +37,8 @@
-
- #include <stdlib.h>
- #include <unistd.h>
-+#include <dirent.h>
-+#include <sys/stat.h>
-
- #include "main.h"
- #include "guifuncs.h"
-@@ -263,7 +265,7 @@
- unsigned char byte;
- dest = fopen(temp, "wb");
- strcpy(orig, WITH_HOME);
-- strcat(orig, "share/mupen64/mupen64.ini");
-+ strcat(orig, "lib/mupen64/mupen64.ini");
- src = fopen(orig, "rb");
- while(fread(&byte, 1, 1, src))
- fwrite(&byte, 1, 1, dest);
-@@ -275,7 +277,7 @@
- strcpy(temp, g_WorkingDir);
- strcat(temp, "lang");
- strcpy(orig, WITH_HOME);
-- strcat(orig, "share/mupen64/lang");
-+ strcat(orig, "lib/mupen64/lang");
- symlink(orig, temp);
-
- /*strcpy(temp, g_WorkingDir);
-@@ -288,14 +290,14 @@
- strcat(temp, "plugins");
- mkdir(temp, 0700);
- strcpy(orig, WITH_HOME);
-- strcat(orig, "share/mupen64/plugins");
-+ strcat(orig, "lib/mupen64/plugins");
- dir = opendir(orig);
- while((entry = readdir(dir)) != NULL)
- {
- if(strcmp(entry->d_name + strlen(entry->d_name) - 3, ".so"))
- {
- strcpy(orig, WITH_HOME);
-- strcat(orig, "share/mupen64/plugins/");
-+ strcat(orig, "lib/mupen64/plugins/");
- strcat(orig, entry->d_name);
- src = fopen(orig, "rb");
- if(src == NULL) continue;
-@@ -321,7 +323,7 @@
- strcat(temp, "plugins/");
- strcat(temp, entry->d_name);
- strcpy(orig, WITH_HOME);
-- strcat(orig, "share/mupen64/plugins/");
-+ strcat(orig, "lib/mupen64/plugins/");
- strcat(orig, entry->d_name);
- symlink(orig, temp);
- }
---- Makefile
-+++ Makefile
-@@ -166,7 +166,7 @@
- endif
-
- PREFIX =$(shell grep WITH_HOME config.h | cut -d '"' -f 2)
--SHARE ="$(PREFIX)share/mupen64/"
-+SHARE ="$(PREFIX)lib/mupen64/"
-
- PLUGINS =plugins/mupen64_input.so plugins/blight_input.so plugins/mupen64_hle_rsp_azimer.so plugins/dummyaudio.so plugins/mupen64_audio.so plugins/jttl_audio.so plugins/mupen64_soft_gfx.so plugins/glN64.so
-
diff --git a/games-emulation/mupen64/files/mupen64-0.5-sdl-ttf.patch b/games-emulation/mupen64/files/mupen64-0.5-sdl-ttf.patch
deleted file mode 100644
index a8d599d385c7..000000000000
--- a/games-emulation/mupen64/files/mupen64-0.5-sdl-ttf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -80,7 +80,6 @@
- OBJ_INPUT =mupen64_input/main.o
-
- OBJ_BLIGHT =blight_input/plugin.o \
-- blight_input/SDL_ttf.o \
- blight_input/arial.ttf.o \
- blight_input/configdialog_sdl.o \
- blight_input/pad.o
-@@ -223,8 +222,6 @@
- blight_input/plugin.o: blight_input/plugin.c
- $(CC) $(CFLAGS) "-DPACKAGE=\"$(shell grep PACKAGE blight_input/package | cut -d "=" -f 2)\"" "-DVERSION=\"$(shell grep VERSION blight_input/package | cut -d "=" -f 2)\"" `sdl-config --cflags` -DGUI_SDL -c -o $@ $<
-
--blight_input/SDL_ttf.o: blight_input/SDL_ttf.c
-- $(CC) $(CFLAGS) `freetype-config --cflags` `sdl-config --cflags` -c -o $@ $<
-
- blight_input/arial.ttf.o: blight_input/arial.ttf.c
-
-@@ -367,7 +364,7 @@
- strip --strip-all $@
-
- plugins/blight_input.so: $(OBJ_BLIGHT)
-- $(CC) $^ -Wl,-Bsymbolic -shared `sdl-config --libs` `freetype-config --libs` -o $@
-+ $(CC) $^ -Wl,-Bsymbolic -shared `sdl-config --libs` -lSDL_ttf -o $@
- strip --strip-all $@
-
- plugins/mupen64_hle_rsp_azimer.so: $(OBJ_RSPHLE)
diff --git a/games-emulation/mupen64/metadata.xml b/games-emulation/mupen64/metadata.xml
index d3c2cc926f0b..2a5c75c7fd81 100644
--- a/games-emulation/mupen64/metadata.xml
+++ b/games-emulation/mupen64/metadata.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<maintainer>
+<email>joker@gentoo.org</email>
+<name>Christian Birchinger</name>
+</maintainer>
<herd>games</herd>
</pkgmetadata>
diff --git a/games-emulation/mupen64/mupen64-0.5-r2.ebuild b/games-emulation/mupen64/mupen64-0.5-r2.ebuild
deleted file mode 100644
index 389cd9075528..000000000000
--- a/games-emulation/mupen64/mupen64-0.5-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5-r2.ebuild,v 1.3 2007/02/22 09:59:30 blubb Exp $
-
-inherit eutils multilib games
-
-MY_P=${PN}_src-${PV}
-DESCRIPTION="A Nintendo 64 (N64) emulator"
-HOMEPAGE="http://mupen64.emulation64.com/"
-SRC_URI="http://mupen64.emulation64.com/files/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/opengl
- >=x11-libs/gtk+-2
- media-libs/libsdl
- media-libs/sdl-ttf
- amd64? (
- app-emulation/emul-linux-x86-gtklibs
- >=app-emulation/emul-linux-x86-sdl-10.0
- )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- !games-emulation/mupen64-blight-input
- !games-emulation/mupen64-glN64
- !games-emulation/mupen64-jttl_sound"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- rm -f plugins/empty blight_input/SDL_ttf*
-
- # FIXME: libdir breakage on amd64
- epatch \
- "${FILESDIR}"/${P}-paths.patch \
- "${FILESDIR}"/${P}-sdl-ttf.patch
-
- sed -i "s:#undef WITH_HOME:#define WITH_HOME \"${GAMES_PREFIX}/\":" \
- config.h \
- || die "sed failed"
-
- # FIXME: -fPIC should only be used on shared objects
- sed -i \
- -e '/strip/d' \
- -e "s:CFLAGS[[:space:]]*=\(.*\):CFLAGS=-fPIC ${CFLAGS}:" \
- -e "s:CXXFLAGS[[:space:]]*=\(.*\):CXXFLAGS=-fPIC ${CXXFLAGS}:" \
- Makefile \
- || die "sed failed"
-}
-
-src_compile() {
- use amd64 && multilib_toolchain_setup x86
-
- local t
- for t in \
- mupen64 \
- mupen64_nogui \
- plugins/mupen64_input.so \
- plugins/blight_input.so \
- plugins/mupen64_hle_rsp_azimer.so \
- plugins/dummyaudio.so \
- plugins/mupen64_audio.so \
- plugins/jttl_audio.so \
- plugins/mupen64_soft_gfx.so \
- plugins/glN64.so
- do
- emake ${t} || die "emake ${t} failed"
- done
-}
-
-src_install() {
- dogamesbin mupen64 mupen64_nogui || die "dogamesbin failed"
-
- insinto "${GAMES_LIBDIR}"/${PN}
- doins -r mupen64.ini jttl_audio.conf lang roms plugins || die "doins failed"
-
- dodoc *.txt doc/readme.pdf
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
- echo
- ewarn "If you are upgrading from a previous version of mupen64,"
- ewarn "backup your saved games then run rm -rf on your"
- ewarn ".mupen64 directory. After launching the new version, copy"
- ewarn "your saved games to their original place."
- echo
-}
diff --git a/games-emulation/mupen64/mupen64-0.5-r3.ebuild b/games-emulation/mupen64/mupen64-0.5-r3.ebuild
deleted file mode 100644
index eb450e56075a..000000000000
--- a/games-emulation/mupen64/mupen64-0.5-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5-r3.ebuild,v 1.1 2007/03/27 15:17:01 joker Exp $
-
-inherit eutils multilib games
-
-MY_P=${PN}_src-${PV}
-DESCRIPTION="A Nintendo 64 (N64) emulator"
-HOMEPAGE="http://mupen64.emulation64.com/"
-SRC_URI="http://mupen64.emulation64.com/files/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/opengl
- >=x11-libs/gtk+-2
- media-libs/libsdl
- media-libs/sdl-ttf
- amd64? (
- app-emulation/emul-linux-x86-gtklibs
- >=app-emulation/emul-linux-x86-sdl-10.0
- )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- !games-emulation/mupen64-blight-input
- !games-emulation/mupen64-glN64
- !games-emulation/mupen64-jttl_sound"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- has_multilib_profile && multilib_toolchain_setup x86
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- rm -f plugins/empty blight_input/SDL_ttf*
-
- epatch \
- "${FILESDIR}"/${P}-anisotropic.patch \
- "${FILESDIR}"/${P}-gentoo3.patch
-
- sed -i \
- -e "s:#undef WITH_HOME:#define WITH_HOME \"$(games_get_libdir)/\":" \
- -e "s:#undef SHARE:#define SHARE \"$(games_get_libdir)/${PN}/\":" \
- config.h \
- || die "sed failed"
-}
-
-src_compile() {
- local t
- for t in \
- mupen64 \
- mupen64_nogui \
- plugins/mupen64_input.so \
- plugins/blight_input.so \
- plugins/mupen64_hle_rsp_azimer.so \
- plugins/dummyaudio.so \
- plugins/mupen64_audio.so \
- plugins/jttl_audio.so \
- plugins/mupen64_soft_gfx.so \
- plugins/glN64.so
- do
- emake ${t} || die "emake ${t} failed"
- done
-}
-
-src_install() {
- dogamesbin mupen64 mupen64_nogui || die "dogamesbin failed"
-
- insinto "$(games_get_libdir)/${PN}"
- doins -r mupen64.ini jttl_audio.conf lang roms plugins || die "doins failed"
-
- dodoc *.txt doc/readme.pdf
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
- echo
- ewarn "If you are upgrading from a previous version of mupen64,"
- ewarn "backup your saved games then run rm -rf on your"
- ewarn ".mupen64 directory. After launching the new version, copy"
- ewarn "your saved games to their original place."
- echo
-}
diff --git a/games-emulation/mupen64/mupen64-0.5-r4.ebuild b/games-emulation/mupen64/mupen64-0.5-r4.ebuild
index b355f75bd999..c35ad323b95d 100644
--- a/games-emulation/mupen64/mupen64-0.5-r4.ebuild
+++ b/games-emulation/mupen64/mupen64-0.5-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5-r4.ebuild,v 1.1 2007/03/28 00:58:24 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5-r4.ebuild,v 1.2 2007/04/02 15:23:58 nyhm Exp $
inherit eutils multilib games
@@ -11,7 +11,7 @@ SRC_URI="http://mupen64.emulation64.com/files/${PV}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
IUSE=""
RDEPEND="virtual/opengl
@@ -23,10 +23,7 @@ RDEPEND="virtual/opengl
>=app-emulation/emul-linux-x86-sdl-10.0
)"
DEPEND="${RDEPEND}
- dev-util/pkgconfig
- !games-emulation/mupen64-blight-input
- !games-emulation/mupen64-glN64
- !games-emulation/mupen64-jttl_sound"
+ dev-util/pkgconfig"
S=${WORKDIR}/${MY_P}