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

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

5 files changed, 45 insertions, 118 deletions

diff --git a/games-emulation/m64py/ChangeLog b/games-emulation/m64py/ChangeLog
index dff514e56e3b..df8812f7734a 100644
--- a/games-emulation/m64py/ChangeLog
+++ b/games-emulation/m64py/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/m64py
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/m64py/ChangeLog,v 1.4 2014/05/08 20:49:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/m64py/ChangeLog,v 1.5 2014/08/15 10:22:03 mgorny Exp $
+
+*m64py-0.2.1-r1 (15 Aug 2014)
+
+  15 Aug 2014; Michał Górny <mgorny@gentoo.org> +m64py-0.2.1-r1.ebuild,
+  -m64py-0.1.8.ebuild, -m64py-0.2.0.ebuild, metadata.xml:
+  Remove games team maintainership following the Council decision. Use standard
+  install layout. Drop old.
 
 *m64py-0.2.1 (08 May 2014)
 
diff --git a/games-emulation/m64py/Manifest b/games-emulation/m64py/Manifest
index 57008d30ab90..6c39f9132607 100644
--- a/games-emulation/m64py/Manifest
+++ b/games-emulation/m64py/Manifest
@@ -1,30 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST m64py-0.1.8.tar.gz 304969 SHA256 a59db4027a4a7b6ffa8a7ba9351da611f1a0481a77b2ae43fb6b9ff48e3f2f4a SHA512 c13ede40f5838e3c0b4e71f8e20af1be5f7cf1a6127071fc6b0f3243866c2b484c8eeba6d8bfa90da03081e8828150fbca8c0b965e5049b415f2a8557b4cd941 WHIRLPOOL e7dc700357ad8d2480cc71c1373bda1f5b60a01c7f090d858d2d5d7f125e47abf6a48a125bd900a7f774026b558319fa5015f0d681588239ffd8018d6e505c65
-DIST m64py-0.2.0.tar.gz 305014 SHA256 4bca5500761256f1b894811bb2615f23999108056bc48ab90a47927aa1f9fe80 SHA512 344e99eb167af7fe9df164298854521d1e69f879b39cc0f33ea278c863b7a5ab84d3574cb98f0546bb56c833d003c9a675f533d7b33c17fddd652ccf3aed8789 WHIRLPOOL a65a06d2bbb5ca1763a33dd73cefee3a4b77f82813f8b131068eca88aeb04e156a1c16fa93bb03acb9b935a44dcda6398bbfd75fa51ed296de6d5223c7f206bf
 DIST m64py-0.2.1.tar.gz 304897 SHA256 6461b494291f22c10ccd60cda4d4750da3c1514e1d5bc2354bad95a9f4cc1525 SHA512 02d5bc4a501f3c9a5851f242119ad6436be9a59b832f27483591353cfad6975da677a124e61330a4430f1813259f5a423bc8413423ee43a3570d74239e33b487 WHIRLPOOL 5998dd86de565e09c392cef6a9bb94978c6ebbfb3169fc30ae075d291ded187efc16fcf0d380c3ae7a85ae74f3b333de786a202a17320348a0d75595f7e5c024
