[gentoo-commits] repo/gentoo:master commit in: media-gfx/birdfont/files/, media-libs/libxmlbird/files/, media-gfx/birdfont/, ...

[gentoo-commits] repo/gentoo:master commit in: media-gfx/birdfont/files/, media-libs/libxmlbird/files/, media-gfx/birdfont/, ...

[Mike Frysinger]

commit:     808cbd7400602ae010e5ab0dcdaf8db9cfa87a99
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 21:11:14 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed May 18 21:12:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=808cbd74

media-libs/libxmlbird & media-gfx/birdfont: switch to doit

Use the system version of doit so we can get parallel build support.
The tiny bundled wrapper can only build serially.

 media-gfx/birdfont/birdfont-2.15.5.ebuild                  |  6 +++---
 media-gfx/birdfont/files/birdfont-2.5.1-verbose.patch      | 10 ----------
 media-libs/libxmlbird/files/libxmlbird-1.2.0-verbose.patch | 10 ----------
 media-libs/libxmlbird/libxmlbird-1.2.0.ebuild              |  8 +++++---
 4 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/media-gfx/birdfont/birdfont-2.15.5.ebuild b/media-gfx/birdfont/birdfont-2.15.5.ebuild
index 2a6deaf..26b66e7 100644
--- a/media-gfx/birdfont/birdfont-2.15.5.ebuild
+++ b/media-gfx/birdfont/birdfont-2.15.5.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 PLOCALES="cs de it sv"
 
-inherit python-any-r1 vala l10n toolchain-funcs multilib eutils
+inherit python-any-r1 vala l10n toolchain-funcs multilib eutils multiprocessing
 
 DESCRIPTION="free font editor which lets you create vector graphics and export TTF, EOT and SVG fonts"
 HOMEPAGE="https://birdfont.org/"
@@ -34,13 +34,13 @@ RDEPEND="dev-db/sqlite:3
 	)"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/doit[${PYTHON_USEDEP}]')
 	$(vala_depend)
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
 	vala_src_prepare
 
-	epatch "${FILESDIR}"/${PN}-2.5.1-verbose.patch
 	epatch "${FILESDIR}"/${PN}-2.15.5-configure-valac.patch
 
 	sed -i \
@@ -75,7 +75,7 @@ src_configure() {
 }
 
 src_compile() {
-	v ./build.py
+	v doit run -n $(makeopts_jobs)
 }
 
 src_install() {

diff --git a/media-gfx/birdfont/files/birdfont-2.5.1-verbose.patch b/media-gfx/birdfont/files/birdfont-2.5.1-verbose.patch
deleted file mode 100644
index b44a28d..0000000
--- a/media-gfx/birdfont/files/birdfont-2.5.1-verbose.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/scripts/run.py
-+++ b/scripts/run.py
-@@ -20,6 +20,7 @@ import subprocess
- 
- def run(cmd):
- 	cmd = "sh -c \"" + cmd.replace ("\"", "\\\"") + "\""
-+	print(cmd)
- 	process = subprocess.Popen (cmd, shell=True)
- 	process.communicate()[0]
- 	if not process.returncode == 0:

diff --git a/media-libs/libxmlbird/files/libxmlbird-1.2.0-verbose.patch b/media-libs/libxmlbird/files/libxmlbird-1.2.0-verbose.patch
deleted file mode 100644
index b44a28d..0000000
--- a/media-libs/libxmlbird/files/libxmlbird-1.2.0-verbose.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/scripts/run.py
-+++ b/scripts/run.py
-@@ -20,6 +20,7 @@ import subprocess
- 
- def run(cmd):
- 	cmd = "sh -c \"" + cmd.replace ("\"", "\\\"") + "\""
-+	print(cmd)
- 	process = subprocess.Popen (cmd, shell=True)
- 	process.communicate()[0]
- 	if not process.returncode == 0:

diff --git a/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild b/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild
index 0934a67..d321727 100644
--- a/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild
+++ b/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI="5"
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
-inherit python-any-r1 vala toolchain-funcs multilib eutils
+inherit python-any-r1 vala toolchain-funcs multilib eutils multiprocessing
 
 DESCRIPTION="XML parser written in Vala"
 HOMEPAGE="https://birdfont.org/xmlbird.php"
@@ -19,10 +19,12 @@ IUSE=""
 # The test build logic needs work.  Doesn't respect compiler settings.
 RESTRICT="test"
 
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/doit[${PYTHON_USEDEP}]')"
+
 src_prepare() {
 	vala_src_prepare
 
-	epatch "${FILESDIR}"/${PN}-1.2.0-verbose.patch
 	epatch "${FILESDIR}"/${PN}-1.2.0-configure-valac.patch
 	epatch "${FILESDIR}"/${PN}-1.2.0-libdir.patch
 
@@ -50,7 +52,7 @@ src_configure() {
 }
 
 src_compile() {
-	v ./build.py
+	v doit run -n $(makeopts_jobs)
 }
 
 src_install() {