Gentoo Archives: gentoo-commits

From: "Markos Chandras (hwoarang)" <hwoarang@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-wm/openbox: openbox-3.5.0_p20111019-r2.ebuild openbox-9999.ebuild ChangeLog openbox-3.5.0_p20111019-r1.ebuild
Date: Mon, 27 Aug 2012 10:29:37
Message-Id: 20120827102927.D9CDE208DF@flycatcher.gentoo.org
1 hwoarang 12/08/27 10:29:27
2
3 Modified: openbox-9999.ebuild ChangeLog
4 Added: openbox-3.5.0_p20111019-r2.ebuild
5 Removed: openbox-3.5.0_p20111019-r1.ebuild
6 Log:
7 fix desktop files according to fd.o desktop entry specifications. Thanks to Julian Ospald <hasufell@g.o>. Bug #431784
8
9 (Portage version: 2.1.11.11/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.19 x11-wm/openbox/openbox-9999.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/openbox/openbox-9999.ebuild?rev=1.19&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/openbox/openbox-9999.ebuild?rev=1.19&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/openbox/openbox-9999.ebuild?r1=1.18&r2=1.19
17
18 Index: openbox-9999.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-9999.ebuild,v
21 retrieving revision 1.18
22 retrieving revision 1.19
23 diff -u -r1.18 -r1.19
24 --- openbox-9999.ebuild 25 Aug 2012 09:41:35 -0000 1.18
25 +++ openbox-9999.ebuild 27 Aug 2012 10:29:27 -0000 1.19
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2012 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-9999.ebuild,v 1.18 2012/08/25 09:41:35 hwoarang Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-9999.ebuild,v 1.19 2012/08/27 10:29:27 hwoarang Exp $
31
32 EAPI="2"
33 inherit multilib autotools eutils git-2
34 @@ -62,15 +62,15 @@
35 echo "/usr/bin/openbox-session" > "${D}/etc/X11/Sessions/${PN}"
36 fperms a+x /etc/X11/Sessions/${PN}
37 emake DESTDIR="${D}" install || die "emake install failed"
38 - if use branding; then
39 - insinto /usr/share/themes
40 - doins -r "${WORKDIR}"/Surreal_Gentoo
41 - # make it the default theme
42 - sed -i \
43 - "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
44 - "${D}"/etc/xdg/openbox/rc.xml \
45 - || die "failed to set Surreal Gentoo as the default theme"
46 - fi
47 + if use branding; then
48 + insinto /usr/share/themes
49 + doins -r "${WORKDIR}"/Surreal_Gentoo
50 + # make it the default theme
51 + sed -i \
52 + "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
53 + "${D}"/etc/xdg/openbox/rc.xml \
54 + || die "failed to set Surreal Gentoo as the default theme"
55 + fi
56 ! use static-libs && rm "${D}"/usr/$(get_libdir)/lib{obt,obrender}.la
57 ! use python && rm "${D}"/usr/libexec/openbox-xdg-autostart
58 }
59
60
61
62 1.252 x11-wm/openbox/ChangeLog
63
64 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/openbox/ChangeLog?rev=1.252&view=markup
65 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/openbox/ChangeLog?rev=1.252&content-type=text/plain
66 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/openbox/ChangeLog?r1=1.251&r2=1.252
67
68 Index: ChangeLog
69 ===================================================================
70 RCS file: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v
71 retrieving revision 1.251
72 retrieving revision 1.252
73 diff -u -r1.251 -r1.252
74 --- ChangeLog 25 Aug 2012 22:49:39 -0000 1.251
75 +++ ChangeLog 27 Aug 2012 10:29:27 -0000 1.252
76 @@ -1,6 +1,15 @@
77 # ChangeLog for x11-wm/openbox
78 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
79 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.251 2012/08/25 22:49:39 ago Exp $
80 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.252 2012/08/27 10:29:27 hwoarang Exp $
81 +
82 +*openbox-3.5.0_p20111019-r2 (27 Aug 2012)
83 +
84 + 27 Aug 2012; Markos Chandras <hwoarang@g.o>
85 + +files/openbox-3.5.0-fix-desktop-files.patch,
86 + +openbox-3.5.0_p20111019-r2.ebuild, -openbox-3.5.0_p20111019-r1.ebuild,
87 + openbox-9999.ebuild:
88 + fix desktop files according to fd.o desktop entry specifications. Thanks to
89 + Julian Ospald <hasufell@g.o>. Bug #431784
90
91 25 Aug 2012; Agostino Sarubbo <ago@g.o>
92 openbox-3.5.0_p20111019-r1.ebuild:
93
94
95
96 1.1 x11-wm/openbox/openbox-3.5.0_p20111019-r2.ebuild
97
98 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/openbox/openbox-3.5.0_p20111019-r2.ebuild?rev=1.1&view=markup
99 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/openbox/openbox-3.5.0_p20111019-r2.ebuild?rev=1.1&content-type=text/plain
100
101 Index: openbox-3.5.0_p20111019-r2.ebuild
102 ===================================================================
103 # Copyright 1999-2012 Gentoo Foundation
104 # Distributed under the terms of the GNU General Public License v2
105 # $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.5.0_p20111019-r2.ebuild,v 1.1 2012/08/27 10:29:27 hwoarang Exp $
106
107 EAPI="2"
108 inherit multilib autotools eutils
109
110 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
111 HOMEPAGE="http://openbox.org/"
112 SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz
113 branding? ( http://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
114
115 LICENSE="GPL-2"
116 SLOT="3"
117 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
118 IUSE="branding debug imlib nls python session startup-notification static-libs"
119
120 RDEPEND="dev-libs/glib:2
121 >=dev-libs/libxml2-2.0
122 python? ( dev-python/pyxdg )
123 >=media-libs/fontconfig-2
124 x11-libs/libXft
125 x11-libs/libXrandr
126 x11-libs/libXt
127 >=x11-libs/pango-1.8[X]
128 imlib? ( media-libs/imlib2 )
129 startup-notification? ( >=x11-libs/startup-notification-0.8 )
130 x11-libs/libXinerama"
131 DEPEND="${RDEPEND}
132 sys-devel/gettext
133 virtual/pkgconfig
134 x11-proto/xextproto
135 x11-proto/xf86vidmodeproto
136 x11-proto/xineramaproto"
137
138 S="${WORKDIR}"
139
140 src_prepare() {
141 epatch "${FILESDIR}"/${PN}-gnome-session-3.4.9.patch
142 epatch "${FILESDIR}"/${P/_p*/}-gtk34.patch
143 epatch "${FILESDIR}"/${P/_p*/}-fix-desktop-files.patch
144 sed -i -e "s:-O0 -ggdb ::" "${S}"/m4/openbox.m4 || die
145 epatch_user
146 eautopoint
147 eautoreconf
148 }
149
150 src_configure() {
151 econf \
152 --docdir=/usr/share/doc/${PF} \
153 $(use_enable debug) \
154 $(use_enable imlib imlib2) \
155 $(use_enable nls) \
156 $(use_enable startup-notification) \
157 $(use_enable session session-management) \
158 $(use_enable static-libs static) \
159 --with-x
160 }
161
162 src_install() {
163 dodir /etc/X11/Sessions
164 echo "/usr/bin/openbox-session" > "${D}/etc/X11/Sessions/${PN}"
165 fperms a+x /etc/X11/Sessions/${PN}
166 emake DESTDIR="${D}" install || die "emake install failed"
167 if use branding; then
168 insinto /usr/share/themes
169 doins -r "${WORKDIR}"/Surreal_Gentoo
170 # make it the default theme
171 sed -i \
172 "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
173 "${D}"/etc/xdg/openbox/rc.xml \
174 || die "failed to set Surreal Gentoo as the default theme"
175 fi
176 ! use static-libs && rm "${D}"/usr/$(get_libdir)/lib{obt,obrender}.la
177 ! use python && rm "${D}"/usr/libexec/openbox-xdg-autostart
178 }