Gentoo Archives: gentoo-commits

From: Priit Laes <plaes@×××××.org>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: dev-util/gdbus-codegen/files/, dev-util/gdbus-codegen/
Date: Thu, 28 Feb 2013 10:37:38
Message-Id: 1362035911.d71bd430b6fc9cf230ed7d9170bc891499e00200.plaes@gentoo
1 commit: d71bd430b6fc9cf230ed7d9170bc891499e00200
2 Author: Priit Laes <plaes <AT> plaes <DOT> org>
3 AuthorDate: Thu Feb 28 07:18:31 2013 +0000
4 Commit: Priit Laes <plaes <AT> plaes <DOT> org>
5 CommitDate: Thu Feb 28 07:18:31 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d71bd430
7
8 dev-util/gdbus-codegen: Add 2.35.8 to overlay
9
10 ---
11 ...ir.patch => gdbus-codegen-2.35.x-sitedir.patch} | 16 ++++++++++++++--
12 ...gen-9999.ebuild => gdbus-codegen-2.35.8.ebuild} | 2 +-
13 dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild | 2 +-
14 3 files changed, 16 insertions(+), 4 deletions(-)
15
16 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
17 similarity index 65%
18 rename from dev-util/gdbus-codegen/files/gdbus-codegen-2.32.4-sitedir.patch
19 rename to dev-util/gdbus-codegen/files/gdbus-codegen-2.35.x-sitedir.patch
20 index 84b91f4..bda2218 100644
21 --- a/dev-util/gdbus-codegen/files/gdbus-codegen-2.32.4-sitedir.patch
22 +++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.35.x-sitedir.patch
23 @@ -1,5 +1,14 @@
24 +From ada31d785ca16c18e203bf83823adb8c7d45f7cf Mon Sep 17 00:00:00 2001
25 +From: Priit Laes <plaes@×××××.org>
26 +Date: Thu, 28 Feb 2013 09:03:51 +0200
27 +Subject: [PATCH] Fix for split gdbus-codegen imports
28 +
29 +---
30 + gio/gdbus-2.0/codegen/gdbus-codegen.in | 10 +++-------
31 + 1 file changed, 3 insertions(+), 7 deletions(-)
32 +
33 diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
34 -index 217c755..8520bb8 100644
35 +index 253d151..67714a5 100644
36 --- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
37 +++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
38 @@ -29,13 +29,9 @@ srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None)
39 @@ -12,10 +21,13 @@ index 217c755..8520bb8 100644
40 + sys.path.insert(0, os.path.abspath(path))
41 + from codegen import codegen_main
42 else:
43 -- path = os.path.join('@libdir@', 'gdbus-2.0')
44 +- path = os.path.join('@datadir@', 'glib-2.0')
45 -
46 -sys.path.insert(0, os.path.abspath(path))
47 -from codegen import codegen_main
48 + from gdbus_codegen import codegen_main
49
50 sys.exit(codegen_main.codegen_main())
51 +--
52 +1.8.1.2
53 +
54
55 diff --git a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.35.8.ebuild
56 similarity index 96%
57 copy from dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
58 copy to dev-util/gdbus-codegen/gdbus-codegen-2.35.8.ebuild
59 index ea72e49..7373a8e 100644
60 --- a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
61 +++ b/dev-util/gdbus-codegen/gdbus-codegen-2.35.8.ebuild
62 @@ -36,7 +36,7 @@ PDEPEND=">=dev-libs/glib-${PV}:2"
63 S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
64
65 python_prepare_all() {
66 - epatch "${FILESDIR}/${PN}-2.32.4-sitedir.patch"
67 + epatch "${FILESDIR}/${PN}-2.35.x-sitedir.patch"
68 sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
69 -i config.py || die "sed config.py failed"
70
71
72 diff --git a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
73 index ea72e49..7373a8e 100644
74 --- a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
75 +++ b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
76 @@ -36,7 +36,7 @@ PDEPEND=">=dev-libs/glib-${PV}:2"
77 S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
78
79 python_prepare_all() {
80 - epatch "${FILESDIR}/${PN}-2.32.4-sitedir.patch"
81 + epatch "${FILESDIR}/${PN}-2.35.x-sitedir.patch"
82 sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
83 -i config.py || die "sed config.py failed"