Bump to new python eclasses

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 71 insertions, 59 deletions

diff --git a/x11-apps/whyteboard/ChangeLog b/x11-apps/whyteboard/ChangeLog
index 2df76e8e579b..bbdd46848d75 100644
--- a/x11-apps/whyteboard/ChangeLog
+++ b/x11-apps/whyteboard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/whyteboard
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/whyteboard/ChangeLog,v 1.6 2014/08/10 20:07:33 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/whyteboard/ChangeLog,v 1.7 2015/03/20 16:34:47 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> metadata.xml,
+  whyteboard-0.41.1.ebuild:
+  Bump to new python eclasses
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> whyteboard-0.41.1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/x11-apps/whyteboard/Manifest b/x11-apps/whyteboard/Manifest
index 4209105570cd..c4e268346f8d 100644
--- a/x11-apps/whyteboard/Manifest
+++ b/x11-apps/whyteboard/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX whyteboard.desktop 316 SHA256 cb23a02f01c4efd79d76bd027c0bfcc3218632e125ab2273ecf75c7bc4b9625c SHA512 0caa79de89d7e82635165074695c19a8b860691db71a96f47329cd3d0d0ba90d4ce53041f72a066464da8c163bc8ac7d5f178835a1a829d4a0514df388f7d802 WHIRLPOOL 02d43ee35eee9801478fbe3be960e2bea03e4d6574e18c087b875cbbee7b592720e5133da8fe2b4db85715beb2071f5c2f8384ccd0f4c8aeab78784b1aa4c65b
-DIST whyteboard-0.41.1.tar.gz 372110 SHA256 2d054981736f905a5c690b73bf2eedbb32337e61e099e87aeae52681f9d83125
-DIST whyteboard.png 7601 SHA256 cd1188ebc24c7fc139052269a528e12c4cb4943195c626a73604ea9b2cf042af
-EBUILD whyteboard-0.41.1.ebuild 1384 SHA256 a421add24fccc18f755239e8e15b6fc87eb549762741aeaf212bdda061aec741 SHA512 dfa970c74746309684617a2c4b430452e1d8c4e6f20a42da8b8194db34386038de20b3c5072eb82fd8565b9e06e58bf7e6b179e2edf653aef457851362b3ebc9 WHIRLPOOL 8b974c255bebff216d38e8146a63c8bdfdd211ef9e8d7d465ea5ecdd436eb97c7b152658ad47034f039c88294d9f277e36c9dfd91f486f678f0dd33b386c117c
-MISC ChangeLog 1062 SHA256 5c0a4c52e18571f221f03b10e4ee2102ac156c6853ed10d0ded48245c3e91662 SHA512 89e6b22c2330f656284c00c329ceee5a693fabd36adc0771a58b4c816f0e56296171b6a324e86dbadb92bf044d9200b0882fa933ad2ae7e18a84eeb205f56bdd WHIRLPOOL abd22295d3e01727c604c8964e9f7e6bf24ba73c4d561bc20ab5bf9f625a1f159db2a0a6b4ff62d8f1bf638b64401fc0ade4fb11dfcd5bd864191700f39396b9
-MISC metadata.xml 793 SHA256 5880f43d9e91cc34f327e8e7b60a024ac34ced2ed487f422d8da07e8f7c2fc9b SHA512 4eb0ba814d421c45f586f3cc285cbf354a322750dabb471e32efb03ce14c41df656f28523d43eeb040c5f4e1e2efad484c7fee556fb7e4491a1c00f4aa030cfc WHIRLPOOL 12a8e67e7e30a15ee2e0d42ad0eaf67f6ff0af37c4f173a4c55442960b3b53109c69570033ae4356acb37846f2f51c9dd00dfe037f22daa6b8cbdee2f6f0d7b7
+DIST whyteboard-0.41.1.tar.gz 372110 SHA256 2d054981736f905a5c690b73bf2eedbb32337e61e099e87aeae52681f9d83125 SHA512 c2f789846c5c611047b590109a49b6c28c51e5c84a7d2399f025b5b79d3c633577106aba79f76f0244bc175cbd3169cd8a53221d08ca94ddf39be01406fd429e WHIRLPOOL fd24754077f07f12c9401878b7ecf34a30e0539b36ae97216386f8b68989241316f7c9705b5e8296685bd28d9ace4c2cb96baa5f22cb6102f42aa1ccea9642f4
+DIST whyteboard.png 7601 SHA256 cd1188ebc24c7fc139052269a528e12c4cb4943195c626a73604ea9b2cf042af SHA512 384b0e6de138d3d193c3fbf02dbfe53273d24d88e9665b04cbc8b826d29b7aa7ff8ad916a39cfb6e44d0518da1229546a230369d55b1ae86cab5152ceb33f4fe WHIRLPOOL 5894486aff445929558f494e71cab58cf3f7ceb3c4a0d43ff8524bca47ac69532a2fd044bcbb938ac0edae268439b422809be8e66e840dfccdd9074a7129367b
+EBUILD whyteboard-0.41.1.ebuild 1188 SHA256 e63a3fd4781db7ef15ec1f1e347e438c74dd1805fdc5fe0cf00af1c47f4f561f SHA512 76df304fd5a2e65f6fb1c935c9fb1b66632592be99c8d9613514b21a591266f359a305ae63998197128fa4868952313f7181e23b411d3e6de80679656db2f6f7 WHIRLPOOL 736edb11384692ccfdb44d10e4c086e6d33c237fd0ad5831dee88772b890858f56206a10b75a5987bc6c1fddf6580a26391c00bbc8feaa662cb80727e55578c5
+MISC ChangeLog 1180 SHA256 5a7adb3f88918f98eb62484aab62486ff475da20eaeaed7e979c9f25a7fb4fda SHA512 c2786e5c8d2bda5806f66c66973205c2cb18d0f100a4ffdd60b98eb711f93b39467e25616436f2f74e95c16555d12007468d08af828d8da60ea509faa1baafea WHIRLPOOL 4ccac8077a0dafe2032ccbe0c569c537e818a6913969403018e84e2fc9c677b2a8aacb7c58a345ce795d37848f3dbc27765ccd38521ec1ec1a3c8f0316d500a9
+MISC metadata.xml 816 SHA256 97ba302455706872ea584bc4d5d5d6deaef68a52b480843e934a4eafd3b3bb80 SHA512 3f1e3b675792c575fd6d2f3a24d6923d4e466d660e06b3b441a08bf4cec29a351b737c21b56e217c8f0de011672a9d2b03b2ef764becbf85c146aad4ce7bdec4 WHIRLPOOL 2e990ca5403e044c6ce7841e98879bc2482fa394f5bfb564fef1617358e45867745263061d17bbe1d96423d4e81702442de6097492b824c2353d38e981ac3ae7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0QYACgkQcaHudmEf86pjegCeKIrttKXajYyaI97MGvTvZr2w
-hBQAoIEqGg+9KkqZ6ln9LjsHmpp9GEst
-=veYQ
+iQJ8BAEBCgBmBQJVDEwoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirkEAP/25EtP2UFOsSrMwQUhks8x7i
+IR1Xq5g4nf/GqMsXvz6hb2LORdv/aq0EkcLOuFvfOCFFi5h7qu4nfUjmj1V1wS15
+u8PLcjjp7PtN8tr/0CKdSv00Z1Fd4CTmSo5Fb7/r7ahXZRmY1WqVDIuEDMuEZTfl
+w6lGWDr1r7yxP+l428gPqNkC1tdtKpAzfGmuGqcuIWuVK5GWaIEaVLO87ounqo9T
+Qrgr40BHEwTEihbpAMnNjg1mNPvxddsec0xsf1pp+dM6sKyAC8KZvbadA7C/XO7x
+/+QlFZCuJynmHlEWGkTaANnuOibi82oX5bbDwCGDjcTEe4OnjkRRW1KGe3PmAvai
+D1+aTc039Q8pd/d4Rfo9VdWjvJBD2M0vo4BK7mdyVFKNmaUhOesEfs8tVoc+e7+t
+Lzkb3Y0vsVAZoBozy3+n0tjnnhf58ylLOePU8KkPbxHwU/7TJQ4pFb+9bG/wSulT
+dJtijHg9c7DaVyH8ZYc047D4EtOZlDhM61iMlaqWeG+7OrGDW6rqXYb2n6XMgmnR
+JwHKlLIsCNcr9NKF7fj6IhVlFV+Gh30Hqh+3H1mSjciuvtxV8kadfFYaSTbdRwRC
+P9FBL00LpFxBTcHoj9rubeYFY9iiLubtRhh4RxgK3QHREGIPsTpuXbUx1dTq7T9I
+LQuCljmuuQlCrg7YKoVV
+=jjEg
 -----END PGP SIGNATURE-----
