twitch153    15/02/08 23:22:18

  Modified:             dolphin-9999.ebuild ChangeLog
  Added:                dolphin-4.0.2-r3.ebuild dolphin-3.5-r1.ebuild
                        dolphin-4.0-r1.ebuild
  Removed:              dolphin-4.0.ebuild dolphin-4.0.2-r2.ebuild
                        dolphin-3.5.ebuild
  Log:
  Adds subslotting to readline RDEPEND package
  
  (Portage version: 2.2.16/cvs/Linux x86_64, signed Manifest commit with key 
A8C8FBCF)

Revision  Changes    Path
1.20                 games-emulation/dolphin/dolphin-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dolphin/dolphin-9999.ebuild?rev=1.20&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dolphin/dolphin-9999.ebuild?rev=1.20&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dolphin/dolphin-9999.ebuild?r1=1.19&r2=1.20

Index: dolphin-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-9999.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dolphin-9999.ebuild 8 Feb 2015 23:13:29 -0000       1.19
+++ dolphin-9999.ebuild 8 Feb 2015 23:22:18 -0000       1.20
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-9999.ebuild,v 1.19 
2015/02/08 23:13:29 twitch153 Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-9999.ebuild,v 1.20 
2015/02/08 23:22:18 twitch153 Exp $
 
 EAPI=5
 
@@ -28,7 +28,7 @@
 RDEPEND=">=media-libs/glew-1.10
        >=media-libs/libsfml-2.1
        >=net-libs/miniupnpc-1.8
-       sys-libs/readline
+       sys-libs/readline:=
        x11-libs/libXext
        x11-libs/libXrandr
        media-libs/libsdl2[haptic,joystick]



1.29                 games-emulation/dolphin/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dolphin/ChangeLog?rev=1.29&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dolphin/ChangeLog?rev=1.29&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dolphin/ChangeLog?r1=1.28&r2=1.29

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-emulation/dolphin/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ChangeLog   8 Feb 2015 23:13:29 -0000       1.28
+++ ChangeLog   8 Feb 2015 23:22:18 -0000       1.29
@@ -1,6 +1,15 @@
 # ChangeLog for games-emulation/dolphin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/ChangeLog,v 1.28 
2015/02/08 23:13:29 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/ChangeLog,v 1.29 
2015/02/08 23:22:18 twitch153 Exp $
+
+*dolphin-4.0.2-r3 (08 Feb 2015)
+*dolphin-3.5-r1 (08 Feb 2015)
+*dolphin-4.0-r1 (08 Feb 2015)
+
+  08 Feb 2015; Devan Franchini <twitch...@gentoo.org> +dolphin-3.5-r1.ebuild,
+  +dolphin-4.0-r1.ebuild, +dolphin-4.0.2-r3.ebuild, -dolphin-3.5.ebuild,
+  -dolphin-4.0.2-r2.ebuild, -dolphin-4.0.ebuild, dolphin-9999.ebuild:
+  Adds subslotting to readline RDEPEND package
 
   08 Feb 2015; Devan Franchini <twitch...@gentoo.org> dolphin-9999.ebuild:
   Adds save for xxhash bundled binary



1.1                  games-emulation/dolphin/dolphin-4.0.2-r3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dolphin/dolphin-4.0.2-r3.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dolphin/dolphin-4.0.2-r3.ebuild?rev=1.1&content-type=text/plain

Index: dolphin-4.0.2-r3.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0.2-r3.ebuild,v 1.1 
2015/02/08 23:22:18 twitch153 Exp $

EAPI=5

WX_GTK_VER="2.9"

inherit cmake-utils eutils pax-utils toolchain-funcs versionator wxwidgets games

SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip";
KEYWORDS="~amd64"

DESCRIPTION="Gamecube and Wii game emulator"
HOMEPAGE="https://www.dolphin-emu.org/";

LICENSE="GPL-2"
SLOT="0"
IUSE="alsa ao bluetooth doc ffmpeg +lzo openal opengl openmp portaudio 
pulseaudio"

RESTRICT="mirror"

RDEPEND=">=media-libs/glew-1.6
        <media-libs/libsfml-2.0
        >=net-libs/miniupnpc-1.8
        media-libs/libsdl2[haptic,joystick]
        sys-libs/readline:=
        x11-libs/libXext
        x11-libs/libXrandr
        alsa? ( media-libs/alsa-lib )
        ao? ( media-libs/libao )
        bluetooth? ( net-wireless/bluez )
        ffmpeg? ( virtual/ffmpeg )
        lzo? ( dev-libs/lzo )
        openal? ( media-libs/openal )
        opengl? ( virtual/opengl )
        portaudio? ( media-libs/portaudio )
        pulseaudio? ( media-sound/pulseaudio )
        "
