bump, fix nagging update notification, ack to Adam Mills for new patch, ack to Kent Fredric wrt bug #522356, fixes Bugs 480550 & 524522. proxy maintainership change to NP-Hardass with consent of prior maintainer wrt bug #542630

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

7 files changed, 157 insertions, 252 deletions

diff --git a/app-emulation/playonlinux/ChangeLog b/app-emulation/playonlinux/ChangeLog
index 1453bcbc7eff..6725548dd370 100644
--- a/app-emulation/playonlinux/ChangeLog
+++ b/app-emulation/playonlinux/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/playonlinux
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/ChangeLog,v 1.21 2014/08/05 00:54:27 zx2c4 Exp $
+# 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 $
+
+*playonlinux-4.2.6 (10 Mar 2015)
+
+  10 Mar 2015; Ian Delaney <idella4@gentoo.org>
+  +files/playonlinux-4.2.6-stop-update-warning.patch, +playonlinux-4.2.6.ebuild,
+  -files/playonlinux-4.1.1-not-exclude-ipv6.patch, -playonlinux-4.1.1-r1.ebuild,
+  -playonlinux-4.1.1.ebuild, metadata.xml:
+  bump, fix nagging update notification, ack to Adam Mills for new patch, ack to
+  Kent Fredric wrt bug #522356, fixes Bugs 480550 & 524522. proxy maintainership
+  change to NP-Hardass with consent of prior maintainer wrt bug #542630
 
 *playonlinux-4.2.4 (05 Aug 2014)
 
diff --git a/app-emulation/playonlinux/files/playonlinux-4.1.1-not-exclude-ipv6.patch b/app-emulation/playonlinux/files/playonlinux-4.1.1-not-exclude-ipv6.patch
deleted file mode 100644
index c783173115c3..000000000000
--- a/app-emulation/playonlinux/files/playonlinux-4.1.1-not-exclude-ipv6.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# Changes wget usage to _allow_ IPv6, but to prefer IPv4. This way, DNS64 and
-# IPv6-only http_proxy scenarios should work.
-# Patch written by Michael Mol <mikemol@gmail.com>
-# Patch based on dialog with upstream, ascertaining their purpose for using
-# -4, and coming up with an agreed-upon workaround. Upstream equivalent is
-# committed to their vcs, and will probably appear in release 4.1.4.
-
-*** python/lib/Variables.py	2012-07-10 20:43:56.968567114 -0400
---- python/lib/Variables-patched.py	2012-07-10 20:44:21.491898941 -0400
-*************** if (os.environ["POL_OS"] == "Mac"):
-*** 26,28 ****
-  	os_name = "darwin"
-! 	os.environ["POL_WGET"] = "wget -4 -q"
-  	
---- 26,28 ----
-  	os_name = "darwin"
-! 	os.environ["POL_WGET"] = "wget --prefer-family=IPv4 -q"
-  	
-*************** if (os.environ["POL_OS"] == "Linux"):
-*** 39,41 ****
-  	else:
-! 		os.environ["POL_WGET"] = "wget -4 -q"
-  
---- 39,41 ----
-  	else:
-! 		os.environ["POL_WGET"] = "wget --prefer-family=IPv4 -q"
-  
diff --git a/app-emulation/playonlinux/files/playonlinux-4.2.6-stop-update-warning.patch b/app-emulation/playonlinux/files/playonlinux-4.2.6-stop-update-warning.patch
new file mode 100644
index 000000000000..3e93adb0f2c2
--- /dev/null
+++ b/app-emulation/playonlinux/files/playonlinux-4.2.6-stop-update-warning.patch
@@ -0,0 +1,17 @@
+# This patch enables the DEBIAN_PACKGE for playonlinux.
+# The changes are described in the source comments below.
+# The flag is unfortnuately named debian, however the
+# benefits apply to any package management system.
+# Patch written by Adam Mills <adam@armills.info>
+
+--- python/lib/Variables.py	2013-08-10 22:19:46.053365072 -0400
++++ python/lib/Variables-patched.py	2013-08-10 22:17:58.275881842 -0400
+@@ -26,7 +26,7 @@
+ # Debian packagers should switch this to TRUE
+ # It will disable update alerts, bug reports, statistics
+ # It will set the good locale directory, and it will use the good msttcorefonts
+-os.environ["DEBIAN_PACKAGE"] = "FALSE"
++os.environ["DEBIAN_PACKAGE"] = "TRUE"
+ 
+ # Variables PlayOnMac
+ if (os.environ["POL_OS"] == "Mac"):
diff --git a/app-emulation/playonlinux/metadata.xml b/app-emulation/playonlinux/metadata.xml
index 598cfa299b71..e0ea5525f07d 100644
--- a/app-emulation/playonlinux/metadata.xml
+++ b/app-emulation/playonlinux/metadata.xml
@@ -3,8 +3,13 @@
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>mikemol@gmail.com</email>
-		<name>Michael Mol</name>
+                <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>
 	</maintainer>
 <use>
 	<flag name="winbind">Enables support for the winbind auth daemon</flag>
