Version bump for Gnome 3.12.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 89 insertions, 2 deletions

diff --git a/dev-util/gdbus-codegen/ChangeLog b/dev-util/gdbus-codegen/ChangeLog
index 971ec91203da..dc77c2a5029e 100644
--- a/dev-util/gdbus-codegen/ChangeLog
+++ b/dev-util/gdbus-codegen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/gdbus-codegen
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/ChangeLog,v 1.85 2014/04/25 19:12:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/ChangeLog,v 1.86 2014/04/27 16:16:54 eva Exp $
+
+*gdbus-codegen-2.40.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +gdbus-codegen-2.40.0.ebuild, +files/gdbus-codegen-2.40.0-sitedir.patch,
+  metadata.xml:
+  Version bump for Gnome 3.12.
 
   25 Apr 2014; Pacho Ramos <pacho@gentoo.org>
   -files/gdbus-codegen-2.32.4-sitedir.patch,
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
new file mode 100644
index 000000000000..ffeb17ba2375
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.40.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__), '..', '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/gdbus-codegen-2.40.0.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.40.0.ebuild
new file mode 100644
index 000000000000..34c89c42db7b
--- /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: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.40.0.ebuild,v 1.1 2014/04/27 16:16:54 eva Exp $
+
+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/metadata.xml b/dev-util/gdbus-codegen/metadata.xml
index 6e0e2ecb48ca..da6fd63d0085 100644
--- a/dev-util/gdbus-codegen/metadata.xml
+++ b/dev-util/gdbus-codegen/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>