DEPEND="${RDEPEND}
        app-arch/zip
        media-gfx/nvidia-cg-toolkit
        media-libs/freetype
        media-libs/libsoundtouch
        >=sys-devel/gcc-4.6.0
        x11-libs/wxGTK:2.9
        "

pkg_pretend() {

        local ver=4.6.0
        local msg="${PN} needs at least GCC ${ver} set to compile."

        if [[ ${MERGE_TYPE} != binary ]]; then
                if ! version_is_at_least ${ver} $(gcc-fullversion); then
                        eerror ${msg}
                        die ${msg}
                fi
        fi

}

src_prepare() {

        # Remove automatic dependencies to prevent building without flags 
enabled.
        if use !alsa; then
                sed -i -e '/^include(FindALSA/d' CMakeLists.txt || die
        fi
        if use !ao; then
                sed -i -e '/^check_lib(AO/d' CMakeLists.txt || die
        fi
        if use !bluetooth; then
                sed -i -e '/^check_lib(BLUEZ/d' CMakeLists.txt || die
        fi
        if use !openal; then
                sed -i -e '/^include(FindOpenAL/d' CMakeLists.txt || die
        fi
        if use !portaudio; then
                sed -i -e '/CMAKE_REQUIRED_LIBRARIES portaudio/d' 
CMakeLists.txt || die
        fi
        if use !pulseaudio; then
                sed -i -e '/^check_lib(PULSEAUDIO/d' CMakeLists.txt || die
        fi

        # Remove ALL the bundled libraries, aside from:
        # - SOIL: The sources are not public.
        # - Bochs-disasm: Don't know what it is.
        # - CLRun: Part of OpenCL
        # - polarssl: Currently fails the check as is.
        mv Externals/SOIL . || die
        mv Externals/Bochs_disasm . || die
        mv Externals/CLRun . || die
        mv Externals/polarssl . || die
        rm -r Externals/* || die
        mv polarssl Externals || die
        mv CLRun Externals || die
        mv Bochs_disasm Externals || die
        mv SOIL Externals || die
}

src_configure() {

        local mycmakeargs=(
                "-DDOLPHIN_WC_REVISION=${PV}"
                "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
                "-Dprefix=${GAMES_PREFIX}"
                "-Ddatadir=${GAMES_DATADIR}/${PN}"
                "-Dplugindir=$(games_get_libdir)/${PN}"
                $( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS )
                $( cmake-utils_use openmp OPENMP )
        )

        cmake-utils_src_configure
}

src_compile() {

        cmake-utils_src_compile
}

src_install() {

        cmake-utils_src_install

        dodoc Readme.txt
        if use doc; then
                dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
        fi

        doicon Source/Core/DolphinWX/resources/Dolphin.xpm
        make_desktop_entry "dolphin-emu" "Dolphin" "Dolphin" "Game;"

        prepgamesdirs
}

pkg_postinst() {
        # Add pax markings for hardened systems
        pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu

        if ! use portaudio; then
                ewarn "If you want microphone capabilities in dolphin-emu, 
rebuild with"
                ewarn "USE=\"portaudio\""
        fi
}



1.1                  games-emulation/dolphin/dolphin-3.5-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dolphin/dolphin-3.5-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dolphin/dolphin-3.5-r1.ebuild?rev=1.1&content-type=text/plain

Index: dolphin-3.5-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-3.5-r1.ebuild,v 1.1 
2015/02/08 23:22:18 twitch153 Exp $

EAPI=5

WX_GTK_VER="2.9"

inherit cmake-utils eutils flag-o-matic pax-utils toolchain-funcs versionator 
wxwidgets games

DESCRIPTION="Gamecube and Wii game emulator"
HOMEPAGE="https://www.dolphin-emu.org/";
SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip";

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
IUSE="alsa ao bluetooth doc ffmpeg +lzo openal opengl openmp portaudio 
pulseaudio"

RESTRICT="mirror"

RDEPEND=">=media-libs/glew-1.6
        >=media-libs/libsdl-1.2[joystick]
        <media-libs/libsfml-2.0
        sys-libs/readline:=
        x11-libs/libXext
        x11-libs/libXrandr
        alsa? ( media-libs/alsa-lib )
        ao? ( media-libs/libao )
        bluetooth? ( net-wireless/bluez )
        ffmpeg? ( virtual/ffmpeg )
        lzo? ( dev-libs/lzo )
        openal? ( media-libs/openal )
        opengl? ( virtual/opengl )
        portaudio?  ( media-libs/portaudio )
        pulseaudio? ( media-sound/pulseaudio )
        "
DEPEND="${RDEPEND}
        app-arch/zip
        media-gfx/nvidia-cg-toolkit
        media-libs/freetype
        >=sys-devel/gcc-4.6.0
        sys-devel/gettext
        virtual/pkgconfig
        x11-libs/wxGTK:2.9
        "

pkg_pretend() {

        local ver=4.6.0
        local msg="${PN} needs at least GCC ${ver} set to compile."

        if [[ ${MERGE_TYPE} != binary ]]; then
                if ! version_is_at_least ${ver} $(gcc-fullversion); then
                        eerror ${msg}
                        die ${msg}
                fi
        fi
}

src_prepare() {

        if [[ $(gcc-version) = "4.8" ]]; then
                epatch "${FILESDIR}"/${PN}-emu-${PV}-gcc-4.8.patch
        fi

        if use !alsa; then
                sed -i -e '/^include(FindALSA/d' CMakeLists.txt || die
        fi
        if use !ao; then
                sed -i -e '/^check_lib(AO/d' CMakeLists.txt || die
        fi
        if use !bluetooth; then
                sed -i -e '/^check_lib(BLUEZ/d' CMakeLists.txt || die
        fi
        if use !openal; then
                sed -i -e '/^include(FindOpenAL/d' CMakeLists.txt || die
        fi
        if use !portaudio; then
                sed -i -e '/CMAKE_REQUIRED_LIBRARIES portaudio/d' 
CMakeLists.txt || die
        fi
        if use !pulseaudio; then
                sed -i -e '/^check_lib(PULSEAUDIO/d' CMakeLists.txt || die
        fi

        # Remove ALL the bundled libraries, aside from:
        # - SOIL: The sources are not public.
        # - Bochs_disasm: Don't know what it is.
        # - CLRun: Part of OpenCL
        mv Externals/SOIL . || die
        mv Externals/Bochs_disasm . || die
        mv Externals/CLRun . || die
        rm -r Externals/* || die "Failed to remove bundled libs"
        mv CLRun Externals || die
        mv Bochs_disasm Externals || die
        mv SOIL Externals || die
}

src_configure() {

        if $($(tc-getPKG_CONFIG) --exists nvidia-cg-toolkit); then
                append-flags "$($(tc-getPKG_CONFIG) --cflags nvidia-cg-toolkit)"
        else
                append-flags "-I/opt/nvidia-cg-toolkit/include"
        fi

        if $($(tc-getPKG_CONFIG) --exists nvidia-cg-toolkit); then
                append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-L 
nvidia-cg-toolkit)"
        else
                if has_version ">=media-gfx/nvidia-cg-toolkit-3.1.0013"; then
                        append-ldflags "-L/opt/nvidia-cg-toolkit/lib64"
                elif has_version "<=media-gfx/nvidia-cg-toolkit-2.1.0017-r1"; 
then
                        append-ldflags "-L/opt/nvidia-cg-toolkit/lib"
                fi
        fi

        local mycmakeargs=(
                "-DDOLPHIN_WC_REVISION=${PV}"
                "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
                "-Dprefix=${GAMES_PREFIX}"
                "-Ddatadir=${GAMES_DATADIR}/${PN}"
                "-Dplugindir=$(games_get_libdir)/${PN}"
                $(cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS)
                $(cmake-utils_use openmp OPENMP )
        )

        cmake-utils_src_configure
}

src_compile() {

        cmake-utils_src_compile
}

src_install() {

        cmake-utils_src_install

        dodoc Readme.txt
        if use doc; then
                dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
        fi

        doicon Source/Core/DolphinWX/resources/Dolphin.xpm
        make_desktop_entry "dolphin-emu" "Dolphin" "Dolphin" "Game;"

        prepgamesdirs
}

pkg_postinst() {
        # Add pax markings for hardened systems
        pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu

        if ! use portaudio; then
                ewarn "If you want microphone capabilities in dolphin-emu, 
rebuild with"
                ewarn "USE=\"portaudio\""
        fi
}



1.1                  games-emulation/dolphin/dolphin-4.0-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dolphin/dolphin-4.0-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dolphin/dolphin-4.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: dolphin-4.0-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0-r1.ebuild,v 1.1 
2015/02/08 23:22:18 twitch153 Exp $

EAPI=5

WX_GTK_VER="2.9"

inherit cmake-utils eutils pax-utils toolchain-funcs versionator wxwidgets games

SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip";
KEYWORDS="~amd64"

DESCRIPTION="Gamecube and Wii game emulator"
HOMEPAGE="https://www.dolphin-emu.org/";

LICENSE="GPL-2"
SLOT="0"
IUSE="alsa ao bluetooth doc ffmpeg +lzo openal opengl openmp portaudio 
pulseaudio"

RESTRICT="mirror"

RDEPEND=">=media-libs/glew-1.6
        >=media-libs/libsdl-1.2[joystick]
        <media-libs/libsfml-2.0
        >=net-libs/miniupnpc-1.8
        sys-libs/readline:=
        x11-libs/libXext
        x11-libs/libXrandr
        alsa? ( media-libs/alsa-lib )
        ao? ( media-libs/libao )
        bluetooth? ( net-wireless/bluez )
        ffmpeg? ( virtual/ffmpeg )
        lzo? ( dev-libs/lzo )
        openal? ( media-libs/openal )
        opengl? ( virtual/opengl )
        portaudio? ( media-libs/portaudio )
        pulseaudio? ( media-sound/pulseaudio )
        "
DEPEND="${RDEPEND}
        app-arch/zip
        media-gfx/nvidia-cg-toolkit
        media-libs/freetype
        media-libs/libsoundtouch
        >=sys-devel/gcc-4.6.0
        x11-libs/wxGTK:2.9
        "

pkg_pretend() {

        local ver=4.6.0
        local msg="${PN} needs at least GCC ${ver} set to compile."

        if [[ ${MERGE_TYPE} != binary ]]; then
                if ! version_is_at_least ${ver} $(gcc-fullversion); then
                        eerror ${msg}
                        die ${msg}
                fi
        fi

}

src_prepare() {

        # Remove automatic dependencies to prevent building without flags 
enabled.
        if use !alsa; then
                sed -i -e '^/include(FindALSA/d' CMakeLists.txt || die
        fi
        if use !ao; then
                sed -i -e '/^check_lib(AO/d' CMakeLists.txt || die
        fi
        if use !bluetooth; then
                sed -i -e '/^check_lib(BLUEZ/d' CMakeLists.txt || die
        fi
        if use !openal; then
                sed -i -e '/^include(FindOpenAL/d' CMakeLists.txt || die
        fi
        if use !portaudio; then
                sed -i -e '/CMAKE_REQUIRED_LIBRARIES portaudio/d' 
CMakeLists.txt || die
        fi
        if use !pulseaudio; then
                sed -i -e '/^check_lib(PULSEAUDIO/d' CMakeLists.txt || die
        fi

        # Remove ALL the bundled libraries, aside from:
        # - SOIL: The sources are not public.
        # - Bochs-disasm: Don't know what it is.
        # - CLRun: Part of OpenCL
        # - polarssl: Currently fails the check as is.
        mv Externals/SOIL . || die
        mv Externals/Bochs_disasm . || die
        mv Externals/CLRun . || die
        mv Externals/polarssl . || die
        rm -r Externals/* || die
        mv polarssl Externals || die
        mv CLRun Externals || die
        mv Bochs_disasm Externals || die
        mv SOIL Externals || die
}

src_configure() {

        local mycmakeargs=(
                "-DDOLPHIN_WC_REVISION=${PV}"
                "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
                "-Dprefix=${GAMES_PREFIX}"
                "-Ddatadir=${GAMES_DATADIR}/${PN}"
                "-Dplugindir=$(games_get_libdir)/${PN}"
                $( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS )
                $( cmake-utils_use openmp OPENMP )
        )

        cmake-utils_src_configure
}

src_compile() {

        cmake-utils_src_compile
}

src_install() {

        cmake-utils_src_install

        dodoc Readme.txt
        if use doc; then
                dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
        fi

        doicon Source/Core/DolphinWX/resources/Dolphin.xpm
        make_desktop_entry "dolphin-emu" "Dolphin" "Dolphin" "Game;"

        prepgamesdirs
}

pkg_postinst() {
        # Add pax markings for hardened systems
        pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu

        if ! use portaudio; then
                ewarn "If you want microphone capabilities in dolphin-emu, 
rebuild with"
                ewarn "USE=\"portaudio\""
        fi
}




Reply via email to