[gentoo-commits] repo/gentoo:master commit in: app-text/queequeg/

[gentoo-commits] repo/gentoo:master commit in: app-text/queequeg/

[Michał Górny]

commit:     0a185ef67e4e2c0cb752b27dd137204129ead4bc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 09:41:38 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 09:44:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a185ef6

app-text/queequeg: python-single-r1, EAPI=6

 ...ueequeg-0.91.ebuild => queequeg-0.91-r1.ebuild} | 43 ++++++++--------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/app-text/queequeg/queequeg-0.91.ebuild b/app-text/queequeg/queequeg-0.91-r1.ebuild
similarity index 55%
rename from app-text/queequeg/queequeg-0.91.ebuild
rename to app-text/queequeg/queequeg-0.91-r1.ebuild
index b89272f9f4..5fe6a7a558 100644
--- a/app-text/queequeg/queequeg-0.91.ebuild
+++ b/app-text/queequeg/queequeg-0.91-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
-PYTHON_DEPEND="2"
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
 
-inherit python
+inherit python-single-r1
 
 DESCRIPTION="A checker for English grammar, for people who are not native English"
 HOMEPAGE="http://queequeg.sourceforge.net/"
@@ -19,15 +19,6 @@ IUSE=""
 DEPEND="app-dicts/wordnet"
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r ${PYTHON_ABI} .
-}
-
 src_compile() {
 	local dictdir=/usr/dict
 
@@ -35,28 +26,24 @@ src_compile() {
 		dictdir=/usr/share/wordnet/dict
 	fi
 
-	emake dict WORDNETDICT=${dictdir} || die
+	emake dict WORDNETDICT=${dictdir}
+
+	python_fix_shebang qq
 }
 
 src_install() {
-	local prefix=$(python_get_sitedir)/${PN}
+	local prefix=/usr/lib/queequeg
 
-	insinto ${prefix}
-	doins *.py
+	python_moduleinto "${prefix}"
+	python_domodule *.py
+	insinto "${prefix}"
 	[[ -f "dict.txt" ]] && doins dict.txt || doins dict.cdb
 
-	exeinto ${prefix}
+	exeinto "${prefix}"
 	doexe qq
-	dosym ${prefix}/qq /usr/bin/qq
+	dodir /usr/bin
+	dosym ../lib/queequeg/qq /usr/bin/qq
 
 	dodoc README TODO
-	dohtml htdocs/*
-}
-
-pkg_postinst() {
-	python_mod_optimize queequeg
-}
-
-pkg_postrm() {
-	python_mod_cleanup queequeg
+	dodoc htdocs/*
 }

[gentoo-commits] repo/gentoo:master commit in: app-text/queequeg/

[David Seifert]

commit:     519caf33e1de10d931c258e4c5c03402044b32b2
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 10:53:04 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 10:53:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=519caf33

app-text/queequeg: Add missing Python variables

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../queequeg/{queequeg-0.91-r1.ebuild => queequeg-0.91-r2.ebuild}    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-text/queequeg/queequeg-0.91-r1.ebuild b/app-text/queequeg/queequeg-0.91-r2.ebuild
similarity index 91%
rename from app-text/queequeg/queequeg-0.91-r1.ebuild
rename to app-text/queequeg/queequeg-0.91-r2.ebuild
index 5fe6a7a558..4c411f3c3d 100644
--- a/app-text/queequeg/queequeg-0.91-r1.ebuild
+++ b/app-text/queequeg/queequeg-0.91-r2.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=6
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit python-single-r1
@@ -15,8 +16,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="app-dicts/wordnet"
+DEPEND="${PYTHON_DEPS}
+	app-dicts/wordnet"
 RDEPEND="${DEPEND}"
 
 src_compile() {