Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-wm/compiz: ChangeLog metadata.xml compiz-0.7.8.ebuild
Date: Fri, 31 Oct 2008 16:48:44
Message-Id: E1KvxAu-0005gc-US@stork.gentoo.org
1 jmbsvicetto 08/10/31 16:48:40
2
3 Modified: ChangeLog metadata.xml
4 Added: compiz-0.7.8.ebuild
5 Log:
6 Fixed the metadata.xml.
7 (Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64)
8
9 Revision Changes Path
10 1.28 x11-wm/compiz/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/ChangeLog?rev=1.28&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/ChangeLog?rev=1.28&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/ChangeLog?r1=1.27&r2=1.28
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v
19 retrieving revision 1.27
20 retrieving revision 1.28
21 diff -u -r1.27 -r1.28
22 --- ChangeLog 29 Aug 2008 02:06:46 -0000 1.27
23 +++ ChangeLog 31 Oct 2008 16:48:40 -0000 1.28
24 @@ -1,6 +1,12 @@
25 # ChangeLog for x11-wm/compiz
26 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.27 2008/08/29 02:06:46 flameeyes Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.28 2008/10/31 16:48:40 jmbsvicetto Exp $
29 +
30 +*compiz-0.7.8 (27 Oct 2008)
31 +
32 + 27 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
33 + metadata.xml, +compiz-0.7.8.ebuild:
34 + Added compiz-0.7.8 to the tree
35
36 29 Aug 2008; Diego Pettenò <flameeyes@g.o> compiz-0.6.2-r1.ebuild:
37 Add some missing build-time dependencies (closes bug #204863), disable
38
39
40
41 1.2 x11-wm/compiz/metadata.xml
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/metadata.xml?rev=1.2&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/metadata.xml?rev=1.2&content-type=text/plain
45 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/metadata.xml?r1=1.1&r2=1.2
46
47 Index: metadata.xml
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/x11-wm/compiz/metadata.xml,v
50 retrieving revision 1.1
51 retrieving revision 1.2
52 diff -u -r1.1 -r1.2
53 --- metadata.xml 16 Sep 2006 14:21:20 -0000 1.1
54 +++ metadata.xml 31 Oct 2008 16:48:40 -0000 1.2
55 @@ -1,6 +1,13 @@
56 <?xml version="1.0" encoding="UTF-8"?>
57 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
58 <pkgmetadata>
59 -<herd>no-herd</herd>
60 -<maintainer><email>hanno@g.o</email></maintainer>
61 +<use>
62 + <flag name="fuse">Enables support for the filesystem in userspace plugin through <pkg>sys-fs/fuse</pkg>.</flag>
63 + <flag name="kde4">Compile the kde4 window decorator and add support for <pkg>kde-base/kdebase-startkde:4.1</pkg>.</flag>
64 + <flag name="annotate">Build the annotate plugin</flag>
65 +</use>
66 +<herd>desktop-effects</herd>
67 +<longdescription>
68 +compiz is a compositing window manager that uses 3D graphics acceleration via OpenGL.
69 +</longdescription>
70 </pkgmetadata>
71
72
73
74 1.1 x11-wm/compiz/compiz-0.7.8.ebuild
75
76 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/compiz-0.7.8.ebuild?rev=1.1&view=markup
77 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/compiz-0.7.8.ebuild?rev=1.1&content-type=text/plain
78
79 Index: compiz-0.7.8.ebuild
80 ===================================================================
81 # Copyright 1999-2008 Gentoo Foundation
82 # Distributed under the terms of the GNU General Public License v2
83 # $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.7.8.ebuild,v 1.1 2008/10/31 16:48:40 jmbsvicetto Exp $
84
85 EAPI="2"
86
87 inherit autotools eutils gnome2-utils multilib
88
89 DESCRIPTION="3D composite and windowmanager"
90 HOMEPAGE="http://www.compiz.org/"
91 SRC_URI="http://xorg.freedesktop.org/archive/individual/app/${P}.tar.gz"
92
93 LICENSE="GPL-2 LGPL-2.1 MIT"
94 SLOT="0"
95 KEYWORDS="~amd64 ~x86"
96 IUSE="+cairo dbus fuse gnome gtk kde kde4 +svg"
97 RESTRICT="mirror"
98
99 DEPEND="
100 dev-libs/glib:2
101 dev-libs/libxml2
102 dev-libs/libxslt
103 >=media-libs/glitz-0.5.6
104 media-libs/libpng
105 >=media-libs/mesa-6.5.1-r1
106 >=x11-base/xorg-server-1.1.1-r1
107 x11-libs/libX11[xcb]
108 x11-libs/libxcb
109 x11-libs/libXcomposite
110 x11-libs/libXdamage
111 x11-libs/libXinerama
112 x11-libs/libXrandr
113 x11-libs/libICE
114 x11-libs/libSM
115 >=x11-libs/libXrender-0.8.4
116 >=x11-libs/startup-notification-0.7
117 cairo? (
118 x11-libs/cairo[X]
119 )
120 dbus? ( >=sys-apps/dbus-1.0 )
121 fuse? ( sys-fs/fuse )
122 gnome? (
123 >=gnome-base/gnome-control-center-2.16.1:2
124 gnome-base/gnome-desktop
125 gnome-base/gconf:2
126 )
127 gtk? (
128 >=x11-libs/gtk+-2.8.0:2
129 >=x11-libs/libwnck-2.18.3
130 x11-libs/pango
131 )
132 kde? (
133 || ( kde-base/kwin:3.5
134 kde-base/kdebase:3.5
135 )
136 dev-libs/dbus-qt3-old
137 )
138 kde4? (
139 || (
140 kde-base/kwin:4.1
141 kde-base/kwin:4
142 kde-base/kwin:kde-svn
143 )
144 )
145 svg? (
146 >=gnome-base/librsvg-2.14.0:2
147 >=x11-libs/cairo-1.0
148 )
149 "
150
151 RDEPEND="${DEPEND}
152 x11-apps/mesa-progs
153 x11-apps/xvinfo"
154
155 DEPEND="${DEPEND}
156 dev-util/pkgconfig
157 x11-proto/damageproto
158 x11-proto/xineramaproto"
159
160 src_prepare() {
161
162 use gnome || {
163 epatch "${FILESDIR}"/${PN}-no-gconf.patch
164 ln -s "${ROOT}"/usr/share/aclocal/gconf-2.m4 acinclude.m4
165
166 # required to apply the above patch
167 intltoolize --copy --force || die "intltoolize failed"
168 eautoreconf || die "eautoreconf failed"
169 }
170 }
171
172 src_configure() {
173 econf \
174 --disable-gnome-keybindings \
175 --enable-librsvg \
176 --with-default-plugins \
177 $(use_enable cairo annotate) \
178 $(use_enable dbus) \
179 $(use_enable dbus dbus-glib) \
180 $(use_enable fuse) \
181 $(use_enable gnome) \
182 $(use_enable gnome gconf) \
183 $(use_enable gnome metacity) \
184 $(use_enable gtk) \
185 $(use_enable kde) \
186 $(use_enable kde4) \
187 || die "econf failed"
188 }
189
190 src_install() {
191 emake DESTDIR="${D}" install || die "emake install failed"
192
193 # Install compiz-manager
194 dobin "${FILESDIR}/compiz-manager" || die "dobin failed"
195
196 # Add the full-path to lspci
197 sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager"
198
199 # Create gentoo's config file
200 dodir /etc/xdg/compiz
201
202 cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager"
203 COMPIZ_BIN_PATH="/usr/bin/"
204 PLUGIN_PATH="/usr/$(get_libdir)/compiz/"
205 LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2"
206 LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2"
207 KWIN="$(type -p kwin)"
208 METACITY="$(type -p metacity)"
209 SKIP_CHECKS="yes"
210 EOF
211
212 dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
213 }
214
215 pkg_postinst() {
216 use gnome && gnome2_gconf_install
217 }
218
219 pkg_prerm() {
220 use gnome && gnome2_gconf_uninstall
221 }