Remove games team maintainership following the Council decision. Use standard install layout.

Package-Manager: portage-2.2.11_p72/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

28 files changed, 779 insertions, 134 deletions

diff --git a/games-emulation/mupen64plus-audio-sdl/ChangeLog b/games-emulation/mupen64plus-audio-sdl/ChangeLog
index d8fbed4a8ecb..7e29506edefe 100644
--- a/games-emulation/mupen64plus-audio-sdl/ChangeLog
+++ b/games-emulation/mupen64plus-audio-sdl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/mupen64plus-audio-sdl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-audio-sdl/ChangeLog,v 1.4 2014/05/15 16:38:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-audio-sdl/ChangeLog,v 1.5 2014/08/15 10:18:56 mgorny Exp $
+
+*mupen64plus-audio-sdl-2.0-r1 (15 Aug 2014)
+
+  15 Aug 2014; Michał Górny <mgorny@gentoo.org>
+  +mupen64plus-audio-sdl-2.0-r1.ebuild, metadata.xml:
+  Remove games team maintainership following the Council decision. Use standard
+  install layout.
 
   15 May 2014; Ulrich Müller <ulm@gentoo.org>
   mupen64plus-audio-sdl-2.0.ebuild:
diff --git a/games-emulation/mupen64plus-audio-sdl/Manifest b/games-emulation/mupen64plus-audio-sdl/Manifest
index 50281db7bade..b3695013bd82 100644
--- a/games-emulation/mupen64plus-audio-sdl/Manifest
+++ b/games-emulation/mupen64plus-audio-sdl/Manifest
@@ -2,20 +2,27 @@
 Hash: SHA256
 
 DIST mupen64plus-audio-sdl-src-2.0.tar.gz 26084 SHA256 943ffa6b6cdaf0cda2a24469dfa1d8e951c88c41472ded9e5c9ecbc111363286 SHA512 92ee4755c22da5a753374c7c6f5e074bf6c1ab06a0ab27d475566d50f8ed75b636b59ffe1a8c9d3d63558bf5783b999a600703951679f7bab346643c0c86871d WHIRLPOOL 82a56a49f0ffe620917dba92bf135593c7e66e2944ec0688b29cc2d5362221b81f76e162840e315476d959b445d38f3bc1bf05538fbf1fa9de96b616835b2198
+EBUILD mupen64plus-audio-sdl-2.0-r1.ebuild 2028 SHA256 cae3e168e2082d48b262da42e6024fce63db6b37dd592f2bf5f18879ff7e5419 SHA512 a5411f01cd967e3db79137c190a56069729d7df019b5831f6a96e942bcf6c50904211269d8cef701dac4c355b10cd39c42f398226dedffea15469824e5456a1b WHIRLPOOL 88a59acbce7370487162d03a5cc2c2824c1def0553a6c31c51667a7f2959a4f9aad8c507f649e4ba9b02d5631ee3701d8302c158829af62e8fa328ad7384f6db
 EBUILD mupen64plus-audio-sdl-2.0.ebuild 2116 SHA256 591e784ec925e2c815dab90ad0264eb5e2272909dbac7c4c703f489b0d921541 SHA512 058cc73fd00fe88935954d3d3ad8fe85d8605aa1169b6cdc6a9923ca0a10b3e41c7d16273bc8c5370f73e1a5f92e670f59fb8c5ce0c435944bac855f5147cc42 WHIRLPOOL 8f7aacb30e03bff57ac4a65a554a6b3f1701c0eda1e4a149eb584aa1ccb9de3b628cb780dec71688d562d86016915daf0096ee18315850dcde03c3cdf2afb61c