-EBUILD m64py-0.1.8.ebuild 2071 SHA256 cbbbcdfcf924cf5f8822ed95a22e1fb9737b47de26a2ab276b13a9708cbd5021 SHA512 943d5d410ff49e49342da70245effab697e6eb679fb208feac65ab7387574074d77a739e1ca1739e04cfc89d1336c2ccacd45340cecf8eac1ec514f35236e122 WHIRLPOOL 4ef637d172f4d51ffb1369a311cab6c05b82d5f31db1905b0ec7c7ca28809b023249ec161ab5d9b02ea48b04710598077210fbfd5a2747c5c614bd02bae8c7d4
-EBUILD m64py-0.2.0.ebuild 2071 SHA256 b0ea0ed498705ec8f9a8704b38a72adac9fbdec736e3ebc50ae2324e702c8792 SHA512 547d74a69f1e69cef7b3ee411284e0338886f58611d564012ba81d5a9bdf55ec61ce33e9c15e3daba58a2058dc955b71e9446ec2bfa2ae62c4de93b7b7f301ab WHIRLPOOL 82813e1256641da10c22cdb1f5e003128eb3d5c7641a5283441c3639e8dcb1563a9add29cb3a04bfd5e1d679864208f2b423a68c90bbee71600fd8c5975f7ab3
+EBUILD m64py-0.2.1-r1.ebuild 2242 SHA256 e1ffb68d5a0f7bcc21b34c0adb05ec28764363d0664d9a25bee88e717ab8b03b SHA512 0913b190cb8006d0e1bfddf972e9e0c9c92bb311bda48a72ba90633f126f45c40b78c6029cb75267229524d62883f87692729ac0b633bcfbdef640498c019939 WHIRLPOOL e7eee244c21f18fcffb02430b152dee230c9170db40362d1e28429d19a3f829419937732dceebc596a4e844a2a54c784f4dc4659559b9e0ee22d65b4c666f1af
 EBUILD m64py-0.2.1.ebuild 2071 SHA256 bf335c0d24e437f269f8573c29d5808ef601840b9ca61ae625b45f5cd58a686b SHA512 2a1e1e0735cedb399219c88ddc29a1e350ba8a945b3e14bcbc17c9f120c8d5f21b4f4c0b52de9580644b7bdd87449c1c9756ef122bc16d56916605c3fa6a8aa0 WHIRLPOOL f9c9f8ac02d62417ef4700d4f7ffc4978250b27e8affd07660a69556b10d497ac191995da50b52a40a24921583d671294fc01ee9ee6edebed328de7a3e304c41
-MISC ChangeLog 748 SHA256 d198d286b19f3cf53b7b778092371c9f731b30331d082f0b2247e7ca6ad87382 SHA512 a4b6e4eb62223c91998d4a22a9e6c004b24574b012b5cb98ffa03e94c85e273d768a290f396aada420bc5fdb8ba91a406382165d4a61e8b03dde78188271f4a0 WHIRLPOOL 077c741646e8eb3a4ba734259fd66a39a4a4b7c12ad9a7c4d3b91a5f5106539a5b5706f0b4ac2c44f6260f9067fb9f777023f1298e8c08300c26f05113ddb981
-MISC metadata.xml 352 SHA256 b5b11f77354a3f9a9051da98c3e7499a195f42a2abc71c3fe55979eeab43c7cc SHA512 579bbf3da7e4b2a573bbec036b4e5710dbe5289278094e9dc3c3cda8d8ca9533031e189bc12a15a47abe9f4cb58f83a98d2b0796ac0394797085b367658c3af8 WHIRLPOOL 3ced83d68b1b7923be49ae91e82ffe778aac35895fd681e8be87f28f77b716a60384af1935cc632abd7c510181d76526d475548e33117c73416d9cd922af49f3
+MISC ChangeLog 1020 SHA256 adbcc4be574325ab7cbcb7818caadda9186a5899bef4fe6683ae3c578aa46d83 SHA512 251433f3cebf9c15485694158c758f1ef338ee80a22f5f92eb48340ef7d4b48cb9429af24bcea4de9703dd39184982c23a6a6b46388410517996b9455ed28feb WHIRLPOOL 757d5b762d8c18f977a800902f3607b2e72259f17671b394754c3d5ec92b1ab69e022cc4417cf9da23d959340a1bb5932f197d03f88851249f219ce16c345824
+MISC metadata.xml 332 SHA256 fddf0cc3fb5d96e622d607039f19d38ea9cf4a428393af81637205b51a6ef5a7 SHA512 67baaca8142e17ac47a00e477efdef2a66ca4d4d2f878cb2e2a0b06b10effe39c5272cc7fa5aaedc5911864e9b8cf50ceb240fce6d0920f4a5ec74676827ca8b WHIRLPOOL aa3fa95c7736443edf6815c5c38e67b94e99549fb3112a13d7988c5143c71d2cec7d7855e7f74e89315ee09850ea70aa2f284c8a9c881c9ee6ce2ee8ef72d43f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTa+3XXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJT7d9+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOGg8P/is7XN6dORY1xPCpFvpLNXEt
-VFcevUzvRFtHeeLdNGPAKTep86V8ofME5mi0wfXGdAYOnvzI7NW57VZNS8uWI/Xg
-N6jN2U5fEYOSq1Us5FsgiH79DSdx+f5ilTsaZnHwe/fVL5/65sieZ5x3ecCHUWRs
-d5GHZWNdp21URhDIbtUNiuOxnWM970wWnOZHsQz70FP7WxqOv7FQoqfa+Qg1/pxa
-hS6C9M8cOJ5eQW2RwmzB9xaiE6py3TYJYDbAAXZIPRvp1uvLUuODjhFfC5bFLzvB
-UKOyEgk220AhXSTVebTh5hMSc5FuLq0GcCkoPNEHXO3voFSqUXeEHDBbwH0geDx2
-3zufYTbdDD0iCyWObinKRMsBNDVX6a9bTOG79fNWyTwlIifstD7OCgMHIu4xbAPf
-PJrTjDQ7gi/AawOUEFHlm+OF2DwzaZ9f0MCcgMdfNA6RUXqaSzGAALStaxSbMdJI
-x36K+6kKBN1V7ydEMhvwXdhsBAwXdOrsJFJf9VY51SKA+iEkmfkleRP9qv8f08kn
-izAWw4sjxx6yx+6dVgaQMkog1kDlg4dBdy2x1bqqqHHHjzgDWN6zzU89glGYGWdB
-fvadFJqqOf9kCOdijlK0kZZvxdHpc/UlyHWCH8KBG27U/25XfL6WNEcC1qthyqAY
-AjAFUcaGcJYeM4hk9b56
-=QkYQ
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO9nsQANyMdVcFQ+ARMG0bMCPMNpNQ
+nQaYOQ2E+VUlpcAiWi51y154So+iGPdb6lzeuyHFWEIaOSmHHR+v60hud1NwS2cF
+q0L90kWC1lRvv+LL0Uud7dsyAkMaRiJ6K4A8pTEdw9RHUk0Cxdz2HHCJG3e84BXj
+3FkzT4egV3FtOw7PWgduVhoTrFp6BNNyWgjEQQaFN6nFnowMUEz9CGNjEJn/m18i
+quaWMu1Z3ZOzYb0YunzW8Z02j+c5nx/TRgkgIPtg5MpJa3zOQTVpeDnxHbnUvYnm
+PnyxDx4GW/G8YHwqtO+h3vSEZPHF49ax9cDtt38h29Mx8SybJbJg1m+SFGbV7Nxg
+sY4FTCGb3JyZQGxa2V2YP3rfxE3G52WlytPPJpexIES7rBozPO7Dgjz5ZdmE91R/
+NVE3+Y6v8TQ6tv4w4A8A6I2tSz3AxP9pGEn+OvrRn93guhAr28jULfNmhyTDvmeL
+Jj9xZ/ncuI1pj7FqAFrnn6Stn88SPS2kgM+fZeBPDa1v4tskj16ReCLdAYjsrvEB
+siwjyFuy97es/YzsTh4R4oZJ420pJyOzgIkJ7IXND/TXqsy3E5tId4VMxszVJcdR
+rVrHBlSrrwwGVYpPLNziWRJq0bH4KTv57iGj/Zzz5JHRM0XI2/9l5iZriH6gWIx6
+yxjf/8tt9oZAIv5Atu4Y
+=s4+7
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/m64py/m64py-0.2.0.ebuild b/games-emulation/m64py/m64py-0.2.0.ebuild
deleted file mode 100644
index 8b8977cb5f7f..000000000000
--- a/games-emulation/m64py/m64py-0.2.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/m64py/m64py-0.2.0.ebuild,v 1.1 2014/02/22 22:36:38 mgorny Exp $
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 games
-
-DESCRIPTION="A frontend for Mupen64Plus"
-HOMEPAGE="http://m64py.sourceforge.net/"
-SRC_URI="mirror://sourceforge/m64py/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# SDL & libmupen64plus are through ctypes, so they rely on specific ABI
-RDEPEND="media-libs/libsdl:0/0[joystick]
-	dev-python/PyQt4[opengl,${PYTHON_USEDEP}]
-	games-emulation/mupen64plus-core:0/2"
-
-python_prepare_all() {
-	# set the correct search path
-	cat >> src/m64py/platform.py <<-_EOF_
-		SEARCH_DIRS = ["$(games_get_libdir)/mupen64plus"]
-_EOF_
-
-	# comment out SDL2 support since our mupen64plus uses SDL1
-	sed -e '/from m64py\.SDL2/s:^:#:' \
-		-e '/QT2SDL2\[/s:^:#:' \
-		-e '/KEYCODE2SCANCODE\[/s:^:#:' \
-		-e '/SCANCODE2KEYCODE\[/s:^:#:' \
-		-i src/m64py/frontend/keymap.py || die
-	sed -e '/--sdl2/d' \
-		-e '/SDL2/s:=.*$:= False:' \
-		-i src/m64py/opts.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--install-scripts="${GAMES_BINDIR}"
-}
-
-# games.eclass ABSOLUTELY MUST come last, so we need to clean up the mess
-src_prepare() { distutils-r1_src_prepare; }
-src_configure() { distutils-r1_src_configure; }
-src_compile() { distutils-r1_src_compile; }
-src_test() { distutils-r1_src_test; }
-
-src_install() {
-	distutils-r1_src_install
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if ! type -P rar >/dev/null && ! type -P unrar >/dev/null; then
-		elog
-		elog "In order to gain RAR archive support, please install either app-arch/rar"
-		elog "or app-arch/unrar."
-	fi
-
-	if ! type -P 7z >/dev/null \
-			&& ! has_version "dev-python/pylzma[${PYTHON_USEDEP}]"; then
-		elog
-		elog "In order to gain 7z archive support, please install either app-arch/p7zip"
-		elog "or dev-python/pylzma."
-	fi
-}
diff --git a/games-emulation/m64py/m64py-0.1.8.ebuild b/games-emulation/m64py/m64py-0.2.1-r1.ebuild
index 07da587b97cf..2960f7f88136 100644
--- a/games-emulation/m64py/m64py-0.1.8.ebuild
+++ b/games-emulation/m64py/m64py-0.2.1-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/m64py/m64py-0.1.8.ebuild,v 1.1 2014/01/11 13:25:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/m64py/m64py-0.2.1-r1.ebuild,v 1.1 2014/08/15 10:22:03 mgorny Exp $
+
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 games
+inherit distutils-r1
 
 DESCRIPTION="A frontend for Mupen64Plus"
 HOMEPAGE="http://m64py.sourceforge.net/"
