[x11-plugins/cd-plugins-thirdparty] Bump EAPI and port to python-single-r1 eclass.

4 files changed, 28 insertions, 33 deletions

diff --git a/x11-plugins/cd-plugins-thirdparty/ChangeLog b/x11-plugins/cd-plugins-thirdparty/ChangeLog
index 17cecfe..5ce5edf 100644
--- a/x11-plugins/cd-plugins-thirdparty/ChangeLog
+++ b/x11-plugins/cd-plugins-thirdparty/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for x11-plugins/cd-plugins-thirdparty
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Feb 2017; Dustin Polke <DuPol@gmx.de> -cd-plugins-thirdparty-3.0.ebuild,
+  +cd-plugins-thirdparty-3.0-r1.ebuild, metadata.xml:
+  Bump EAPI and port to python-single-r1 eclass.
+
   23 May 2012; Dustin Polke <DuPol@gmx.de>
   -cd-plugins-thirdparty-2.4-r1.ebuild:
   Drop old.
diff --git a/x11-plugins/cd-plugins-thirdparty/Manifest b/x11-plugins/cd-plugins-thirdparty/Manifest
index e0331a3..b6a7c8c 100644
--- a/x11-plugins/cd-plugins-thirdparty/Manifest
+++ b/x11-plugins/cd-plugins-thirdparty/Manifest
@@ -1,6 +1,3 @@
-DIST Pidgin-3.0.tar.gz 480780 RMD160 3fe34bbd079d2f9bf4555aca400448116377f9ca SHA1 c71b84963609bfe53b6e89638507e76ae38bb38d SHA256 a2395458c0065e5345c00f33c6a8ede8df93b968f123acf61d8961923f95a7f4
-DIST Pidgin-Purple-theme.tar.bz2 173287 RMD160 6d04554b286fb21a53e5eefdabec9d13c3ac9bc7 SHA1 f65ee11e33ff75f4f47d3374862ae052edae9984 SHA256 e0d2893a3d28a978105d9d8a1b2b6abf0159174523c7315c4a852d88510cd270
-DIST Xchat-3.0.tar.gz 8720 RMD160 36c9bd11189a77ded07ad722f8096270ae8c0081 SHA1 d646c88c51e450469ea814f2772ab3459b04422d SHA256 19e136b534a47b5bb12255876fe8b4f64fbb24482b3a7ae91893b0d277c69aa8
-EBUILD cd-plugins-thirdparty-3.0.ebuild 1638 RMD160 6476749412eab3d66926e1472d56886349751319 SHA1 ce3d5c9523155904e459a263f6cd3e9f7e9cf11c SHA256 94b9b91c89ae8fa015ae8b6732a362ec300829ac200a54f7c70f0a22e644a4c7
-MISC ChangeLog 1877 RMD160 a4a40f8c3f545df91889149e4072a37c5a6471b5 SHA1 f6b6e81e77b259bebe5c620c1803d673e3098e95 SHA256 45120d7def1c029666323e4500b4b9f92a11f62711a15a02793c387423fb8473
-MISC metadata.xml 541 RMD160 1efcc9a78e7b747a825ba67ddddbaafa14496524 SHA1 8ed9b69e021f7e8f5a9f01d5ed8c1ac2e324d536 SHA256 b88f0b87dfd094c61af9a9146e3744f137496dfe48cc5504ff82a62196e310a3
+DIST Pidgin-3.0.tar.gz 480780 SHA256 a2395458c0065e5345c00f33c6a8ede8df93b968f123acf61d8961923f95a7f4 SHA512 d1473f95a86ba4d1f8f99294e212844c78a92a7b02bd963bf3d6154f9122c60109672afa97e5558f6398a670e83019df201a04b30d4788bec5c4aed06953baed WHIRLPOOL 3ac1ceacd613bc8bd325aa54033e06d6a2c87130b772e7d27ae6df0a839bc0819feee4e78864b77252fd8d9307309b0e20049181e0406a40ddc9c6dbe6bd868f
+DIST Pidgin-Purple-theme.tar.bz2 173287 SHA256 e0d2893a3d28a978105d9d8a1b2b6abf0159174523c7315c4a852d88510cd270 SHA512 2e4b995b83434e5999e803aa84ba922742a544204bc25e86bf1903e1f9c1ca6fd77daa185f436c9f3ecd1ae67cfc15bc601ad2b8e42f956233027f919ff26620 WHIRLPOOL fbc011a222f35288bae0d8cb572056f545b6532f23174ad2f0832fbb2b3aa13af28fb1469d8106f0df25f98f563f1b608bcc64536dacc447005e4944cc604062
+DIST Xchat-3.0.tar.gz 8720 SHA256 19e136b534a47b5bb12255876fe8b4f64fbb24482b3a7ae91893b0d277c69aa8 SHA512 31fa964ed1e476e05dd105febe63647883c19e7e247c30ce703beb78a736f2f9c935e1aa43004c4f4fa0482c41e6e9fa72252e3d3331ab61e1a19ec88ba5b1ca WHIRLPOOL 65113a58b76d6f3db17181aae368f1823eda65dbf6dd61b91a986dc383c68c7d1a1a67dc9216812af8d92b9924e3aaa7376b3329e7ccd87d1def97b8d9fcf068
diff --git a/x11-plugins/cd-plugins-thirdparty/cd-plugins-thirdparty-3.0.ebuild b/x11-plugins/cd-plugins-thirdparty/cd-plugins-thirdparty-3.0-r1.ebuild
index b265007..ab44552 100644
--- a/x11-plugins/cd-plugins-thirdparty/cd-plugins-thirdparty-3.0.ebuild
+++ b/x11-plugins/cd-plugins-thirdparty/cd-plugins-thirdparty-3.0-r1.ebuild
@@ -1,13 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
 
