revbump; convert -> distutils-r1, rm old, fixes Bug #541150, endorsement provided in said bug

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 93 insertions, 91 deletions

diff --git a/dev-vcs/qct/ChangeLog b/dev-vcs/qct/ChangeLog
index c1a6ce208ec7..1d242d053bd7 100644
--- a/dev-vcs/qct/ChangeLog
+++ b/dev-vcs/qct/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/qct
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qct/ChangeLog,v 1.9 2011/01/18 12:55:44 arfrever Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qct/ChangeLog,v 1.10 2015/02/25 01:04:48 idella4 Exp $
+
+*qct-1.7-r1 (25 Feb 2015)
+
+  25 Feb 2015; Ian Delaney <idella4@gentoo.org> +qct-1.7-r1.ebuild,
+  -qct-1.7.ebuild:
+  revbump; convert -> distutils-r1, rm old, fixes Bug #541150, endorsement
+  provided in said bug
 
   18 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   qct-1.7.ebuild:
@@ -37,4 +44,3 @@
   15 Jun 2009; Ben de Groot <yngwin@gentoo.org> +files/qct.rc:
   Initial import from qting-edge overlay. Ebuild developed by Dror Levin and
   contributors in bug 162963.
-
diff --git a/dev-vcs/qct/Manifest b/dev-vcs/qct/Manifest
index 38497e21abd7..6d186d74e64f 100644
--- a/dev-vcs/qct/Manifest
+++ b/dev-vcs/qct/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX qct.rc 25 SHA256 bd57baa16b844bacc1b191cf055c2bbd412e4dffeaab14d597651bb669910d0f SHA512 61bda2332e9a9400ecbcd134a65b3a286291690afed67b91ac6773d16b23e6c3ea1615601b6a1bf79bed76b681455941ae2260167d3844c197db83bafa1a8e09 WHIRLPOOL 6d63e5594648408042aa2c1fbb703c4df40a7cf80c673f594f49be23be9fbb8f87c22a39c3b169868cda876e802ac8b400cc54b37e9385ad515665e2081dae36
 DIST qct-1.7.tar.gz 56658 SHA256 06e9969f6c8a08b67f289bc0e95b4f4469d6adbf1aa0bed0f0cc8c5bdea222d0 SHA512 85f8b6bcd5c4081ba17da1bc7e17d0036ec10d9133ed5383adbca16f81b8550d6f137e34636c20f3d03b7cedca75467daa057022374866b4e2ab18aaf7d4b6d2 WHIRLPOOL 1b806fdf090e8465e0c36e5ce6d6879d9cdc43f8906b1a13c72c6f1806c40fff6a1a77b0db59a60b9566e4ac785192a8ab498103bef249ee560899b0c05b0e2a
-EBUILD qct-1.7.ebuild 2039 SHA256 626c43cb9159b15ed3d9d519504a3e40b274f6ef77e194986c3bb1c873dc8e08 SHA512 4c2ca9795a237e127c61512d7b1dac57a732a15dd8f22802eadfae2a5fdd7ef8590396eb3e67889cae7566d5609ce56ccabb9757621e03d354a576df2095b98c WHIRLPOOL 5d4a15a8797772ede1f8d388f5ec93e7975d355064c2d4d09f4122058ff3199f145d46c3ea379a24f7999173b909a8fc74f8a23ffc4f03f1582d679252985a86
-MISC ChangeLog 1499 SHA256 9d4a0f130cbd128d3b1b20edf986816b3ba9c00dd6e430555c71ab0e5db55f46 SHA512 47476711f7bd86e50535b4e826a8c0075010e327d19b99775a31f8aeb3e45ed33522ca7acd6b65db572e2f10cfdff26a2c69e686bb9bd3f327051ab54561830c WHIRLPOOL 3e6fefe83cb4a81e95b19c0d90b25d8932e01ca0816c0b9829deb355fe2de35d9749ebc5790a06ec4ab13f86115901c09bdb89740b11e19d7560d0d26cb85793
+EBUILD qct-1.7-r1.ebuild 1712 SHA256 7f6ed6f1b33ab5c8c720490217e5e954a4b5eab489712e8ec25033cf329fae55 SHA512 511857dc3eee8c5c6ca34cfb12f80bb060945b840f7b560a84c75c5e723239f66e0ea225fb4af9ef2f2e46b47a448a40a320c1f10cb9046e3f39e09d27ac2faa WHIRLPOOL 264cadb32efa6c461bc46491c38e168717fdce1279e6f401a1c361a152156fa611f1970acf403086a6fcbef1befc1ef2511189344122d6f39f3b465b9af4a80e
+MISC ChangeLog 1711 SHA256 a28e1499b5112885ec25dd6e00d308cff88ab12574b67feba94131d4d2bfdbbd SHA512 d502707b80b8efd6393386fb69d24ef9a6ebabb86c7eb60d3f9592956c308aceba1bee546fd2b1d8ae22f0745f1f9a526eb34469a1c931ff4705fd71fa88dd0c WHIRLPOOL ac0b4c0bd05342d4ba21005ad6a786a02446fdb9b2e7b43cdc1db053edc9046c25538410095adc9cf83878c0be93362e729a11264e41db127813b9eb9bfc84da
 MISC metadata.xml 424 SHA256 e1dd8b7c429e5a2a4bf8863d9a28be90381250ca09b2fe1d3ce402998c60e179 SHA512 6e80064e9633e152194f97a03f0d3c9ddaf3444595a602fdf8c66d0e269cddc02525aea82b7c95005873f84e52a76491969f91409627722d54cadeb9fb91f056 WHIRLPOOL 528c84cb88e62a35eb41b650576d18426566125b1b7c2f6a631c3cb7a3f6bc5931f18a5ae6031ba7540edf01551075ed93f8fbc3dcaebbfd518046710f9ce4d3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlTtH8YACgkQso7CE7gHKw3mXgCfezBQ0cQ/sfPK21fIfwgntmSe
