Version bump to 4.2.8 resolving bug #548754, drop 4.1.9

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 18F89C67)

3 files changed, 34 insertions, 32 deletions

diff --git a/app-emulation/playonlinux/ChangeLog b/app-emulation/playonlinux/ChangeLog
index 6725548dd370..115e8f1e472b 100644
--- a/app-emulation/playonlinux/ChangeLog
+++ b/app-emulation/playonlinux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/playonlinux
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/ChangeLog,v 1.22 2015/03/10 03:12:02 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/ChangeLog,v 1.23 2015/06/19 18:30:59 np-hardass Exp $
+
+*playonlinux-4.2.8 (19 Jun 2015)
+
+  19 Jun 2015; NP-Hardass <NP-Hardass@gentoo.org> +playonlinux-4.2.8.ebuild,
+  -playonlinux-4.1.9.ebuild, metadata.xml:
+  Version bump to 4.2.8, drop 4.1.9
 
 *playonlinux-4.2.6 (10 Mar 2015)
 
diff --git a/app-emulation/playonlinux/metadata.xml b/app-emulation/playonlinux/metadata.xml
index e0ea5525f07d..d94fe6d47e49 100644
--- a/app-emulation/playonlinux/metadata.xml
+++ b/app-emulation/playonlinux/metadata.xml
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
+	<herd>wine</herd>
 	<maintainer>
-                <email>idella4@gentoo.org</email>
-                <name>Ian Delaney</name>
-        </maintainer>
-        <maintainer>
-                <email>np.hardass@gmail.com</email>
-                <name>NP-Hardass</name>
-                <description>proxy maintainer and recipient of bugs</description>
+		<email>np-hardass@gentoo.org</email>
+		<name>NP-Hardass</name>
 	</maintainer>
-<use>
-	<flag name="winbind">Enables support for the winbind auth daemon</flag>
-</use>
+	<use>
+		<flag name="winbind">Enables support for the winbind auth daemon</flag>
+	</use>
 </pkgmetadata>
 
diff --git a/app-emulation/playonlinux/playonlinux-4.1.9.ebuild b/app-emulation/playonlinux/playonlinux-4.2.8.ebuild
index 6983ef23f821..eae72a2e2232 100644
--- a/app-emulation/playonlinux/playonlinux-4.1.9.ebuild
+++ b/app-emulation/playonlinux/playonlinux-4.2.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/playonlinux-4.1.9.ebuild,v 1.1 2013/02/14 07:11:40 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/playonlinux-4.2.8.ebuild,v 1.1 2015/06/19 18:30:59 np-hardass Exp $
 
-EAPI="4"
-PYTHON_DEPEND="2"
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
 
-inherit eutils python games gnome2-utils
+inherit gnome2-utils python-single-r1 games
 
 MY_PN="PlayOnLinux"
 
@@ -18,13 +18,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="winbind"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 DEPEND=""
 RDEPEND="app-emulation/wine
 	app-arch/cabextract
 	app-arch/p7zip
 	app-arch/unzip
 	app-crypt/gnupg
-	dev-python/wxpython:2.8
+	dev-python/wxpython:2.8[${PYTHON_USEDEP}]
 	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
 	net-misc/wget
 	x11-apps/mesa-progs
@@ -44,14 +46,16 @@ S=${WORKDIR}/${PN}
 # Look at debian pkg: http://packages.debian.org/sid/playonlinux
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+	python-single-r1_pkg_setup
 	games_pkg_setup
 }
 
 src_prepare() {
-	sed -e 's/PYTHON="python"/PYTHON="python2"/' -i playonlinux || die
-	python_convert_shebangs -r 2 .
+	epatch "${FILESDIR}/${PN}-4.2.4-pol-bash.patch"
+	epatch "${FILESDIR}/${PN}-4.2.4-binary-plugin.patch"
+	epatch "${FILESDIR}/${PN}-4.2.6-stop-update-warning.patch"
+
+	python_fix_shebang .
 
 	# remove playonmac
 	rm etc/{playonmac.icns,terminal.applescript} || die
@@ -67,16 +71,13 @@ src_install() {
 
 	# bash/ install
 	exeinto "${GAMES_DATADIR}/${PN}/bash"
-	doexe bash/*
+	find "${S}/bash" -type f -exec doexe '{}' +
 	exeinto "${GAMES_DATADIR}/${PN}/bash/expert"
-	doexe bash/expert/*
+	find "${S}/bash/expert" -type f -exec doexe '{}' +
 
 	# python/ install
-	exeinto "${GAMES_DATADIR}/${PN}/python"
-	doexe python/*
-	# sub dir without exec permissions
-	insinto "${GAMES_DATADIR}/${PN}/python"
-	doins -r python/lib
+	python_moduleinto "${GAMES_DATADIR}/${PN}"
+	python_domodule python
 
 	# main executable files
 	exeinto "${GAMES_DATADIR}/${PN}"
@@ -88,9 +89,11 @@ src_install() {
 		newicon -s $size etc/${PN}$size.png ${PN}.png
 	done
 
-	dodoc CHANGELOG
+	doman "${FILESDIR}"/playonlinux{,-pkg}.1
+	dodoc CHANGELOG.md
 
 	games_make_wrapper ${PN} "./${PN}" "${GAMES_DATADIR}/${PN}"
+	games_make_wrapper ${PN}-pkg "./${PN}-pkg" "${GAMES_DATADIR}/${PN}"
 	make_desktop_entry ${PN} ${MY_PN} ${PN} Game
 
 	prepgamesdirs
@@ -102,7 +105,6 @@ pkg_preinst() {
 
 pkg_postinst() {
 	games_pkg_postinst
-	python_mod_optimize "${GAMES_DATADIR}/${PN}"
 	gnome2_icon_cache_update
 }
 
@@ -115,6 +117,5 @@ pkg_prerm() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup "${GAMES_DATADIR}/${PN}"
 	gnome2_icon_cache_update
 }