Merge pull request #28 from leycec/python-multilib

Fix #26 and #27.

games-emulation/retroarch/Manifest

@@ -1,4 +1,4 @@
 AUX retroarch-9999-build.patch 1945 SHA256 112158d34105aae23eb4ce77795ccd4a36cdd1a28e07970042e05a37ae9a14c8 SHA512 a3088387e9cc8e09808265ea3bdfd5d0c4dd871e4fb6c121dced6e84d9d3c1bc645008c686d762fefd8b7d53934ffaef448964573cf007dc5fd366c7f61f6425 WHIRLPOOL df0824e299adc6dcb1629acd380c22720541c68830b559ea1b54aa3c16dbdd4fd3732c1bb3b7824128ca0025f8aa7f7f90b8fbb24e53d22c94b12f409169b978
 AUX retroarch-python.patch 284 SHA256 4742a207932216c90188fd1a051bf984f69c872e09e6d34663b36a508913b7b7 SHA512 55fd6de84b6d5189f91992acceb3b8413e21c14b594c9cd822bbf19e87644949a30592b577ee995ef35312e699bd1f53faf4d887e0a792c71adb5c96e9f0d42e WHIRLPOOL 3ef6f21bc2f09c719dc2bfa3fa93bdc0917aae861edda7e2a2e40590934e507c330333e7de2cd176961a078f10e9f6d60bf2fe5c93ccdb8af5b69fd39c072d8c
-EBUILD retroarch-9999.ebuild 6552 SHA256 b72b116abff1c72fa5b75924f2cadb8684f813130aa6b943f89d18686a1e0850 SHA512 e155233a01d837e15499132ccc98a3ccd41f04a9babd313473b55ce2ed86dc82458184cc7629a4181e43047a5c359130c85f9aac3bd008f3160330501f82e8b0 WHIRLPOOL 8dd07450a3469fab99a883d314b157d102405351e4006c6bb91c6dab47d2ea06dd153c19da13785276dfd2e33a8915df3e5e9d82ddb055441f1a2cb6f4608403
-MISC metadata.xml 2443 SHA256 cdb2e837c055512386bad1b6a87f4065a1070ca90c90bbb20eccb7098524190e SHA512 6453736125b4d78fab87d06164e3710d4ccf75de265bf33f19116f4ca8f28df2e6f45cbb6866e25a4deafdff7717e602f7b54b16a94ea4296774284484b6d932 WHIRLPOOL 583363f86f0edfc2f6a6881ae6f69ac118ba79736affd13fbbea6e58c66a0f84483122837cbec6dba7f6e3f25c9e487abb97fd90cd7cfb07b17f75f272317109
+EBUILD retroarch-9999.ebuild 7032 SHA256 96a024748da086ba55eaae6a3999b4f7e5918054d5c70c8f934fd60a0d5e56cf SHA512 9582bd5c20ab5075e4f4c88fc98b67681f61286a0b921d5684d346b63464e6a83b1d982256c056ca51d20e11fbf672d45daafceb57e9a4c42ea071bb36c241fc WHIRLPOOL fd1ad5d765da14938187142df3684c5b6833b31ec49043d4440bbdd76526af0ef1bdf9bb0c0620cb19ae280e935dfd9d7ec32537f13674351e57355cfae055fd
+MISC metadata.xml 2566 SHA256 f95514fa8f12470755a973899e69d367ecd3334b80e8c6960970bd02306f0b40 SHA512 698f5b9bb84f3b2932852d5b569091896a079cca242b0623636d142f5f795bf536a74e98fdab4123dcd2e26f373cf64f93296a8f9aeba2b3c3b65407a15f2ae8 WHIRLPOOL 9e3950b5220cc0e10104f85303a27940f423db2766bb7727a2c3e33fb9de307ef9275e067e223fbf7f7a40a91f91f71cd5e07f3955203a8208bfa86b546ab2b7

games-emulation/retroarch/metadata.xml

