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:' \
