Version bump to 4.2.8 resolving bug #548754, drop 4.1.9

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18F89C67

4 files changed, 51 insertions, 39 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/Manifest b/app-emulation/playonlinux/Manifest
index 3115f0ba16aa..ea13c052e436 100644
--- a/app-emulation/playonlinux/Manifest
+++ b/app-emulation/playonlinux/Manifest
@@ -6,18 +6,28 @@ AUX playonlinux-4.2.4-pol-bash.patch 1089 SHA256 80e4d5245ba70e207832e662879c684
 AUX playonlinux-4.2.6-stop-update-warning.patch 751 SHA256 04e6192521a284e89f31ccaa30667d107721ef966860a0337a0d89f8f2954848 SHA512 2f5e0866bc4ae6ac497c54253562b86f085dbc791f735e2595ffa78d2b54d3caa5f5654e87a42f2a6c00701d1d7ca4ad1858630166e8b88adc426ae10e0c8f75 WHIRLPOOL 7f297b1bbbf68fe9e9d0d1b58667fecd06fb9af9286188f9a292b48f67d869b613ab5c6483df6a7ff7250335e069ce276b5a035a65920c84f97f3c81425faa04
 AUX playonlinux-pkg.1 643 SHA256 436e21b1187f582d59b6aa0a3bcd1f972bb9910ac532107f94cedd659d1283ce SHA512 115f87cee7c6d56dbc54da9b120ca468fb29ae4be116101cfa3e8efd1efd9a372e6e8424462087807f6755d496575c44788914f4e45c901359ce52fbe37210a8 WHIRLPOOL 6b5427b82fd0c95aa94675687971e62ddee979ce9b8711c534d448784ad11cc7beefc86a4cf212a154c4a33873350d313a517feb3b81eb0f0767cd9f879a916b
 AUX playonlinux.1 886 SHA256 76150743dae8b5d28910d754e506ab36774a3bd24442b9ff353325a6a916ab27 SHA512 44ba1a04a7e8dbf3d85d81bbcf92917b6fe7bd68478bbcfecfe0c30619b834cc6c973fc6dd7d637d7debc7ede2a206248feaca1a017834ba95f076fd16679c2d WHIRLPOOL da9edb65bb42b56dc518087c7308c05b3a4bd638d1a539382828e333b524ee29b9a4ef72292a701e9a45d68cc79065ee0e626669466c8241d72bc46e3c89ef56
-DIST PlayOnLinux_4.1.9.tar.gz 4040628 SHA256 b2c061150451481c3bb038734f49cb2c487a3325c54554ba3c7fffb9a215244c SHA512 71c2ac2479a47398f26804be1e15fdd29c6de66ab26fc00596f354bedc9bac33c23437a8e0e2fac93979117693e28101e581549398d3633eca49f9b10270cd21 WHIRLPOOL d0c3c019e9d95eb67f2ae3a30cf6403da7225619d36168ad360edf0055e9f41052009845e379abd2f788c78702f607ffb4ea856b2b7fdda978e50c07c9ef3ebc
 DIST PlayOnLinux_4.2.4.tar.gz 4638249 SHA256 cc6f9c41c9f91278d995d14b7be6bd86c765cf41351c80e885df29da40b57554 SHA512 1f200e43da4e43b6687cc05243cb9375d312c5382d4d82f06f574cc4a1a4322568ed429abc463d830cfcc1a818d0cc93147fbc60858a6b19872b55a479c8c58c WHIRLPOOL d09c5439a618d99af0ae380cb39a8e92acd47869190f984981e9cdc91272da48c6731457d0a23383c47219371bdf9d6018fe89a7acaaba32fc96221b58406d99
 DIST PlayOnLinux_4.2.6.tar.gz 3202517 SHA256 34fc06ce55f889673529a405d17ffc045a68cc998a679377056ed63988dd64e2 SHA512 41c4af5335874020f6405f460a0b9787f7dcfb77790661ff254d2af7ff107a94020b75a8b4f1856f1e4b866e63dee49d5823edf4867d64cd20c41b17387f5490 WHIRLPOOL 4278cc00c76abfeecb87d125046a977c69d5e62b751481ffa5ed4ca4a911507bc6b650bd8648cc7b4cd794e7f0c9e91197adc3854c963770bd87a535d83ab562