-MISC ChangeLog 924 SHA256 f935ae4571eb4d5a9b4d374c39c85569af1cd5723b2f7c8156e4ae7d6f78dfd4 SHA512 241af5c2c3be6dee183c4f4260035d931dceb9b6d42c1ed374caee545bdb9439c75796b9a0c823e9638f287c3e6d638053ec9799b296a2d7535ffb604265d38d WHIRLPOOL 127848c844caf165364f06fb1fa5283205f6697d208eb0db070a31a0a93c6d77c2f57c553de3a08dbf5ddc5ab810cc9493dcc162e8c2d2a1b74df6552a793c92
-MISC metadata.xml 352 SHA256 b5b11f77354a3f9a9051da98c3e7499a195f42a2abc71c3fe55979eeab43c7cc SHA512 579bbf3da7e4b2a573bbec036b4e5710dbe5289278094e9dc3c3cda8d8ca9533031e189bc12a15a47abe9f4cb58f83a98d2b0796ac0394797085b367658c3af8 WHIRLPOOL 3ced83d68b1b7923be49ae91e82ffe778aac35895fd681e8be87f28f77b716a60384af1935cc632abd7c510181d76526d475548e33117c73416d9cd922af49f3
+MISC ChangeLog 1175 SHA256 3675f0ba059be923fa2f7e45e5d0ec214a30822cd7ae1d4a81f5c32e9e119a8c SHA512 7bfb7a15ebaf4fdfb61e9724c619b73c500aa58b9cc5a4ee908f4f8e302acbe372f04cc71a17968d6f548fdbf5b1981129038a165f28d44183b51c89da768df4 WHIRLPOOL faaac8aaac1c8ba8bf3a5633fc5d72732bb9c3865b64979a5dbec5fac78cc03f78fc6b737c397c930781bcb1a0b6a28cdf76db5aac67601dac7febf895496c11
+MISC metadata.xml 332 SHA256 fddf0cc3fb5d96e622d607039f19d38ea9cf4a428393af81637205b51a6ef5a7 SHA512 67baaca8142e17ac47a00e477efdef2a66ca4d4d2f878cb2e2a0b06b10effe39c5272cc7fa5aaedc5911864e9b8cf50ceb240fce6d0920f4a5ec74676827ca8b WHIRLPOOL aa3fa95c7736443edf6815c5c38e67b94e99549fb3112a13d7988c5143c71d2cec7d7855e7f74e89315ee09850ea70aa2f284c8a9c881c9ee6ce2ee8ef72d43f
+MISC metadata.xml.rej 2313 SHA256 a337d5e81b5badbde92fd7d6653d023a95688943443237c408c6999a4efa42c7 SHA512 1b488f1b3bc20c755f529d2c0be666698c9cfbe3c19106a90e22f67d3efea5923aa007928d5e21e55c0f735fc70e3a1f020be8631b0c63d5147a292267c4b294 WHIRLPOOL c9e6213777a21f4ce47f2081dcb4eb1d6f0433a81f54511fd3cc9ab88130e84f9e871d02a8e7b9d5aca784d098383eb53a221de9179d079ef557c161f9e950fc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTdO2HAAoJEJQzkH1pP7W4YvYL/RycxxecDXXO7Zpe09Sgasee
-lXWFYTDyeL8qeWegZnaK61jyeKdMMEBnS9FlV+Y5T3yCxdVVNfJXGdOzDq6btE5V
-bvWlu3BYATRBaIhkEfcOMnKCA1yIUJC09fUhdT/rjOrDUWaZw9dH+a+cCMGCj4MS
-QOc2Ku6N1+2JAKu+7gtPFmvG2RMHgflJYRKTMpmAPQYhKaXb8X99njmMpSKpww9x
-H87hFRNgePFJMSM02BYgdfirbKWOPZbZDo+oEX9CsqYcU9mmVeMurTx95q0IbkFn
-u307jL2npqdbOKe9L/l1+gO85k/UwA3sWsWelay2dyt7XoiWmZTvN0631GrDO2qM
-ayTH0FHPVy56yF5xkYa/dpzizxWNvXuYZIcE3plyRNDu6rIWJXvlDhKe7olHhwcJ
-DCi2nld6ubrq5XLZ48zcnfzGjjWvmPGnQvoCt+vM23nGal9Ta4c3DZun0GpKxmKz
-egrdgXZ2MbNVoj88/YQzSGCfGAHHIaCvL5gm8n3ePQ==
-=E4AD
+iQJ8BAEBCABmBQJT7d7DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOTVYP/3hnuR6v8S8SeKcsyKo0YShx
+zcFbvet1ARLpGaN39Cpmj0agz1zCEgZPCLkFt0MhI9e68w2ENiabelhlXoQSuXxN
+0cZuCCExnSx6RDnXtUMJv0RoQYBLz+5TQnNBZ+AgGHIKXJSguG8lUIdci8ax4Qj9
+MNocbM6PoHuIghDKkTEuFKsQ3rCn5Ua/dIqMUyDHFdHX3c2+X1pjnkuxL3/tOpeh
+NbxNqTaiRRAdVU9Wiq/yg7Rezt66zFNwwQ8JiqKut7hp2osv3g8LqULmiQT1oodz
+T147fI6xFueV5xP9/jRtUGOwc+c+okmixdWp/4mho60V7AEGVMxN75kedmGpF+x7
+z/CtL6tOcXBKzjXMRDvi6XeFDp3LuwUZrq10ky0YPSLIDZvh/ZOKRtO3KSGSrij4
+IbD1s2OaAjHCIbHaGEHWlDEt2g9HFkJU73aBZNVKn7cuppCPyOs6KKqd3HXIY6u2
+sBjNpXEP7Mlcj9jcAvGwvXl9VwgK8M6Rvuy/EBU8aqH6ckVxi1/AYdUaZbdvt32O
+ZJiDvMRl/FfPQbea0WKMppMCC5Y+ik0W08lVzp/gWvq8CAKl2LlSKPFaD/ep5gNV
+NzmZzddJss7zFSzhU67RxluVvqdM6ehBJSh85VZBq/9X0Onv0PEVjJc5Ux9PsnAH
+G58CXROE/WIvv/80pyOf
+=4d86
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus-audio-sdl/metadata.xml b/games-emulation/mupen64plus-audio-sdl/metadata.xml
index 9047711e4ffd..955f381367d5 100644
--- a/games-emulation/mupen64plus-audio-sdl/metadata.xml
+++ b/games-emulation/mupen64plus-audio-sdl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
diff --git a/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.0-r1.ebuild b/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.0-r1.ebuild
new file mode 100644
index 000000000000..ee371121b1ad
--- /dev/null
+++ b/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.0-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.0-r1.ebuild,v 1.1 2014/08/15 10:18:56 mgorny Exp $
+
+EAPI=5
+
+MY_P=${PN}-src-${PV}
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, SDL audio plugin"
+HOMEPAGE="http://code.google.com/p/mupen64plus/"
+SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libsamplerate oss speex"
+
+RDEPEND=">=games-emulation/mupen64plus-core-2.0-r1:0=
+	media-libs/libsdl:0=[sound]
+	libsamplerate? ( media-libs/libsamplerate:0= )
+	speex? ( media-libs/speex:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+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}-sdl-config...
+		SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl)"
+		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl)"
+
+		NO_SPEEX=$(usex speex 0 1)
+		NO_SRC=$(usex libsamplerate 0 1)
+		NO_OSS=$(usex oss 0 1)
+	)
+
+	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
+	use x86 && MAKEARGS+=( HOST_CPU=i386 )
+
+	emake "${MAKEARGS[@]}" all
+}
+
+src_install() {
+	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/games-emulation/mupen64plus-core/ChangeLog b/games-emulation/mupen64plus-core/ChangeLog
index c02a4e323dc8..2073797441cc 100644
--- a/games-emulation/mupen64plus-core/ChangeLog
+++ b/games-emulation/mupen64plus-core/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/mupen64plus-core
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-core/ChangeLog,v 1.4 2014/04/14 15:37:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-core/ChangeLog,v 1.5 2014/08/15 10:17:41 mgorny Exp $
+
+*mupen64plus-core-2.0-r1 (15 Aug 2014)
+
+  15 Aug 2014; Michał Górny <mgorny@gentoo.org> +mupen64plus-core-2.0-r1.ebuild,
+  metadata.xml:
+  Remove games team maintainership following the Council decision. Use standard
+  install layout.
 
   14 Apr 2014; Michał Górny <mgorny@gentoo.org> mupen64plus-core-2.0.ebuild:
   Add dep on libsdl[opengl] for screenshot code, bug #507600.
diff --git a/games-emulation/mupen64plus-core/Manifest b/games-emulation/mupen64plus-core/Manifest
index 0a2c2ae41b3c..16349005b54e 100644
--- a/games-emulation/mupen64plus-core/Manifest
+++ b/games-emulation/mupen64plus-core/Manifest
@@ -2,25 +2,27 @@
 Hash: SHA256
 
 DIST mupen64plus-core-src-2.0.tar.gz 1127862 SHA256 7e98795dbe4646b858919078f58a6ed94f7cfa30867df6cf44ef33da6aaa7a28 SHA512 6f7391536c23b465af737b3b64f3488bc0275c472e27f97f1d8be61e917c6772cad2c747db8ffa251ba88ba4f4c0d29de2451325f3ea4bcc6049534ef1dac41e WHIRLPOOL c32c97071d911696c9b24a931287ba7da1bdb29434300d984926a2a1b0541660022b6a811f616e8ed18de8d59fdafd168a571b248165c950d80f4e045e25aa53
+EBUILD mupen64plus-core-2.0-r1.ebuild 2887 SHA256 6ab93cb0601858229b72048a58f287ccbe4148c15ae215ec438a75e4691149e4 SHA512 c3400fe85c1355e3e83948bcabe9025b0f188f04c27968b66caddce36c5452287c147e3a8e015d0d473d37f6f691e5cdf949d5e340ac851d2501f520d4ad6643 WHIRLPOOL 9a57b8bd39fce0572c4b0f0815937d7de6c81a7d22c33e97f59a09db5525da76b3159ba3cb6bc8c06c5408def16c2a13bbb6b2e2083bf9c4bba254ade7a812ed
 EBUILD mupen64plus-core-2.0.ebuild 2560 SHA256 660862a03aed27abe73fcdd029e242dc015197ac48fe41b3c9ba39b9898a9483 SHA512 579b0ed0203175ed0e08fc863a4d08c4ff2a6510a9c0969cbfd17f238d236ad939359f8a7adf1a7fb047048ed4592ec7e21415bb6b27a5f055edeb775b41d6b9 WHIRLPOOL ab3380488d6f9ea344c9c3b0eac41de761f7627aa7f41ea19cc8a7518bf11b49653db3e52b234dc229e8b80962d819ac0f9973d01838c2ad5b2143945ff447dd
-MISC ChangeLog 848 SHA256 587b11130a5d79723245e0e4a2e2d71d985f039b7a8e0f6586f60e56d54dd301 SHA512 80bf9a880e6c2a8afa568fcd48530fe8b3a8317bd3f4460aa01f7291420ba32a8c8579f62caa7160217195843aec0f20af3763469ca1e47c48c57549a90e8c35 WHIRLPOOL 1de3b8a47492b1ea75e3644b6bc03e0761237c5b8a8007ca9ee0233829576db3e9b26f477fca74b749bfdec8aebb1277aa8226167e5c4833a2ca79d63273f345
-MISC metadata.xml 889 SHA256 989541d6301b589b95a3b07a04d37c7f00d8a5eabf2df70bafc826471b4669a6 SHA512 c190c870601ac89e30a9db66742fd79aa653523973c053c732649c1685346c2e4a7bc5fea8184ef29c045baf5d51c5444f2a328e64f03dcb7ef5e9a320ca2aa7 WHIRLPOOL 9ecae27a5e8f2c3942812430c39270f3010b03f8f6d3cfcf248c74d5ccf7b9bf6918421baaab2ea601f8e07ca57c3c65eff7a9371a7e170e5d759f64573d8023
+MISC ChangeLog 1086 SHA256 8ee24214bd3c3f768bf4d63a61d4d47df61dd1e353816dd8dc9fac66b1ab6954 SHA512 eefd2783f85a6a973d1f8d4cc674d9f7b60caf3217dbacd5f39fc1e71a6120e36dfa94e4726087e9c4f2202b91872b932fe9f5f9f24062a258c3f8dec7e28b43 WHIRLPOOL ddf74c74bee78e2ffe9b04d2584371c50afee676f2b14ed8a4693f30a1005815872b697dc91d654a572a58d81e40f8c42f7ba6549eee8b888f0544dd34ccaa53
+MISC metadata.xml 869 SHA256 8e83c778e51403aa1eedb752a4b7579d8fee8f219ee7df2e72326b17f1f5786c SHA512 36723ad70d97ad15862e85814f5029e009128bd88108c97b10f0af7dc7fb622be7f47e242e9cb60811e003550c0bd3f8dc38d5d2779c5b05b973ece1e4502c5c WHIRLPOOL 619aa49c13444daaa4442869d7e0b039fd6884f12cd857cbeeb518d3c4ab4f8e1a1557dbc3e465be50d48a3db7354fe2a42e303db39f87f65de9cc47612bb670
+MISC metadata.xml.rej 2460 SHA256 7ecdf62530f247e49ddce34489a12fa09e277be902951564d343f481dd550195 SHA512 f0facfb81f15361df7e798afc015ae41787d72a1c606127ebfb5f2861990381c6418450db520a1cae1da6fa254058da8832a32d7eb201b66f8b9466b3722cfac WHIRLPOOL 7423a08bce4e9a18dee5280e018e73d8d5e36fe2674b583b23b0f9368133ca7e25a58ac82bb667a26bed7ab8e764801233c7fd9c1273c638865aa69fe694358c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTTADdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJT7d58XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOaF4P/17tYXdi2EF2BzwKsKp38THP
-xLGPMe0cI5Tf5VdvrXyZkXeG+jgofa9mgCcOXYfeILHm67NyVfJl6lGEc1kgS0dC
-yI39Y6uKKyqdWUQKms5Zq+bdmg9t2wElT/5IUET6CeLkBevDc2Ohow8ugqcTZv1V
-jFoC7zcY5iiu8IzkRk949q/MzBhWwUVdXcX4NIkmww2nZ5uGmSEYUYcDsdCqjsXE
-rnVd0eNwp5pFS5Ues/0d6aaSJhhTYs28yd4W4BqT7XuB957yquxTILrCP42LwMEf
-lxZHYzre1Q7ovvwQ77sQPeQVoZwovXXS7QjsGNncyweACERGCGgXf7xs9hIt+/0N
-iYQkf0ru7GfGu5Xr20sDpi3ZahEyhFJOd7tR5WnIrt9AmuAyXd5RiaYsUg9Iwkur
-+DupxMCW5BiysjY/jS/8w9cca+CVD0J0ljWGPbT36S0fUDGaz8iB0By/w2qnll6p
-L8zTQRBTxhVllzIMPikycBeoxo3L2lRYONUvWKJNBkXTLj94POOwJhkhb4m42S0C
-2aKIpbJC8feZEhP7raPLpOthInAl1bSITsl7tUA4cGc9oZbV68TFBe41dMlYq96k
-8amKYCkhfZ8oH6C5GvA4TWH+fVNZYlxpmlRKVaW6onfIKLvszyNPp/8g6E4pZSud
-fT1Z1ty08nezlpWaDuwh
-=5upY
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOu84P/RbE/7qPbEBUFlnE7zpjHBcO
+ZiymKRnw74OPKFOAp3XfW7BTIv4wGWQDhTy+5skksl6U2x6DGhHM7tqzXMkZ8P0V
++LFbcxXMb1uXre+Omkqugd9CqFHpFLNURCXxBBE24+wYbOKQumzziNtsErzM6ASf
+3BaVZctxdwl5CoZY4LpoDW0veAlSviNm/oosLpROLHWDpPtp3HoCuPsF+dipM949
+BvD4QFofPKAleChriXoKt6lXs+RU9m3a07FEMAmC5op5C7AgTFKXg+XuAuQa/A9S
+JUik/W0ltVSJRN5MsfBuxgQmrsaTOk5+sHJmdDKI6AE4beHVfhzbBkgBoMiPt8Kz
+2sGXokpi+mvMepAHskgssJ0MykOswW8xk+VDysQUgOcKf7ovITU/cdE9A65ARCqX
+N7RahfDFDv2CLnd5zAT3G6JQo+kR1dB7AjxuHxgC74y3oyq+f2jIWxMiNgLJQO7L
+PJE0Mv3Hn2vPKx6c+5zSmqri51s5BFPMZrNmCE0DQdzF8ZQG1Hulix8MkjhEHTDb
+Dgqd/eTruD2ntE8T7RPHN/dWQ6Mf+YYDwtJuSqzfDY4/nCUXPQKYX2QTm4wtNPTT
+LsnEMxHCy+i8oPo5CfTSlw49V6Nxd5G7pqsX1RkUs35RXDlmTsoaPRA4QSO+f6Al
+rAyd0FR1MrAW2kg6oe50
+=AJuL
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus-core/metadata.xml b/games-emulation/mupen64plus-core/metadata.xml
index 03105a006bdd..801b08301307 100644
--- a/games-emulation/mupen64plus-core/metadata.xml
+++ b/games-emulation/mupen64plus-core/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.0-r1.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.0-r1.ebuild
new file mode 100644
index 000000000000..631b9f53360b
--- /dev/null
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.0-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-core/mupen64plus-core-2.0-r1.ebuild,v 1.1 2014/08/15 10:17:41 mgorny Exp $
+
+EAPI=5
+
+MY_P=${PN}-src-${PV}
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, core library"
+HOMEPAGE="http://code.google.com/p/mupen64plus/"
+SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+IUSE="lirc new-dynarec +osd sse"
+
+RDEPEND="media-libs/libpng:0=
+	media-libs/libsdl: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 games.eclass
+RDEPEND="${RDEPEND}
+	!<games-emulation/m64py-0.2.1-r1
+	!<games-emulation/mupen64plus-audio-sdl-2.0-r1
+	!<games-emulation/mupen64plus-input-sdl-2.0-r1
+	!<games-emulation/mupen64plus-rsp-hle-2.0-r1
+	!<games-emulation/mupen64plus-ui-console-2.0-r1
+	!<games-emulation/mupen64plus-video-glide64mk2-2.0-r1
+	!<games-emulation/mupen64plus-video-rice-2.0-r1"
+
+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}-sdl-config...
+		SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl)"
+		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl)"
+
+		OSD=$(usex osd 1 0)
+		NO_ASM=$(usex sse 0 1)
+		LIRC=$(usex lirc 1 0)
+		# (it does not build)
+		# DEBUGGER=$(usex debug 1 0)
+		NEW_DYNAREC=$(usex new-dynarec 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
+}
diff --git a/games-emulation/mupen64plus-input-sdl/ChangeLog b/games-emulation/mupen64plus-input-sdl/ChangeLog
index 93ab7ae14fc9..53af53ee6c50 100644
--- a/games-emulation/mupen64plus-input-sdl/ChangeLog
+++ b/games-emulation/mupen64plus-input-sdl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/mupen64plus-input-sdl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-input-sdl/ChangeLog,v 1.3 2013/12/19 16:55:18 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-input-sdl/ChangeLog,v 1.4 2014/08/15 10:19:19 mgorny Exp $
+
+*mupen64plus-input-sdl-2.0-r1 (15 Aug 2014)
+
+  15 Aug 2014; Michał Górny <mgorny@gentoo.org>
+  +mupen64plus-input-sdl-2.0-r1.ebuild, metadata.xml:
+  Remove games team maintainership following the Council decision. Use standard
+  install layout.
 
   19 Dec 2013; Michał Górny <mgorny@gentoo.org>
   mupen64plus-input-sdl-2.0.ebuild:
