Update to EAPI5 and python-r1.eclass

(Portage version: 2.1.12.10/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)

3 files changed, 44 insertions, 36 deletions

diff --git a/app-portage/pqlop/ChangeLog b/app-portage/pqlop/ChangeLog
index 16e91f45e811..fb629b430fc1 100644
--- a/app-portage/pqlop/ChangeLog
+++ b/app-portage/pqlop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-portage/pqlop
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/pqlop/ChangeLog,v 1.2 2012/10/31 08:54:55 mgorny Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/pqlop/ChangeLog,v 1.3 2013/07/06 18:03:49 maksbotan Exp $
+
+*pqlop-0.02-r1 (06 Jul 2013)
+
+  06 Jul 2013; Maxim Koltsov <maksbotan@gentoo.org> +pqlop-0.02-r1.ebuild,
+  -pqlop-0.02.ebuild:
+  Update to EAPI5 and python-r1.eclass
 
   31 Oct 2012; Michał Górny <mgorny@gentoo.org> pqlop-0.02.ebuild:
   Use virtual for argparse.
diff --git a/app-portage/pqlop/pqlop-0.02-r1.ebuild b/app-portage/pqlop/pqlop-0.02-r1.ebuild
new file mode 100644
index 000000000000..dc3aac0f0571
--- /dev/null
+++ b/app-portage/pqlop/pqlop-0.02-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/pqlop/pqlop-0.02-r1.ebuild,v 1.1 2013/07/06 18:03:49 maksbotan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+
+inherit python-r1
+
+DESCRIPTION="emerge.log parser written in python"
+HOMEPAGE="https://bitbucket.org/LK4D4/pqlop"
+SRC_URI="https://bitbucket.org/LK4D4/pqlop/raw/${PV}/pqlop.py -> ${P}.py"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/python-argparse[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	newbin "${DISTDIR}"/${P}.py ${PN} || die "newbin failed"
+	python_replicate_script "${ED}"/usr/bin/${PN} || die "python_replicate_script failed"
+}
diff --git a/app-portage/pqlop/pqlop-0.02.ebuild b/app-portage/pqlop/pqlop-0.02.ebuild
deleted file mode 100644
index 93dd3865504b..000000000000
--- a/app-portage/pqlop/pqlop-0.02.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/pqlop/pqlop-0.02.ebuild,v 1.2 2012/10/31 08:54:55 mgorny Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="*:2.5"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit python
-
-DESCRIPTION="emerge.log parser written in python"
-HOMEPAGE="https://bitbucket.org/LK4D4/pqlop"
-SRC_URI="https://bitbucket.org/LK4D4/pqlop/raw/${PV}/pqlop.py -> ${P}.py"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/python-argparse"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	installation() {
-		newbin "${DISTDIR}/${P}.py" ${PN}-${PYTHON_ABI} || die "newbin failed"
-		python_convert_shebangs ${PYTHON_ABI} "${ED}"usr/bin/${PN}-${PYTHON_ABI}
-	}
-	python_execute_function installation
-	python_generate_wrapper_scripts "${ED}"usr/bin/${PN}
-}