-EBUILD playonlinux-4.1.9.ebuild 3123 SHA256 f0e27070f47b896e19059f6bb307b4a560bd07702af5528d277de7e860aa90c9 SHA512 c6f1e0c637916aea356469bd96d8eb6581e749715d92c1a511a7d8376d87613f3760261bdf886862e7887e891891790508336ad292f5fbf509416b051bc18973 WHIRLPOOL ab3a4dd799adb96a310dd631fd37e5e50705b82a0bcf8a8a14917018ebe194fab6dab2c225c541488fa97afee89a90e07b5d7bbc4ec21f08909206680045e973
+DIST PlayOnLinux_4.2.8.tar.gz 3168086 SHA256 2ae8d5132706f3c697d0a53573c5835938dd042b620eb76790181b285797985c SHA512 8b9c934bf3591030dc9922757eadb09db34fee7c5a5ee8b800c831ee1b99e55959c0b66f645a89d3dc5d7287438da3a26c6877076175272e199221231accba12 WHIRLPOOL cbaafa8f0f90c89931135c0fbcd91df00676fde4e0e9305a3d8f52234a51b96682e5a4aca14138f1f3f54ac43f69d38b7186667fcab97c72fa8043c3ffbd68d6
 EBUILD playonlinux-4.2.4.ebuild 3161 SHA256 d0b1554e6de1a1b02be2b0bf5f92d03664ff9b9652b58fa39810205dc0a72f19 SHA512 3e8949354c6ae22b58420cc77be1a2bde58bc57b2772820b367526ab533d5b857c5ee126046eba1477da30ebda0d40993b46df621502fcffb8570171b10a73c1 WHIRLPOOL a14ee8e20177b34f898d83ba380b79ef2d28fb0d736cec28d5676c7c35c20d8fffcd7a694eda81b45d384917ac83c8812a90470b4a52d94ab2c85787bb78fb20
 EBUILD playonlinux-4.2.6.ebuild 3262 SHA256 70ceb07685e48329a165da6fa65fc93d1125acf33b99a8c18ba3fc3111af54cf SHA512 d03215e2e615716ec4a712797e828d910b6204521a8d65844cd40052266270019d4d6dfd9fdb1e1413cf204dcad9d855125014f4d4b0c77ccb4068d2d6fa1545 WHIRLPOOL 3df7397e8a06ba3b44716e45c77b3df12f4ab168ef308298f7413fcc4b0e8a44d3785f209bcfb4588e0fbda1e04aea4439133d94114c80d923f29aa1e54b8f75