diff --git a/games-emulation/mupen64plus-input-sdl/Manifest b/games-emulation/mupen64plus-input-sdl/Manifest
index 51c8ff443f4f..4ad8f6941cb6 100644
--- a/games-emulation/mupen64plus-input-sdl/Manifest
+++ b/games-emulation/mupen64plus-input-sdl/Manifest
@@ -2,25 +2,27 @@
 Hash: SHA256
 
 DIST mupen64plus-input-sdl-src-2.0.tar.gz 43553 SHA256 b6be48e978683cced8c208ad03e27828c17ac7b2da5e699d6c34945db63d95b6 SHA512 adbeb83e01721aa74e5e65c05e4bff2a250c7bf51835a8b2c020752e9bf0bdb0f0672914fc5285ad9da2e6fa44259780aea6415d77914bb34e521f30eecf6747 WHIRLPOOL 647ccef13620c863077ae2eefb6934d966eaa413fe70437a38560e5fa03f479428e4848f2c2f3f38163a122a29f8b118fb50f9f772bfd1df96ab2860044352d7
+EBUILD mupen64plus-input-sdl-2.0-r1.ebuild 1838 SHA256 7314d584e26e2ada9eadcbdc69d2cd8c81d0ee3b7fe9d2aa5fa3ade21bb3fbb3 SHA512 d8e091d9499218babbf21600b9c82c1b91c2e892bbec5723fa2a825d23a69e8f2689c7b31385b45f3297181a94e2c6efbd96639215dc8b75cc38a1e9b5071d16 WHIRLPOOL c31f771f816eb635425de74c4096d704de672e560f8ee091954e047855179a5fe4ece57f14e0134b1f34c0216864c15f961d148d1eeefa8c69c0936310413e34
 EBUILD mupen64plus-input-sdl-2.0.ebuild 1929 SHA256 b39c6ffd79274ce0bf718fad47d7167641d747a900873b8ceed9e284af41178b SHA512 5a9c265a2518444fc2525ecf9925fb8c612dae5ede9f5c4adbf6585333fb96dd35f75f77885bb27ba548831d1d51f5dd5aea5d04ee24f8a506fbc47bd44d3e66 WHIRLPOOL 91b0303b16ad7a3d365ec9c4fb04327a060cb6649727134777c81095eb2a88d611a9e8ffceac57cc64c621c48a0506e01b164955e22c1a51c58a7c0024ffa06e
