Convert to python-single-r1 (bug #515522, thanks to grknight), EAPI bump.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x1A5D023975B0583D!

3 files changed, 40 insertions, 20 deletions

diff --git a/dev-util/imediff2/ChangeLog b/dev-util/imediff2/ChangeLog
index acb5e4166f4d..af033851a68c 100644
--- a/dev-util/imediff2/ChangeLog
+++ b/dev-util/imediff2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/imediff2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/imediff2/ChangeLog,v 1.8 2014/02/11 18:30:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/imediff2/ChangeLog,v 1.9 2014/07/04 15:23:21 dev-zero Exp $
+
+*imediff2-1.1.2-r3 (04 Jul 2014)
+
+  04 Jul 2014; Tiziano Müller <dev-zero@gentoo.org> +imediff2-1.1.2-r3.ebuild,
+  -imediff2-1.1.2-r2.ebuild:
+  Convert to python-single-r1 (bug #515522, thanks to grknight), EAPI bump.
 
   11 Feb 2014; Michael Sterrett <mr_bones_@gentoo.org>
   -imediff2-1.1.2-r1.ebuild:
diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
index 5c6fbccc004c..aeddd242ce47 100644
--- a/dev-util/imediff2/Manifest
+++ b/dev-util/imediff2/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST imediff2_1.1.2.orig.tar.gz 17974 SHA256 08cff1c6638bde687cc8428ed45c3a7947b6d51ff1b1cd613f8d1062f03e8916 SHA512 54d196d67107283bc3339eba30acb1c60972f256a268e86da397e0bdafa05220facc7979638a6a917b0c2dc7171edc3aa6b188295c9f40e9debf87a63731e748 WHIRLPOOL 59f934c283bf352fc6fbf8d4ce71fd92cee33dcef18f492f10cbdad3c2dfc6137fb9a175c9915bb7c83cb423f72647d8034f04dc5f449d31fa461cba3f22b666
-EBUILD imediff2-1.1.2-r2.ebuild 928 SHA256 a3556633b22dd202596363f7678a4e5211894e3b733bb4c0fa168eddd54c6cfc SHA512 d2d01f03b54c3daa6a3eb502172d5e2a49994ecc0a3e1c7d01aa8c1576c2957f99b314aca1446ed3ee315eead59c2f644b4fcaf1bbf9928182825e28a8d9baac WHIRLPOOL d1d0a6d8ed7e5c61ca5e3ad0a8b4f3f27d35dcaacf67a7eed98df89313052741be34e3d72e98647a7f5dd813dfc05e70bccb340762fd9eea86d87527a208584b
-MISC ChangeLog 1307 SHA256 5520f90cbe9e20402a745beb58564bdb70438e18592ef901956f984eb4962ca8 SHA512 37e7dc4d347dbcdc512cf19f6a2b13deb097d826d730b18ceab2e6340f5d354d27b7071f89d1b403eca7e28f003a62636e73ac47a6d41463ede1dbf704f10bfa WHIRLPOOL 6f5044c0cc782588e9ceb46a75f2c9ad536cb53009d74e3ecc19493ee1a8dc5fe8dcb9331ab8d6e4feb07cc97c6b575793eaa05d5ea42695d3fba6e7486d303a
+EBUILD imediff2-1.1.2-r3.ebuild 867 SHA256 b31e1cc47c3ce3c55425e6a35b73f3dcd4c6cf830c5dd336b11102297c95d4d2 SHA512 0cd8f340d3619577ed9d1319ef52d57f6d7ff005ed7d441993dde8544d03bf2a01e72839d03fe3006d280f07d220008198297ea9e37abd7bfea22469fc25a6b8 WHIRLPOOL 442617fe5243b4bee72f231d973c1d5ac3a3d33ceafee62acc496022465ebd761e721771b8052c88926c2c90567a8d414baabef7ffc8d641207ee172f7694ea9
+MISC ChangeLog 1526 SHA256 5a06c3300fcf2dad9922c80da2f61ad99c5a3189b3ecb2b5ec0e1205f7a3e42e SHA512 d67b8504de33adbc19f31b57c7ceb244575a31fdad11fa9c57de9b67fcb18c8f7782c8d05fff741b468bbf9a96ef569edc7053b19d3929851616fea6abc22625 WHIRLPOOL 226fdf90d95e0e3c52bc36fe7317d005ae491a3035c0f0da435764f35dc988341f2c2c2426b4a1a9ac0c51acf6febe0ab50e17aea42c2639f4dd2d05a9f7443f
 MISC metadata.xml 236 SHA256 8db85d348f1fcca741457358302188e30b7b1c0524a9a55820b935d8bcac959e SHA512 8086fc7bc2140d0b7b96293ba80717a8dcb88b255cc3906b5ac1ec4b9c67a412d3a51ad03a19e3b700a0235d0622b525ef85289f616646d47c698b3b54157b7e WHIRLPOOL 080a90e854f29d29d005f164fba91fc9e05f362460cd8f825ecb7f16d893a1cce1f7e842bf561918a491d156c48c1d8e4a60b177ab28667c067ee379d626de68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJTtsbqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCMjM3NDkyMkQ0OTFBMUIyMzgzNkZBMkUx
+QTVEMDIzOTc1QjA1ODNEAAoJEBpdAjl1sFg9UgAP/1ZvQClZA7abAcquM1XhtUT4
+1gNZXCuC4L+bWIhsXAY+7bJyhoKZmZFVa8P1jGi0xoW+OB9vuBp9b32huINMP+l3
+c6T+a+WLSJsU3n6NKIaTUa13U8jMxjtb7rKdS5w0n1bvDu3pD/bCO11tAUYPkBog
+/1C4I5B2aEDAisqbwy6wb9MlvVFFX4v8qYgUHzVctemn8vnbQ2LOzZ7ZKkvxYEGT
+5kuv5kmnxS1XS/2WmxYknv8YOebaJKolf37EpbHGE1bKUTSCe3e1Fr6VcIAF0Ih8
+E+ITgaa7qyKAN3Z6PSNOGEh63pQ/LRG4t4mmIYA2WjMHpmdNCicIEt0KK1f54mUu
++jN/SnmFp5RboLH1gayRS+wc/QeMWOmgHXjHD14YMnCkJLbff8tQuQKOHC59csvi
+EsfkInAVIguK5Z/96a6Q0WCcLyuaFMVMo0eyq+J9nDcIRK9P1zCdo6BIp+gz/eey
++FDj3ZdPX6m5xZqe9ZzBCAMV5CPfaPIwBr9cIURIPkw2hFyrUpVsrwbFxOchgu2u
+1nPa1OSfCcRpWjtr/IHhOSL8ZAlT70W9SRpiZB+HbbNl5EIGAT8tGecDSGnPgAaS
+1KvKCpJDovfAZicvKNE8FSDO/vDAKA94f3Fdf5ihaWk9x+g/GanUaSfLscbqMraX
+7sOo4WdE6o11wkw2AJkn
+=SGzT
+-----END PGP SIGNATURE-----
diff --git a/dev-util/imediff2/imediff2-1.1.2-r2.ebuild b/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
index 1a1599531fee..11186a82ddaf 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r2.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/imediff2/imediff2-1.1.2-r2.ebuild,v 1.3 2013/08/15 03:44:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/imediff2/imediff2-1.1.2-r3.ebuild,v 1.1 2014/07/04 15:23:21 dev-zero Exp $
 
-EAPI="4"
+EAPI="5"
 
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="ncurses"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses"
 
-inherit python versionator
+inherit python-single-r1 versionator
 
 MY_P=${PN}_$(replace_version_separator 3 -)
 
@@ -20,27 +20,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-lang/python[ncurses]"
+DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 S=${WORKDIR}/${PN}
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs 2 imediff2
-}
-
 src_compile() {
 	# Otherwise the docs get regenerated :)
 	:
 }
 
 src_install() {
-	dobin imediff2
+	python_doscript imediff2
 	dodoc AUTHORS README
 	doman imediff2.1
 }