+ZcYAnArTjM1hzPSXyZG/7NDpCyhqpGLz
+=ltrf
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/qct/qct-1.7-r1.ebuild b/dev-vcs/qct/qct-1.7-r1.ebuild
new file mode 100644
index 000000000000..742a42ccab1e
--- /dev/null
+++ b/dev-vcs/qct/qct-1.7-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qct/qct-1.7-r1.ebuild,v 1.1 2015/02/25 01:04:48 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="PyQt based commit tool for many VCSs"
+HOMEPAGE="http://qct.sourceforge.net/"
+SRC_URI="http://qct.sourceforge.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bazaar cvs mercurial monotone subversion"
+
+DEPEND="app-text/asciidoc[${PYTHON_USEDEP}]
+	app-text/xmlto
+	dev-python/PyQt4[${PYTHON_USEDEP}]
+	bazaar? ( dev-vcs/bzr[${PYTHON_USEDEP}] )
+	cvs? ( dev-vcs/cvs )
+	mercurial? ( dev-vcs/mercurial[${PYTHON_USEDEP}] )
+	monotone? ( dev-vcs/monotone )
+	subversion? ( dev-vcs/subversion[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	rm qctlib/vcs/p4.py
+
+	# support for git requires cogito which isn't in portage
+	rm qctlib/vcs/git.py
+	rm qctlib/vcs/cg.py
+
+	use bazaar || rm qctlib/vcs/bzr.py
+	use cvs || rm qctlib/vcs/cvs.py
+	use mercurial || rm qctlib/vcs/hg.py
+	use monotone || rm qctlib/vcs/mtn.py
+	use subversion || rm qctlib/vcs/svn.py
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# manpage and html docs are built using asciidoc
+	make -C doc man html || die
+	doman doc/qct.1 || die
+	dohtml doc/qct.1.html || die
+
+	if use bazaar; then
+		insinto "$(python_get_sitedir)/bzrlib/plugins"
+		doins plugins/qctBzrPlugin.py
+	fi
+
+	if use mercurial; then
+		insinto "$(python_get_sitedir)/hgext"
+		doins hgext/qct.py
+		insinto /etc/mercurial/hgrc.d
+		doins "${FILESDIR}/qct.rc"
+	fi
+}
diff --git a/dev-vcs/qct/qct-1.7.ebuild b/dev-vcs/qct/qct-1.7.ebuild
deleted file mode 100644
index 43aba7642054..000000000000
--- a/dev-vcs/qct/qct-1.7.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qct/qct-1.7.ebuild,v 1.9 2011/01/18 12:55:44 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="PyQt based commit tool for many VCSs"
-HOMEPAGE="http://qct.sourceforge.net/"
-SRC_URI="http://qct.sourceforge.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bazaar cvs mercurial monotone subversion"
-
-DEPEND="app-text/asciidoc
-	app-text/xmlto
-	dev-python/PyQt4
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	mercurial? ( dev-vcs/mercurial )
-	monotone? ( dev-vcs/monotone )
-	subversion? ( dev-vcs/subversion )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	python_pkg_setup
-
-	PYTHON_MODNAME="qctlib"
-	if use bazaar; then
-		PYTHON_MODNAME+=" bzrlib/plugins/qctBzrPlugin.py"
-	fi
-	if use mercurial; then
-		PYTHON_MODNAME+=" hgext/qct.py"
-	fi
-}
-
-src_prepare() {
-	distutils_src_prepare
-
-	rm qctlib/vcs/p4.py
-
-	# support for git requires cogito which isn't in portage
-	rm qctlib/vcs/git.py
-	rm qctlib/vcs/cg.py
-
-	use bazaar || rm qctlib/vcs/bzr.py
-	use cvs || rm qctlib/vcs/cvs.py
-	use mercurial || rm qctlib/vcs/hg.py
-	use monotone || rm qctlib/vcs/mtn.py
-	use subversion || rm qctlib/vcs/svn.py
-}
-
-src_install() {
-	distutils_src_install
-
-	# manpage and html docs are built using asciidoc
-	make -C doc man html || die
-	doman doc/qct.1 || die
-	dohtml doc/qct.1.html || die
-
-	if use bazaar; then
-		install_bazaar_plugins() {
-			insinto "$(python_get_sitedir)/bzrlib/plugins" || return 1
-			doins plugins/qctBzrPlugin.py || return 1
-		}
-		python_execute_function -q install_bazaar_plugins
-	fi
-
-	if use mercurial; then
-		install_mercurial_extension() {
-			insinto "$(python_get_sitedir)/hgext" || return 1
-			doins hgext/qct.py || return 1
-		}
-		python_execute_function -q install_mercurial_extension
-		insinto /etc/mercurial/hgrc.d || die
-		doins "${FILESDIR}/qct.rc" || die
-	fi
-}