-MISC ChangeLog 744 SHA256 a5479fd0a2734911f29d52f6f011251d82376a73ed7e7dc137327b69f68d5483 SHA512 906bf13f808aeb5cda1a024c02a4b8c39f9205fa34a81cd330d5401a6f2502bcb18b6c7ea7465f97eb9472773b73ec0551b7e00c248cda458420e7c29473a354 WHIRLPOOL 51faf7f9eaa3547d82fe834dd3e275cea0939766ef2ca0eb75dd8b806c869205854bcac934d6bdd2d5de181b47de53973b5b2618eca2b475aef6d00659af6b32
-MISC metadata.xml 352 SHA256 b5b11f77354a3f9a9051da98c3e7499a195f42a2abc71c3fe55979eeab43c7cc SHA512 579bbf3da7e4b2a573bbec036b4e5710dbe5289278094e9dc3c3cda8d8ca9533031e189bc12a15a47abe9f4cb58f83a98d2b0796ac0394797085b367658c3af8 WHIRLPOOL 3ced83d68b1b7923be49ae91e82ffe778aac35895fd681e8be87f28f77b716a60384af1935cc632abd7c510181d76526d475548e33117c73416d9cd922af49f3
+MISC ChangeLog 992 SHA256 3b9b326842af5af7cb5a2f2846b7eece6a443f578ff262031642537fb296a0e2 SHA512 a6294efc6935e437e5942d95c8a2ae82b3bdf537929206e65e092fba5f5d4e53f73f53f7c8e2448a1b4ec5a8c1d93aedbbc07d59635d7feebb67b8ba7c9bfa8e WHIRLPOOL 515c90d674234de27f1743375ff044c2c134b3e216cb380d9bbf301c2325cbdc23229d2188877f6963318833ffb1000144feaf0063e60a05fe1878cc8c4bfa6d
+MISC metadata.xml 332 SHA256 fddf0cc3fb5d96e622d607039f19d38ea9cf4a428393af81637205b51a6ef5a7 SHA512 67baaca8142e17ac47a00e477efdef2a66ca4d4d2f878cb2e2a0b06b10effe39c5272cc7fa5aaedc5911864e9b8cf50ceb240fce6d0920f4a5ec74676827ca8b WHIRLPOOL aa3fa95c7736443edf6815c5c38e67b94e99549fb3112a13d7988c5143c71d2cec7d7855e7f74e89315ee09850ea70aa2f284c8a9c881c9ee6ce2ee8ef72d43f
+MISC metadata.xml.rej 2313 SHA256 a337d5e81b5badbde92fd7d6653d023a95688943443237c408c6999a4efa42c7 SHA512 1b488f1b3bc20c755f529d2c0be666698c9cfbe3c19106a90e22f67d3efea5923aa007928d5e21e55c0f735fc70e3a1f020be8631b0c63d5147a292267c4b294 WHIRLPOOL c9e6213777a21f4ce47f2081dcb4eb1d6f0433a81f54511fd3cc9ab88130e84f9e871d02a8e7b9d5aca784d098383eb53a221de9179d079ef557c161f9e950fc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJSsyT3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJT7d7ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOGGEP/jZsrrQryjh6GLkfCNkMU5px
-tWVzAD0fpbuKHSm6heLyCWY/IGPnVLYYI0jvZHsGvCVtBV5tBqSbN8JHp30Xgv8w
-/dEIOcNyTu0JO9mR0aO9aEh63lR/tBkHQs0hz7cBYED+5CFR6lImprV/DnkfDzj6
-BkW42pNzOTbghnqF7fNwxA7Fv0gr/v0pwDcNeLr1skACQdOc+poiaJDRIfPBc35J
-bvmQ6tnPUvYxJ7lLEZOfIk5AVgjPq9MCtH4j2TZ++/12CCMozmudLUHn9kXmYfMv
-z+DEy+DDGwsBOzqsj5vmhGPDQ/t1FHgYTv7YM3bltSuDuD3HTEqK5FR4nWlbUBvW
-rb7RP4kGXfLgTdh/26aG6EF1TTrmU+hrdUPJQhYMnR/v5I0wpgLLFrkq8Ps2oCQo
-BBYPB49StMk+ufylCZPotuOKlk38xReIlTPZiEieSVrPB3seu/4edSKkWeesnAox
-gWSxiniFqX/gGcizFG8Hs+iwh6tHcwqArepanaGGEG+rB6PGYbZMyfvlHaxrTuP4
-HJu/kUI2ahN75mu7iqYrm01bMS9y18SP/UfdYfafi07ZXimpz1k+3S1KAwpD/1nr
-kfGyd6kBacQ5LlB+KQ1wBggGGSMrKqMy/GpwZ8+MFW4rWTDJlUX5vVsh8u9cOeKP
-LWc1kmmODfUNOhDQFw7T
-=CTBB
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOD/0P/0WAGCM3S5UIg4sVpr/kTTdH
+CNq5TPFlBH2ZoE8QyMKOpJT5lOKtB3WRAl286fF9hGF0R8JKa2axusvNY3Y4G4J3
+wP3r5i6AHB4f3ABE/3GEKRZlSOi3yzFDzfYy/q3liGc+R9EKi0KZanZYWzBfFxq7
+2vyQyiQjunnWZdyR622RVcf+b+qXVkV4bZk4VOk8cadno2HChvtJceVwHpTQuoMW
+ZxnztAuXyAkgy7XcywQbr/WdCJpfRq3ZCMGi10HwcViUyKJjHExnIKhaMkS6ha16
+Ok2DI5VMOyAle80fAYYLxAJVrc9OmkA6r5mneL+XltUrOz1XkfO8r5UxUSqdgv+v
+k1psOjfD6slzQQQJ4+/zf+z3aH4ZdXSjV2rDQC4zn+jrP19qzB7woi4q9gM49GiX
+g6dgNnPGo69mu+4LfQPqcI7iWt6oDHLhOzg2OBmkJBFlHHVw464R1winnwRiKG+m
+QDoLYtA1mCzB+QccD9uOJSrQ2V/wYGMXYCIHOIqDzL6ndKYn48GROPrn1VXog6XI
+ICIR1uGfCusZlQih3ZDIzWwYNAJX1fDYHZOR2hq4i59cQ1k+C6nCpfYbEYCFw7ib
+PCnZCPnXSoe57BnA82H2Vyz1IazVpWy1cMgyIXHoiVgqDcrnvuxaCmWXfAHyOEqj
+9J8aWv0lO0RbpU+j3rLc
+=qo+d
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus-input-sdl/metadata.xml b/games-emulation/mupen64plus-input-sdl/metadata.xml
index 9047711e4ffd..955f381367d5 100644
--- a/games-emulation/mupen64plus-input-sdl/metadata.xml
+++ b/games-emulation/mupen64plus-input-sdl/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
diff --git a/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.0-r1.ebuild b/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.0-r1.ebuild
new file mode 100644
index 000000000000..12b85fc09486
--- /dev/null
+++ b/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.0-r1.ebuild,v 1.1 2014/08/15 10:19:19 mgorny Exp $
+
+EAPI=5
+
+MY_P=${PN}-src-${PV}
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, SDL input plugin"
+HOMEPAGE="http://code.google.com/p/mupen64plus/"
+SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=games-emulation/mupen64plus-core-2.0-r1:0=
+	media-libs/libsdl:0=[joystick]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+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}-sdl-config...
+		SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl)"
+		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl)"
+	)
+
+	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
+	use x86 && MAKEARGS+=( HOST_CPU=i386 )
+
+	emake "${MAKEARGS[@]}" all
+}
+
+src_install() {
+	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/games-emulation/mupen64plus-rsp-hle/ChangeLog b/games-emulation/mupen64plus-rsp-hle/ChangeLog
index 38eae4c13922..337cec0da134 100644
--- a/games-emulation/mupen64plus-rsp-hle/ChangeLog
+++ b/games-emulation/mupen64plus-rsp-hle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/mupen64plus-rsp-hle
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-rsp-hle/ChangeLog,v 1.3 2013/12/19 16:55:10 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-rsp-hle/ChangeLog,v 1.4 2014/08/15 10:19:41 mgorny Exp $
+
+*mupen64plus-rsp-hle-2.0-r1 (15 Aug 2014)
+
+  15 Aug 2014; Michał Górny <mgorny@gentoo.org>
+  +mupen64plus-rsp-hle-2.0-r1.ebuild, metadata.xml:
+  Remove games team maintainership following the Council decision. Use standard
+  install layout.
 
   19 Dec 2013; Michał Górny <mgorny@gentoo.org> mupen64plus-rsp-hle-2.0.ebuild:
   Update SRC_URI following the upstream move to github.
diff --git a/games-emulation/mupen64plus-rsp-hle/Manifest b/games-emulation/mupen64plus-rsp-hle/Manifest
index cec3961c7fe9..fffa8d79eb51 100644
--- a/games-emulation/mupen64plus-rsp-hle/Manifest
+++ b/games-emulation/mupen64plus-rsp-hle/Manifest
@@ -2,25 +2,27 @@
 Hash: SHA256
 
 DIST mupen64plus-rsp-hle-src-2.0.tar.gz 46291 SHA256 61c2bd163b3506d206957ba690dfd1b4d2921a6c8a3883ab6a8ef1204de7b736 SHA512 e1caa121d377be0856708fa5c13c234abc0bbb2cab90f40963983baf6230a1d4a4b7da9af0fa2ed6737538265b6392d8a43e9e537ccbd63bbb6ee44da8b29fdf WHIRLPOOL 9b3b1557bfc301390b5069892c4fabead82d7a6f1bf28da7a51ce8345fbbb12e611756d4818f423936517fbc51b0839eb25b3e9acf88160a9857ac7c7eb9ab35
+EBUILD mupen64plus-rsp-hle-2.0-r1.ebuild 1589 SHA256 8411206b180ce0217fddd70de2026430d25a2b16dedd7848197faa81b79faced SHA512 6353648e577f4b9a86a47da2b9c84e202db61198a5f1208eb8776e1d3243ec511294e8f463f9fe48a30efea92e926ae2185e159f0cc38805d8c8c7a8d74d0b33 WHIRLPOOL 5643850992d9f9a1b4586b634e224c639079de3ccfa97eb291eb61f5b2f14ae3c19e78f730d0a728429381e53781927c40dd88d44602d8db1a6453590acf0089
 EBUILD mupen64plus-rsp-hle-2.0.ebuild 1638 SHA256 696411409a63e95d26a2da94bc88cc87f897f0594bf196994b4724b8d48f0c2a SHA512 0f2cf30489c31bb69497d003cb1a459626b2ba97ba2521fce20ea9f7920d4cf83b773bf3227836dc26b7897b3a550c828ff8f1ddb957d0252b39d4f8007f5c00 WHIRLPOOL 65b53ead5b2b85c76a8e261e63600edae56cc2ed68f2e40d99f52044d61b6dd1e73dac2a6ef02819afcb0f860dc158baed057f8a8c3c6dc0e5e0733952e3e14d
-MISC ChangeLog 726 SHA256 257a86be8aadb666d20420837b9ce777164622705ed83adc75f49d04f0fabb68 SHA512 ee9bb880420a361eea661f61740ddd924626f86179b50da4c275e337cada141b6cec29896bb716309cb907f5f5f137fff74ba4bb24b917eb2ff7e327bc59ec9f WHIRLPOOL 7a3c9a11747f3ef18766718b50403d87a440790f16297367d80de79a4bbd2a37ed817cb20541db0962702b44c25a2e465c014c3e9c91231bef81a1c53bcbd157
-MISC metadata.xml 352 SHA256 b5b11f77354a3f9a9051da98c3e7499a195f42a2abc71c3fe55979eeab43c7cc SHA512 579bbf3da7e4b2a573bbec036b4e5710dbe5289278094e9dc3c3cda8d8ca9533031e189bc12a15a47abe9f4cb58f83a98d2b0796ac0394797085b367658c3af8 WHIRLPOOL 3ced83d68b1b7923be49ae91e82ffe778aac35895fd681e8be87f28f77b716a60384af1935cc632abd7c510181d76526d475548e33117c73416d9cd922af49f3
+MISC ChangeLog 970 SHA256 7d240b1c2c0f59958ca3c87b4311f052dfb160d615277c2b9fded3ec1ad46cbd SHA512 499b49628140133275ec4dc4655fa47a4b8fbbbabc4dc7f4198879ba0607087df20d53bcef5396771feae08e13f7c58d33aabe550458f28a940181da436db948 WHIRLPOOL dd76b4681fec3ee4ffda760d53df4f1175a598fd1e026948e1c3267951502baed3ecfce283072ca0a2062af7983d97218518e30a2e6ad2393fd388d46f61ad44
+MISC metadata.xml 332 SHA256 fddf0cc3fb5d96e622d607039f19d38ea9cf4a428393af81637205b51a6ef5a7 SHA512 67baaca8142e17ac47a00e477efdef2a66ca4d4d2f878cb2e2a0b06b10effe39c5272cc7fa5aaedc5911864e9b8cf50ceb240fce6d0920f4a5ec74676827ca8b WHIRLPOOL aa3fa95c7736443edf6815c5c38e67b94e99549fb3112a13d7988c5143c71d2cec7d7855e7f74e89315ee09850ea70aa2f284c8a9c881c9ee6ce2ee8ef72d43f
+MISC metadata.xml.rej 2313 SHA256 a337d5e81b5badbde92fd7d6653d023a95688943443237c408c6999a4efa42c7 SHA512 1b488f1b3bc20c755f529d2c0be666698c9cfbe3c19106a90e22f67d3efea5923aa007928d5e21e55c0f735fc70e3a1f020be8631b0c63d5147a292267c4b294 WHIRLPOOL c9e6213777a21f4ce47f2081dcb4eb1d6f0433a81f54511fd3cc9ab88130e84f9e871d02a8e7b9d5aca784d098383eb53a221de9179d079ef557c161f9e950fc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJSsyTvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJT7d7wXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO1HAP/RcmcvscZ5b9a6G/S4sV6RAy
-4oKk+U4fqaTybdu6xeJfP40VwzSzHvlMJI/NaVgS9NkDhIfY5ZueXsGDtkFeKzw+
-BJQklnFSllVfnzvl3qu8z0n71ndgAb3hFd5oQ5VAhskt4Rr6t1w3mAw6bbRAkueD
-APl6tMIwq979PhDsizLSZA6WkAyVc51TlYBaNLFftvcGooeMICGUpfSkrUdmpBqC
-9yE1Av9vd9Tx7Ik4KBbVu3lgU03WQi0681QDuYlDc8FZx1G66CE3T1ug83Lbv6G/
-h719dLcWgan3MwYEWog1IzhNA6id90Mxaql/bbkdQ8MpcYmBxROFbdQynjyr0xDc
-sTOO8Bh/L4QPix9q3jduGbiOD1p/e4Q/Ot0nI24ZuaR0FyDvaptvN0X1N6oYxmue
-rqR8PhN7Qbqm6FvAYFhAZTrgYKkcGA/eK3g0+njdD/bPpIQtJXyFPfadVY5bZxe8
-XbW3Nzyi+fgmWsH94VZyxCYbnU9aAJqZCAE3vx6A+waS9jV9iMVAaIMpBBOJgz5z
-3lgiR7OEpiv8J/TnBSHX4OP3lJqQ6ZSxvuul7RwNiTAW+QK2vYbA+ZU2yNNyyRB3
-q+t3Sd7VlHZZ6BqRHzHqz3u44w/0O2YdsTAfd1ZwkvEe1Q841MQP92UdzeYKXUWn
-lBEl96S7U+b8kBCx46+q
-=y/Jd
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOItAP/3B5OeACDq9FmC5VpQ06kX2M
+C+sH2nMPWRqUNGxKfUW+WBrkiIfj0AkDcG5eXDR1hyR415QMW8eHqBt95BPe/MIU
+t4CsiDQ22ND92YX/u93Ygad8w7Qmp3/CTa38a4X1MLLO2b/dv5PaO9+LrlFrQPxY
+TM6KwqRW4/zLX7V2be8PyA7mfPHJDyQ2rsmkJmwnMXMZ3zjxIe6LfrIE2ZJPILUE
+8+KSv2zLleBC+YrDS4oBQn0zTZ/nop7GFGsWwbiYWzFIcRvpvmeFlWGqYTmD/Xu7
+H8BNe8xAvZaESP4Hilr6zNZ1gl6mbthKQLtJAfuemiZfihzyj5DzafXhOhJnUSSG
++gdloVWFkFObo1gsUeQOTs5GUrxC70Ppa3eeutnzrb6N6/KBg2F7YOrUM+TzZwde
+RX2/ge6IwyUcEI5R9NRKPKdCJc7NH+FIhRwlUE3Q5Lzten7TxlaxxVIZ6WcAiFVF
+nv/BBHxgOQe6TFZ96z/qhwSuUvB4Etcqz8cBEtiywpYRqdy/qsdbnGlHFnXAgLWR
+cMVaZ716/KvEDsi+0EC6kAnurW6MODeqdwzyYyKnKRtrpFp9UacIvNXeOYQlQViC
+M08UuiA3vxWUINj5tLbedZO3S8dq0dL00AN2D8gLYZC+SflfJm640UvjlunRcLym
+0fGYYtTQq0OsDSed9/y+
+=ew01
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus-rsp-hle/metadata.xml b/games-emulation/mupen64plus-rsp-hle/metadata.xml
index 9047711e4ffd..955f381367d5 100644
--- a/games-emulation/mupen64plus-rsp-hle/metadata.xml
+++ b/games-emulation/mupen64plus-rsp-hle/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
diff --git a/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.0-r1.ebuild b/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.0-r1.ebuild
new file mode 100644
index 000000000000..d318210c2f54
--- /dev/null
+++ b/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.0-r1.ebuild,v 1.1 2014/08/15 10:19:41 mgorny Exp $
+
+EAPI=5
+
+MY_P=${PN}-src-${PV}
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, HLE RSP plugin"
+HOMEPAGE="http://code.google.com/p/mupen64plus/"
+SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=games-emulation/mupen64plus-core-2.0-r1:0="
+DEPEND="${RDEPEND}"
+
+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=
+	)
+
+	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
+	use x86 && MAKEARGS+=( HOST_CPU=i386 )
+
+	emake "${MAKEARGS[@]}" all
+}
+
+src_install() {
+	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/games-emulation/mupen64plus-ui-console/ChangeLog b/games-emulation/mupen64plus-ui-console/ChangeLog
index a98becb36a22..0c4d26ca2476 100644
--- a/games-emulation/mupen64plus-ui-console/ChangeLog
+++ b/games-emulation/mupen64plus-ui-console/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/mupen64plus-ui-console
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-ui-console/ChangeLog,v 1.3 2013/12/19 16:55:06 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-ui-console/ChangeLog,v 1.4 2014/08/15 10:20:03 mgorny Exp $
+
+*mupen64plus-ui-console-2.0-r1 (15 Aug 2014)
+
+  15 Aug 2014; Michał Górny <mgorny@gentoo.org>
+  +mupen64plus-ui-console-2.0-r1.ebuild, metadata.xml:
+  Remove games team maintainership following the Council decision. Use standard
+  install layout.
 
   19 Dec 2013; Michał Górny <mgorny@gentoo.org>
   mupen64plus-ui-console-2.0.ebuild:
diff --git a/games-emulation/mupen64plus-ui-console/Manifest b/games-emulation/mupen64plus-ui-console/Manifest
index 5bfa92dcc9ef..ae11f3d641ec 100644
--- a/games-emulation/mupen64plus-ui-console/Manifest
+++ b/games-emulation/mupen64plus-ui-console/Manifest
@@ -2,25 +2,27 @@
 Hash: SHA256
 
 DIST mupen64plus-ui-console-src-2.0.tar.gz 37954 SHA256 87b9ac0a5ebbc835baa4e1fba0f50e7467e87da6469aa28fdb196e2040e54877 SHA512 7276e19772cfa047ea75c0c87930d7042a41d7d30912cae7f2c44e37ce6d446e8f5bf4e8ce89e69cabcb05185fe7b59a0ff5d12a7f7bbfa010404c2bedd94ea0 WHIRLPOOL 455a3fbb5eb0027ffbf52693e41f2fe8b5a098e32daa0d532b05f0841a35905beb0ffac9b942165d0b03f975468fff75f953cb9b9de02f8a5e49944e28dfccf8
+EBUILD mupen64plus-ui-console-2.0-r1.ebuild 1859 SHA256 048a1eb6d44107ef140f4c360df0ba1f6d5bd706397c47c2a558bfbd854bfb85 SHA512 f505b683f954fc8dbd5820ea4c3b7636439462e43460d35f5058abd50bbc40537f22033295328c31a6ef12dea98e09776f932f10a8e13e3f7817881f7d45c893 WHIRLPOOL 28c40f81170486f89f7340eee10e57347882a1471c06782a32e7e3fb4d9c51ff3d95f9fe92fe3aaea3e688796bc43ff486a09aafa530ac4541755813ba4c9155
 EBUILD mupen64plus-ui-console-2.0.ebuild 2010 SHA256 5972304902f673d4c34cab4f78c817ad4985376abc8a28620ea9936ce47ff907 SHA512 ed586a3d699010bb7192eda5a0efce9d354aa034bf6e13c7402e3d7cde42e2792d9d8af7290be6aa9f3d4835f76b332c40ebf066bd64c510537279bad41f93db WHIRLPOOL 48f520286f51b38c2f394bc3c1bd91def1ed093d706de9cffaa3403dc2665fa7bbdbabb5bd3c58d7c41528c8bb4fd24b8ff49af4ec81bb3147a47e67484163a1
-MISC ChangeLog 744 SHA256 ee135364c83ef99d460139ccda8658f3d5d5e5361e66a15136ad218094603323 SHA512 ba5928444f3b10c4bb57e76cd48b0e022fdebe2572456c60239a275beeb8e4ee8743c3cb1fe82e4422e86e96f44effb5c50c7e27383739035fa4ed8a6dd63fd2 WHIRLPOOL 5093e52aedb87d3827f40974d153e94e5e8908d1b82f9f4dab572f8546cbbd84ad727fffc40136575c356a16351e6f90e47eb80a0b99c41fdc09b20139c97a8c
-MISC metadata.xml 352 SHA256 b5b11f77354a3f9a9051da98c3e7499a195f42a2abc71c3fe55979eeab43c7cc SHA512 579bbf3da7e4b2a573bbec036b4e5710dbe5289278094e9dc3c3cda8d8ca9533031e189bc12a15a47abe9f4cb58f83a98d2b0796ac0394797085b367658c3af8 WHIRLPOOL 3ced83d68b1b7923be49ae91e82ffe778aac35895fd681e8be87f28f77b716a60384af1935cc632abd7c510181d76526d475548e33117c73416d9cd922af49f3
+MISC ChangeLog 994 SHA256 91b9168bc7ae1e9688b39f88eb6ef7d148d3626bfc5d6e9b5dcc2337ba553f74 SHA512 7205f4606e7be5a7c206e66e440e60c00dc11768a4289251b966f6a13545b60a965767d45759ca0b447a236a12687775bdfec43acb8ccb684bedfbeea6a11ce6 WHIRLPOOL d607613008a024317def64e9c9e1fece420333365057fa0ea103023f04ee990d0992e185ff8d969e46c5ffcab7deec71cba5b141a101dccb8f3edb3f102fa7c9
+MISC metadata.xml 332 SHA256 fddf0cc3fb5d96e622d607039f19d38ea9cf4a428393af81637205b51a6ef5a7 SHA512 67baaca8142e17ac47a00e477efdef2a66ca4d4d2f878cb2e2a0b06b10effe39c5272cc7fa5aaedc5911864e9b8cf50ceb240fce6d0920f4a5ec74676827ca8b WHIRLPOOL aa3fa95c7736443edf6815c5c38e67b94e99549fb3112a13d7988c5143c71d2cec7d7855e7f74e89315ee09850ea70aa2f284c8a9c881c9ee6ce2ee8ef72d43f
+MISC metadata.xml.rej 2313 SHA256 a337d5e81b5badbde92fd7d6653d023a95688943443237c408c6999a4efa42c7 SHA512 1b488f1b3bc20c755f529d2c0be666698c9cfbe3c19106a90e22f67d3efea5923aa007928d5e21e55c0f735fc70e3a1f020be8631b0c63d5147a292267c4b294 WHIRLPOOL c9e6213777a21f4ce47f2081dcb4eb1d6f0433a81f54511fd3cc9ab88130e84f9e871d02a8e7b9d5aca784d098383eb53a221de9179d079ef557c161f9e950fc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJSsyTsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJT7d8GXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOAzIQAIoH1Db5p2MkMvcw5pXqLhNr
-lEYD4lu8m8qqQNuIytl4r6OvixM8r1TFbAyPBGsWStPftumUGvtQlBuQm08eIsVv
-eqcZ0Z5M45QTM7QikBRc8+0a63wu/7TbOAuH9MjwhvVjEj6CaI1UcRhsM0CTIxPd
-pVchKt1VFGFQ/w0aXm7E3+t9Treais9FY9Yb8qKem3H+f0FkauRU22nM3AG0tbBP
-HQm5QutlYdM4uO4yOIuxcWR0nq3QwmUivolgiqFQSPpQBS7eG0r2dz+4g2u/rIfs
-7593ycwsPdHG2EduNJW5nR13hYMpnFNp2V869epO5pevk4aVux3cE00xMFHFI6Zz
-S8+7/8xYEp/H/h03x6lqseritKhf3o36/x9/7fOuuwjdvS4cx3EEBULjiA/wilGZ
-P6ajdTG+NeFefkFiHqf5l1LqB9fQOlmZScq5dzF85/UHVs9Rw/cla0uc61j1uuNA
-UHjVVujtizrg8rAj/H+uDm8nyJ8HBYyVMjR0t/1XQ0TgbpoZi9pix+8mcvjPsSSs
-pzIgMQcRZVH6t1fP/OuA6Rm7I0Lb/MHi0kf2tfg3nbix1dnM3Hn8zMEy3viEfKFW
-mYL2VLs/NWwKBKPL8WcMK62oCt9ujhF3zP/LhzSBICBodtZ+Np1N0B0YTfGo3qkD
-Eow92aMyqigN4fL4bIgI
-=2udd
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOWjYP/R1wWnVu5ybVVhUAu9IiRv9P
+8D8EzgmNnJdYalJoNrSn4iJVxZnxW/EG9Ez/rmk5/0QDFKHB1zPIGrCKuCgC9SWA
+ab5qzS2rjGQKyc/EV6txiG100uIonNkbA/fYwoYv98wAuVTnVNGhMsESM8LMek63
+ffDbAO0lsc8SV2Vxlmq6WcOlgCUaE18spXu7rRyDXlViRYFQl9vctoOFKcBlvPtU
+BMdupCpvwbSXWj5VbdH3XQIo2htQOLTQTQKZdCr0gIBoNiG80aW/cLaTQtkJgQSB
+pxLFsrJBN+BH4SHLFk1Nb8sDOGG6g1QO3BzQBK+XOtJ4k/rU3t1UcAsIfF8zeL09
+M+LB4GiaLR4O+AuyVLVYZshq08sHonshLhPdw3UKDX277Nct/tbR+hB6ygJOYk3u
+rKKEm8bap0GmM+IPih0xDJrTYVVJ44xQfx9SRaHleEtY8Uhi65o7EylshiuxG8xK
+eSRpJS+l6XQFLdvqJXqJobKgjRx50yNtOXRo0x6wEHWjq1k8/ZwgU3YJv6sO3ig9
+djxc7Z+s0glJILx0P3TYqTg10yQCVmxlRTb03dctwg5KCcph5JPtPGI/cG5SK1Qp
+4gmI4mLb2oSSAwK8/6OardYYj3MwzAtA7Qar9NhDwEyHcJFHo8Bf3kEWbSZJVX9/
+ojeflvif2+L7qW+9IOYp
+=5+/f
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus-ui-console/metadata.xml b/games-emulation/mupen64plus-ui-console/metadata.xml
index 9047711e4ffd..955f381367d5 100644
--- a/games-emulation/mupen64plus-ui-console/metadata.xml
+++ b/games-emulation/mupen64plus-ui-console/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
diff --git a/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.0-r1.ebuild b/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.0-r1.ebuild
new file mode 100644
index 000000000000..7d48e7b06925
--- /dev/null
+++ b/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.0-r1.ebuild,v 1.1 2014/08/15 10:20:03 mgorny Exp $
+
+EAPI=5
+
+MY_P=${PN}-src-${PV}
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, console UI"
+HOMEPAGE="http://code.google.com/p/mupen64plus/"
+SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=games-emulation/mupen64plus-core-2.0-r1:0=
+	media-libs/libsdl:0=
+	!<games-emulation/mupen64plus-2.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+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}-sdl-config...
+		SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl)"
+		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl)"
+	)
+
+	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
+	use x86 && MAKEARGS+=( HOST_CPU=i386 )
+
+	emake "${MAKEARGS[@]}" all
+}
+
+src_install() {
+	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/games-emulation/mupen64plus-video-glide64mk2/ChangeLog b/games-emulation/mupen64plus-video-glide64mk2/ChangeLog
index 6fe9f94495c7..754db159b92c 100644
--- a/games-emulation/mupen64plus-video-glide64mk2/ChangeLog
+++ b/games-emulation/mupen64plus-video-glide64mk2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/mupen64plus-video-glide64mk2
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-video-glide64mk2/ChangeLog,v 1.3 2013/12/19 16:55:11 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-video-glide64mk2/ChangeLog,v 1.4 2014/08/15 10:20:24 mgorny Exp $
+
+*mupen64plus-video-glide64mk2-2.0-r1 (15 Aug 2014)
+
+  15 Aug 2014; Michał Górny <mgorny@gentoo.org>
+  +mupen64plus-video-glide64mk2-2.0-r1.ebuild, metadata.xml:
+  Remove games team maintainership following the Council decision. Use standard
+  install layout.
 
   19 Dec 2013; Michał Górny <mgorny@gentoo.org>
   mupen64plus-video-glide64mk2-2.0.ebuild:
diff --git a/games-emulation/mupen64plus-video-glide64mk2/Manifest b/games-emulation/mupen64plus-video-glide64mk2/Manifest
index c9eb66eefdac..767c85da0753 100644
--- a/games-emulation/mupen64plus-video-glide64mk2/Manifest
+++ b/games-emulation/mupen64plus-video-glide64mk2/Manifest
@@ -2,25 +2,27 @@
 Hash: SHA256
 
 DIST mupen64plus-video-glide64mk2-src-2.0.tar.gz 445166 SHA256 7761594432e90aed2dd12a5f16b30674c65b1f1abad0d98ac6239c3b2c44a4d5 SHA512 043b84927219b574da3c489119007bd115c9fa0f3f476ea9e812c8321a7f1e9309af06bed0b975c00201bc35f925d3b85c3411aa02310fd1ea508191184afa9a WHIRLPOOL b55c7412139b5b31fc919947068a7ad06958b20e54b9ac350cac88af3fec0d03d4f36675c1b60ba330061e652d489113bd7b84f53e7677c3cc1f0039c2a135af
+EBUILD mupen64plus-video-glide64mk2-2.0-r1.ebuild 1999 SHA256 508e2f660a07466545f81a5ee83c82b0bb383f2f33145b9edfaa43315f3b0559 SHA512 103bb87ebce4c0169afc85c35254892be5ca7a3daa2178aa44b6aecf72acbc234ebb357ff5b9d8f33f8a51c18884c280b56de69b942ea214e19f98ab73433cd0 WHIRLPOOL ff8a4981c509cee3d37d831c28ec956a51d7af76b1c79b78808e471764afe57e92027d4473fc267f10efd382d6ba82645d36b7b2b247cb4541bf483bd99f370a
 EBUILD mupen64plus-video-glide64mk2-2.0.ebuild 2090 SHA256 a199a9af3b435a47020a6658f7598b855378d934cdbe692faee9b5f0c6ef6ae1 SHA512 f002417d950a673b04c92f82f798ec1d2836a926b8335ed70c0357b8e605c3a0d9e17ddc194b30d7cb63d9a6e6ea0784b827e9619906b6b95ade93e5d2c99f51 WHIRLPOOL dbe5ae5cd104e6b155ef03089df873074c877d0e558c78efd054c4e19d9753204228012a453d27fdc54ac108e2a59d1cd5c23a45b459b565180a5c47a305aae3
-MISC ChangeLog 793 SHA256 27c6f30f0ba8192c518ec5e2a7b7e19723003e73e9a1841e9ba29cac2a67d917 SHA512 0e029f47ce2a12e1e2393aec485f676d76768c9a436264da45fdecf418f573c1806c2f6f1b6607d1f746470d4223107fa0a18b8477922ef7c4c8fe05fae89fb0 WHIRLPOOL 4e9df99d1b402fca8c8ad24efb19d9e35505d490765702237f514ef9b045bc4c5bc488bf3bb37db9664354a159cee01d5c073781308c64949af815403ca46dec
-MISC metadata.xml 463 SHA256 4a126ef8cd1352fae79abfb1388f6c6ef0cff0ae6a88d4229635826b79d08ce3 SHA512 28bd320c4c7e10021a0472150c3f7ee748480cd0a2df4bae810271b6fcdfd5fc33d35a600540b36c77cdfd577a7c2f884efe48f8a5ec2af083d8ac919def952f WHIRLPOOL bbd139638ad1815e9502714726c6ec6f0901c7e0f71c9514e147fbea1dccbcb47eba3e4b4cad79ada3f9a55ca537620f880cb55e0f43f162e2c2000cad8664b4
+MISC ChangeLog 1055 SHA256 6a67a9c2abe1f75ad1d7de3afa1a299580522fa171f5fe1bc25775715c4f0e5a SHA512 186b06d6ffe562e13f76b634202f5b118e179dd1700ac0cf7d3ef4986c1c9948adfdc9f2a75be6b9b4714d4fb2d5eeb6c860c32a3025dc2da6a47f8541bd8e3f WHIRLPOOL fc6f8d929c98f11e058b03e22fd157a2261402bbd4acd7421395d7196555ff6428ec6e8944b129bbef8cd5ab64a277e055db52c647990c969f7c2fdfc2cc49d7
+MISC metadata.xml 443 SHA256 759620e173d1dc1827d22869f1b73db8c4b0a662e3c2db0742e709572a80cd88 SHA512 2fdfbadab0dcabd4c359a1d888171d83493aa3268b78a86fe89b719f3d407b90b6b6bc1063180797a76e594b5cc2155a4a4573cb054e39927d09e0d6bf66a979 WHIRLPOOL 264321f8844b00c13f9ea946e12acf63d8d08faeae56e8888833001fd5465bf7532190a5cb2a57e80806bd7d3fb8998c1862fd6a22390e77e4fdc9520ee5a445
+MISC metadata.xml.rej 2313 SHA256 a337d5e81b5badbde92fd7d6653d023a95688943443237c408c6999a4efa42c7 SHA512 1b488f1b3bc20c755f529d2c0be666698c9cfbe3c19106a90e22f67d3efea5923aa007928d5e21e55c0f735fc70e3a1f020be8631b0c63d5147a292267c4b294 WHIRLPOOL c9e6213777a21f4ce47f2081dcb4eb1d6f0433a81f54511fd3cc9ab88130e84f9e871d02a8e7b9d5aca784d098383eb53a221de9179d079ef557c161f9e950fc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJSsyTwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJT7d8bXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOISsQAI6zWvBHvqDetaXXnaE5WTiq
-X20CiPHf+DIXBBbLBn/gHfZiQQ98AuWEl1817qg9OGdaI4TCo9qOIYIOhug1uCyX
-7iF8FINZIauVuD0D4QFYkWc7gmUKfyJg+pktrvrQ1lzmrWzwssmCs53Hyl7/vbQg
-abPSptIYsiuWMHc0tHU5oFKirznQFZT61wOeX7aQiXuDmh5OxFMsXpXgyUel/CLc
-AqkxWza3TyOfRNmQ2qvMTkJaVZAWFXiN1KEVoCZs3uUtZ3Glps53DhhNoTZPZKu1
-JQTbq8PfiJcQJZA3zBBqDv+BoSCA2AGGvzgP+j+zoedQYkFu0J6x6Crj871hqDA+
-q0dWI37D/i1j2fiYKrWT8sNL757NV1xckOEPm4lPcXp2hg7JW5eUG1S0hhT4PDgt
-CG7LRyJ5DZMP+wXYPIxOnLm5/PNFYSyPgAxj8tQpjZokN7cdrkFpIgQGyuWpdl9R
-EFCtRr7UoQgGVf5h8FvHzXeyEIbPR5ceQN3gy7Wwlov4DjsuuISHTBK/a55Wfyc7
-YLGn0q0UBR+XmT50jMZ6sYQrSrRCnnfsw0sU5buaRITz4ZHPmLkaJCeXBMBMltww
-kcvz030I7tfXYvohrPGKLegKBX1XjM3PhVDF8+uq16nLIrqY3a5FGts4BYhCc7kW
-+CUBDWsHQwW6zZJWJLIT
-=TjRx
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOgjEQAM2HVeUyFf/4xcQY1Fw17BOF
+0U4U3r0Pq64aOSBnaMBc50/DvxVGInRs1eVrK9Zu+AcSG8rZVpdF2SVzhVJcVZ7P
+t+49XGI4Idqs3u5k2EEoypnXLROj9To3c49DPtr/70KTOw/i2SfFb8aLZNu+NZ85
+4SSj40ut2fdVcgTLYWw1LK9hJrELzH9nVNqLWtOBz53jfeFXdKKrvXlUlChXEg72
+T+u9SYhUXCnRAKwjY8H4jvJUzahag2iB9u8fnbRxLnaq/P11zn4s5ZKPPmN1UWl7
+EY8vNGmqrD/K9g2k/uEyYi4bjHA0zNFfVD3TLKLPD+V53VTw6kslltEU2LzhXOtz
+clSepkiL/myTmjoi74oRi7+Bddk4N/OdHQMaUkqnUgMrhrPrzkmHm8vL0bLQ9JaG
+t6iay8Ce91CytGsxA2TQEJGr4GM4QzF+Y0oFs67tgJQgERR4CdPjWG9Y5bzM7D+7
+4wOeM0Ktre7whRC3kiZiw4v6jjemQFmaEDhF781QI7pszZ/3tKXl4is3HwJzNkt/
++lY9UsJTEUW2KM+D//aBr2ZkBbdGbMcgKl29m14myMqqP62m5h6hAOY9K9mg721S
+5PQJOjQQDbE7bYVjYFkfq7WgM43SPEabge25W1WHVn/TW/DHcWYitx16nJNieE6A
+2N0L6xH1CZOs1G9ujHvm
+=JNOk
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus-video-glide64mk2/metadata.xml b/games-emulation/mupen64plus-video-glide64mk2/metadata.xml
index 768d58ed25dc..c1ab2c82254e 100644
--- a/games-emulation/mupen64plus-video-glide64mk2/metadata.xml
+++ b/games-emulation/mupen64plus-video-glide64mk2/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
diff --git a/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.0-r1.ebuild b/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.0-r1.ebuild
new file mode 100644
index 000000000000..59d42e2b5a0c
--- /dev/null
+++ b/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.0-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.0-r1.ebuild,v 1.1 2014/08/15 10:20:24 mgorny Exp $
+
+EAPI=5
+
+MY_P=${PN}-src-${PV}
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, glide64mk2 video plugin"
+HOMEPAGE="http://code.google.com/p/mupen64plus/"
+SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hires sse"
+
+RDEPEND=">=games-emulation/mupen64plus-core-2.0-r1:0=
+	media-libs/libpng:0=
+	media-libs/libsdl:0=
+	sys-libs/zlib:0=
+	virtual/opengl:0=
+	hires? ( dev-libs/boost:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+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}-sdl-config...
+		SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl)"
+		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl)"
+
+		NO_ASM=$(usex sse 0 1)
+		HIRES=$(usex hires 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
+}
diff --git a/games-emulation/mupen64plus-video-rice/ChangeLog b/games-emulation/mupen64plus-video-rice/ChangeLog
index 265a44674a43..b369887a3760 100644
--- a/games-emulation/mupen64plus-video-rice/ChangeLog
+++ b/games-emulation/mupen64plus-video-rice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/mupen64plus-video-rice
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-video-rice/ChangeLog,v 1.3 2013/12/19 16:55:02 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-video-rice/ChangeLog,v 1.4 2014/08/15 10:20:47 mgorny Exp $
+
+*mupen64plus-video-rice-2.0-r1 (15 Aug 2014)
+
+  15 Aug 2014; Michał Górny <mgorny@gentoo.org>
+  +mupen64plus-video-rice-2.0-r1.ebuild, metadata.xml:
+  Remove games team maintainership following the Council decision. Use standard
+  install layout.
 
   19 Dec 2013; Michał Górny <mgorny@gentoo.org>
   mupen64plus-video-rice-2.0.ebuild:
