Attachment #421256 for bug #568802

Line 1 Link Here

(-)a/games-emulation/vbam/Manifest (+1 lines)
		1	DIST VBA-M_Beta_2.tar.gz 3023671 SHA256 0469684aa8bde5939cff9f928717c8b1b1ccbb7f57132b1752afd1359e9421ce SHA512 ee9ea797c7fcbc89a0e6c51f764346a927d9cc5bc4d5c9b575ac38615e5e5e46949fdf34acfb35474bf4a0a9291dfccb11bbebd4ccd28c4cfccf2329421a645a WHIRLPOOL e79ee17266445c54f92dacf4529081653c7c618e0f79d5c00fbb370825702d8ef9ee084893ddd4b51a1bb50a7ec6b92305da9589818f1b0481e6159c19aecff9
1	DIST vbam-2.0.0_pre1507.tar.xz 2169848 SHA256 08c512dee029118c65043a3b82caa1e96e49b7c522f3c0c4bed2e091846a0d51 SHA512 9f06fc871c674caf3cc936016b486e98ab1db129edac0ac3615b7b03cfb7b79d9cffa89f436577a9524a128987a6b65bfbbfa0ed602fe17e5dcfbdb56a445c2f WHIRLPOOL b1f926a9b24b0bc3a801c68e723b474f2ee1e60d9ae9851933935fc0bc234f089e1d565b7ceadcc1e2fe24792e7a54f7fc473a0aa545ee5a15bab5844d0df200	2	DIST vbam-2.0.0_pre1507.tar.xz 2169848 SHA256 08c512dee029118c65043a3b82caa1e96e49b7c522f3c0c4bed2e091846a0d51 SHA512 9f06fc871c674caf3cc936016b486e98ab1db129edac0ac3615b7b03cfb7b79d9cffa89f436577a9524a128987a6b65bfbbfa0ed602fe17e5dcfbdb56a445c2f WHIRLPOOL b1f926a9b24b0bc3a801c68e723b474f2ee1e60d9ae9851933935fc0bc234f089e1d565b7ceadcc1e2fe24792e7a54f7fc473a0aa545ee5a15bab5844d0df200

Line 0 Link Here

(-)a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild (-2 / +7 lines)
		1	--- visualboyadvance-m-VBA-M_Beta_2/src/wx/CMakeLists.txt.old 2015-12-30 12:15:01.421560801 -0500
Lines 6-16 EAPI=5 Link Here
6	WX_GTK_VER="3.0"	6	WX_GTK_VER="3.0"
7	inherit cmake-utils wxwidgets gnome2-utils fdo-mime games	7	inherit cmake-utils wxwidgets gnome2-utils fdo-mime games
8		8
		9	MY_P=${P/alpha/pre}
		10
9	if [[ ${PV} == 9999 ]]; then	11	if [[ ${PV} == 9999 ]]; then
10	ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"	12	ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"
11	inherit subversion	13	inherit subversion
12	else	14	else
13	SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"	15	SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${MY_P}.tar.xz"
14	KEYWORDS="amd64 x86"	16	KEYWORDS="amd64 x86"
15	fi	17	fi
16		18
Lines 48-53 DEPEND="${RDEPEND} Link Here
48	nls? ( sys-devel/gettext )	50	nls? ( sys-devel/gettext )
49	virtual/pkgconfig"	51	virtual/pkgconfig"
50		52
		53	S="${WORKDIR}/${MY_P}"
		54
