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

(Portage version: 2.2.11_p72/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

4 files changed, 27 insertions, 97 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/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>