diff --git a/app-emulation/playonlinux/playonlinux-4.1.1-r1.ebuild b/app-emulation/playonlinux/playonlinux-4.1.1-r1.ebuild
deleted file mode 100644
index ced9306fd9bc..000000000000
--- a/app-emulation/playonlinux/playonlinux-4.1.1-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/playonlinux-4.1.1-r1.ebuild,v 1.1 2012/07/14 18:22:55 hwoarang Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit eutils python games
-
-MY_PN="PlayOnLinux"
-
-DESCRIPTION="Set of scripts to easily install and use Windows games and software"
-HOMEPAGE="http://playonlinux.com/"
-SRC_URI="http://www.playonlinux.com/script_files/${MY_PN}/${PV}/${MY_PN}_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="winbind"
-
-DEPEND=""
-RDEPEND="app-emulation/wine
-	app-arch/cabextract
-	app-arch/p7zip
-	app-arch/unzip
-	app-crypt/gnupg
-	dev-python/wxpython:2.8
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-	net-misc/wget
-	x11-apps/mesa-progs
-	x11-terms/xterm
-	media-gfx/icoutils
-	winbind? ( net-fs/samba[winbind] ) "
-
-S=${WORKDIR}/${PN}
-
-# TODO:
-# Having a real install script and let playonlinux use standard filesystem
-# 	architecture to prevent having everything installed into GAMES_DATADIR
-# It will let using LANGUAGES easily
-# How to deal with Microsoft Fonts installation asked every time ?
-# How to deal with wine version installed ? (have a better mgmt of system one)
-# Look at debian pkg: http://packages.debian.org/sid/playonlinux
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	games_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-not-exclude-ipv6.patch"
-	sed -i -e "s/\(Categories=\).*/\1Game;Emulator;/" etc/PlayOnLinux.desktop \
-		|| die
-	sed -e 's/PYTHON="python"/PYTHON="python2"/' -i lib/variables playonlinux || die
-	python_convert_shebangs -r 2 .
-}
-
-src_install() {
-	# all things without exec permissions
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r resources lang lib etc plugins
-
-	# bash/ install
-	exeinto "${GAMES_DATADIR}/${PN}/bash"
-	doexe bash/*
-	exeinto "${GAMES_DATADIR}/${PN}/bash/terminals"
-	doexe bash/terminals/*
-	exeinto "${GAMES_DATADIR}/${PN}/bash/expert"
-	doexe bash/expert/*
-
-	# python/ install
-	exeinto "${GAMES_DATADIR}/${PN}/python"
-	doexe python/*
-	# sub dir without exec permissions
-	insinto "${GAMES_DATADIR}/${PN}/python"
-	doins -r python/lib
-
-	# main executable files
-	exeinto "${GAMES_DATADIR}/${PN}"
-	doexe ${PN}{,-pkg,-bash,-shell,-url_handler}
-
-	# making a script to run playonlinux from ${GAMES_BINDIR}
-	echo "#!/bin/bash" > ${PN}_launcher
-	echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN} \$*" >> ${PN}_launcher
-	newgamesbin playonlinux_launcher playonlinux
-
-	# making a script to run playonlinux-cmd from ${GAMES_BINDIR}
-	echo "#!/bin/bash" > ${PN}_cmd_launcher
-	echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN}-cmd \$*" >> ${PN}_cmd_launcher
-	newgamesbin playonlinux_cmd_launcher playonlinux-cmd
-
-	dodoc CHANGELOG
-
-	doicon etc/${PN}.png
-	domenu etc/${MY_PN}.desktop
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	python_mod_optimize "${GAMES_DATADIR}/${PN}"
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${GAMES_DATADIR}/${PN}"
-
-	elog "Installed softwares and games with playonlinux have not been removed."
-	elog "To remove them, you can re-install playonlinux and remove them using it"
-	elog "or do it manually by removing .PlayOnLinux/ in your home directory."
-}
diff --git a/app-emulation/playonlinux/playonlinux-4.1.1.ebuild b/app-emulation/playonlinux/playonlinux-4.1.1.ebuild
deleted file mode 100644
index b9d348505d18..000000000000
--- a/app-emulation/playonlinux/playonlinux-4.1.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/playonlinux-4.1.1.ebuild,v 1.1 2012/06/16 19:12:24 pacho Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit eutils python games
-
-MY_PN="PlayOnLinux"
-
-DESCRIPTION="Set of scripts to easily install and use Windows games and software"
-HOMEPAGE="http://playonlinux.com/"
-SRC_URI="http://www.playonlinux.com/script_files/${MY_PN}/${PV}/${MY_PN}_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="winbind"
-
-DEPEND=""
-RDEPEND="app-emulation/wine
-	app-arch/cabextract
-	app-arch/p7zip
-	app-arch/unzip
-	app-crypt/gnupg
-	dev-python/wxpython:2.8
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-	net-misc/wget
-	x11-apps/mesa-progs
-	x11-terms/xterm
-	media-gfx/icoutils
-	winbind? ( net-fs/samba[winbind] ) "
-
-S=${WORKDIR}/${PN}
-
-# TODO:
-# Having a real install script and let playonlinux use standard filesystem
-# 	architecture to prevent having everything installed into GAMES_DATADIR
-# It will let using LANGUAGES easily
-# How to deal with Microsoft Fonts installation asked every time ?
-# How to deal with wine version installed ? (have a better mgmt of system one)
-# Look at debian pkg: http://packages.debian.org/sid/playonlinux
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	games_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e "s/\(Categories=\).*/\1Game;Emulator;/" etc/PlayOnLinux.desktop \
-		|| die
-	sed -e 's/PYTHON="python"/PYTHON="python2"/' -i lib/variables playonlinux || die
-	python_convert_shebangs -r 2 .
-}
-
-src_install() {
-	# all things without exec permissions
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r resources lang lib etc plugins
-
-	# bash/ install
-	exeinto "${GAMES_DATADIR}/${PN}/bash"
-	doexe bash/*
-	exeinto "${GAMES_DATADIR}/${PN}/bash/terminals"
-	doexe bash/terminals/*
-	exeinto "${GAMES_DATADIR}/${PN}/bash/expert"
-	doexe bash/expert/*
-
-	# python/ install
-	exeinto "${GAMES_DATADIR}/${PN}/python"
-	doexe python/*
-	# sub dir without exec permissions
-	insinto "${GAMES_DATADIR}/${PN}/python"
-	doins -r python/lib
-
-	# main executable files
-	exeinto "${GAMES_DATADIR}/${PN}"
-	doexe ${PN}{,-pkg,-bash,-shell,-url_handler}
-
-	# making a script to run playonlinux from ${GAMES_BINDIR}
-	echo "#!/bin/bash" > ${PN}_launcher
-	echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN} \$*" >> ${PN}_launcher
-	newgamesbin playonlinux_launcher playonlinux
-
-	# making a script to run playonlinux-cmd from ${GAMES_BINDIR}
-	echo "#!/bin/bash" > ${PN}_cmd_launcher
-	echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN}-cmd \$*" >> ${PN}_cmd_launcher
-	newgamesbin playonlinux_cmd_launcher playonlinux-cmd
-
-	dodoc CHANGELOG
-
-	doicon etc/${PN}.png
-	domenu etc/${MY_PN}.desktop
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	python_mod_optimize "${GAMES_DATADIR}/${PN}"
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${GAMES_DATADIR}/${PN}"
-
-	elog "Installed softwares and games with playonlinux have not been removed."
-	elog "To remove them, you can re-install playonlinux and remove them using it"
-	elog "or do it manually by removing .PlayOnLinux/ in your home directory."
-}
diff --git a/app-emulation/playonlinux/playonlinux-4.2.6.ebuild b/app-emulation/playonlinux/playonlinux-4.2.6.ebuild
new file mode 100644
index 000000000000..0970bd8c438a
--- /dev/null
+++ b/app-emulation/playonlinux/playonlinux-4.2.6.ebuild
@@ -0,0 +1,121 @@
+# 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.2.6.ebuild,v 1.1 2015/03/10 03:12:02 idella4 Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2-utils python-single-r1 games
+
+MY_PN="PlayOnLinux"
+
+DESCRIPTION="Set of scripts to easily install and use Windows games and software"
+HOMEPAGE="http://playonlinux.com/"
+SRC_URI="http://www.playonlinux.com/script_files/${MY_PN}/${PV}/${MY_PN}_${PV}.tar.gz"
+
+LICENSE="GPL-3"
+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[${PYTHON_USEDEP}]
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+	net-misc/wget
+	x11-apps/mesa-progs
+	x11-terms/xterm
+	media-gfx/icoutils
+	|| ( net-analyzer/netcat net-analyzer/netcat6 )
+	winbind? ( net-fs/samba[winbind] ) "
+
+S=${WORKDIR}/${PN}
+
+# TODO:
+# Having a real install script and let playonlinux use standard filesystem
+# 	architecture to prevent having everything installed into GAMES_DATADIR
+# It will let using LANGUAGES easily
+# How to deal with Microsoft Fonts installation asked every time ?
+# How to deal with wine version installed ? (have a better mgmt of system one)
+# Look at debian pkg: http://packages.debian.org/sid/playonlinux
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	games_pkg_setup
+}
+
+src_prepare() {
+	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
+
+	# remove desktop integration
+	rm etc/{PlayOnLinux.desktop,PlayOnLinux.directory,playonlinux-Programmes.menu} || die
+}
+
+src_install() {
+	# all things without exec permissions
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r resources lang lib etc plugins
+
+	# bash/ install
+	exeinto "${GAMES_DATADIR}/${PN}/bash"
+	find "${S}/bash" -type f -exec doexe '{}' +
+	exeinto "${GAMES_DATADIR}/${PN}/bash/expert"
+	find "${S}/bash/expert" -type f -exec doexe '{}' +
+
+	# python/ install
+	python_moduleinto "${GAMES_DATADIR}/${PN}"
+	python_domodule python
+
+	# main executable files
+	exeinto "${GAMES_DATADIR}/${PN}"
+	doexe ${PN}{,-pkg,-bash,-shell,-url_handler}
+
+	# icons
+	doicon -s 128 etc/${PN}.png
+	for size in 16 22 32; do
+		newicon -s $size etc/${PN}$size.png ${PN}.png
+	done
+
+	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
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Installed softwares and games with playonlinux have not been removed."
+		elog "To remove them, you can re-install playonlinux and remove them using it"
+		elog "or do it manually by removing .PlayOnLinux/ in your home directory."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}