Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-wm/awesome: awesome-3.5_rc1.ebuild ChangeLog
Date: Sat, 24 Nov 2012 21:28:15
Message-Id: 20121124212804.0A74C20C9F@flycatcher.gentoo.org
1 robbat2 12/11/24 21:28:03
2
3 Modified: ChangeLog
4 Added: awesome-3.5_rc1.ebuild
5 Log:
6 Version bump for new upstream major version, acked by wired. You must update your configurations per the wiki guide! http://awesome.naquadah.org/wiki/Awesome_3.4_to_3.5.
7
8 (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)
9
10 Revision Changes Path
11 1.139 x11-wm/awesome/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/ChangeLog?rev=1.139&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/ChangeLog?rev=1.139&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/ChangeLog?r1=1.138&r2=1.139
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v
20 retrieving revision 1.138
21 retrieving revision 1.139
22 diff -p -w -b -B -u -u -r1.138 -r1.139
23 --- ChangeLog 30 Sep 2012 14:23:20 -0000 1.138
24 +++ ChangeLog 24 Nov 2012 21:28:03 -0000 1.139
25 @@ -1,6 +1,15 @@
26 # ChangeLog for x11-wm/awesome
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.138 2012/09/30 14:23:20 matsuu Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.139 2012/11/24 21:28:03 robbat2 Exp $
30 +
31 +*awesome-3.5_rc1 (24 Nov 2012)
32 +
33 + 24 Nov 2012; Robin H. Johnson <robbat2@g.o> +awesome-3.5_rc1.ebuild,
34 + +files/awesome-3.5_rc1-convert-path.patch,
35 + +files/awesome-3.5_rc1-luadoc-fix-patch:
36 + Version bump for new upstream major version, acked by wired. You must update
37 + your configurations per the wiki guide!
38 + http://awesome.naquadah.org/wiki/Awesome_3.4_to_3.5.
39
40 30 Sep 2012; MATSUU Takuto <matsuu@g.o>
41 -files/3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch,
42
43
44
45 1.1 x11-wm/awesome/awesome-3.5_rc1.ebuild
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/awesome-3.5_rc1.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/awesome-3.5_rc1.ebuild?rev=1.1&content-type=text/plain
49
50 Index: awesome-3.5_rc1.ebuild
51 ===================================================================
52 # Copyright 1999-2012 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.5_rc1.ebuild,v 1.1 2012/11/24 21:28:03 robbat2 Exp $
55
56 EAPI="3"
57 CMAKE_MIN_VERSION="2.8"
58 inherit cmake-utils eutils
59
60 DESCRIPTION="A dynamic floating and tiling window manager"
61 HOMEPAGE="http://awesome.naquadah.org/"
62 MY_PV="${PV/_/-}"
63 MY_P="${PN}-${MY_PV}"
64 SRC_URI="http://awesome.naquadah.org/download/${MY_P}.tar.xz"
65
66 LICENSE="GPL-2"
67 SLOT="0"
68 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
69 IUSE="dbus doc elibc_FreeBSD gnome"
70
71 COMMON_DEPEND=">=dev-lang/lua-5.1
72 dev-libs/libev
73 >=dev-libs/libxdg-basedir-1
74 media-libs/imlib2[png]
75 x11-libs/cairo[xcb]
76 || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
77 >=x11-libs/libxcb-1.6
78 >=x11-libs/pango-1.19.3
79 >=x11-libs/startup-notification-0.10_p20110426
80 >=x11-libs/xcb-util-0.3.8
81 dbus? ( >=sys-apps/dbus-1 )
82 elibc_FreeBSD? ( dev-libs/libexecinfo )"
83
84 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
85 DEPEND="${COMMON_DEPEND}
86 >=app-text/asciidoc-8.4.5
87 app-text/xmlto
88 dev-util/gperf
89 virtual/pkgconfig
90 media-gfx/imagemagick[png]
91 >=x11-proto/xcb-proto-1.5
92 >=x11-proto/xproto-7.0.15
93 doc? (
94 app-doc/doxygen
95 dev-lua/luadoc
96 media-gfx/graphviz
97 )"
98
99 RDEPEND="${COMMON_DEPEND}
100 || (
101 x11-misc/gxmessage
102 x11-apps/xmessage
103 )"
104
105 # bug #321433: Need one of these to for awsetbg.
106 # imagemagick provides 'display' and is further down the default list, but
107 # listed here for completeness. 'display' however is only usable with
108 # x11-apps/xwininfo also present.
109 RDEPEND="${RDEPEND}
110 || (
111 ( x11-apps/xwininfo
112 || ( media-gfx/imagemagick[X] media-gfx/graphicsmagick[imagemagick,X] )
113 )
114 x11-misc/habak
115 media-gfx/feh
116 x11-misc/hsetroot
117 media-gfx/qiv
118 media-gfx/xv
119 x11-misc/xsri
120 media-gfx/xli
121 x11-apps/xsetroot
122 )"
123
124 DOCS="AUTHORS BUGS PATCHES README STYLE"
125
126 S="${WORKDIR}/${MY_P}"
127
128 src_prepare() {
129 # Upstreamed
130 #epatch \
131 # "${FILESDIR}/${PN}-3.4.2-backtrace.patch"
132
133 # bug #408025
134 epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
135
136 # Fix luadoc build
137 epatch "${FILESDIR}/${PN}-3.5_rc1-luadoc-fix-patch"
138
139 # Fix name of luadoc binary
140 sed -i \
141 -e '/^a_find_program/{ /LDOC_EXECUTABLE/{ s/ldoc.lua/luadoc/; } }' \
142 "${S}"/awesomeConfig.cmake || die
143 }
144
145 src_configure() {
146 mycmakeargs=(
147 -DPREFIX="${EPREFIX}"/usr
148 -DSYSCONFDIR="${EPREFIX}"/etc
149 $(cmake-utils_use_with dbus DBUS)
150 $(cmake-utils_use doc GENERATE_LUADOC)
151 )
152
153 cmake-utils_src_configure
154 }
155
156 src_compile() {
157 local myargs="all"
158
159 if use doc ; then
160 myargs="${myargs} doc"
161 fi
162 cmake-utils_src_make ${myargs}
163 }
164
165 src_install() {
166 cmake-utils_src_install
167
168 if use doc ; then
169 (
170 cd "${CMAKE_BUILD_DIR}"/doc
171 mv html doxygen
172 dohtml -r doxygen || die
173 )
174 mv "${ED}"/usr/share/doc/${PN}/doc/html "${ED}"/usr/share/doc/${PF}/html/luadoc || die
175 fi
176 rm -rf "${ED}"/usr/share/doc/${PN} || die
177
178 exeinto /etc/X11/Sessions
179 newexe "${FILESDIR}"/${PN}-session ${PN} || die
180
181 # GNOME-based awesome
182 if use gnome ; then
183 # GNOME session
184 insinto /usr/share/gnome-session/sessions
185 doins "${FILESDIR}/${PN}-gnome.session" || die
186 # Application launcher
187 insinto /usr/share/applications
188 doins "${FILESDIR}/${PN}-gnome.desktop" || die
189 # X Session
190 insinto /usr/share/xsessions/
191 doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
192 fi
193 }