@@ -19,12 +20,12 @@ IUSE=""
 # SDL & libmupen64plus are through ctypes, so they rely on specific ABI
 RDEPEND="media-libs/libsdl:0/0[joystick]
 	dev-python/PyQt4[opengl,${PYTHON_USEDEP}]
-	games-emulation/mupen64plus-core:0/2"
+	>=games-emulation/mupen64plus-core-2.0-r1:0/2"
 
 python_prepare_all() {
 	# set the correct search path
 	cat >> src/m64py/platform.py <<-_EOF_
-		SEARCH_DIRS = ["$(games_get_libdir)/mupen64plus"]
+		SEARCH_DIRS = ["/usr/$(get_libdir)/mupen64plus"]
 _EOF_
 
 	# comment out SDL2 support since our mupen64plus uses SDL1
@@ -40,24 +41,21 @@ _EOF_
 	distutils-r1_python_prepare_all
 }
 
-python_install() {
-	distutils-r1_python_install \
-		--install-scripts="${GAMES_BINDIR}"
-}
-
-# games.eclass ABSOLUTELY MUST come last, so we need to clean up the mess
-src_prepare() { distutils-r1_src_prepare; }
-src_configure() { distutils-r1_src_configure; }
-src_compile() { distutils-r1_src_compile; }
-src_test() { distutils-r1_src_test; }
-
-src_install() {
-	distutils-r1_src_install
-	prepgamesdirs
-}
-
 pkg_postinst() {
-	games_pkg_postinst
+	local vr
+	for vr in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 0.2.1-r1 ${vr}; then
+			ewarn
+			ewarn "Starting with mupen64plus-2.0-r1, the plugin install path has changed."
+			ewarn "In order for m64py to find mupen64plus, you will either need to set"
+			ewarn "new paths in configuration dialog or remove your configuration file."
+			ewarn "The new paths are:"
+			ewarn
+			ewarn " Library file:      /usr/$(get_libdir)/libmupen64plus.so.2.0.0"
+			ewarn " Plugins directory: /usr/$(get_libdir)/mupen64plus"
+			ewarn " Data directory:    /usr/share/mupen64plus"
+		fi
+	done
 
 	if ! type -P rar >/dev/null && ! type -P unrar >/dev/null; then
 		elog
diff --git a/games-emulation/m64py/metadata.xml b/games-emulation/m64py/metadata.xml
index 9047711e4ffd..955f381367d5 100644
--- a/games-emulation/m64py/metadata.xml
+++ b/games-emulation/m64py/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>