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

4 files changed, 71 insertions, 3 deletions

diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
new file mode 100644
index 00000000..8d1a9a38
--- /dev/null
+++ b/dev-util/gdbus-codegen/Manifest
@@ -0,0 +1 @@
+DIST glib-2.35.8.tar.xz 6484640 SHA256 ab4ca7c1851859fb2807298394ef4d1d4e96ecf9d52287653aee3cf7749ff078 SHA512 6f5f300a19eb8e89f180d2bf25539705133b1ec6ba15009005539863483dc91cb360db1a720fd6d22778f80f0262c46cf0bf545310a03002a561c80f2424c7fc WHIRLPOOL 0b470bd1e4f57c668f90a31d258d49b3ec2e7b8ae6e925ca6b0f83bea36562bc3aa303b5ae1b79a971ebb1a496715475da9f5088734d25c8303521c58532204c
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
index 84b91f4c..bda22184 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-2.35.8.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.35.8.ebuild
new file mode 100644
index 00000000..7373a8e2
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.35.8.ebuild
@@ -0,0 +1,55 @@
+# 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 ea72e491..7373a8e2 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"