diff --git a/games-emulation/mupen64plus-video-rice/Manifest b/games-emulation/mupen64plus-video-rice/Manifest
index d7ec60c792d9..8dd53637d2e6 100644
--- a/games-emulation/mupen64plus-video-rice/Manifest
+++ b/games-emulation/mupen64plus-video-rice/Manifest
@@ -2,25 +2,27 @@
 Hash: SHA256
 
 DIST mupen64plus-video-rice-src-2.0.tar.gz 362013 SHA256 3eb076e7c38ab45c9ec752d30e00eca022a9e0c6ead1a22df13ad94902e08238 SHA512 bbab67be20b6d2ed6a246de8a2b955051489ac128ddecff0e3fc54782fc1d17ed8f9e1cded22d215b2c5c865b4b5fe831fffb28803247a2e494746565d23d764 WHIRLPOOL ab4399e0c70351e69995a5f40aa308b4d37489b7997d8a0eae97a183c62eea6976469c1e420c04cd24f9c32e9828d677264ce684e57af2500e7e57047bf98011
+EBUILD mupen64plus-video-rice-2.0-r1.ebuild 1908 SHA256 97ecf9b5a6dea3917bf3f6720490797739d3ab71ac355492dc1142711efca17c SHA512 2d26ca76a8a6bbf6d8a96d2de5b5be45aaeb8f00600ec93e4f3a44702822fae5c0a5a0e763454ef3d1d7ee966dad0dc43e88c868a21465cef836fe7bed45d6b6 WHIRLPOOL 33f06a37692496498b0d13b735c4c85cf8c65625e3dce08b1c6ea9eaf8e7ac7942c6130cfb7a3a592d41cb1cab04a15f55c7c4f42ca73fdc45b27c1bd690a3be
 EBUILD mupen64plus-video-rice-2.0.ebuild 1999 SHA256 8671f8984ce9b0b0b7903c3421746704875a1e4b76a2a4fab5893cae34891138 SHA512 a8b41305196a6bdc45fde897c850ed544715de1358c8d92ce3dec0b79975916f13f62bd358e18de87ed0626185d49c1e4680c5baa5b2bcd53f6ee4f3ed9193ad WHIRLPOOL 3918395e473deb7ff1ab1a7a119c7f4d330c4dd9bcca3b534d05322f56992f2e7e127e8d139fe499861f204c48e735ac4b066174ebcca4a4da6c9142da88c782
