app-misc/gvrng: bump to EAPI 5, port to python-r1 eclass, simplify dependencies

2 files changed, 21 insertions, 20 deletions

diff --git a/app-misc/gvrng/Manifest b/app-misc/gvrng/Manifest
index 970050b26..3ce9d6a4e 100644
--- a/app-misc/gvrng/Manifest
+++ b/app-misc/gvrng/Manifest
@@ -1,6 +1,6 @@
-AUX 01_gui_gtk_path.patch 369 RMD160 81576674969bc24c5ea3d38fb947897baee81611 SHA1 3e1399236fc014903f5f8a6e9b557ddf55981970 SHA256 2dbb95239dd9b8353178a066a022083129e4c14579b5fe196641cfa38270035a
-AUX gvrng.desktop 213 RMD160 9ceb51aba6b65649455335b1ad6fccd3dec648db SHA1 f538b7aca1dc35b831a808a54e9eea8f67a9ffaf SHA256 e86da1b114cbe4ab4b841647d2fec9e47937672fae1a55902762ce6bd5138425
-DIST GvRng_4.4.tgz 444818 RMD160 d60ee23064595de06bc7063e4109d1e69c4de8ff SHA1 2ade0265954c94a39030707e13597c7711600161 SHA256 8702e13425f5f6bc53bb61b8eafbf034d77edf7f33abaff300f158a3d1538a3e
-EBUILD gvrng-4.4.ebuild 1411 RMD160 e785c03f96a2064be599e6088f85fb289003616c SHA1 de2f67284f77ecabb04a1aec79d3317fcff7f7c2 SHA256 b5295f05dc52e3f14c23d4f4d8ec399b1ac2c906a8dde61cc45863d0530d04ae
-MISC ChangeLog 656 RMD160 7ad1ac404b92a28c2e0a69dc31dbd0797460e4f2 SHA1 b03e1e27ab598947f004ba2a08f92f0d52037c2c SHA256 03362499ae66e52616236c2149294110ec95b36be2f804daf2e4909e783e5d31
-MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
+AUX 01_gui_gtk_path.patch 369 SHA256 2dbb95239dd9b8353178a066a022083129e4c14579b5fe196641cfa38270035a SHA512 9e5ff643fe367795dd23f6245d62e117fda4ca35aaee2cc81364ac948b0f59c874d0456b5da6735458766ecd8f36d706d759c17ab7605655d2afd6ae7b22fa83 WHIRLPOOL 1b974538f8a3f2a5d3f135d54620d6f35cb8a57aee9c8ff29fd11e5f971f5638ec6ea794221e021125fb77a7064aa57814a2eb4d7a64c73894f06296898fff12
+AUX gvrng.desktop 213 SHA256 e86da1b114cbe4ab4b841647d2fec9e47937672fae1a55902762ce6bd5138425 SHA512 87332d22dcd1ce9b0eaaac3a4d4cba95c4e1f9213134b4066409416b424f9286c8cee8ecd2c13a9c941b8b317cc6366a1ea5e0f659ea1f50332f28e8214faec9 WHIRLPOOL 9aee80ec317e9ac31bf1757ac9d315cffdc2a34c610aa9866fd0a7bc2ab4aaea20150e23406ccb27854b3aeee6eb2804dfa2d1541279766873c535c8fe4765e0
+DIST GvRng_4.4.tgz 444818 SHA256 8702e13425f5f6bc53bb61b8eafbf034d77edf7f33abaff300f158a3d1538a3e SHA512 8f0029a6bbdf8870bca2f9a74445d8b8508da3091aac200393a636030b48463eb764ac7d41c4f27eb329b7d21180d21af1600b3ae1d81397357d0836ee53fdef WHIRLPOOL b9040f0bd26a208661352b5f556024c15b157421a445113d54fb395263945032a57cb5fa0be8eaedf7b6c14e2057dc3867d6ebc43a323f33d4abeb016fcf6c1b
+EBUILD gvrng-4.4.ebuild 1135 SHA256 3cc67bf00e5bed17f905b21402fd557ef130e7bf8e36e8235b8dfa5c708ac765 SHA512 2a116b88ab4e0094fc565eb754dcbc14a85ce53e2174726c99d3439b76d67400da0d928f8b921922012f14ee2e12ab73e543c9eb6f32fb97e2cb1160f2a77c77 WHIRLPOOL c4c2dda3a3b581792f0c5e42beb4550af718a679ebfd79f3afdfa08bd0147acbe3e349017dc65978ef8d60d4343f86c24ef0a9e7885d17b4692565c10c3feee4
+MISC ChangeLog 656 SHA256 03362499ae66e52616236c2149294110ec95b36be2f804daf2e4909e783e5d31 SHA512 6397f380ae8ac39b17ea46b18ab21bbe552c449dbf929968d55f94bfa3c6d449e0051750e91791ea4a4110a843e09353544578c812ffb43e2264d7e8f27760dc WHIRLPOOL ec00faa843f08d30c576963760a43c937c139bbcbc56960e0195aa354afae74bc793acd5fb5d26aaf5ef3ef1cd7a21e2a288bec8056dd18f21951b6c2b357776
+MISC metadata.xml 208 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82 SHA512 21d90d4547c76c80e50e134359dfbec42b158bbc16e4741738bdde5f67b7926d158dae1905948a477405b74e754ce4ed63cad910f220a709db8dfccf160e5288 WHIRLPOOL 33ec53f42c7a8c4c419989bd94e083c417574463e19c9c1322e6b96d0f5a6a52e3dd69fbedf2d11a7a77d24a93b81f3a604b6b33cac62548389537bf3e42df0e
diff --git a/app-misc/gvrng/gvrng-4.4.ebuild b/app-misc/gvrng/gvrng-4.4.ebuild
index 98138ece2..e8d0d5756 100644
--- a/app-misc/gvrng/gvrng-4.4.ebuild
+++ b/app-misc/gvrng/gvrng-4.4.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="5"
 
