Gentoo Archives: gentoo-commits

From: Nirbheek Chauhan <nirbheek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/
Date: Wed, 11 Jan 2012 04:37:00
Message-Id: dec0b8b77932f31e945bece98f48726bbb9c8bf1.nirbheek@gentoo
1 commit: dec0b8b77932f31e945bece98f48726bbb9c8bf1
2 Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 11 04:36:43 2012 +0000
4 Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 11 04:36:43 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dec0b8b7
7
8 x11-libs/gtk+: fix 9999 ebuild
9
10 ---
11 x11-libs/gtk+/gtk+-3.3.6.ebuild | 4 ----
12 x11-libs/gtk+/gtk+-9999.ebuild | 6 ++----
13 2 files changed, 2 insertions(+), 8 deletions(-)
14
15 diff --git a/x11-libs/gtk+/gtk+-3.3.6.ebuild b/x11-libs/gtk+/gtk+-3.3.6.ebuild
16 index b9d5b14..5185182 100644
17 --- a/x11-libs/gtk+/gtk+-3.3.6.ebuild
18 +++ b/x11-libs/gtk+/gtk+-3.3.6.ebuild
19 @@ -94,10 +94,6 @@ src_prepare() {
20 sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
21 -i gtk/tests/recentmanager.c || die "sed 2 failed"
22
23 - # Missing file, required for tests; https://bugzilla.gnome.org/show_bug.cgi?id=662024
24 - cp "${FILESDIR}/${PN}-3.2.1-selector.errors" \
25 - tests/css/parser/selector.errors || die "cp failed"
26 -
27 # FIXME: multiple reftests fail when run from portage (but succeed when
28 # run from a manual compile in a temp directory)
29 sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
30
31 diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
32 index c2e17d0..72d6e70 100644
33 --- a/x11-libs/gtk+/gtk+-9999.ebuild
34 +++ b/x11-libs/gtk+/gtk+-9999.ebuild
35 @@ -101,10 +101,6 @@ src_prepare() {
36 sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
37 -i gtk/tests/recentmanager.c || die "sed 2 failed"
38
39 - # Missing file, required for tests; https://bugzilla.gnome.org/show_bug.cgi?id=662024
40 - cp "${FILESDIR}/${PN}-3.2.1-selector.errors" \
41 - tests/css/parser/selector.errors || die "cp failed"
42 -
43 # FIXME: multiple reftests fail when run from portage (but succeed when
44 # run from a manual compile in a temp directory)
45 sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
46 @@ -128,6 +124,8 @@ src_prepare() {
47 strip_builddir SRC_SUBDIRS demos Makefile.am
48 [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
49 fi
50 +
51 + gnome2_src_prepare
52 }
53
54 src_configure() {