-EAPI="4"
-PYTHON_DEPEND="2"
-#SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit multilib python
+inherit multilib python-single-r1
 
 DESCRIPTION="Third-party plugins for cairo-dock"
 HOMEPAGE="http://www.glx-dock.org/mc_album.php?a=8"
@@ -21,20 +18,17 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="pidgin xchat"
-REQUIRED_USE="|| ( ${IUSE} )"
+REQUIRED_USE="|| ( ${IUSE} )
+	${PYTHON_REQUIRED_USE}"
 
-RDEPEND="=x11-plugins/cd-plugins-core-${PV}*[python]"
+RDEPEND="=x11-plugins/cd-plugins-core-${PV}*[python]
+	${PYTHON_DEPS}"
 DEPEND=""
 
 S="${WORKDIR}"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
-	python_convert_shebangs -r 2 .
+	python_fix_shebang .
 	# fix preview link
 	if use pidgin; then
 		mv Pidgin/themes/Eve-Wall-E/preview{@,} || die
diff --git a/x11-plugins/cd-plugins-thirdparty/metadata.xml b/x11-plugins/cd-plugins-thirdparty/metadata.xml
index bf358bb..c4a6c89 100644
--- a/x11-plugins/cd-plugins-thirdparty/metadata.xml
+++ b/x11-plugins/cd-plugins-thirdparty/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<use>
-		<flag name="pidgin">Installs Pidgin plugin for <pkg>x11-misc/cairo-dock</pkg>.</flag>
-		<flag name="xchat">Installs XChat plugin for <pkg>x11-misc/cairo-dock</pkg>.</flag>
-	</use>
-	<longdescription>
-		cd-plugins-thirdparty offers third-party plugins for <pkg>x11-misc/cairo-dock</pkg>.
-	</longdescription>
-	<maintainer>
-		<email>DuPol@gmx.de</email>
-		<name>Dustin Polke</name>
-	</maintainer>
+<use>
+	<flag name="pidgin">Installs Pidgin plugin for <pkg>x11-misc/cairo-dock</pkg>.</flag>
+	<flag name="xchat">Installs XChat plugin for <pkg>x11-misc/cairo-dock</pkg>.</flag>
+</use>
+<longdescription>
+	cd-plugins-thirdparty offers third-party plugins for <pkg>x11-misc/cairo-dock</pkg>.
+</longdescription>
+<maintainer type="person">
+	<email>DuPol@gmx.de</email>
+	<name>Dustin Polke</name>
+</maintainer>
 </pkgmetadata>