@@ -7,6 +7,7 @@
   </maintainer>
   <use>
     <flag name='alsa'>Enable ALSA support</flag>
+    <flag name='armvfp'>Enable Vector Floating Point (VFP) instruction set support for post-ARMv5 ARM architectures</flag>
     <flag name='assets'>adds <pkg>games-emulation/retroarch-assets</pkg> as dependency</flag>
     <flag name='cg'>Enable Cg shader support</flag>
     <flag name='cores'>Changes default retroarch.cfg to the standardpath of the libretro* ebuilds</flag>

games-emulation/retroarch/retroarch-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,11 @@ EGIT_REPO_URI="git://github.com/libretro/RetroArch.git"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa +armvfp +assets +cg +cores +database egl +fbo ffmpeg gles gles3 glui jack +joypad_autoconfig kms +netplay +neon openal +opengl oss pulseaudio python sdl sdl2 +shaders +truetype +threads +udev v4l2 openvg +overlays +xml +xmb xv xinerama +x11 zlib"
+
+# To avoid fatal dependency failures for users enabling the "python" USE flag, a
+# default "python_single_target_python*" USE flag *MUST* be set below to the
+# default version of Python 3 for default Portage profiles.
+IUSE="alsa +armvfp +assets +cg +cores +database egl +fbo ffmpeg gles gles3 glui jack +joypad_autoconfig kms +netplay +neon openal +opengl oss pulseaudio sdl sdl2 +shaders +truetype +threads +udev v4l2 openvg +overlays +xml +xmb xv xinerama +x11 zlib python +python_single_target_python3_3 python_single_target_python3_4"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	assets? ( games-emulation/retroarch-assets )
@@ -56,6 +60,7 @@ REQUIRED_USE="|| ( alsa jack openal oss pulseaudio )
 	      alsa? ( threads )
 	      arm? ( gles? ( egl ) )
 	      cg? ( opengl )
+		  python? ( ${PYTHON_REQUIRED_USE} )
 	      sdl2? ( !sdl )
 	      kms? ( egl )
 	      xmb? ( assets )
