[gentoo-commits] proj/gnome:master commit in: dev-util/gdbus-codegen/files/, dev-util/gdbus-codegen/

["Dennis Lamm" <expeditioneer@gentoo.org>]

commit:     a3c788add00d768e3ff651d4b330590c60323975
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 15:00:13 2018 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 15:00:13 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=a3c788ad

dev-util/gdbus-codegen: version bump

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 .../files/gdbus-codegen-2.40.0-sitedir.patch       | 31 -----------
 .../files/gdbus-codegen-2.54.2-sitedir.patch       |  3 +-
 dev-util/gdbus-codegen/gdbus-codegen-2.54.2.ebuild |  4 +-
 ...n-2.54.2.ebuild => gdbus-codegen-2.54.3.ebuild} |  4 +-
 dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild   | 65 ++++++++--------------
 5 files changed, 29 insertions(+), 78 deletions(-)

diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.40.0-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.40.0-sitedir.patch
deleted file mode 100644
index ffeb17ba..00000000
--- a/dev-util/gdbus-codegen/files/gdbus-codegen-2.40.0-sitedir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 626f79dcfb1f26997f2807829c6fa19f6c3303f5 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Sun, 20 Jan 2013 20:25:13 +0330
-Subject: [PATCH] glib-2.35.4-external-gdbus-codegen
-
----
- gio/gdbus-2.0/codegen/gdbus-codegen.in | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-index 253d151..2295481 100644
---- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
-+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-@@ -29,13 +29,7 @@ srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None)
- 
- if srcdir is not None:
-     path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
--elif os.name == 'nt':
--    # Makes gdbus-codegen 'relocatable' at runtime on Windows.
--    path = os.path.join(os.path.dirname(__file__), '..', 'share', 'glib-2.0')
- else:
--    path = os.path.join('@datadir@', 'glib-2.0')
--
--sys.path.insert(0, os.path.abspath(path))
--from codegen import codegen_main
-+    from gdbus_codegen import codegen_main
- 
- sys.exit(codegen_main.codegen_main())
--- 
-1.8.1
-

diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.2-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.2-sitedir.patch
index de90afc3..fc003abc 100644
--- a/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.2-sitedir.patch
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.2-sitedir.patch
@@ -3,8 +3,7 @@ From: Sobhan Mohammadpour <mohammadpour.sobhan@gmail.com>
 Date: Thu, 14 Dec 2017 17:10:50 +0330
 Subject: [PATCH] glib-2.54.2 external gdbus codegen
 
-based on gdbus-codegen-2.40.0-sitedir.patch
----
+--
  gio/gdbus-2.0/codegen/gdbus-codegen.in | 11 +----------
  1 file changed, 1 insertion(+), 10 deletions(-)
 

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.54.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.54.2.ebuild
index 52e4ec78..a2092104 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.54.2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.54.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 GNOME_ORG_MODULE="glib"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="xml"

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.54.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
similarity index 96%
copy from dev-util/gdbus-codegen/gdbus-codegen-2.54.2.ebuild
copy to dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
index 52e4ec78..cf8d58e5 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.54.2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 GNOME_ORG_MODULE="glib"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="xml"

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
index 34284cbd..2ed677e5 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
@@ -1,68 +1,52 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
-inherit eutils python-r1
+inherit gnome.org distutils-r1
 if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://git.gnome.org/${GNOME_ORG_MODULE}"
-	inherit autotools git-2
-else
-	inherit gnome.org
+	inherit git-r3
 fi
 
 DESCRIPTION="GDBus code and documentation generator"
 HOMEPAGE="http://www.gtk.org/"
 
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://git.gnome.org/browse/${GNOME_ORG_MODULE}"
+	SRC_URI=""
+fi
+
 LICENSE="LGPL-2+"
 SLOT="0"
+
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
+
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-libs/libxslt-1
-	>=dev-util/gtk-doc-am-1.15
-	>=sys-devel/gettext-0.11
-"
+DEPEND="${RDEPEND}"
 
 # To prevent circular dependencies with glib[test]
 PDEPEND=">=dev-libs/glib-${PV}:2"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.40.0-sitedir.patch"
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
 
-	# Leave shebang alone
-	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' \
-		-i gio/gdbus-2.0/codegen/gdbus-codegen.in || die
-
-	# Leave automake defaults do the work for us
-	sed -e "s:\(codegendir =\).*:\1 \$(pyexecdir)/gdbus_codegen:" \
-		-i gio/gdbus-2.0/codegen/Makefile.am || die
-
-	eautoreconf
-
-	prepare_python() {
-		mkdir -p "${BUILD_DIR}"
-	}
-	python_foreach_impl prepare_python
-}
-
-src_configure() {
-	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir econf
-}
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.54.2-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
 
-src_compile() {
-	python_foreach_impl run_in_build_dir emake -C gio/gdbus-2.0/codegen
-	python_foreach_impl run_in_build_dir emake -C docs/reference/gio gdbus-codegen.1
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
 }
 
 src_test() {
@@ -70,8 +54,7 @@ src_test() {
 	einfo "when merged with FEATURES=test"
 }
 
-src_install() {
-	python_foreach_impl run_in_build_dir emake install -C gio/gdbus-2.0/codegen DESTDIR="${D}"
-	python_foreach_impl run_in_build_dir doman docs/reference/gio/gdbus-codegen.1
-	python_replicate_script "${ED}"/usr/bin/gdbus-codegen
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
 }