-MISC ChangeLog 1154 SHA256 ae74469eea8e68e1b39f1cadb9395f3bfaf388328694fa9a0811b9d32b8a92bf SHA512 d1defb8814f7ee58fa24666b859402de37bbe9919d8cf66a301f99dbed5c569c4bf16ead358095bec4819da240315c383eb3a12e6c3d3071fda776896b065928 WHIRLPOOL 38cd622bb79d4ef4cca76fda9d4ec350d9eec1b9ff2adea6a7f9233790b128e5391ea3174fd485fb823372e079b30af55ac4d756dcd3f945313823ad266f97f7
-MISC metadata.xml 595 SHA256 f19c6b6f6e41739862a1f544ae7ff63432117925f40b2dfb269fcb5850cb6cd7 SHA512 1540cf576d5f3dbf107d8fb0c9e142911dea5b4940545616811e1e26c981a5cdeb0ab5a7fd46c4732ec495df1149e085afbaeb7b309c8e165f23ca3647a70ce7 WHIRLPOOL ffd213f57422758a0c50bc133c36caf34ab620230084bd0c97a4dece48a6f8110056c98470d05c0dac3a25175cdee60529b18b73c6bcd39f139a36dd4bf5bfd4
+EBUILD playonlinux-4.2.8.ebuild 3265 SHA256 8356712072300fc09ffd9abccde770eebc2ca82b20329c28c9e948d5359fb99e SHA512 8c71cc9931fdb568ea49676b6b6f4c9adb66c00876b0b9991fc5fc68a2cc1d1f186a6d2d985007497ed29a29c7dd9293a0874166d3d50ffc0da48c96b3f6f7f6 WHIRLPOOL 4cd2250448ad918e97c4a5230158b861744857e428578b02621a1e1aa2d5ad36513fe9ffad05f609e15bc8194aa930738bf0d0c78006149d2736b385bff791c2
+MISC ChangeLog 1348 SHA256 163fba679118cf0efb5e66be8612308086478a79e9079f4c2b18e581c2c3bf08 SHA512 cdb901b5dd3d14b9e7f48e7aacdd23571c3bf376b48649983a9a252822282d1ac60b30059ef3e5b2461ddcb1b53c989dba915397ef905a89a5ed68f19816faba WHIRLPOOL 9c071694bc7c29456aa6b2cbff838b1026575964703770907b9287255e49bd6b8b556387a29402499d47ec18e9bb23f1c6f8e625fc532e353fb18d47d050aeb5
+MISC metadata.xml 342 SHA256 eda29dba62d7a725415217ef270aa1981571a1a63561a41ddec4324cec22f1a8 SHA512 cffaf85a47a3f70d3196e7952f59791c7e20c90dee5e07924c06723c3d151dd1f5f19ea6f7a0975e0746c56f0be8816c90bfa969cc0318a97382beccde47770d WHIRLPOOL a586ba13e1a3a58a4952b17cce50db18db8ed1c38d8e49e717cf7122f1f6b59b9f046e10d9353749acbeb504bdb4fd9e73d6018435febfd56ebaf3ddd98e11a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlT+YREACgkQso7CE7gHKw2orgCeOj3q4+YGElFmSMqkMGtCM/L0
-hGEAnRZ+y5hPMKNg15vAPWZOIrjanj0m
-=7w0g
+iQIcBAEBCAAGBQJVhF/fAAoJEBzZQR2yrxj7D9AP/0S9y48qmSzbfbQnxr30+Fed
+OcfF7+pOHb0oYHch1JulnLm5pwRXq90viuApxFbf9TVKCy+8i47/gYHcEs3kSMkH
+tRAs6LI381X2XzhMfFjCM4p/K5/cmBiDXO68kXxV90zaWDkkzQoUyR2oyMdxMyNP
+r7hBXalakIX7ks+sba3T7OfVzheBD7P+qhQ6vj4ud/Yme893YawaivPFe5fxwuWz
+E3qOYsrsULoprzQ7nBDBrq3XErGaAgwxLU8TYSPIeKZA/vHNlrDxF5L/ua17+8JL
+G02dBLT917MiRPuXu0rCithoo8vJaiiwpWfm33JPb3Baa9Q5SacsozTEe7fnxOAF
+kBc9ZiRbPkYgL3lLcoLI7gbJQ1n+XdvRRNbbJULx7tW28VECmUvyV7SvfFzYi6J7
+8LhCJGMBUozQNNB0lViP44tT6cKuxWWxfalZdXrbts3iTXzF4V+/RxNAWpbm5Vc/
+DFKFrairzkyaaMKfXCooXt3r4i9m/g7nUUeZiXAU5KsmXKIooijqhrmQw7Icf+jv
+Q3SdWsG7kTtJqQb5nbb/8NiRDG6UN25ATx4eR80A/oefk78O8z0fDOuTek7nK4oW
+v6Hb8UO6NLb6nGs6cqQ1fQBPF/ST4e4IftD2E2C/++dWJmaWGgTbs4umzLPxoOfh
++nIWvCSNf4r8CV+dC9oF
+=eSqo
 -----END PGP SIGNATURE-----
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
 }