@@ -86,31 +91,31 @@ src_prepare() {
 
 	#changing default options to a more sensible default
 	sed -i retroarch.cfg \
-		-e 's:# libretro_directory =:libretro_directory = "/usr/lib/libretro/":' \
-		-e 's:# libretro_info_path =:libretro_info_path = "/usr/share/libretro/info/":' \
-		-e 's:# joypad_autoconfig_dir =:joypad_autoconfig_dir = "/usr/share/retroarch/autoconfig/":' \
+		-e 's:# libretro_directory =:libretro_directory = "'${EROOT}'usr/'$(get_libdir)'/libretro/":' \
+		-e 's:# libretro_info_path =:libretro_info_path = "'${EROOT}'usr/share/libretro/info/":' \
+		-e 's:# joypad_autoconfig_dir =:joypad_autoconfig_dir = "'${EROOT}'usr/share/retroarch/autoconfig/":' \
 		-e 's:# rgui_browser_directory =:rgui_browser_directory = "~/":' \
-		-e 's:# assets_directory =:assets_directory = "/usr/share/retroarch/assets/":' \
+		-e 's:# assets_directory =:assets_directory = "'${EROOT}'usr/share/retroarch/assets/":' \
 		-e 's:# rgui_config_directory =:rgui_config_directory = "~/.config/retroarch/":' \
-		-e 's:# video_shader_dir =:video_shader_dir = "/usr/share/libretro/shaders/":' \
-		-e 's:# video_filter_dir =:video_filter_dir = "/usr/lib/retroarch/filters/video/":' \
-		-e 's:# audio_filter_dir =:audio_filter_dir = "/usr/lib/retroarch/filters/audio/":' \
-		-e 's:# overlay_directory =:overlay_directory = "/usr/share/libretro/overlays/":' \
-		-e 's:# content_database_path =:content_database_path = "/usr/share/libretro/data/":' \
-		-e 's:# cheat_database_path =:cheat_database_path = "/usr/share/libretro/cheats/":' \
+		-e 's:# video_shader_dir =:video_shader_dir = "'${EROOT}'usr/share/libretro/shaders/":' \
+		-e 's:# video_filter_dir =:video_filter_dir = "'${EROOT}'usr/'$(get_libdir)'/retroarch/filters/video/":' \
+		-e 's:# audio_filter_dir =:audio_filter_dir = "'${EROOT}'usr/'$(get_libdir)'/retroarch/filters/audio/":' \
+		-e 's:# overlay_directory =:overlay_directory = "'${EROOT}'usr/share/libretro/overlays/":' \
+		-e 's:# content_database_path =:content_database_path = "'${EROOT}'usr/share/libretro/data/":' \
+		-e 's:# cheat_database_path =:cheat_database_path = "'${EROOT}'usr/share/libretro/cheats/":' \
 		-e 's:# system_directory =:system_directory = "~/.local/share/retroarch/system/":' \
 		-e 's:# savestate_directory =:savestate_directory = "~/.local/share/retroarch/savestates/":' \
 		-e 's:# savefile_directory =:savefile_directory = "~/.local/share/retroarch/savefiles/":' \
 		-e 's:# content_directory =:content_directory = "~/":' \
 		-e 's:# screenshot_directory =:screenshot_directory = "~/.local/share/retroarch/screenshots/":' \
-		-e 's:# extraction_directory =:extraction_directory = "/tmp/":' \
+		-e 's:# extraction_directory =:extraction_directory = "'${EROOT}'tmp/":' \
 		|| die
 }
 
 src_configure() {
 	if use cg; then
-		append-ldflags -L/opt/nvidia-cg-toolkit/$(get_libdir)
-		append-cflags -I/opt/nvidia-cg-toolkit/include
+		append-ldflags -L"${EROOT}"opt/nvidia-cg-toolkit/$(get_libdir)
+		append-cflags -I"${EROOT}"opt/nvidia-cg-toolkit/include
 	fi
 
 	egamesconf \
@@ -133,7 +138,6 @@ src_configure() {
 		$(use_enable oss) \
 		$(use_enable pulseaudio pulse) \
 		$(use_enable python) \
-		$(use_enable python) \
 		$(use_enable sdl) \
 		$(use_enable sdl2) \
 		$(use_enable threads) \
@@ -147,7 +151,7 @@ src_configure() {
 		$(use_enable xv xvideo) \
 		$(use_enable zlib) \
 		--enable-dynamic \
-		--with-man_dir="/usr/share/man/man1" \
+		--with-man_dir=${EROOT}"usr/share/man/man1" \
 		|| die
 }
 
@@ -158,17 +162,17 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${ED}" install || die
 	dodoc README.md AUTHORS
 	insinto /usr/share/applications/
 	doins "${S}"/debian/retroarch.desktop
-	insinto /usr/lib/retroarch/filters/video/
+	insinto /usr/$(get_libdir)/retroarch/filters/video/
 	doins "${S}"/gfx/video_filters/*.so
 	doins "${S}"/gfx/video_filters/*.filt
-	insinto /usr/lib/retroarch/filters/audio/
+	insinto /usr/$(get_libdir)/retroarch/filters/audio/
 	doins "${S}"/audio/audio_filters/*.so
 	doins "${S}"/audio/audio_filters/*.dsp
-	keepdir /usr/lib/libretro/
+	keepdir /usr/$(get_libdir)/libretro/
 	keepdir /usr/share/libretro/info/
 	keepdir /usr/share/libretro/shaders/
 	keepdir /usr/share/libretro/overlays/
@@ -180,7 +184,7 @@ src_install() {
 }
 
 pkg_preinst() {
-	if ! has_version "=${CATEGORY}/${PN}-${PV}"; then
+	if ! has_version "=${CATEGORY}/${P}"; then
 		first_install="1"
 	fi
 }