diff --git a/x11-apps/whyteboard/metadata.xml b/x11-apps/whyteboard/metadata.xml
index d3654d853aad..e86319d033f7 100644
--- a/x11-apps/whyteboard/metadata.xml
+++ b/x11-apps/whyteboard/metadata.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-	<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-	<pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
-		<email>lxnay@gentoo.org</email>
-		<name>Fabio Erculiani</name>
-		<description>Maintainer. Assign bugs to him</description>
-	</maintainer>
-	<maintainer>
-		<email>ziapannocchia@gmail.com</email>
-		<name>Marco Clocchiatti</name>
-		<description>Proxy maintainer. CC him on bugs</description>
-	</maintainer>
-	<longdescription lang="en">A simple image, PDF and postscript file annotator.</longdescription>
-	<upstream>
-		<maintainer status="active" >
-			<email></email>
-			<name>Steven Sproat</name>
-		</maintainer>
-		<remote-id type="google-code">http://whyteboard.org/</remote-id>
-	</upstream>
-	<use>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>lxnay@gentoo.org</email>
+    <name>Fabio Erculiani</name>
+    <description>Maintainer. Assign bugs to him</description>
+  </maintainer>
+  <maintainer>
+    <email>ziapannocchia@gmail.com</email>
+    <name>Marco Clocchiatti</name>
+    <description>Proxy maintainer. CC him on bugs</description>
+  </maintainer>
+  <longdescription lang="en">A simple image, PDF and postscript file annotator.</longdescription>
+  <upstream>
+    <maintainer status="active">
+      <email/>
+      <name>Steven Sproat</name>
+    </maintainer>
+    <remote-id type="google-code">http://whyteboard.org/</remote-id>
+  </upstream>
+  <use>
 	</use>
 </pkgmetadata>
