Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-plugins/compiz-plugins-main: ChangeLog compiz-plugins-main-0.8.6-r1.ebuild
Date: Sat, 04 Sep 2010 22:09:05
Message-Id: 20100904220856.6B3A720051@flycatcher.gentoo.org
1 flameeyes 10/09/04 22:08:56
2
3 Modified: ChangeLog compiz-plugins-main-0.8.6-r1.ebuild
4 Log:
5 Update the ebuild to follow the -extra ebuild as well.
6
7 (Portage version: 2.2_rc75/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.13 x11-plugins/compiz-plugins-main/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog?rev=1.13&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog?rev=1.13&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog?r1=1.12&r2=1.13
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog,v
19 retrieving revision 1.12
20 retrieving revision 1.13
21 diff -u -r1.12 -r1.13
22 --- ChangeLog 4 Sep 2010 22:01:05 -0000 1.12
23 +++ ChangeLog 4 Sep 2010 22:08:56 -0000 1.13
24 @@ -1,6 +1,10 @@
25 # ChangeLog for x11-plugins/compiz-plugins-main
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog,v 1.12 2010/09/04 22:01:05 flameeyes Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog,v 1.13 2010/09/04 22:08:56 flameeyes Exp $
29 +
30 + 04 Sep 2010; Diego E. Pettenò <flameeyes@g.o>
31 + compiz-plugins-main-0.8.6-r1.ebuild:
32 + Update the ebuild to follow the -extra ebuild as well.
33
34 *compiz-plugins-main-0.8.6-r1 (04 Sep 2010)
35
36
37
38
39 1.2 x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild?rev=1.2&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild?rev=1.2&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild?r1=1.1&r2=1.2
44
45 Index: compiz-plugins-main-0.8.6-r1.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild,v
48 retrieving revision 1.1
49 retrieving revision 1.2
50 diff -u -r1.1 -r1.2
51 --- compiz-plugins-main-0.8.6-r1.ebuild 4 Sep 2010 22:01:05 -0000 1.1
52 +++ compiz-plugins-main-0.8.6-r1.ebuild 4 Sep 2010 22:08:56 -0000 1.2
53 @@ -1,10 +1,10 @@
54 # Copyright 1999-2010 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild,v 1.1 2010/09/04 22:01:05 flameeyes Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild,v 1.2 2010/09/04 22:08:56 flameeyes Exp $
58
59 EAPI="2"
60
61 -inherit eutils gnome2-utils
62 +inherit autotools eutils gnome2-utils
63
64 DESCRIPTION="Compiz Fusion Window Decorator Plugins"
65 HOMEPAGE="http://www.compiz.org/"
66 @@ -29,10 +29,17 @@
67 >=dev-util/intltool-0.35
68 >=dev-util/pkgconfig-0.19
69 >=sys-devel/gettext-0.15
70 + gconf? ( gnome-base/gconf )
71 "
72
73 src_prepare() {
74 - use gconf || epatch "${FILESDIR}"/${PN}-no-gconf.patch
75 + if ! use gconf; then
76 + epatch "${FILESDIR}"/${PN}-no-gconf.patch
77 +
78 + # required to apply the above patch
79 + intltoolize --copy --force || die "intltoolize failed"
80 + eautoreconf || die "eautoreconf failed"
81 + fi
82 }
83
84 src_configure() {
85 @@ -40,7 +47,7 @@
86 --disable-dependency-tracking \
87 --enable-fast-install \
88 --disable-static \
89 - $(use_enable gconf schemas) || die "econf failed"
90 + $(use_enable gconf schemas)
91 }
92
93 src_install() {