Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alex Alexander (wired)" <wired@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/uzbl: ChangeLog uzbl-2010.04.03.ebuild uzbl-9999.ebuild
Date: Sun, 04 Apr 2010 10:12:18
Message-Id: E1NyMoL-0000Zr-Nb@stork.gentoo.org
1 wired 10/04/04 10:12:09
2
3 Modified: ChangeLog uzbl-9999.ebuild
4 Added: uzbl-2010.04.03.ebuild
5 Log:
6 [uzbl] version bump
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.25 www-client/uzbl/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/uzbl/ChangeLog?rev=1.25&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/uzbl/ChangeLog?rev=1.25&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/uzbl/ChangeLog?r1=1.24&r2=1.25
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v
19 retrieving revision 1.24
20 retrieving revision 1.25
21 diff -u -r1.24 -r1.25
22 --- ChangeLog 30 Mar 2010 17:56:55 -0000 1.24
23 +++ ChangeLog 4 Apr 2010 10:12:09 -0000 1.25
24 @@ -1,6 +1,12 @@
25 # ChangeLog for www-client/uzbl
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.24 2010/03/30 17:56:55 wired Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.25 2010/04/04 10:12:09 wired Exp $
29 +
30 +*uzbl-2010.04.03 (04 Apr 2010)
31 +
32 + 04 Apr 2010; Alex Alexander <wired@g.o> +uzbl-2010.04.03.ebuild,
33 + uzbl-9999.ebuild:
34 + version bump, fix keywords
35
36 30 Mar 2010; Alex Alexander <wired@g.o> uzbl-2010.02.02-r1.ebuild,
37 uzbl-2010.03.14.ebuild, uzbl-9999.ebuild:
38
39
40
41 1.14 www-client/uzbl/uzbl-9999.ebuild
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild?rev=1.14&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild?rev=1.14&content-type=text/plain
45 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild?r1=1.13&r2=1.14
46
47 Index: uzbl-9999.ebuild
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v
50 retrieving revision 1.13
51 retrieving revision 1.14
52 diff -u -r1.13 -r1.14
53 --- uzbl-9999.ebuild 30 Mar 2010 17:56:55 -0000 1.13
54 +++ uzbl-9999.ebuild 4 Apr 2010 10:12:09 -0000 1.14
55 @@ -1,6 +1,6 @@
56 # Copyright 1999-2010 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.13 2010/03/30 17:56:55 wired Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.14 2010/04/04 10:12:09 wired Exp $
60
61 EAPI="2"
62
63 @@ -10,12 +10,14 @@
64 if [[ ${PV} == *9999* ]]; then
65 inherit git
66 EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/Dieterbe/uzbl.git"}
67 + KEYWORDS=""
68 SRC_URI=""
69 IUSE="experimental"
70 use experimental &&
71 EGIT_BRANCH="experimental" &&
72 EGIT_COMMIT="experimental"
73 else
74 + KEYWORDS="~amd64 ~x86"
75 SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz"
76 fi
77
78 @@ -24,7 +26,6 @@
79
80 LICENSE="LGPL-2.1 MPL-1.1"
81 SLOT="0"
82 -KEYWORDS=""
83 IUSE+=" +browser helpers +tabbed vim-syntax"
84
85 COMMON_DEPEND="
86
87
88
89 1.1 www-client/uzbl/uzbl-2010.04.03.ebuild
90
91 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/uzbl/uzbl-2010.04.03.ebuild?rev=1.1&view=markup
92 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/uzbl/uzbl-2010.04.03.ebuild?rev=1.1&content-type=text/plain
93
94 Index: uzbl-2010.04.03.ebuild
95 ===================================================================
96 # Copyright 1999-2010 Gentoo Foundation
97 # Distributed under the terms of the GNU General Public License v2
98 # $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2010.04.03.ebuild,v 1.1 2010/04/04 10:12:09 wired Exp $
99
100 EAPI="2"
101
102 inherit base
103
104 IUSE=""
105 if [[ ${PV} == *9999* ]]; then
106 inherit git
107 EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/Dieterbe/uzbl.git"}
108 KEYWORDS=""
109 SRC_URI=""
110 IUSE="experimental"
111 use experimental &&
112 EGIT_BRANCH="experimental" &&
113 EGIT_COMMIT="experimental"
114 else
115 KEYWORDS="~amd64 ~x86"
116 SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz"
117 fi
118
119 DESCRIPTION="Web interface tools which adhere to the unix philosophy."
120 HOMEPAGE="http://www.uzbl.org"
121
122 LICENSE="LGPL-2.1 MPL-1.1"
123 SLOT="0"
124 IUSE+=" +browser helpers +tabbed vim-syntax"
125
126 COMMON_DEPEND="
127 >=dev-libs/icu-4.0.1
128 >=net-libs/libsoup-2.24
129 >=net-libs/webkit-gtk-1.1.15
130 >=x11-libs/gtk+-2.14
131 "
132
133 DEPEND="
134 >=dev-util/pkgconfig-0.19
135 ${COMMON_DEPEND}
136 "
137
138 RDEPEND="
139 ${COMMON_DEPEND}
140 x11-misc/xdg-utils
141 browser? (
142 x11-misc/xclip
143 )
144 helpers? (
145 dev-python/pygtk
146 dev-python/pygobject
147 dev-python/simplejson
148 gnome-extra/zenity
149 net-misc/socat
150 x11-libs/pango
151 x11-misc/dmenu
152 x11-misc/xclip
153 )
154 vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
155 "
156 # TODO document what requires the above helpers
157 # simplejson - save uzbl_tabbed.py sessions & presets in json.
158
159 pkg_setup() {
160 if ! use helpers; then
161 elog "uzbl's extra scripts use various optional applications:"
162 elog
163 elog " dev-python/pygtk"
164 elog " dev-python/pygobject"
165 elog " dev-python/simplejson"
166 elog " gnome-extra/zenity"
167 elog " net-misc/socat"
168 elog " x11-libs/pango"
169 elog " x11-misc/dmenu"
170 elog " x11-misc/xclip"
171 elog
172 elog "Make sure you emerge the ones you need manually."
173 elog "You may also activate the *helpers* USE flag to"
174 elog "install all of them automatically."
175 else
176 einfo "You have enabled the *helpers* USE flag that installs"
177 einfo "various optional applications used by uzbl's extra scripts."
178 fi
179
180 if use tabbed && ! use browser; then
181 ewarn
182 ewarn "You enabled the *tabbed* USE flag but not *browser*."
183 ewarn "*tabbed* depends on *browser*, so it will be disabled."
184 ewarn
185 ebeep 3
186 fi
187 }
188
189 src_prepare() {
190 if [[ ${PV} == *9999* ]]; then
191 git_src_prepare
192 else
193 cd "${WORKDIR}"/Dieterbe-uzbl-*
194 S=$(pwd)
195 fi
196
197 # remove -ggdb
198 sed -i "s/-ggdb //g" Makefile ||
199 die "-ggdb removal sed failed"
200
201 # adjust path in default config file to /usr/share
202 sed -i "s:/usr/local/share/uzbl:/usr/share/uzbl:g" \
203 examples/config/config ||
204 die "config path sed failed"
205 }
206
207 src_compile() {
208 emake || die "compile failed"
209 }
210
211 src_install() {
212 local targets="install-uzbl-core"
213 use browser && targets="${targets} install-uzbl-browser"
214 use browser && use tabbed && targets="${targets} install-uzbl-tabbed"
215
216 emake DESTDIR="${D}" PREFIX="/usr" DOCDIR="${D}/usr/share/doc/${PF}" ${targets} ||
217 die "Installation failed"
218
219 if use vim-syntax; then
220 insinto /usr/share/vim/vimfiles/ftdetect
221 doins "${S}"/extras/vim/ftdetect/uzbl.vim || die "vim-syntax doins failed"
222
223 insinto /usr/share/vim/vimfiles/syntax
224 doins "${S}"/extras/vim/syntax/uzbl.vim || die "vim-syntax doins failed"
225 fi
226
227 }
Report Message
Find on MARC Find on Google Groups