-MISC ChangeLog 751 SHA256 0c9da40585664c47d831d8832120321c9cb7884b92ae719193c5cacc6f420e87 SHA512 10bdfc8bd4b80dacefab6008f93fc80a925fdd3ebf5bda8b8b8bc321484d969d3194f7d1b213b6631c3fc55547d643e3fa42e4aea426ba5fbac5e2d25c659b12 WHIRLPOOL d8c3a641c75363aae8b85ee2c0932cd3b7978683eea60b189cc744c28c3caa759e4df8314d9e35efdd8f0bab1c49f3c528ff6921817c6b2a7052ea29e80559a7
-MISC metadata.xml 352 SHA256 b5b11f77354a3f9a9051da98c3e7499a195f42a2abc71c3fe55979eeab43c7cc SHA512 579bbf3da7e4b2a573bbec036b4e5710dbe5289278094e9dc3c3cda8d8ca9533031e189bc12a15a47abe9f4cb58f83a98d2b0796ac0394797085b367658c3af8 WHIRLPOOL 3ced83d68b1b7923be49ae91e82ffe778aac35895fd681e8be87f28f77b716a60384af1935cc632abd7c510181d76526d475548e33117c73416d9cd922af49f3
+MISC ChangeLog 1001 SHA256 9bc623feda391a83468973c4be1139b30fb7dc12441de6e75e0c5e4ffcd3facc SHA512 6454f2b2621457393f9a608184cadd0e39584d0fd753898f567cb84950602ce7188655e82da2158bb3f91a76cf8cf30105a403c73f3e79d678ebf19631b44f7c WHIRLPOOL f872f80b63eba794a68f8aca8723018dd450ac101bbaa9187daba5490640befb510806a0875a54fbb2ffe8b4447a796b9504382f93ac4a300e5771f11a6075b3
+MISC metadata.xml 332 SHA256 fddf0cc3fb5d96e622d607039f19d38ea9cf4a428393af81637205b51a6ef5a7 SHA512 67baaca8142e17ac47a00e477efdef2a66ca4d4d2f878cb2e2a0b06b10effe39c5272cc7fa5aaedc5911864e9b8cf50ceb240fce6d0920f4a5ec74676827ca8b WHIRLPOOL aa3fa95c7736443edf6815c5c38e67b94e99549fb3112a13d7988c5143c71d2cec7d7855e7f74e89315ee09850ea70aa2f284c8a9c881c9ee6ce2ee8ef72d43f
+MISC metadata.xml.rej 2313 SHA256 a337d5e81b5badbde92fd7d6653d023a95688943443237c408c6999a4efa42c7 SHA512 1b488f1b3bc20c755f529d2c0be666698c9cfbe3c19106a90e22f67d3efea5923aa007928d5e21e55c0f735fc70e3a1f020be8631b0c63d5147a292267c4b294 WHIRLPOOL c9e6213777a21f4ce47f2081dcb4eb1d6f0433a81f54511fd3cc9ab88130e84f9e871d02a8e7b9d5aca784d098383eb53a221de9179d079ef557c161f9e950fc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJSsyToXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJT7d8yXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOPxsP/3ayd+qj3BhM6M2LRnZueOpo
-OXIbWsHPAlKG/mq/W4KAKg8Jfs1AbZ7ek+h1OCTsEuodAwnRp417YYCKtChSjpkG
-xyHlZyzltQ4LPJRsuCraNQBcLZmBhnG25cAGe9iL4mhWaboPlpOZ56iU/DLVyNGl
-ZMdNKbioa8jJv6J7GSOTXVaNvMKEjBr0+cTicCOdg7oasfe6j09T7ltf+akeLRmf
-1+xb6pzuKnSOWU86RSy17k+gPkheRrRKjeSV1h11fRxQYayLawWML2wrrgYhQPWX
-M5Alz38E4dNN0LYmeiiffhfaBJF5r4o++VeGNbb2d+1r6ij0ZeDVr9qmv1Jm9zja
-PMZA6KyT5Ck7RU8Bi9swc6AaSk8yXh0PwZ/HiqTOhWNXGnwKbwlw7ynBlwgFVdlW
-J0qNYdkpAR+zlxiEgPz0o8W+zJj1gbX99Bh/dASm9Ty298/lE0GkC7gG9m0akkAa
-WyA9noKOFK9IefF2h6jy38GQ5laeLvnUKCC2XSvSGx7zOKWMqwv4dLF6S8fNFpli
-kkqgIMkX7LpxfB8SasibLs3r4H49zETHqrHN0HFOaPKNiPBn20XdMquskIcBOGJ1
-ROu9Co7HJza1lwizW+XLrFz4CeWLfKICBlLRrn5bQqBV3S3nWEZEuxzmddetlURS
-rYtH4WM0Syd+sx0cnSV/
-=xtPR
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOOqkQAKGpRczXKO6RZS73vu223Qdn
+g/gs7yuNYSDFHs5+bcIHVumITpqUsjbeqtLavo0LuDLKzVMvIBHc7pFtSsinbDXe
+STMzubtEykao643dc+KGUceNlrPGF5uz9mHhkIis6SgiR0gHWlv/OBscDLI2lXwT
+geRU5y4YosFLsml375D9xsQFYlrr27cK7C70ccagieuBmSA5OkXXPqWsGjFvfpO9
+4BiSm9GhnZy2OSv3Z+mqeaIeGG/SkUmNcCAXNWzUmDDF71KOPcOI5nx6vYg0JUqZ
+bbR4grwJEREPu3bKUR/+8t7Uonf4TuwQauqnRGXBhCXumRcOxV2UU4qHFaxkthGy
+2vhIG7zjOoGEwqyflI1/fVIieVzO5Z8pTCexWWc7Uc0yM7wm0if+cAsFoZemiizG
+CWKWx/PUf7PL96WfO74CIiasYv7nr24hxbc99oHVZWIXaFmhUB0dHnqa6Pb08lLX
+ZiKtebgQkgVQe3a3w+uTUsWYAZQqVh+G+xYt9LOcoHNyIGz9JO7LD8hn6kwjyF4c
+fySTFCaUpN64XsBHQHz+iHqFpWj/9MjFEr/iR6V1ErquP4WdvwUT1dNG84NcPE/F
+bshAn4lPV9CHYZnnaZxUC2h9uzJNCbmrRfVb5BKkJ09ZjmD0dnyDxZ5ijWBdeBrD
+G5P5l46QZNxorE149Jt5
+=43DJ
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus-video-rice/metadata.xml b/games-emulation/mupen64plus-video-rice/metadata.xml
index 9047711e4ffd..955f381367d5 100644
--- a/games-emulation/mupen64plus-video-rice/metadata.xml
+++ b/games-emulation/mupen64plus-video-rice/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
diff --git a/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.0-r1.ebuild b/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.0-r1.ebuild
new file mode 100644
index 000000000000..3a8b3c0120fd
--- /dev/null
+++ b/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.0-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.0-r1.ebuild,v 1.1 2014/08/15 10:20:47 mgorny Exp $
+
+EAPI=5
+
+MY_P=${PN}-src-${PV}
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, rice video plugin"
+HOMEPAGE="http://code.google.com/p/mupen64plus/"
+SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sse"
+
+RDEPEND=">=games-emulation/mupen64plus-core-2.0-r1:0=
+	media-libs/libpng:0=
+	media-libs/libsdl:0=[video]
+	virtual/opengl:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+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}-sdl-config...
+		SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl)"
+		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl)"
+
+		NO_ASM=$(usex sse 0 1)
+	)
+
+	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
+	use x86 && MAKEARGS+=( HOST_CPU=i386 )
+
+	emake "${MAKEARGS[@]}" all
+}
+
+src_install() {
+	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+	einstalldocs
+}