bump, fix nagging update notification, ack to Adam Mills for new patch, ack to Kent...
authorIan Delaney <idella4@gentoo.org>
Tue, 10 Mar 2015 03:12:27 +0000 (03:12 +0000)
committerIan Delaney <idella4@gentoo.org>
Tue, 10 Mar 2015 03:12:27 +0000 (03:12 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

app-emulation/playonlinux/ChangeLog
app-emulation/playonlinux/Manifest
app-emulation/playonlinux/files/playonlinux-4.1.1-not-exclude-ipv6.patch [deleted file]
app-emulation/playonlinux/files/playonlinux-4.2.6-stop-update-warning.patch [new file with mode: 0644]
app-emulation/playonlinux/metadata.xml
app-emulation/playonlinux/playonlinux-4.1.1-r1.ebuild [deleted file]
app-emulation/playonlinux/playonlinux-4.1.1.ebuild [deleted file]
app-emulation/playonlinux/playonlinux-4.2.6.ebuild [new file with mode: 0644]

index 1453bcbc7eff3ce5f711c48dc2f3ea60025567a6..6725548dd3708c99f194befb10d5b9e8ce746168 100644 (file)
@@ -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)
 
index 61a21e54719d6ac63708f6755d2fcb22ecc074bd..3115f0ba16aa66a8fb07ca89644335240b96c591 100644 (file)
@@ -1,34 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX playonlinux-4.1.1-not-exclude-ipv6.patch 976 SHA256 0064e7c74e90650d5bd6d7e030369f67096e0b04b4a6657946686b56666820b7 SHA512 158e1b47dc017d84c1679707dbf2eaf941ce04abad9ce0afee0dc6ad3702e1aa2b1673cd343c1e50e1514e8efcb3edde4d98650546086b204964491bf8a843ac WHIRLPOOL 0b2399035ce01ffd482457581270fb347e2901818305cdd1cad5942fa1297f016a9b54382a8b685f48ec47020ccf92c549a2b21e5d8c23d2fbb12ab3dd0fb5e3
 AUX playonlinux-4.2.4-binary-plugin.patch 556 SHA256 dec6a4d47ca1e54a7ce8ca372a3e30aca34910440ee6ee1126c3ec9dd0d50063 SHA512 fbba7ce997f29354498b0e8a2438b0e875f775bd36993dead7dab50db79dd08f9b2dfc6f6948895473f8e3a6a0a19d6976131ae7a2d9f5da8acbbc1512c4c99b WHIRLPOOL bca096b739950ec049714a06daa6364545f264efc61358d6e5991faea838c4e647518997701d2ead014b1af39445a04eede9f1d6b05fcfda4699baaa552f70f4
 AUX playonlinux-4.2.4-pol-bash.patch 1089 SHA256 80e4d5245ba70e207832e662879c6844e7dea4583a3913a032a96b52ddef039c SHA512 d7ac172a63a42cbcbfbd8a60566b9b55fb1e853759a7b388627d14a2dab61ff36a1c6252d5178426daada6758ad50d102546f085b24c754c9f595d91b7d5e614 WHIRLPOOL 47e197effaf091c1a3a1f1649213ef161654afc24f4dd31f5e47a14bdf05e9cddb5356b2ebf6a1fb7ca5f3242937a0ae7cde7bd87cd7bef14067dba86e158d45
+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.1.tar.gz 4010031 SHA256 eb314836ac798c7cbafdc76dc0660b2178610d3dc557d97aa7c72dfc0dee8e63 SHA512 4062f6a507e613bc46a118571fc0c6560b20adf3dd4707f581730bf1877a1fbbb234558bedd2b3be81c5ff8f9429dbc6c2030f9ad5b3b5174ff3908c3d0c43fd WHIRLPOOL 87270a50bc356cccd7347aca78d2fd63812701c8cc407b33b94636e11601d5d1bf9e7fefbf4c86195e1e4fd62506ba8c1a0e4107e93185552410ae6ec5004011
 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
