Merge remote-tracking branch 'github/pr/608'.

Gentoo-Bug: 570836
Pull-Request: https://github.com/gentoo/gentoo/pull/608

5 files changed, 0 insertions, 443 deletions

diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
deleted file mode 100644
index d3e6fa3b3ed0..000000000000
--- a/www-client/uzbl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uzbl-2012.05.14.tar.gz 152376 SHA256 4b4b3baf2339250b81818b12918af51a33f353a580856fe27eb193f71a4294cf SHA512 d0025a50c852007d5203b05d1bb1e77855c1c1d7e3cad685fd981817e5729682ccf01786f7e06c36a82ebbc1079e5d83fdb1cca40cc768024088dcc840a5ef90 WHIRLPOOL 1e16856b7b5005ae3dcad00c48ad5548bbee0d09403cdde35eda350013944ce35d67fc53063abf69d28d3c3ca37fc305101f0a6d2d645d9f01af1560d25f04e7
diff --git a/www-client/uzbl/metadata.xml b/www-client/uzbl/metadata.xml
deleted file mode 100644
index f41c27690e4b..000000000000
--- a/www-client/uzbl/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tharvik@gmail.com</email>
-		<name>Kéwan Marconnet</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="browser">Install the uzbl-browser script</flag>
-		<flag name="experimental">Enable experimental branch</flag>
-		<flag name="helpers">Optional tools used by uzbl scripts</flag>
-		<flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
-		<flag name="tabbed">Install the uzbl-tabbed script</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">Dieterbe/uzbl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-client/uzbl/uzbl-2012.05.14-r1.ebuild b/www-client/uzbl/uzbl-2012.05.14-r1.ebuild
deleted file mode 100644
index b6171741ddb9..000000000000
--- a/www-client/uzbl/uzbl-2012.05.14-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="https://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-2012.05.14.ebuild b/www-client/uzbl/uzbl-2012.05.14.ebuild
deleted file mode 100644
index 2d0859a297fd..000000000000
--- a/www-client/uzbl/uzbl-2012.05.14.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-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"
-	use experimental &&
-		EGIT_BRANCH="experimental" &&
-		EGIT_COMMIT="experimental"
-else
-	inherit vcs-snapshot
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://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+=" +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
-
-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"
-}
-
-src_compile() {
-	emake USE_GTK3=$(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"
-
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" 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
deleted file mode 100644
index b6171741ddb9..000000000000
--- a/www-client/uzbl/uzbl-9999.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="https://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
-}