removed obsolete stuff

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key EB9B4AFA)

8 files changed, 8 insertions, 822 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index 1e3137e48da1..e47552241795 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/uzbl
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.50 2012/08/20 17:12:46 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.51 2013/02/02 04:42:03 wired Exp $
+
+  02 Feb 2013; Alex Alexander <wired@gentoo.org> -uzbl-2010.11.25.ebuild,
+  -uzbl-2011.02.15.ebuild, -uzbl-2011.03.17.ebuild, -uzbl-2011.07.17.ebuild,
+  -uzbl-2011.07.25.ebuild, -uzbl-2011.10.01.ebuild,
+  -files/uzbl-makefile-docdir.patch:
+  removed obsolete stuff
 
 *uzbl-2012.05.14 (20 Aug 2012)
 
diff --git a/www-client/uzbl/files/uzbl-makefile-docdir.patch b/www-client/uzbl/files/uzbl-makefile-docdir.patch
deleted file mode 100644
index ae1c4c6e39b8..000000000000
--- a/www-client/uzbl/files/uzbl-makefile-docdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.orig	2010-03-14 15:31:02.685612392 +0200
-+++ Makefile	2010-03-14 15:34:02.224647749 +0200
-@@ -43,6 +43,7 @@
- # RUN_PREFIX : what the prefix is when the software is run. usually the same as PREFIX
- PREFIX?=/usr/local
- INSTALLDIR?=$(DESTDIR)$(PREFIX)
-+DOCDIR?=$(INSTALLDIR)/share/uzbl/docs
- RUN_PREFIX?=$(PREFIX)
- 
- # the 'tests' target can never be up to date
-@@ -100,14 +101,14 @@
- 
- install-uzbl-core: all
- 	install -d $(INSTALLDIR)/bin
--	install -d $(INSTALLDIR)/share/uzbl/docs
-+	install -d $(DOCDIR)
- 	install -d $(INSTALLDIR)/share/uzbl/examples
--	cp -rp docs         $(INSTALLDIR)/share/uzbl/
--	cp -rp src/config.h $(INSTALLDIR)/share/uzbl/docs/
-+	cp -rp docs/*       $(DOCDIR)/
-+	cp -rp src/config.h $(DOCDIR)/
- 	cp -rp examples     $(INSTALLDIR)/share/uzbl/
- 	install -m755 uzbl-core    $(INSTALLDIR)/bin/uzbl-core
--	install -m644 AUTHORS      $(INSTALLDIR)/share/uzbl/docs
--	install -m644 README       $(INSTALLDIR)/share/uzbl/docs
-+	install -m644 AUTHORS      $(DOCDIR)
-+	install -m644 README       $(DOCDIR)
- 	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
- 
- install-uzbl-browser:
diff --git a/www-client/uzbl/uzbl-2010.11.25.ebuild b/www-client/uzbl/uzbl-2010.11.25.ebuild
deleted file mode 100644
index 78df950be003..000000000000
--- a/www-client/uzbl/uzbl-2010.11.25.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2010.11.25.ebuild,v 1.5 2012/05/03 06:01:03 jdhore Exp $
-
-EAPI="2"
-
-inherit base
-
-IUSE=""
-if [[ ${PV} == *9999* ]]; then
-	inherit git
-	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
-	KEYWORDS="~amd64 ~x86"
-	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+=" +browser helpers +tabbed vim-syntax"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	>=dev-libs/icu-4.0.1
-	>=net-libs/libsoup-2.24:2.4
-	>=net-libs/webkit-gtk-1.1.15:2
-	>=x11-libs/gtk+-2.14:2
-"
-
-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
-
-	if use tabbed && ! use browser; then
-		ewarn
-		ewarn "You enabled the *tabbed* USE flag but not *browser*."
-		ewarn "*tabbed* depends on *browser*, so it will be disabled."
-		ewarn
-		ebeep 3
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} == *9999* ]]; then
-		git_src_prepare
-	else
-		cd "${WORKDIR}"/Dieterbe-uzbl-*
-		S=$(pwd)
-	fi
-
-	# remove -ggdb
-	sed -i "s/-ggdb //g" Makefile ||
-		die "-ggdb removal sed failed"
-
-	# adjust path in default config file to /usr/share
-	sed -i "s:/usr/local/share/uzbl:/usr/share/uzbl:g" \
-		examples/config/config ||
-		die "config path sed failed"
-}
-
-src_compile() {
-	emake || die "compile failed"
-}
-
-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="/usr" DOCDIR="${D}/usr/share/doc/${PF}" ${targets} ||
-		die "Installation failed"
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/uzbl.vim || die "vim-syntax doins failed"
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/uzbl.vim || die "vim-syntax doins failed"
-	fi
-
-}
diff --git a/www-client/uzbl/uzbl-2011.02.15.ebuild b/www-client/uzbl/uzbl-2011.02.15.ebuild
deleted file mode 100644
index 98ea2eac90ab..000000000000
--- a/www-client/uzbl/uzbl-2011.02.15.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2011.02.15.ebuild,v 1.6 2012/05/03 06:01:03 jdhore Exp $
-
-EAPI="4"
-
-inherit base
-
-IUSE=""
-if [[ ${PV} == *9999* ]]; then
-	inherit git
-	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
-	KEYWORDS="~amd64 ~x86"
-	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+=" +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
-	>=net-libs/webkit-gtk-1.1.15:2
-	>=x11-libs/gtk+-2.14:2
-"
-
-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
-	ewarn
-	ewarn "This version introduces some backwards-incompatible changes."
-	ewarn "Please read http://www.uzbl.org/news.php?id=32 for more details."
-	ewarn
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git_src_unpack
-	else
-		unpack ${A}
-		mv Dieterbe-uzbl-* "${S}"
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} == *9999* ]]; then
-		git_src_prepare
-	fi
-
-	# remove -ggdb
-	sed -i "s/-ggdb //g" Makefile ||
-		die "-ggdb removal sed failed"
-}
-
-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="/usr" DOCDIR="${D}/usr/share/doc/${PF}" ${targets} ||
-		die "Installation failed"
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/uzbl.vim || die "vim-syntax doins failed"
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/uzbl.vim || die "vim-syntax doins failed"
-	fi
-
-}
diff --git a/www-client/uzbl/uzbl-2011.03.17.ebuild b/www-client/uzbl/uzbl-2011.03.17.ebuild
deleted file mode 100644
index 628265957d1b..000000000000
--- a/www-client/uzbl/uzbl-2011.03.17.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2011.03.17.ebuild,v 1.3 2012/05/03 06:01:03 jdhore Exp $
-
-EAPI="4"
-
-inherit base
-
-IUSE=""
-if [[ ${PV} == *9999* ]]; then
-	inherit git
-	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
-	KEYWORDS="~amd64 ~x86"
-	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+=" +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
-	>=net-libs/webkit-gtk-1.1.15:2
-	>=x11-libs/gtk+-2.14:2
-"
-
-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
-	ewarn
-	ewarn "This version introduces some backwards-incompatible changes."
-	ewarn "Please read http://www.uzbl.org/news.php?id=33 for more details."
-	ewarn
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git_src_unpack
-	else
-		unpack ${A}
-		mv Dieterbe-uzbl-* "${S}"
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} == *9999* ]]; then
-		git_src_prepare
-	fi
-
-	# remove -ggdb
-	sed -i "s/-ggdb //g" Makefile ||
-		die "-ggdb removal sed failed"
-}
-
-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="/usr" DOCDIR="${D}/usr/share/doc/${PF}" ${targets} ||
-		die "Installation failed"
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/uzbl.vim || die "vim-syntax doins failed"
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/uzbl.vim || die "vim-syntax doins failed"
-	fi
-
-}
diff --git a/www-client/uzbl/uzbl-2011.07.17.ebuild b/www-client/uzbl/uzbl-2011.07.17.ebuild
deleted file mode 100644
index cf084574ae3f..000000000000
--- a/www-client/uzbl/uzbl-2011.07.17.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2011.07.17.ebuild,v 1.3 2012/05/03 06:01:03 jdhore Exp $
-
-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
-	KEYWORDS="~amd64 ~x86"
-	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+=" +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
-	echo
-	ewarn "There's a window sizing bug in this release. Upstream is deciding on"
-	ewarn "a solution, until then you can work around it by adding"
-	ewarn "  set scrollbars_visible = 1"
-	ewarn "to the bottom of your config file."
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-		mv Dieterbe-uzbl-* "${S}"
-	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="/usr" DOCDIR="${D}/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-2011.07.25.ebuild b/www-client/uzbl/uzbl-2011.07.25.ebuild
deleted file mode 100644
index 016ca6967459..000000000000
--- a/www-client/uzbl/uzbl-2011.07.25.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2011.07.25.ebuild,v 1.3 2012/05/03 06:01:03 jdhore Exp $
-
-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
-	KEYWORDS="~amd64 ~x86"
-	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+=" +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_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-		mv Dieterbe-uzbl-* "${S}"
-	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="/usr" DOCDIR="${D}/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-2011.10.01.ebuild b/www-client/uzbl/uzbl-2011.10.01.ebuild
deleted file mode 100644
index cefb9345f00a..000000000000
--- a/www-client/uzbl/uzbl-2011.10.01.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2011.10.01.ebuild,v 1.3 2012/05/03 06:01:03 jdhore Exp $
-
-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
-	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+=" +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_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-		mv Dieterbe-uzbl-* "${S}"
-	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
-
-}