-EBUILD playonlinux-4.1.1-r1.ebuild 3219 SHA256 957b1ea749917e5ec6f895ed41cdf9dd4c3540845b6511544385c5fc054eef1d SHA512 4c3447afb0deed7fafb4ac98d276d0d32447471e36dd71c06c04af4a45be3821b265ffabaece1e4b8db8c7da35bf3e10dba19b9613cdd92b6d92bda465db9a92 WHIRLPOOL 1d31fa4be4b505199a270f54095f12571d917791c34c02f79b96d77e1249c168ef736ac6e6b3dffb63a64297fe0d6749b20668c24004f3b65a7fab13d44a5b55
-EBUILD playonlinux-4.1.1.ebuild 3163 SHA256 59205f96005eaad222c07875089a7bccc81587f5d3e9705440a0b41c8e5f0767 SHA512 55375c3c7ab5641df2a1d5997c78eac660e09f5cf8636a042e1a17e531ff8935226936816aad53d73ce69acb488815e4d7484ebc0be6aad97326f55853bb5452 WHIRLPOOL 087b8efe8be4eea069f68a830cada845fa0bee604b3d09c57fcad265ea27e3cbfcbf467ac3f88f09c27c06d0399379cdd0183bb0068f6dd2a73401388141c390
+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
 EBUILD playonlinux-4.2.4.ebuild 3161 SHA256 d0b1554e6de1a1b02be2b0bf5f92d03664ff9b9652b58fa39810205dc0a72f19 SHA512 3e8949354c6ae22b58420cc77be1a2bde58bc57b2772820b367526ab533d5b857c5ee126046eba1477da30ebda0d40993b46df621502fcffb8570171b10a73c1 WHIRLPOOL a14ee8e20177b34f898d83ba380b79ef2d28fb0d736cec28d5676c7c35c20d8fffcd7a694eda81b45d384917ac83c8812a90470b4a52d94ab2c85787bb78fb20
-MISC ChangeLog 630 SHA256 e1643644e679f205f04fbe20d1baaa49bcba66c3fe4d75ae1e822b1ba1906163 SHA512 86e258580a43d7ee754e704e5e4e23bf540556cd590f37df3a39686a3d18cea4717db69b95b69e8416651484d14fef77c4870558c4ac093d97488c86ee55213e WHIRLPOOL b98962295a83d2f76ec9b878174289470f05d2cc164e93fbcee9a74893a987ad4a04d641592cecb0e6783521db22f9f29b62b8416c10e84b7fa890a0394c32de
-MISC metadata.xml 349 SHA256 533abdc56b3ce793ec1cd836a87f45fbc3f4b90202618e4bae3887ea6d2cc00b SHA512 3280af5d9614fd76deb16ab50b6afc6d08020c17d997df16780850b2d21fcc1f04ddf72849c4e58f6f10163647dcfffc664d489b601aaa4e797021d7d5db12a7 WHIRLPOOL 05d6e6f7e7e60de7cee3b1d6456a2b2bab6193e557dc202b161ac340970d745fe670ce50ffa1f6b1e12498ae1374a554285b231e8fec21347894491a136a2b62
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT4CvQAAoJEEn8cBKl3gOu5vAQAKVx4YaOJnyolY33Lsmrcuxk
-NWO3g6JT+S+27uILUSCpLp1/B+r+khePYbS0e9mDE5S03rrwpJB1KOVOWXmrUcGk
-L/Dmt+1OtsF8J4Kea9zQ/JK5roV8wW65uLBHpBP/d+J95X0IsQ11XHNDZPB9cAj+
-7Q82wZXahXNorhV7RqagHALI89FXX4t9Oz4+BuGpg+xMen0dV/EdtV1S4EaJ9Bw8
-fiFIusimGf6dKjkoQyrf91P+pN5AYAOVFvG26MdbgEf7YxNtUhyzHVDfN2T6Z2AB
-jXae+HfHlx1SSyRGMasAgxQjDGfE4RMOLQjMSBTxN82Q1YIJtI+pK+JBAX4ydK6z
-GKmz8ghGHs1gShFUr5iN3x5GRlheuZHPazcXd9PeER7TNuqi+52Xxd3tKsb2F+EQ
-AfhwD9l+9nHFkyta6G7zw29+iB1VrElCO1h1HJDa/hxeAxXxmpw/1I3IL2hJqFFE
-q2Cz3bgi4+kOOOLlXJaoN+IiRf0mxSvRKrdd2oDamVnfPmzABDL7FOXGqKe0VjTH
-QTlnw7+C19yqk+hu9zbxIOjThY2WBDodybjj32qlWNmW8lnn5zo0PBnf3DZKLrTX
-1Orc5vRvz/I28Xh39aN4qkVJVtFZt1/t/lGZCgNYM9BOdUvdoJ9QoiAdN3zg2Xh8
-9/vXRy0mDIOGFsOmHXTC
-=ug/j
+iEYEAREIAAYFAlT+YREACgkQso7CE7gHKw2orgCeOj3q4+YGElFmSMqkMGtCM/L0
+hGEAnRZ+y5hPMKNg15vAPWZOIrjanj0m
+=7w0g
 -----END PGP SIGNATURE-----
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 (file)
index c783173..0000000
+++ /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 (file)
index 0000000..3e93adb
--- /dev/null
@@ -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"):
index 598cfa299b713208b6dbe18a3c56562f38b241a0..e0ea5525f07df44d64dcf8621ae502b3aaec0530 100644 (file)
@@ -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 (file)
index ced9306..0000000
+++ /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 (file)
index b9d3485..0000000
+++ /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 (file)
index 0000000..0970bd8
--- /dev/null
@@ -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
+}