51	src_prepare() {	55	src_prepare() {
52	[[ ${PV} == 9999 ]] && subversion_src_prepare	56	[[ ${PV} == 9999 ]] && subversion_src_prepare
53		57
Lines 56-62 src_prepare() { Link Here
56		60
57	sed -i "s:$DESTINATION$ bin:\1 ${GAMES_BINDIR}:" \	61	sed -i "s:$DESTINATION$ bin:\1 ${GAMES_BINDIR}:" \
58	CMakeLists.txt src/{wx,gtk}/CMakeLists.txt \|\| die	62	CMakeLists.txt src/{wx,gtk}/CMakeLists.txt \|\| die
59	epatch "${FILESDIR}"/${P}-man.patch	63	epatch "${FILESDIR}"/${MY_P}-man.patch
60	}	64	}
61		65
62	src_configure() {	66	src_configure() {




# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$

EAPI=5
WX_GTK_VER="3.0"
inherit cmake-utils wxwidgets gnome2-utils fdo-mime games

if [[ ${PV} == 9999 ]]; then
	ESVN_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
	inherit git
else
	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/VBA-M_Beta_2.tar.gz"
	KEYWORDS="~amd64 ~x86"
fi

DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
HOMEPAGE="http://vba-m.com/"

LICENSE="GPL-2+"
SLOT="0"
IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
REQUIRED_USE="|| ( sdl gtk wxwidgets )"

RDEPEND=">=media-libs/libpng-1.4:0=
	media-libs/libsdl[sound]
	sys-libs/zlib
	virtual/glu
	virtual/opengl
	link? ( >=media-libs/libsfml-2.0 )
	ffmpeg? ( virtual/ffmpeg[-libav] )
	lirc? ( app-misc/lirc )
	nls? ( virtual/libintl )
	sdl? ( media-libs/libsdl[joystick,opengl] )
	gtk? ( >=dev-cpp/glibmm-2.4.0:2
		>=dev-cpp/gtkmm-2.4.0:2.4
		>=dev-cpp/gtkglextmm-1.2.0 )
	wxwidgets? (
		cairo? ( x11-libs/cairo )
		openal? ( media-libs/openal )
		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
	)"
DEPEND="${RDEPEND}
	wxwidgets? ( || (
		media-gfx/imagemagick
		media-gfx/graphicsmagick[imagemagick] ) )
	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
	nls? ( sys-devel/gettext )
	virtual/pkgconfig"

S="${WORKDIR}/visualboyadvance-m-VBA-M_Beta_2"

src_prepare() {
	[[ ${PV} == 9999 ]] && subversion_src_prepare

	# fix issue with zlib-1.2.5.1 macros (bug #383179)
	sed -i '1i#define OF(x) x' src/common/memgzio.c || die

	sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
		CMakeLists.txt src/{wx,gtk}/CMakeLists.txt || die
	epatch "${FILESDIR}"/vbam-2.0.0_pre1507-man.patch
	epatch "${FILESDIR}"/${P}-wx-cmakelists.patch
}

src_configure() {
	append-cxxflags $(test-flags-CXX -std=gnu++11 -fpermissive)
	local mycmakeargs=(
		$(cmake-utils_use_enable cairo CAIRO)
		$(cmake-utils_use_enable ffmpeg FFMPEG)
		$(cmake-utils_use_enable gtk GTK)
		$(cmake-utils_use_enable link LINK)
		$(cmake-utils_use_enable lirc LIRC)
		$(cmake-utils_use_enable nls NLS)
		$(cmake-utils_use_enable openal OPENAL)
		$(cmake-utils_use_enable sdl SDL)
		$(cmake-utils_use_enable wxwidgets WX)
		$(cmake-utils_use_enable x86 ASM_CORE)
		$(cmake-utils_use_enable x86 ASM_SCALERS)
		-DCMAKE_SKIP_RPATH=ON
		-DDATA_INSTALL_DIR=share/games/${PN}
	)
	cmake-utils_src_configure
}

src_compile() {
	cmake-utils_src_compile
}

src_install() {
	cmake-utils_src_install
	use sdl && dodoc doc/ReadMe.SDL.txt
	prepgamesdirs
}

pkg_preinst() {
	[[ ${PV} == 9999 ]] && subversion_pkg_preinst

	games_pkg_preinst
	if use gtk || use wxwidgets ; then
		gnome2_icon_savelist
	fi
}

pkg_postinst() {
	games_pkg_postinst
	if use gtk || use wxwidgets ; then
		gnome2_icon_cache_update
		use gtk && fdo-mime_desktop_database_update
	fi
}

pkg_postrm() {
	if use gtk || use wxwidgets ; then
		gnome2_icon_cache_update
		use gtk && fdo-mime_desktop_database_update
	fi
}

Return to bug 568802

Line 0 Link Here

(-)a/games-emulation/vbam/vbam-2.0.0_beta2.ebuild (+117 lines)
		1	# Copyright 1999-2015 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3	# $Id$
		4
		5	EAPI=5
		6	WX_GTK_VER="3.0"
		7	inherit cmake-utils wxwidgets gnome2-utils fdo-mime games
		8
		9	if [[ ${PV} == 9999 ]]; then
		10	ESVN_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
		11	inherit git
		12	else
		13	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/VBA-M_Beta_2.tar.gz"
		14	KEYWORDS="~amd64 ~x86"
		15	fi
		16
		17	DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
		18	HOMEPAGE="http://vba-m.com/"
		19
		20	LICENSE="GPL-2+"
		21	SLOT="0"
		22	IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
		23	REQUIRED_USE="\|\| ( sdl gtk wxwidgets )"
		24
		25	RDEPEND=">=media-libs/libpng-1.4:0=
		26	media-libs/libsdl[sound]
		27	sys-libs/zlib
		28	virtual/glu
		29	virtual/opengl
		30	link? ( >=media-libs/libsfml-2.0 )
		31	ffmpeg? ( virtual/ffmpeg[-libav] )
		32	lirc? ( app-misc/lirc )
		33	nls? ( virtual/libintl )
		34	sdl? ( media-libs/libsdl[joystick,opengl] )
		35	gtk? ( >=dev-cpp/glibmm-2.4.0:2
		36	>=dev-cpp/gtkmm-2.4.0:2.4
		37	>=dev-cpp/gtkglextmm-1.2.0 )
		38	wxwidgets? (
		39	cairo? ( x11-libs/cairo )
		40	openal? ( media-libs/openal )
		41	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
		42	)"
		43	DEPEND="${RDEPEND}
		44	wxwidgets? ( \|\| (
		45	media-gfx/imagemagick
		46	media-gfx/graphicsmagick[imagemagick] ) )
		47	x86? ( \|\| ( dev-lang/nasm dev-lang/yasm ) )
		48	nls? ( sys-devel/gettext )
		49	virtual/pkgconfig"
		50
		51	S="${WORKDIR}/visualboyadvance-m-VBA-M_Beta_2"
		52
		53	src_prepare() {
		54	[[ ${PV} == 9999 ]] && subversion_src_prepare
		55
		56	# fix issue with zlib-1.2.5.1 macros (bug #383179)
		57	sed -i '1i#define OF(x) x' src/common/memgzio.c \|\| die
		58
		59	sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
		60	CMakeLists.txt src/{wx,gtk}/CMakeLists.txt \|\| die
		61	epatch "${FILESDIR}"/vbam-2.0.0_pre1507-man.patch
		62	epatch "${FILESDIR}"/${P}-wx-cmakelists.patch
		63	}
		64
65	src_configure() {
66	append-cxxflags $(test-flags-CXX -std=gnu++11 -fpermissive)
67	local mycmakeargs=(
68	$(cmake-utils_use_enable cairo CAIRO)
69	$(cmake-utils_use_enable ffmpeg FFMPEG)
70	$(cmake-utils_use_enable gtk GTK)
71	$(cmake-utils_use_enable link LINK)
72	$(cmake-utils_use_enable lirc LIRC)
73	$(cmake-utils_use_enable nls NLS)
74	$(cmake-utils_use_enable openal OPENAL)
75	$(cmake-utils_use_enable sdl SDL)
76	$(cmake-utils_use_enable wxwidgets WX)
77	$(cmake-utils_use_enable x86 ASM_CORE)
78	$(cmake-utils_use_enable x86 ASM_SCALERS)
79	-DCMAKE_SKIP_RPATH=ON
80	-DDATA_INSTALL_DIR=share/games/${PN}
81	)
82	cmake-utils_src_configure
83	}
84
85	src_compile() {
86	cmake-utils_src_compile
87	}
88
89	src_install() {
90	cmake-utils_src_install
91	use sdl && dodoc doc/ReadMe.SDL.txt
92	prepgamesdirs
93	}
94
95	pkg_preinst() {
96	[[ ${PV} == 9999 ]] && subversion_pkg_preinst
97
98	games_pkg_preinst
99	if use gtk \|\| use wxwidgets ; then
100	gnome2_icon_savelist
101	fi
102	}
103
104	pkg_postinst() {
105	games_pkg_postinst
106	if use gtk \|\| use wxwidgets ; then
107	gnome2_icon_cache_update
108	use gtk && fdo-mime_desktop_database_update
109	fi
110	}
111
112	pkg_postrm() {
113	if use gtk \|\| use wxwidgets ; then
114	gnome2_icon_cache_update
115	use gtk && fdo-mime_desktop_database_update
116	fi
117	}