-inherit eutils
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-r1
 
 DESCRIPTION="The Guido van Robot Programming Language"
 HOMEPAGE="http://gvr.sourceforge.net"
@@ -15,14 +16,14 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="doc"
 
-DEPEND="dev-lang/python
-	>=dev-python/pygtk-2.0.0
+DEPEND="${PYTHON_DEPS}
+	dev-python/pygtk:2
 	dev-python/pygobject:2
-	>=dev-python/pygtksourceview-2.0.0"
+	dev-python/pygtksourceview:2"
 
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/GvRng_${PV}
+S="${WORKDIR}/GvRng_${PV}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/01_gui_gtk_path.patch
@@ -30,16 +31,16 @@ src_prepare() {
 
 src_install() {
 	insinto /usr/share/${PN}
-	doins -r *.py gvrngrc gui-gtk bitmaps gvr_progs locale po || die "Failed to install files"
-	dodoc Changelog docs/Summary-en.txt || die "Failed to install docs"
+	doins -r *.py gvrngrc gui-gtk bitmaps gvr_progs locale po
+	dodoc Changelog docs/Summary-en.txt
 	if use doc; then
-		dohtml -r docs/tutorial.html docs/lessons || die "Failed to install tutorial and lessons"
+		dohtml -r docs/tutorial.html docs/lessons
 	fi
-	fperms 755 /usr/share/${PN}/gvrng.py || die "Failed to set permissions on gvrng.py"
-	dodir /usr/bin || die "Failed to create /usr/bin"
-	dosym /usr/share/${PN}/gvrng.py /usr/bin/gvrng || die "Failed to create symlink"
-	domenu "${FILESDIR}"/gvrng.desktop || die "Failed to copy desktop file"
-	doman docs/gvrng.1.gz  || die "Failed to install man page"
+	fperms 755 /usr/share/${PN}/gvrng.py
+	dodir /usr/bin
+	dosym /usr/share/${PN}/gvrng.py /usr/bin/gvrng
+	domenu "${FILESDIR}"/gvrng.desktop
+	doman docs/gvrng.1.gz
 }
 
 pkg_postinst() {