| 1 |
swift 14/07/06 12:18:50 |
| 2 |
|
| 3 |
Modified: uzbl-9999.ebuild ChangeLog |
| 4 |
Added: uzbl-2012.05.14-r1.ebuild |
| 5 |
Log: |
| 6 |
Fix bug #513466 (incl. #506006, #456310, #486012, #453208) thanks to Kéwan "tharvik" Marconnet |
| 7 |
|
| 8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.29 www-client/uzbl/uzbl-9999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild?rev=1.29&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild?rev=1.29&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild?r1=1.28&r2=1.29 |
| 16 |
|
| 17 |
Index: uzbl-9999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v |
| 20 |
retrieving revision 1.28 |
| 21 |
retrieving revision 1.29 |
| 22 |
diff -u -r1.28 -r1.29 |
| 23 |
--- uzbl-9999.ebuild 2 Jun 2014 13:43:20 -0000 1.28 |
| 24 |
+++ uzbl-9999.ebuild 6 Jul 2014 12:18:50 -0000 1.29 |
| 25 |
@@ -1,35 +1,37 @@ |
| 26 |
# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.28 2014/06/02 13:43:20 tomwij Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.29 2014/07/06 12:18:50 swift Exp $ |
| 30 |
|
| 31 |
-EAPI="4" |
| 32 |
+EAPI='5' |
| 33 |
+ |
| 34 |
+PYTHON_COMPAT=( python2_7 ) |
| 35 |
+ |
| 36 |
+inherit python-single-r1 |
| 37 |
|
| 38 |
-IUSE="gtk3" |
| 39 |
if [[ ${PV} == *9999* ]]; then |
| 40 |
inherit git-2 |
| 41 |
- EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/Dieterbe/uzbl.git"} |
| 42 |
- KEYWORDS="" |
| 43 |
- SRC_URI="" |
| 44 |
- IUSE+=" experimental" |
| 45 |
+ EGIT_REPO_URI=${EGIT_REPO_URI:-'git://github.com/Dieterbe/uzbl.git'} |
| 46 |
+ KEYWORDS='' |
| 47 |
+ SRC_URI='' |
| 48 |
+ IUSE='experimental' |
| 49 |
use experimental && |
| 50 |
- EGIT_BRANCH="experimental" && |
| 51 |
- EGIT_COMMIT="experimental" |
| 52 |
+ EGIT_BRANCH='next' |
| 53 |
else |
| 54 |
inherit vcs-snapshot |
| 55 |
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 56 |
+ KEYWORDS='~amd64 ~x86 ~amd64-linux ~x86-linux' |
| 57 |
SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz" |
| 58 |
fi |
| 59 |
|
| 60 |
-DESCRIPTION="Web interface tools which adhere to the unix philosophy" |
| 61 |
-HOMEPAGE="http://www.uzbl.org" |
| 62 |
+DESCRIPTION='Web interface tools which adhere to the unix philosophy.' |
| 63 |
+HOMEPAGE='http://www.uzbl.org' |
| 64 |
|
| 65 |
-LICENSE="LGPL-2.1 MPL-1.1" |
| 66 |
-SLOT="0" |
| 67 |
-IUSE+=" +browser helpers +tabbed vim-syntax" |
| 68 |
+LICENSE='LGPL-2.1 MPL-1.1' |
| 69 |
+SLOT='0' |
| 70 |
+IUSE+=' gtk3 +browser helpers +tabbed vim-syntax' |
| 71 |
|
| 72 |
-REQUIRED_USE="tabbed? ( browser )" |
| 73 |
+REQUIRED_USE='tabbed? ( browser )' |
| 74 |
|
| 75 |
-COMMON_DEPEND=" |
| 76 |
+COMMON_DEPEND=' |
| 77 |
dev-libs/glib:2 |
| 78 |
>=dev-libs/icu-4.0.1 |
| 79 |
>=net-libs/libsoup-2.24:2.4 |
| 80 |
@@ -41,8 +43,7 @@ |
| 81 |
net-libs/webkit-gtk:3 |
| 82 |
x11-libs/gtk+:3 |
| 83 |
) |
| 84 |
- |
| 85 |
-" |
| 86 |
+' |
| 87 |
|
| 88 |
DEPEND=" |
| 89 |
virtual/pkgconfig |
| 90 |
@@ -71,47 +72,71 @@ |
| 91 |
" |
| 92 |
# TODO document what requires the above helpers |
| 93 |
|
| 94 |
+PREFIX="${EPREFIX}/usr" |
| 95 |
+ |
| 96 |
pkg_setup() { |
| 97 |
+ python-single-r1_pkg_setup |
| 98 |
if ! use helpers; then |
| 99 |
elog "uzbl's extra scripts use various optional applications:" |
| 100 |
elog |
| 101 |
- elog " dev-python/pygtk" |
| 102 |
- elog " dev-python/pygobject:2" |
| 103 |
- elog " gnome-extra/zenity" |
| 104 |
- elog " net-misc/socat" |
| 105 |
- elog " x11-libs/pango" |
| 106 |
- elog " x11-misc/dmenu" |
| 107 |
- elog " x11-misc/xclip" |
| 108 |
+ elog ' dev-python/pygtk' |
| 109 |
+ elog ' dev-python/pygobject:2' |
| 110 |
+ elog ' gnome-extra/zenity' |
| 111 |
+ elog ' net-misc/socat' |
| 112 |
+ elog ' x11-libs/pango' |
| 113 |
+ elog ' x11-misc/dmenu' |
| 114 |
+ elog ' x11-misc/xclip' |
| 115 |
elog |
| 116 |
- elog "Make sure you emerge the ones you need manually." |
| 117 |
- elog "You may also activate the *helpers* USE flag to" |
| 118 |
- elog "install all of them automatically." |
| 119 |
+ elog 'Make sure you emerge the ones you need manually.' |
| 120 |
+ elog 'You may also activate the *helpers* USE flag to' |
| 121 |
+ elog 'install all of them automatically.' |
| 122 |
else |
| 123 |
- einfo "You have enabled the *helpers* USE flag that installs" |
| 124 |
+ einfo 'You have enabled the *helpers* USE flag that installs' |
| 125 |
einfo "various optional applications used by uzbl's extra scripts." |
| 126 |
fi |
| 127 |
} |
| 128 |
|
| 129 |
src_prepare() { |
| 130 |
# remove -ggdb |
| 131 |
- sed -i "s/-ggdb //g" Makefile || |
| 132 |
- die "-ggdb removal sed failed" |
| 133 |
+ sed -i 's/-ggdb //g' Makefile || |
| 134 |
+ die '-ggdb removal sed failed' |
| 135 |
|
| 136 |
# make gtk3 configurable |
| 137 |
- sed -r "s:^(USE_GTK3) = (.*):\1?=\2:" -i Makefile || |
| 138 |
- die "Makefile sed for gtk3 failed" |
| 139 |
+ sed -r 's:^(USE_GTK3) = (.*):\1?=\2:' -i Makefile || |
| 140 |
+ die 'Makefile sed for gtk3 failed' |
| 141 |
+ |
| 142 |
+ # specify python version |
| 143 |
+ python_fix_shebang bin/uzbl-tabbed || |
| 144 |
+ die 'Fix shebang failed' |
| 145 |
+ |
| 146 |
+ # fix sandbox |
| 147 |
+ if [ ${PV} == 9999 ] && ! use experimental |
| 148 |
+ then |
| 149 |
+ sed -i 's/prefix=$(PREFIX)/prefix=$(DESTDIR)\/$(PREFIX)/' Makefile || |
| 150 |
+ die 'Makefile sed for sandbox failed' |
| 151 |
+ fi |
| 152 |
+ |
| 153 |
+ # fix QA of uzbl.desktop |
| 154 |
+ if [ ${PV} == 9999 ] && use experimental |
| 155 |
+ then |
| 156 |
+ sed -i 's/Categories=Application;Network;/Categories=Network;/' \ |
| 157 |
+ uzbl.desktop.in || die 'QA compliance of uzbl.desktop.in failed' |
| 158 |
+ fi |
| 159 |
} |
| 160 |
|
| 161 |
src_compile() { |
| 162 |
- emake USE_GTK3=$(use gtk3 && echo 1 || echo 0) |
| 163 |
+ [[ ${PV} == 9999 ]] && gtk_var='ENABLE_GTK3' || gtk_var='USE_GTK3' |
| 164 |
+ emake PREFIX="${PREFIX}" ${gtk_var}=$(use gtk3 && echo 1 || echo 0) |
| 165 |
} |
| 166 |
|
| 167 |
src_install() { |
| 168 |
- local targets="install-uzbl-core" |
| 169 |
+ local targets='install-uzbl-core' |
| 170 |
use browser && targets="${targets} install-uzbl-browser" |
| 171 |
use browser && use tabbed && targets="${targets} install-uzbl-tabbed" |
| 172 |
|
| 173 |
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" DOCDIR="${ED}/usr/share/doc/${PF}" ${targets} |
| 174 |
+ # -j1 : upstream bug #351 |
| 175 |
+ emake -j1 DESTDIR="${D}" PREFIX="${PREFIX}" \ |
| 176 |
+ DOCDIR="${ED}/usr/share/doc/${PF}" ${targets} |
| 177 |
|
| 178 |
if use vim-syntax; then |
| 179 |
insinto /usr/share/vim/vimfiles/ftdetect |
| 180 |
@@ -120,5 +145,4 @@ |
| 181 |
insinto /usr/share/vim/vimfiles/syntax |
| 182 |
doins "${S}"/extras/vim/syntax/uzbl.vim |
| 183 |
fi |
| 184 |
- |
| 185 |
} |
| 186 |
|
| 187 |
|
| 188 |
|
| 189 |
1.58 www-client/uzbl/ChangeLog |
| 190 |
|
| 191 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/ChangeLog?rev=1.58&view=markup |
| 192 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/ChangeLog?rev=1.58&content-type=text/plain |
| 193 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/ChangeLog?r1=1.57&r2=1.58 |
| 194 |
|
| 195 |
Index: ChangeLog |
| 196 |
=================================================================== |
| 197 |
RCS file: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v |
| 198 |
retrieving revision 1.57 |
| 199 |
retrieving revision 1.58 |
| 200 |
diff -u -r1.57 -r1.58 |
| 201 |
--- ChangeLog 2 Jun 2014 13:43:20 -0000 1.57 |
| 202 |
+++ ChangeLog 6 Jul 2014 12:18:50 -0000 1.58 |
| 203 |
@@ -1,6 +1,13 @@ |
| 204 |
# ChangeLog for www-client/uzbl |
| 205 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 206 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.57 2014/06/02 13:43:20 tomwij Exp $ |
| 207 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.58 2014/07/06 12:18:50 swift Exp $ |
| 208 |
+ |
| 209 |
+*uzbl-2012.05.14-r1 (06 Jul 2014) |
| 210 |
+ |
| 211 |
+ 06 Jul 2014; Sven Vermeulen <swift@g.o> +uzbl-2012.05.14-r1.ebuild, |
| 212 |
+ uzbl-9999.ebuild: |
| 213 |
+ Fix bug #513466 (incl. #506006, #456310, #486012, #453208) thanks to Kéwan |
| 214 |
+ "tharvik" Marconnet |
| 215 |
|
| 216 |
02 Jun 2014; Tom Wijsman <TomWij@g.o> uzbl-2012.05.14.ebuild, |
| 217 |
uzbl-9999.ebuild: |
| 218 |
|
| 219 |
|
| 220 |
|
| 221 |
1.1 www-client/uzbl/uzbl-2012.05.14-r1.ebuild |
| 222 |
|
| 223 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/uzbl-2012.05.14-r1.ebuild?rev=1.1&view=markup |
| 224 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/uzbl-2012.05.14-r1.ebuild?rev=1.1&content-type=text/plain |
| 225 |
|
| 226 |
Index: uzbl-2012.05.14-r1.ebuild |
| 227 |
=================================================================== |
| 228 |
# Copyright 1999-2014 Gentoo Foundation |
| 229 |
# Distributed under the terms of the GNU General Public License v2 |
| 230 |
# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2012.05.14-r1.ebuild,v 1.1 2014/07/06 12:18:50 swift Exp $ |
| 231 |
|
| 232 |
EAPI='5' |
| 233 |
|
| 234 |
PYTHON_COMPAT=( python2_7 ) |
| 235 |
|
| 236 |
inherit python-single-r1 |
| 237 |
|
| 238 |
if [[ ${PV} == *9999* ]]; then |
| 239 |
inherit git-2 |
| 240 |
EGIT_REPO_URI=${EGIT_REPO_URI:-'git://github.com/Dieterbe/uzbl.git'} |
| 241 |
KEYWORDS='' |
| 242 |
SRC_URI='' |
| 243 |
IUSE='experimental' |
| 244 |
use experimental && |
| 245 |
EGIT_BRANCH='next' |
| 246 |
else |
| 247 |
inherit vcs-snapshot |
| 248 |
KEYWORDS='~amd64 ~x86 ~amd64-linux ~x86-linux' |
| 249 |
SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz" |
| 250 |
fi |
| 251 |
|
| 252 |
DESCRIPTION='Web interface tools which adhere to the unix philosophy.' |
| 253 |
HOMEPAGE='http://www.uzbl.org' |
| 254 |
|
| 255 |
LICENSE='LGPL-2.1 MPL-1.1' |
| 256 |
SLOT='0' |
| 257 |
IUSE+=' gtk3 +browser helpers +tabbed vim-syntax' |
| 258 |
|
| 259 |
REQUIRED_USE='tabbed? ( browser )' |
| 260 |
|
| 261 |
COMMON_DEPEND=' |
| 262 |
dev-libs/glib:2 |
| 263 |
>=dev-libs/icu-4.0.1 |
| 264 |
>=net-libs/libsoup-2.24:2.4 |
| 265 |
!gtk3? ( |
| 266 |
>=net-libs/webkit-gtk-1.1.15:2 |
| 267 |
>=x11-libs/gtk+-2.14:2 |
| 268 |
) |
| 269 |
gtk3? ( |
| 270 |
net-libs/webkit-gtk:3 |
| 271 |
x11-libs/gtk+:3 |
| 272 |
) |
| 273 |
' |
| 274 |
|
| 275 |
DEPEND=" |
| 276 |
virtual/pkgconfig |
| 277 |
${COMMON_DEPEND} |
| 278 |
" |
| 279 |
|
| 280 |
RDEPEND=" |
| 281 |
${COMMON_DEPEND} |
| 282 |
x11-misc/xdg-utils |
| 283 |
browser? ( |
| 284 |
x11-misc/xclip |
| 285 |
) |
| 286 |
helpers? ( |
| 287 |
dev-python/pygtk |
| 288 |
dev-python/pygobject:2 |
| 289 |
gnome-extra/zenity |
| 290 |
net-misc/socat |
| 291 |
x11-libs/pango |
| 292 |
x11-misc/dmenu |
| 293 |
x11-misc/xclip |
| 294 |
) |
| 295 |
tabbed? ( |
| 296 |
dev-python/pygtk |
| 297 |
) |
| 298 |
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) |
| 299 |
" |
| 300 |
# TODO document what requires the above helpers |
| 301 |
|
| 302 |
PREFIX="${EPREFIX}/usr" |
| 303 |
|
| 304 |
pkg_setup() { |
| 305 |
python-single-r1_pkg_setup |
| 306 |
if ! use helpers; then |
| 307 |
elog "uzbl's extra scripts use various optional applications:" |
| 308 |
elog |
| 309 |
elog ' dev-python/pygtk' |
| 310 |
elog ' dev-python/pygobject:2' |
| 311 |
elog ' gnome-extra/zenity' |
| 312 |
elog ' net-misc/socat' |
| 313 |
elog ' x11-libs/pango' |
| 314 |
elog ' x11-misc/dmenu' |
| 315 |
elog ' x11-misc/xclip' |
| 316 |
elog |
| 317 |
elog 'Make sure you emerge the ones you need manually.' |
| 318 |
elog 'You may also activate the *helpers* USE flag to' |
| 319 |
elog 'install all of them automatically.' |
| 320 |
else |
| 321 |
einfo 'You have enabled the *helpers* USE flag that installs' |
| 322 |
einfo "various optional applications used by uzbl's extra scripts." |
| 323 |
fi |
| 324 |
} |
| 325 |
|
| 326 |
src_prepare() { |
| 327 |
# remove -ggdb |
| 328 |
sed -i 's/-ggdb //g' Makefile || |
| 329 |
die '-ggdb removal sed failed' |
| 330 |
|
| 331 |
# make gtk3 configurable |
| 332 |
sed -r 's:^(USE_GTK3) = (.*):\1?=\2:' -i Makefile || |
| 333 |
die 'Makefile sed for gtk3 failed' |
| 334 |
|
| 335 |
# specify python version |
| 336 |
python_fix_shebang bin/uzbl-tabbed || |
| 337 |
die 'Fix shebang failed' |
| 338 |
|
| 339 |
# fix sandbox |
| 340 |
if [ ${PV} == 9999 ] && ! use experimental |
| 341 |
then |
| 342 |
sed -i 's/prefix=$(PREFIX)/prefix=$(DESTDIR)\/$(PREFIX)/' Makefile || |
| 343 |
die 'Makefile sed for sandbox failed' |
| 344 |
fi |
| 345 |
|
| 346 |
# fix QA of uzbl.desktop |
| 347 |
if [ ${PV} == 9999 ] && use experimental |
| 348 |
then |
| 349 |
sed -i 's/Categories=Application;Network;/Categories=Network;/' \ |
| 350 |
uzbl.desktop.in || die 'QA compliance of uzbl.desktop.in failed' |
| 351 |
fi |
| 352 |
} |
| 353 |
|
| 354 |
src_compile() { |
| 355 |
[[ ${PV} == 9999 ]] && gtk_var='ENABLE_GTK3' || gtk_var='USE_GTK3' |
| 356 |
emake PREFIX="${PREFIX}" ${gtk_var}=$(use gtk3 && echo 1 || echo 0) |
| 357 |
} |
| 358 |
|
| 359 |
src_install() { |
| 360 |
local targets='install-uzbl-core' |
| 361 |
use browser && targets="${targets} install-uzbl-browser" |
| 362 |
use browser && use tabbed && targets="${targets} install-uzbl-tabbed" |
| 363 |
|
| 364 |
# -j1 : upstream bug #351 |
| 365 |
emake -j1 DESTDIR="${D}" PREFIX="${PREFIX}" \ |
| 366 |
DOCDIR="${ED}/usr/share/doc/${PF}" ${targets} |
| 367 |
|
| 368 |
if use vim-syntax; then |
| 369 |
insinto /usr/share/vim/vimfiles/ftdetect |
| 370 |
doins "${S}"/extras/vim/ftdetect/uzbl.vim |
| 371 |
|
| 372 |
insinto /usr/share/vim/vimfiles/syntax |
| 373 |
doins "${S}"/extras/vim/syntax/uzbl.vim |
| 374 |
fi |
| 375 |
} |
Archives