From 345da67d5ddeffcb7253af320e2a121690aec53f Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 4 Oct 2015 12:58:52 +0200
Subject: games-emulation/mupen64plus-core: Use DejaVu font, #548214

Use DejaVu Sans instead of deprecated BitStream Vera for OSD.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=548214

Package-Manager: portage-2.2.22
---
 .../mupen64plus-core-2.5-r1.ebuild                 | 112 +++++++++++++++++++++
 .../mupen64plus-core/mupen64plus-core-2.5.ebuild   | 112 ---------------------
 2 files changed, 112 insertions(+), 112 deletions(-)
 create mode 100644 games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild
 delete mode 100644 games-emulation/mupen64plus-core/mupen64plus-core-2.5.ebuild

(limited to 'games-emulation')

diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild
new file mode 100644
index 000000000000..1954420fce96
--- /dev/null
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${PN}-src-${PV}
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, core library"
+HOMEPAGE="http://www.mupen64plus.org/"
+SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/2-sdl2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debugger gles2 lirc new-dynarec +osd cpu_flags_x86_sse"
+
+RDEPEND="media-libs/libpng:0=
+	media-libs/libsdl2:0=[joystick,opengl,video]
+	sys-libs/zlib:0=[minizip]
+	lirc? ( app-misc/lirc:0 )
+	osd? (
+		media-fonts/dejavu
+		media-libs/freetype:2=
+		virtual/opengl:0=
+		virtual/glu:0=
+	)
+	!<games-emulation/mupen64plus-2.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+# block versions using SDL1
+RDEPEND="${RDEPEND}
+	!<games-emulation/m64py-0.2.3-r1
+	!<games-emulation/mupen64plus-audio-sdl-2.5
+	!<games-emulation/mupen64plus-input-sdl-2.5
+	!<games-emulation/mupen64plus-ui-console-2.5
+	!<games-emulation/mupen64plus-video-glide64mk2-2.5
+	!<games-emulation/mupen64plus-video-rice-2.5"
+
+REQUIRED_USE="gles2? ( !osd )"
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch_user
+
+	# avoid implicitly appending CPU flags
+	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
+}
+
+src_compile() {
+	MAKEARGS=(
+		# Note: please keep this in sync in all of mupen64plus-* packages
+
+		-C projects/unix
+
+		# this basically means: GNU userspace
+		UNAME=Linux
+
+		# verbose output
+		V=1
+
+		CROSS_COMPILE="${CHOST}-"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		# usual CFLAGS, CXXFLAGS and LDFLAGS are respected
+		# so we can leave OPTFLAGS empty
+		OPTFLAGS=
+
+		# paths, some of them are used at compile time
+		PREFIX=/usr
+		LIBDIR=/usr/$(get_libdir)
+
+		# disable unwanted magic
+		LDCONFIG=:
+		INSTALL_STRIP_FLAG=
+
+		# Package-specific stuff
+
+		# CROSS_COMPILE causes it to look for ${CHOST}-sdl2-config...
+		SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl2)"
+		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
+
+		OSD=$(usex osd 1 0)
+		NO_ASM=$(usex cpu_flags_x86_sse 0 1)
+		LIRC=$(usex lirc 1 0)
+		DEBUGGER=$(usex debugger 1 0)
+		NEW_DYNAREC=$(usex new-dynarec 1 0)
+		USE_GLES=$(usex gles2 1 0)
+	)
+
+	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
+	use x86 && MAKEARGS+=( HOST_CPU=i386 )
+
+	emake "${MAKEARGS[@]}" all
+}
+
+src_install() {
+	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+	einstalldocs
+	dodoc -r doc/{emuwiki-api-doc,new_dynarec.txt}
+
+	# replace bundled font with a symlink
+	# TODO: fix the code to not rely on it
+	local font_path=/usr/share/mupen64plus/font.ttf
+	rm "${D%/}/${font_path}" || die
+	if use osd; then
+		dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${font_path}"
+	fi
+}
diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.ebuild
deleted file mode 100644
index a279007f2240..000000000000
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${PN}-src-${PV}
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, core library"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/2-sdl2"
-KEYWORDS="~amd64 ~x86"
-IUSE="debugger gles2 lirc new-dynarec +osd cpu_flags_x86_sse"
-
-RDEPEND="media-libs/libpng:0=
-	media-libs/libsdl2:0=[joystick,opengl,video]
-	sys-libs/zlib:0=[minizip]
-	lirc? ( app-misc/lirc:0 )
-	osd? (
-		media-fonts/ttf-bitstream-vera
-		media-libs/freetype:2=
-		virtual/opengl:0=
-		virtual/glu:0=
-	)
-	!<games-emulation/mupen64plus-2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# block versions using SDL1
-RDEPEND="${RDEPEND}
-	!<games-emulation/m64py-0.2.3-r1
-	!<games-emulation/mupen64plus-audio-sdl-2.5
-	!<games-emulation/mupen64plus-input-sdl-2.5
-	!<games-emulation/mupen64plus-ui-console-2.5
-	!<games-emulation/mupen64plus-video-glide64mk2-2.5
-	!<games-emulation/mupen64plus-video-rice-2.5"
-
-REQUIRED_USE="gles2? ( !osd )"
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch_user
-
-	# avoid implicitly appending CPU flags
-	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
-}
-
-src_compile() {
-	MAKEARGS=(
-		# Note: please keep this in sync in all of mupen64plus-* packages
-
-		-C projects/unix
-
-		# this basically means: GNU userspace
-		UNAME=Linux
-
-		# verbose output
-		V=1
-
-		CROSS_COMPILE="${CHOST}-"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-		# usual CFLAGS, CXXFLAGS and LDFLAGS are respected
-		# so we can leave OPTFLAGS empty
-		OPTFLAGS=
-
-		# paths, some of them are used at compile time
-		PREFIX=/usr
-		LIBDIR=/usr/$(get_libdir)
-
-		# disable unwanted magic
-		LDCONFIG=:
-		INSTALL_STRIP_FLAG=
-
-		# Package-specific stuff
-
-		# CROSS_COMPILE causes it to look for ${CHOST}-sdl2-config...
-		SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl2)"
-		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
-
-		OSD=$(usex osd 1 0)
-		NO_ASM=$(usex cpu_flags_x86_sse 0 1)
-		LIRC=$(usex lirc 1 0)
-		DEBUGGER=$(usex debugger 1 0)
-		NEW_DYNAREC=$(usex new-dynarec 1 0)
-		USE_GLES=$(usex gles2 1 0)
-	)
-
-	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
-	use x86 && MAKEARGS+=( HOST_CPU=i386 )
-
-	emake "${MAKEARGS[@]}" all
-}
-
-src_install() {
-	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
-	einstalldocs
-	dodoc -r doc/{emuwiki-api-doc,new_dynarec.txt}
-
-	# replace bundled font with a symlink
-	# TODO: fix the code to not rely on it
-	local font_path=/usr/share/mupen64plus/font.ttf
-	rm "${D%/}/${font_path}" || die
-	if use osd; then
-		dosym /usr/share/fonts/ttf-bitstream-vera/Vera.ttf "${font_path}"
-	fi
-}
-- 
cgit v1.2.3-65-gdbad