Bump to new python eclasses

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 49 insertions, 49 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/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() {