diff --git a/x11-apps/whyteboard/whyteboard-0.41.1.ebuild b/x11-apps/whyteboard/whyteboard-0.41.1.ebuild
index eb699048c369..3742ca4267a8 100644
--- a/x11-apps/whyteboard/whyteboard-0.41.1.ebuild
+++ b/x11-apps/whyteboard/whyteboard-0.41.1.ebuild
@@ -1,48 +1,44 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/whyteboard/whyteboard-0.41.1.ebuild,v 1.4 2014/08/10 20:07:33 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/whyteboard/whyteboard-0.41.1.ebuild,v 1.5 2015/03/20 16:34:47 jlec Exp $
 
-EAPI="3"
+EAPI=5
 
-PYTHON_DEPEND="2" # Upstream doesn't support Python 3.x
+PYTHON_COMPAT=( python2_7 )
 
-inherit eutils python multilib
+inherit eutils python-single-r1 multilib
 
 DESCRIPTION="A simple image, PDF and postscript file annotator"
+HOMEPAGE="http://code.google.com/p/whyteboard"
+SRC_URI="
+	http://whyteboard.googlecode.com/files/${P}.tar.gz
+	http://dev.gentoo.org/~lxnay/${PN}/${PN}.png"
+
 LICENSE="ISC"
 SLOT="0"
-IUSE=""
-
-HOMEPAGE="http://code.google.com/p/whyteboard"
-SRC_URI="http://whyteboard.googlecode.com/files/${P}.tar.gz http://dev.gentoo.org/~lxnay/${PN}/${PN}.png"
 KEYWORDS="~amd64 ~x86"
+IUSE=""
 
+DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
-	dev-python/wxpython
+	dev-python/wxpython:*[${PYTHON_USEDEP}]
 	media-gfx/imagemagick"
 
 src_install() {
-	dodir /usr/bin
-	dodir /usr/share/applications
-	dodir /usr/share/pixmaps
+	doicon "${DISTDIR}"/${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
 
-	insinto /usr/share/pixmaps
-	doins "${DISTDIR}/${PN}.png" || die
-	domenu "${FILESDIR}/${PN}.desktop" || die
+	dodoc CHANGELOG.txt DEVELOPING.txt README.txt TODO.txt
 
-	dodoc CHANGELOG.txt DEVELOPING.txt README.txt TODO.txt || die
-
-	local appdir="$(python_get_sitedir)/${PN}"
-	dodir "${appdir}"
-	insinto "${appdir}"
-	doins -r images 'locale' "${PN}" "${PN}-help" "${PN}.py" || die
+	python_domodule images locale ${PN} ${PN}-help ${PN}.py
 
 	cat >> "${T}/${PN}" <<- EOF
 	#!/bin/sh
-	exec $(PYTHON) -O "$(python_get_sitedir)/${PN}/${PN}.py"
+	exec ${PYTHON} -O "$(python_get_sitedir)/${PN}/${PN}.py"
 	EOF
-	exeinto /usr/bin
-	doexe "${T}/${PN}" || die
+	dobin "${T}/${PN}"
+
+	python_optimize
 }
 
 pkg_preinst() {