public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: dev-util/gdbus-codegen/files/, dev-util/gdbus-codegen/
@ 2012-07-16  5:53 Alexandre Restovtsev
  0 siblings, 0 replies; 7+ messages in thread
From: Alexandre Restovtsev @ 2012-07-16  5:53 UTC (permalink / raw
  To: gentoo-commits

commit:     258d8e656be6b1d9ef8621461abddccf0abb9131
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 16 05:43:30 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Jul 16 05:48:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=258d8e65

dev-util/gdbus-codegen: sync with gx86 for python3 support

Update to python-distutils-ng.eclass to make it easier to add python3
support, which is coming in 2.33.4.

---
 .../files/gdbus-codegen-2.32.4-sitedir.patch       |   21 +++++++
 dev-util/gdbus-codegen/files/setup.py-2.32.4       |    6 ++
 ....33.3.ebuild => gdbus-codegen-2.33.3-r1.ebuild} |   57 ++++++-------------
 dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild   |   57 ++++++-------------
 4 files changed, 63 insertions(+), 78 deletions(-)

diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.32.4-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.32.4-sitedir.patch
new file mode 100644
index 0000000..84b91f4
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.32.4-sitedir.patch
@@ -0,0 +1,21 @@
+diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+index 217c755..8520bb8 100644
+--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
++++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+@@ -29,13 +29,9 @@ 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__), '..', 'lib', 'gdbus-2.0')
++    sys.path.insert(0, os.path.abspath(path))
++    from codegen import codegen_main
+ else:
+-    path = os.path.join('@libdir@', 'gdbus-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())

diff --git a/dev-util/gdbus-codegen/files/setup.py-2.32.4 b/dev-util/gdbus-codegen/files/setup.py-2.32.4
new file mode 100644
index 0000000..c5318e3
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/setup.py-2.32.4
@@ -0,0 +1,6 @@
+from distutils.core import setup
+setup(name="gdbus_codegen",
+      version="@PV@",
+      packages=["gdbus_codegen"],
+      package_dir={"gdbus_codegen" : ""},
+      scripts=["gdbus-codegen"])

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.33.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.33.3-r1.ebuild
similarity index 50%
rename from dev-util/gdbus-codegen/gdbus-codegen-2.33.3.ebuild
rename to dev-util/gdbus-codegen/gdbus-codegen-2.33.3-r1.ebuild
index ff2d6f4..9c65f0d 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.33.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.33.3-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="4"
 GNOME_ORG_MODULE="glib"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
+PYTHON_COMPAT="python2_5 python2_6 python2_7" # python3_1 python3_2 in >=2.33.4
 
-inherit multilib python
+inherit eutils python-distutils-ng
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://git.gnome.org/${GNOME_ORG_MODULE}"
 	inherit git-2
@@ -23,28 +22,31 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 IUSE=""
 
+RDEPEND="python_targets_python2_5? ( dev-lang/python:2.5[xml] )
+	python_targets_python2_6? ( dev-lang/python:2.6[xml] )
+	python_targets_python2_7? ( dev-lang/python:2.7[xml] )
+"
+#	python_targets_python3_1? ( dev-lang/python:3.1[xml] )
+#	python_targets_python3_2? ( dev-lang/python:3.2[xml] )
 DEPEND=""
-RDEPEND="${DEPEND}"
+
 # To prevent circular dependencies with glib[test]
 PDEPEND=">=dev-libs/glib-${PV}:2"
 
 S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs 2 gdbus-codegen.in
-	sed -e "s:@libdir@:${EPREFIX}/usr/$(get_libdir):" \
-		-i gdbus-codegen.in || die "sed gdbus-codegen.in failed"
+python_prepare_all() {
+	epatch "${FILESDIR}/${PN}-2.32.4-sitedir.patch"
 	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
 		-i config.py || die "sed config.py failed"
+
+	mv gdbus-codegen.in gdbus-codegen || die "mv failed"
+	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() {
@@ -52,29 +54,6 @@ src_test() {
 	elog "when merged with FEATURES=test"
 }
 
-src_install() {
-	insinto "/usr/$(get_libdir)/gdbus-2.0/codegen"
-
-	# Keep in sync with gio/gdbus-2.0/codegen/Makefile.am!
-	doins __init__.py \
-		codegen.py \
-		codegen_main.py \
-		codegen_docbook.py \
-		config.py \
-		dbustypes.py \
-		parser.py \
-		utils.py
-
-	newbin gdbus-codegen.in gdbus-codegen
-
+python_install_all() {
 	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
 }
-
-pkg_postinst() {
-	python_need_rebuild
-	python_mod_optimize /usr/$(get_libdir)/gdbus-2.0/codegen
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/gdbus-2.0/codegen
-}

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
index ff2d6f4..5e66e1b 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="4"
 GNOME_ORG_MODULE="glib"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
+PYTHON_COMPAT="python2_5 python2_6 python2_7 python3_1 python3_2"
 
-inherit multilib python
+inherit eutils python-distutils-ng
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://git.gnome.org/${GNOME_ORG_MODULE}"
 	inherit git-2
@@ -23,28 +22,31 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 IUSE=""
 
+RDEPEND="python_targets_python2_5? ( dev-lang/python:2.5[xml] )
+	python_targets_python2_6? ( dev-lang/python:2.6[xml] )
+	python_targets_python2_7? ( dev-lang/python:2.7[xml] )
+	python_targets_python3_1? ( dev-lang/python:3.1[xml] )
+	python_targets_python3_2? ( dev-lang/python:3.2[xml] )
+"
 DEPEND=""
-RDEPEND="${DEPEND}"
+
 # To prevent circular dependencies with glib[test]
 PDEPEND=">=dev-libs/glib-${PV}:2"
 
 S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs 2 gdbus-codegen.in
-	sed -e "s:@libdir@:${EPREFIX}/usr/$(get_libdir):" \
-		-i gdbus-codegen.in || die "sed gdbus-codegen.in failed"
+python_prepare_all() {
+	epatch "${FILESDIR}/${PN}-2.32.4-sitedir.patch"
 	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
 		-i config.py || die "sed config.py failed"
+
+	mv gdbus-codegen.in gdbus-codegen || die "mv failed"
+	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() {
@@ -52,29 +54,6 @@ src_test() {
 	elog "when merged with FEATURES=test"
 }
 
-src_install() {
-	insinto "/usr/$(get_libdir)/gdbus-2.0/codegen"
-
-	# Keep in sync with gio/gdbus-2.0/codegen/Makefile.am!
-	doins __init__.py \
-		codegen.py \
-		codegen_main.py \
-		codegen_docbook.py \
-		config.py \
-		dbustypes.py \
-		parser.py \
-		utils.py
-
-	newbin gdbus-codegen.in gdbus-codegen
-
+python_install_all() {
 	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
 }
-
-pkg_postinst() {
-	python_need_rebuild
-	python_mod_optimize /usr/$(get_libdir)/gdbus-2.0/codegen
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/gdbus-2.0/codegen
-}



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-util/gdbus-codegen/files/, dev-util/gdbus-codegen/
@ 2013-02-28 10:37 Priit Laes
  0 siblings, 0 replies; 7+ messages in thread
From: Priit Laes @ 2013-02-28 10:37 UTC (permalink / raw
  To: gentoo-commits

commit:     d71bd430b6fc9cf230ed7d9170bc891499e00200
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Thu Feb 28 07:18:31 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Thu Feb 28 07:18:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d71bd430

dev-util/gdbus-codegen: Add 2.35.8 to overlay

---
 ...ir.patch => gdbus-codegen-2.35.x-sitedir.patch} |   16 ++++++++++++++--
 ...gen-9999.ebuild => gdbus-codegen-2.35.8.ebuild} |    2 +-
 dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild   |    2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.32.4-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.35.x-sitedir.patch
similarity index 65%
rename from dev-util/gdbus-codegen/files/gdbus-codegen-2.32.4-sitedir.patch
rename to dev-util/gdbus-codegen/files/gdbus-codegen-2.35.x-sitedir.patch
index 84b91f4..bda2218 100644
--- a/dev-util/gdbus-codegen/files/gdbus-codegen-2.32.4-sitedir.patch
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.35.x-sitedir.patch
@@ -1,5 +1,14 @@
+From ada31d785ca16c18e203bf83823adb8c7d45f7cf Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Thu, 28 Feb 2013 09:03:51 +0200
+Subject: [PATCH] Fix for split gdbus-codegen imports
+
+---
+ gio/gdbus-2.0/codegen/gdbus-codegen.in | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
 diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-index 217c755..8520bb8 100644
+index 253d151..67714a5 100644
 --- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
 +++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
 @@ -29,13 +29,9 @@ srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None)
@@ -12,10 +21,13 @@ index 217c755..8520bb8 100644
 +    sys.path.insert(0, os.path.abspath(path))
 +    from codegen import codegen_main
  else:
--    path = os.path.join('@libdir@', 'gdbus-2.0')
+-    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.2
+

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.35.8.ebuild
similarity index 96%
copy from dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
copy to dev-util/gdbus-codegen/gdbus-codegen-2.35.8.ebuild
index ea72e49..7373a8e 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.35.8.ebuild
@@ -36,7 +36,7 @@ PDEPEND=">=dev-libs/glib-${PV}:2"
 S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
 
 python_prepare_all() {
-	epatch "${FILESDIR}/${PN}-2.32.4-sitedir.patch"
+	epatch "${FILESDIR}/${PN}-2.35.x-sitedir.patch"
 	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
 		-i config.py || die "sed config.py failed"
 

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
index ea72e49..7373a8e 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
@@ -36,7 +36,7 @@ PDEPEND=">=dev-libs/glib-${PV}:2"
 S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
 
 python_prepare_all() {
-	epatch "${FILESDIR}/${PN}-2.32.4-sitedir.patch"
+	epatch "${FILESDIR}/${PN}-2.35.x-sitedir.patch"
 	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
 		-i config.py || die "sed config.py failed"
 


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-util/gdbus-codegen/files/, dev-util/gdbus-codegen/
@ 2013-04-07 16:00 Gilles Dartiguelongue
  0 siblings, 0 replies; 7+ messages in thread
From: Gilles Dartiguelongue @ 2013-04-07 16:00 UTC (permalink / raw
  To: gentoo-commits

commit:     0bea9c68812aead41d28c7615fac45abb930e166
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 15:59:46 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 15:59:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0bea9c68

dev-util/gdbus-codegen: make live ebuild actually work

Ebuild must have been unused up to now since it didn't actually work.

---
 .../files/gdbus-codegen-2.35.x-sitedir.patch       |   33 ------------
 dev-util/gdbus-codegen/gdbus-codegen-2.35.8.ebuild |   55 --------------------
 dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild   |   53 ++++++++++++++-----
 3 files changed, 38 insertions(+), 103 deletions(-)

diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.35.x-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.35.x-sitedir.patch
deleted file mode 100644
index bda2218..0000000
--- a/dev-util/gdbus-codegen/files/gdbus-codegen-2.35.x-sitedir.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ada31d785ca16c18e203bf83823adb8c7d45f7cf Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Thu, 28 Feb 2013 09:03:51 +0200
-Subject: [PATCH] Fix for split gdbus-codegen imports
-
----
- gio/gdbus-2.0/codegen/gdbus-codegen.in | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-index 253d151..67714a5 100644
---- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
-+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-@@ -29,13 +29,9 @@ 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__), '..', 'lib', 'gdbus-2.0')
-+    sys.path.insert(0, os.path.abspath(path))
-+    from codegen import codegen_main
- 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.2
-

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.35.8.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.35.8.ebuild
deleted file mode 100644
index 7373a8e..0000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.35.8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils distutils-r1
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://git.gnome.org/${GNOME_ORG_MODULE}"
-	inherit git-2
-else
-	inherit gnome.org
-fi
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~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}"
-
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	epatch "${FILESDIR}/${PN}-2.35.x-sitedir.patch"
-	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
-		-i config.py || die "sed config.py failed"
-
-	sed -e 's:#!@PYTHON@:#!/usr/bin/env 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() {
-	elog "Skipping tests. This package is tested by dev-libs/glib"
-	elog "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
index 7373a8e..b526f88 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
@@ -7,10 +7,10 @@ GNOME_ORG_MODULE="glib"
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
 PYTHON_REQ_USE="xml"
 
-inherit eutils distutils-r1
+inherit eutils python-r1
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://git.gnome.org/${GNOME_ORG_MODULE}"
-	inherit git-2
+	inherit autotools git-2
 else
 	inherit gnome.org
 fi
@@ -28,28 +28,51 @@ fi
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
+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
+"
 
 # To prevent circular dependencies with glib[test]
 PDEPEND=">=dev-libs/glib-${PV}:2"
 
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.36.0-sitedir.patch"
 
-python_prepare_all() {
-	epatch "${FILESDIR}/${PN}-2.35.x-sitedir.patch"
-	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
-		-i config.py || die "sed config.py failed"
+	# Leave shebang alone
+	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' \
+		-i gio/gdbus-2.0/codegen/gdbus-codegen.in || die
 
-	sed -e 's:#!@PYTHON@:#!/usr/bin/env 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"
+	# 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 
+}
+
+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 
 }
 
 src_test() {
-	elog "Skipping tests. This package is tested by dev-libs/glib"
-	elog "when merged with FEATURES=test"
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
 }
 
-python_install_all() {
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+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
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-util/gdbus-codegen/files/, dev-util/gdbus-codegen/
@ 2013-11-24 19:34 Gilles Dartiguelongue
  0 siblings, 0 replies; 7+ messages in thread
From: Gilles Dartiguelongue @ 2013-11-24 19:34 UTC (permalink / raw
  To: gentoo-commits

commit:     6592fe1f9a4e69a39b496966759a25ad5828cd26
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 18:26:09 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:16:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6592fe1f

dev-util/gdbus-codegen: 2.36.4-r1 → 2.38.2

---
 .../files/gdbus-codegen-2.36.0-sitedir.patch       | 31 ++++++++++++++
 dev-util/gdbus-codegen/gdbus-codegen-2.38.2.ebuild | 49 ++++++++++++++++++++++
 dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild   |  8 ++--
 3 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.36.0-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.36.0-sitedir.patch
new file mode 100755
index 0000000..795d839
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.36.0-sitedir.patch
@@ -0,0 +1,31 @@
+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__), '..', 'lib', 'gdbus-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/gdbus-codegen-2.38.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.38.2.ebuild
new file mode 100644
index 0000000..ddba018
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.38.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.36.0-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
+		-i config.py || die "sed config.py failed"
+
+	sed -e 's:#!@PYTHON@:#!/usr/bin/env 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() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
index b526f88..70b6487 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils python-r1
@@ -58,12 +58,12 @@ src_prepare() {
 }
 
 src_configure() {
-	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir econf 
+	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir econf
 }
 
 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 
+	python_foreach_impl run_in_build_dir emake -C docs/reference/gio gdbus-codegen.1
 }
 
 src_test() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-util/gdbus-codegen/files/, dev-util/gdbus-codegen/
@ 2014-04-15 22:05 Gilles Dartiguelongue
  0 siblings, 0 replies; 7+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-15 22:05 UTC (permalink / raw
  To: gentoo-commits

commit:     5e2d00cf9202f4d048b622409b5e66a0464a933d
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 12 23:31:44 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr 15 20:58:58 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5e2d00cf

dev-util/gdbus-codegen: 2.38.2 → 2.40.0

---
 ...ir.patch => gdbus-codegen-2.40.0-sitedir.patch} |  4 +-
 dev-util/gdbus-codegen/gdbus-codegen-2.40.0.ebuild | 49 ++++++++++++++++++++++
 dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild   |  6 +--
 3 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.36.0-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.40.0-sitedir.patch
old mode 100755
new mode 100644
similarity index 88%
rename from dev-util/gdbus-codegen/files/gdbus-codegen-2.36.0-sitedir.patch
rename to dev-util/gdbus-codegen/files/gdbus-codegen-2.40.0-sitedir.patch
index 795d839..ffeb17b
--- a/dev-util/gdbus-codegen/files/gdbus-codegen-2.36.0-sitedir.patch
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.40.0-sitedir.patch
@@ -17,13 +17,13 @@ index 253d151..2295481 100644
      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__), '..', 'lib', 'gdbus-2.0')
+-    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
++    from gdbus_codegen import codegen_main
  
  sys.exit(codegen_main.codegen_main())
 -- 

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.40.0.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.40.0.ebuild
new file mode 100644
index 0000000..16780b8
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.40.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.40.0-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
+		-i config.py || die "sed config.py failed"
+
+	sed -e 's:#!@PYTHON@:#!/usr/bin/env 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() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
index 70b6487..51b59b6 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -23,7 +23,7 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	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=""
 
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 PDEPEND=">=dev-libs/glib-${PV}:2"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.36.0-sitedir.patch"
+	epatch "${FILESDIR}/${PN}-2.40.0-sitedir.patch"
 
 	# Leave shebang alone
 	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' \


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-util/gdbus-codegen/files/, dev-util/gdbus-codegen/
@ 2017-12-14 14:07 Sobhan Mohammadpour
  0 siblings, 0 replies; 7+ messages in thread
From: Sobhan Mohammadpour @ 2017-12-14 14:07 UTC (permalink / raw
  To: gentoo-commits

commit:     f19cc3dfa93e79fb08f61c3e6577fc3b6fb0659b
Author:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 14:07:01 2017 +0000
Commit:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 14:07:01 2017 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f19cc3df

dev-util/gdbus-codegen: version bumpt to 2.54.2

Package-Manager: Portage-2.3.18, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 .../files/gdbus-codegen-2.54.2-sitedir.patch       | 35 ++++++++++++++++
 dev-util/gdbus-codegen/gdbus-codegen-2.54.2.ebuild | 46 ++++++++++++++++++++++
 2 files changed, 81 insertions(+)

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
new file mode 100644
index 00000000..de90afc3
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.2-sitedir.patch
@@ -0,0 +1,35 @@
+From f2f8ccb15cc6288455f4780d016789aa2e023d6d Mon Sep 17 00:00:00 2001
+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/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+index 8050981..c097702 100644
+--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
++++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+@@ -28,16 +28,7 @@ filedir = os.path.dirname(__file__)
+ 
+ if srcdir is not None:
+     path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
+-elif os.path.basename(filedir) == 'bin':
+-    # Make the prefix containing gdbus-codegen 'relocatable' at runtime by
+-    # adding /some/prefix/bin/../share/glib-2.0 to the python path
+-    path = os.path.join(filedir, '..', 'share', 'glib-2.0')
+ else:
+-    # Assume that the modules we need are in the current directory and add the
+-    # parent directory to the python path.
+-    path = os.path.join(filedir, '..')
+-
+-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())
+-- 
+2.15.1
+

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.54.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.54.2.ebuild
new file mode 100644
index 00000000..52e4ec78
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.54.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.54.2-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	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() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-util/gdbus-codegen/files/, dev-util/gdbus-codegen/
@ 2018-01-14 15:00 Dennis Lamm
  0 siblings, 0 replies; 7+ messages in thread
From: Dennis Lamm @ 2018-01-14 15:00 UTC (permalink / raw
  To: gentoo-commits

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"
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-01-14 15:00 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-15 22:05 [gentoo-commits] proj/gnome:master commit in: dev-util/gdbus-codegen/files/, dev-util/gdbus-codegen/ Gilles Dartiguelongue
  -- strict thread matches above, loose matches on Subject: below --
2018-01-14 15:00 Dennis Lamm
2017-12-14 14:07 Sobhan Mohammadpour
2013-11-24 19:34 Gilles Dartiguelongue
2013-04-07 16:00 Gilles Dartiguelongue
2013-02-28 10:37 Priit Laes
2012-07-16  5:53 Alexandre Restovtsev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox