Fix bug #513466 (incl. #506006, #456310, #486012, #453208) thanks to Kéwan "tharvik" Marconnet

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

4 files changed, 235 insertions, 49 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index 5f9fa795ef35..cc7f65b4781e 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/uzbl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.57 2014/06/02 13:43:20 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.58 2014/07/06 12:18:50 swift Exp $
+
+*uzbl-2012.05.14-r1 (06 Jul 2014)
+
+  06 Jul 2014; Sven Vermeulen <swift@gentoo.org> +uzbl-2012.05.14-r1.ebuild,
+  uzbl-9999.ebuild:
+  Fix bug #513466 (incl. #506006, #456310, #486012, #453208) thanks to Kéwan
+  "tharvik" Marconnet
 
   02 Jun 2014; Tom Wijsman <TomWij@gentoo.org> uzbl-2012.05.14.ebuild,
   uzbl-9999.ebuild:
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index d3cf653b7911..20d2faec2d3f 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -2,18 +2,25 @@
 Hash: SHA256
 
 DIST uzbl-2012.05.14.tar.gz 152376 SHA256 4b4b3baf2339250b81818b12918af51a33f353a580856fe27eb193f71a4294cf SHA512 d0025a50c852007d5203b05d1bb1e77855c1c1d7e3cad685fd981817e5729682ccf01786f7e06c36a82ebbc1079e5d83fdb1cca40cc768024088dcc840a5ef90 WHIRLPOOL 1e16856b7b5005ae3dcad00c48ad5548bbee0d09403cdde35eda350013944ce35d67fc53063abf69d28d3c3ca37fc305101f0a6d2d645d9f01af1560d25f04e7
+EBUILD uzbl-2012.05.14-r1.ebuild 3552 SHA256 688f358d3a655080107d8068bd9206c07f5a28e5815034d03152e58d7af40ef6 SHA512 9127590d3462e0f9957b648c966fcbd85af1c640b6c70d42e9928f71775e3abbdc2bcc1ec3051475c662e0076f74aabbba0e2a13bbb03966da4b1e015c62c8a9 WHIRLPOOL bd1aa6e38bc876c25c0fab1020af648adae65c761c20b99602e11b511fe2400f301f886745ef9e3a0557719db79d129196877d2fc3c2fb91e12997c1d3ba8cd3
 EBUILD uzbl-2012.05.14.ebuild 2880 SHA256 069fae33041256d2322e9f94f926f12753ea0f05438f1ba2ae10a0b719356ed9 SHA512 3a9c38e22c5db8819133ac2dc1b882c1c2774510a45af883755700418570e08bfbcae6dbd1f459c40375db34dc9ca1ba444bd9ef5513c1fbab3f7cd00b229ed4 WHIRLPOOL b7527184f291e5b7f5fd005c3996f5d4cef1dd9992903534516b37e0238d4c12a5bb04a8b86108217bed2ba2c5548ffe70ca5e1662303877ddd06ee4fef7b7b0
-EBUILD uzbl-9999.ebuild 2877 SHA256 104fd96f25854657b3746d36e3ae363e0f310957fa2c62596c8fd554b2a25be6 SHA512 47e13a3eb1cb13a10dfdc8ef8a95f7e6482844f073543be23135d9ca835d5e41c0a7a6b0581213caf7d9d59f7d759169bd67d7a60f9272360309de9f5f557a94 WHIRLPOOL 36622abd0b76a3217b179a3ca36057cda3b40a0f689a4b61e1f522db1bcae1dbed0bf624558c3da1ca7869da4da41f88c6d568d40431b39eef1308638a558700
-MISC ChangeLog 9907 SHA256 ef184c7081ebb88a20a9ad77213b9583cf74dae6c8766e5c38d4c90d2e1ecb92 SHA512 57dd3dfacabead8ded8a51ab478b5d583a0f5c935062d5f135db128c35df33403bdc14bc313e5174a5b59a9b52a273150d9b97127f482b9f5582a3f8972d1b97 WHIRLPOOL bd267fd973100b22795cc96393601ae2f22bcecdeffe137fbb3612244d5ed6a3331e4e7bc0a443d4b8c6d001b7f64b0d4712e3be63d71f5640b5b33f03b2e8c8
+EBUILD uzbl-9999.ebuild 3544 SHA256 3f7bf235995b65af248a7c78531c42565b939da1e1a28ee7123045ff43a68ff3 SHA512 8c71c975e0071706b2d31f7b323c37b1bc29b7c3bb6d4ae46ac4eac1b27df855eccfac56cf41ded666cbcdc151afb25ff356ca3afd8ad7ca95476bd7430109c9 WHIRLPOOL c7b7348a6f136d15b6c8286eb737e5019a7c7bcbbfd22d7387f5da6ab2daa6ada77d29bfc729cfc7d7ebe66df6dd8ad86b182cdbbeb908e6118ed94f83635c0c
+MISC ChangeLog 10139 SHA256 2f500f168e8244e8cf8dd40fb91b83291f7a384621c160993587c588edb9696b SHA512 4601015ebe38e0ba7787bec94db23ea51769e7f6b22e50d054e728bdf8215a45d29cd7e11bb7c2ae6d8cff89c05990573ce9483b11674e3aa24c6715c88a3c06 WHIRLPOOL 1d7f008cd0f16aa075465745e0a5e00a636497b690d1d6c50b2ce016ed2e6bda4aa5e6ca18812b8b43f663561f025075181e7d165bbcfc668c3036d300ae702f
 MISC metadata.xml 607 SHA256 79a9d40b918e124c3e8b9825b1e2001bf8d8f2084eb5a227591aa9c42bc8c325 SHA512 09ec10192e87660fc1d398c6ffe2a8fb020b9eafbd665e23a1b75ab688edf655d1974570e22511373a0121d96ef3fcc928baeae0d8e3b53379f9f64ab6117114 WHIRLPOOL 52fb352e863b47ff06f48108ee5c4322294c19d9dcb5d3f49a1d2bef4fab7afab74620af72639bd795b0ee8b46b3e93384a7e809f55cce04bee54228ffaa20d5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTjH9NAAoJEJWyH81tNOV9Pt0IALzizVmAFSkTous7Xxdh1n3p
-r2vSIAnMgQ1THeyZnVIz68kQ4doflMFqrAxay029bf1wOm5n8sopZcoRo4hhTBdB
-cqmSZdEWcqmO+vVwtf9SfnRQ9dEr3zaI3PbcMVravHwU0gPhV2/YOExY6j1djcIZ
-FxmnSpKxpdOjZQYSXmk/SkRe5y1YeHJPwogRcBGquhRheAguqSoqLvdYrMxFTx/Z
-PqnpI+eAcYCum0qhgFc3Dj596oA2PMVGtB10gMiwWKUZ24XXOVN/uLvbOvgUOh0T
-DbY636i21UF4/SXmTFn31L2zk8aFtYGsh6gFtrpOpzFp1iHCd59ba/1dbIvJWpg=
-=8/0l
+iQIcBAEBCAAGBQJTuT56AAoJEC7dUkA7aK9HbNYP+wd3MZsB8Q1npjI9vL0ciAIL
+YMBASrZ0yz+Mo++w0oFGKjZSvc+gY727rnxUkvDn8BH8j0lX+qkxbMKnRZL7RndC
+9THaNYalFW+cxw21ZF7NsfoFzwHW0vGnu2nGgytbjTfuIhB2ECwEPnHP3RYQr9JV
+M3+bmo9uAIS5UXrmeWvTR09FvEB/tNGdFz8JCLxUxzCSudm6BFze6/PYL+6iwxZJ
+Y0WI96gBNLVZ1/7RITsub30QCKVDULJ09H7/qrxbYqk2Ejc9OlrnyeVoAPDrSO+w
+rqJwHgGrvWnNzlfHv0mhgpDSWpcE6+VrQRlbSjjEJJb6qoRx4BQP7EIjEehMvZwc
+ALsmryllhddJkvlKrmSr7wAR3MBG3wPx6QlRmj86bx6b4timYo9eRE8wAyxC/LYp
+yV4F3g5eXcf/nWAbabKoeIlyJV/GM32yLu5PF9wOY15FPhV+8QCscN8EbseJ1Oqh
+Mhn3TEAZHaeXs3QhENBtuYulDP90R7auHYcvyP3c4f5TE4lcZEH1sjWr1KoWzrvT
+NsR+W0uLzNVWWEu8HI6VGMK9FmlIOuMag8hzM7jZTxmgTtDq84XhBjbVdxCYA+Rq
+9PKBJC+/QNtHiuYYFEcxOhlvfF4ETikP20vTy2elW0WKWSc5o/7GYkyENUKg4Dlx
+yDlNK7r26wzXp7CPFZIN
+=f0NV
 -----END PGP SIGNATURE-----
diff --git a/www-client/uzbl/uzbl-2012.05.14-r1.ebuild b/www-client/uzbl/uzbl-2012.05.14-r1.ebuild
new file mode 100644
index 000000000000..36e97aef1dce
--- /dev/null
+++ b/www-client/uzbl/uzbl-2012.05.14-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $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 $
+
+EAPI='5'
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI=${EGIT_REPO_URI:-'git://github.com/Dieterbe/uzbl.git'}
+	KEYWORDS=''
+	SRC_URI=''
+	IUSE='experimental'
+	use experimental &&
+		EGIT_BRANCH='next'
+else
+	inherit vcs-snapshot
+	KEYWORDS='~amd64 ~x86 ~amd64-linux ~x86-linux'
+	SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz"
+fi
+
+DESCRIPTION='Web interface tools which adhere to the unix philosophy.'
+HOMEPAGE='http://www.uzbl.org'
+
+LICENSE='LGPL-2.1 MPL-1.1'
+SLOT='0'
+IUSE+=' gtk3 +browser helpers +tabbed vim-syntax'
+
+REQUIRED_USE='tabbed? ( browser )'
+
+COMMON_DEPEND='
+	dev-libs/glib:2
+	>=dev-libs/icu-4.0.1
+	>=net-libs/libsoup-2.24:2.4
+	!gtk3? (
+		>=net-libs/webkit-gtk-1.1.15:2
+		>=x11-libs/gtk+-2.14:2
+	)
+	gtk3? (
+		net-libs/webkit-gtk:3
+		x11-libs/gtk+:3
+	)
+'
+
+DEPEND="
+	virtual/pkgconfig
+	${COMMON_DEPEND}
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	browser? (
+		x11-misc/xclip
+	)
+	helpers? (
+		dev-python/pygtk
+		dev-python/pygobject:2
+		gnome-extra/zenity
+		net-misc/socat
+		x11-libs/pango
+		x11-misc/dmenu
+		x11-misc/xclip
+	)
+	tabbed? (
+		dev-python/pygtk
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+# TODO document what requires the above helpers
+
+PREFIX="${EPREFIX}/usr"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if ! use helpers; then
+		elog "uzbl's extra scripts use various optional applications:"
+		elog
+		elog '   dev-python/pygtk'
+		elog '   dev-python/pygobject:2'
+		elog '   gnome-extra/zenity'
+		elog '   net-misc/socat'
+		elog '   x11-libs/pango'
+		elog '   x11-misc/dmenu'
+		elog '   x11-misc/xclip'
+		elog
+		elog 'Make sure you emerge the ones you need manually.'
+		elog 'You may also activate the *helpers* USE flag to'
+		elog 'install all of them automatically.'
+	else
+		einfo 'You have enabled the *helpers* USE flag that installs'
+		einfo "various optional applications used by uzbl's extra scripts."
+	fi
+}
+
+src_prepare() {
+	# remove -ggdb
+	sed -i 's/-ggdb //g' Makefile ||
+		die '-ggdb removal sed failed'
+
+	# make gtk3 configurable
+	sed -r 's:^(USE_GTK3) = (.*):\1?=\2:' -i Makefile ||
+		die 'Makefile sed for gtk3 failed'
+
+	# specify python version
+	python_fix_shebang bin/uzbl-tabbed ||
+		die 'Fix shebang failed'
+
+	# fix sandbox
+	if [ ${PV} == 9999 ] && ! use experimental
+	then
+		sed -i 's/prefix=$(PREFIX)/prefix=$(DESTDIR)\/$(PREFIX)/' Makefile ||
+			die 'Makefile sed for sandbox failed'
+	fi
+
+	# fix QA of uzbl.desktop
+	if [ ${PV} == 9999 ] && use experimental
+	then
+		sed -i 's/Categories=Application;Network;/Categories=Network;/'	\
+			uzbl.desktop.in || die 'QA compliance of uzbl.desktop.in failed'
+	fi
+}
+
+src_compile() {
+	[[ ${PV} == 9999 ]] && gtk_var='ENABLE_GTK3' || gtk_var='USE_GTK3'
+	emake PREFIX="${PREFIX}" ${gtk_var}=$(use gtk3 && echo 1 || echo 0)
+}
+
+src_install() {
+	local targets='install-uzbl-core'
+	use browser && targets="${targets} install-uzbl-browser"
+	use browser && use tabbed && targets="${targets} install-uzbl-tabbed"
+
+	# -j1 : upstream bug #351
+	emake -j1 DESTDIR="${D}" PREFIX="${PREFIX}"	\
+		DOCDIR="${ED}/usr/share/doc/${PF}" ${targets}
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/uzbl.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/uzbl.vim
+	fi
+}
diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild
index 1519081eaaaf..06d6e740e317 100644
--- a/www-client/uzbl/uzbl-9999.ebuild
+++ b/www-client/uzbl/uzbl-9999.ebuild
@@ -1,35 +1,37 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.28 2014/06/02 13:43:20 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.29 2014/07/06 12:18:50 swift Exp $
 
-EAPI="4"
+EAPI='5'
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
 
-IUSE="gtk3"
 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/Dieterbe/uzbl.git"}
-	KEYWORDS=""
-	SRC_URI=""
-	IUSE+=" experimental"
+	EGIT_REPO_URI=${EGIT_REPO_URI:-'git://github.com/Dieterbe/uzbl.git'}
+	KEYWORDS=''
+	SRC_URI=''
+	IUSE='experimental'
 	use experimental &&
-		EGIT_BRANCH="experimental" &&
-		EGIT_COMMIT="experimental"
+		EGIT_BRANCH='next'
 else
 	inherit vcs-snapshot
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS='~amd64 ~x86 ~amd64-linux ~x86-linux'
 	SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz"
 fi
 
-DESCRIPTION="Web interface tools which adhere to the unix philosophy"
-HOMEPAGE="http://www.uzbl.org"
+DESCRIPTION='Web interface tools which adhere to the unix philosophy.'
+HOMEPAGE='http://www.uzbl.org'
 
-LICENSE="LGPL-2.1 MPL-1.1"
-SLOT="0"
-IUSE+=" +browser helpers +tabbed vim-syntax"
+LICENSE='LGPL-2.1 MPL-1.1'
+SLOT='0'
+IUSE+=' gtk3 +browser helpers +tabbed vim-syntax'
 
-REQUIRED_USE="tabbed? ( browser )"
+REQUIRED_USE='tabbed? ( browser )'
 
-COMMON_DEPEND="
+COMMON_DEPEND='
 	dev-libs/glib:2
 	>=dev-libs/icu-4.0.1
 	>=net-libs/libsoup-2.24:2.4
@@ -41,8 +43,7 @@ COMMON_DEPEND="
 		net-libs/webkit-gtk:3
 		x11-libs/gtk+:3
 	)
-
-"
+'
 
 DEPEND="
 	virtual/pkgconfig
@@ -71,47 +72,71 @@ RDEPEND="
 "
 # TODO document what requires the above helpers
 
+PREFIX="${EPREFIX}/usr"
+
 pkg_setup() {
+	python-single-r1_pkg_setup
 	if ! use helpers; then
 		elog "uzbl's extra scripts use various optional applications:"
 		elog
-		elog "   dev-python/pygtk"
-		elog "   dev-python/pygobject:2"
-		elog "   gnome-extra/zenity"
-		elog "   net-misc/socat"
-		elog "   x11-libs/pango"
-		elog "   x11-misc/dmenu"
-		elog "   x11-misc/xclip"
+		elog '   dev-python/pygtk'
+		elog '   dev-python/pygobject:2'
+		elog '   gnome-extra/zenity'
+		elog '   net-misc/socat'
+		elog '   x11-libs/pango'
+		elog '   x11-misc/dmenu'
+		elog '   x11-misc/xclip'
 		elog
-		elog "Make sure you emerge the ones you need manually."
-		elog "You may also activate the *helpers* USE flag to"
-		elog "install all of them automatically."
+		elog 'Make sure you emerge the ones you need manually.'
+		elog 'You may also activate the *helpers* USE flag to'
+		elog 'install all of them automatically.'
 	else
-		einfo "You have enabled the *helpers* USE flag that installs"
+		einfo 'You have enabled the *helpers* USE flag that installs'
 		einfo "various optional applications used by uzbl's extra scripts."
 	fi
 }
 
 src_prepare() {
 	# remove -ggdb
-	sed -i "s/-ggdb //g" Makefile ||
-		die "-ggdb removal sed failed"
+	sed -i 's/-ggdb //g' Makefile ||
+		die '-ggdb removal sed failed'
 
 	# make gtk3 configurable
-	sed -r "s:^(USE_GTK3) = (.*):\1?=\2:" -i Makefile ||
-		die "Makefile sed for gtk3 failed"
+	sed -r 's:^(USE_GTK3) = (.*):\1?=\2:' -i Makefile ||
+		die 'Makefile sed for gtk3 failed'
+
+	# specify python version
+	python_fix_shebang bin/uzbl-tabbed ||
+		die 'Fix shebang failed'
+
+	# fix sandbox
+	if [ ${PV} == 9999 ] && ! use experimental
+	then
+		sed -i 's/prefix=$(PREFIX)/prefix=$(DESTDIR)\/$(PREFIX)/' Makefile ||
+			die 'Makefile sed for sandbox failed'
+	fi
+
+	# fix QA of uzbl.desktop
+	if [ ${PV} == 9999 ] && use experimental
+	then
+		sed -i 's/Categories=Application;Network;/Categories=Network;/'	\
+			uzbl.desktop.in || die 'QA compliance of uzbl.desktop.in failed'
+	fi
 }
 
 src_compile() {
-	emake USE_GTK3=$(use gtk3 && echo 1 || echo 0)
+	[[ ${PV} == 9999 ]] && gtk_var='ENABLE_GTK3' || gtk_var='USE_GTK3'
+	emake PREFIX="${PREFIX}" ${gtk_var}=$(use gtk3 && echo 1 || echo 0)
 }
 
 src_install() {
-	local targets="install-uzbl-core"
+	local targets='install-uzbl-core'
 	use browser && targets="${targets} install-uzbl-browser"
 	use browser && use tabbed && targets="${targets} install-uzbl-tabbed"
 
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" DOCDIR="${ED}/usr/share/doc/${PF}" ${targets}
+	# -j1 : upstream bug #351
+	emake -j1 DESTDIR="${D}" PREFIX="${PREFIX}"	\
+		DOCDIR="${ED}/usr/share/doc/${PF}" ${targets}
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/ftdetect
@@ -120,5 +145,4 @@ src_install() {
 		insinto /usr/share/vim/vimfiles/syntax
 		doins "${S}"/extras/vim/syntax/uzbl.vim
 	fi
-
 }