From 305d9b248697fd66486c68cfe5f9ce7305ee09bf Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sat, 16 Jul 2016 19:29:20 +0100
Subject: clean some deprecated ebuilds

---
 dev-vcs/git-gui-tools/Manifest                   |  10 --
 dev-vcs/git-gui-tools/git-gui-tools-2.2.1.ebuild | 217 -----------------------
 dev-vcs/git-gui-tools/git-gui-tools-2.2.2.ebuild | 205 ---------------------
 dev-vcs/git-gui-tools/git-gui-tools-2.3.0.ebuild | 205 ---------------------
 dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild | 205 ---------------------
 dev-vcs/git-gui-tools/git-gui-tools-2.4.0.ebuild | 205 ---------------------
 dev-vcs/git-gui-tools/git-gui-tools-2.4.2.ebuild | 205 ---------------------
 dev-vcs/git-gui-tools/git-gui-tools-2.4.4.ebuild | 205 ---------------------
 dev-vcs/git-gui-tools/git-gui-tools-2.4.6.ebuild | 205 ---------------------
 dev-vcs/git-gui-tools/git-gui-tools-2.5.0.ebuild | 205 ---------------------
 10 files changed, 1867 deletions(-)
 delete mode 100644 dev-vcs/git-gui-tools/Manifest
 delete mode 100644 dev-vcs/git-gui-tools/git-gui-tools-2.2.1.ebuild
 delete mode 100644 dev-vcs/git-gui-tools/git-gui-tools-2.2.2.ebuild
 delete mode 100644 dev-vcs/git-gui-tools/git-gui-tools-2.3.0.ebuild
 delete mode 100644 dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild
 delete mode 100644 dev-vcs/git-gui-tools/git-gui-tools-2.4.0.ebuild
 delete mode 100644 dev-vcs/git-gui-tools/git-gui-tools-2.4.2.ebuild
 delete mode 100644 dev-vcs/git-gui-tools/git-gui-tools-2.4.4.ebuild
 delete mode 100644 dev-vcs/git-gui-tools/git-gui-tools-2.4.6.ebuild
 delete mode 100644 dev-vcs/git-gui-tools/git-gui-tools-2.5.0.ebuild

(limited to 'dev-vcs/git-gui-tools')

diff --git a/dev-vcs/git-gui-tools/Manifest b/dev-vcs/git-gui-tools/Manifest
deleted file mode 100644
index c2378c09..00000000
--- a/dev-vcs/git-gui-tools/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST git-2.2.1.tar.xz 3590808 SHA256 09422dc9a0bdddf6bdd5b8634c71e1ed3125256c47424e6a2687701e764ef450 SHA512 66bccfa617d2c8e2e61e5aac9b8daef9d4dc151b85906af252cadef3306ecf792ad6d7869deb149f0d04f6e7c3e9f71119bfeece5690e61782fb357e5384027b WHIRLPOOL f288d0227f3ad3045fd7dcc7a7fa6e68cb29c3a4d363d6648aa4f09aa5742a4496c67d63d0ad120a1f8f9420b9ae30930b8ffb3229f176cf429f8b8c8a1d06e6
-DIST git-2.2.2-Gentoo-patches.tar.gz 4605 SHA256 70613dd13269a919069deadda91e157928d4ea9ff3b3e54d7755552610275cd0 SHA512 cd7b27108a0cb9449c90c063d7506ae28004d95bc3379542adf77cd135345b591383b264398ede5d7ce946dca01cd064d30688ec6143588d969a1f9dfc896c8c WHIRLPOOL 1ecffa35d78eadda38a517f9c3b1e177e8a84541cabeba95ab670dfa9d8ada9a7f7817c592bd80e9e0b5993549d9e9c2c3325b2eda07a60164679b3048b1d403
-DIST git-2.2.2.tar.xz 3592264 SHA256 aa6d2efcc0c7bb9b9edc6d56d90921706b833972f1d2abe70f71be7838f22d05 SHA512 e3ca6f40de04ed940f521fff4c7e92446e40ad1627acc5b4c090ebf114dcf279d4b1f3efe1189ffa43192fce412165621fc12ea90e2f7d02a6a9ccda655dc69b WHIRLPOOL 9e20def83bbb9b11cb5982fc5f19b09767657ff80f02a237dff6ddaddd3209b4cfb9288bec1b6dc80c6a6db1869cfcaa90e2374279012fc8215771c1a58a1fc2
-DIST git-2.3.0.tar.xz 3608648 SHA256 94b23a14d66df536cfe7de37551f55acf908f8bddf30a0f5325a255bb57b0aca SHA512 4be85d3ba3ffac6c55cce648ab6c0a6fe89164e9657480aeee0def79289dbcba486722756b1729d0cedda6012cd582b88129d483ce916bfe06cde5a423f05bc7 WHIRLPOOL d08762cf37536a347aabb2916dce9d482313c41a180b5c440481d9574e9a6c482eb18e0055410171478010e647ae353d70f7113fa07fd8d74bb77909e327ea75
-DIST git-2.3.1.tar.xz 3609908 SHA256 1acc4b051576143eb41d80f5675476629588c7c5fb4e6a1dc2c4590f47c498b7 SHA512 f113a9e8c7f9879088de6fa6bfbe9363f25eac279d5eb218ea1f5186cd1c45609760f498a5c066196b3a6e15dd931960e94dcdc14685e8ef1c5c72524113c0cf WHIRLPOOL f1c15ded4f4785d244a5242c823fcf8d63d1c3408c1a1696c99926fdbcab76e23e40d3ee8225925e786ce8eae7597a73a7f9f6cd8e5f1ef7d599ac8b254f9951
-DIST git-2.4.0.tar.xz 3681516 SHA256 b33438dd94659958a74850aacae4a2b3a626baec36d7f29c266130b08045bb24 SHA512 0114c5d0dbfeed46e0ba1c8c0da463c52cae6954238547502f44d9050af0d921906beea96ff2c5f56a7c822200d9daa0f1d040f883c701b88a23ec81ac777138 WHIRLPOOL 1f4667b295e541d4f035de9e415636f317f590e104119a1b212cb321f25120df31e45ba88470ee883d1ea9a0033f2b307981c9d9e5807919475dbc5f81b6b22e
-DIST git-2.4.2.tar.xz 3683880 SHA256 4801ec1cd8c2175b58cfdbc721d0bf50d74ae226f36905fceb894c2fb620c9e5 SHA512 0013069b73572fd764489222ad94cf94b9e08fc65223187a300e6662fb56b27dceea0b3a473cf8630793a5bf0c87e3b63264936bc38b66f71c6a548912540326 WHIRLPOOL 52d2fcd44c4da3f0e1f2caa229e1086b92022b992e410f3c20344f527f3cb9a623d3f0b6a8d5d66f3e4f43b9677f0211ebbaaffe85a621b784af1f5bc3f5896c
-DIST git-2.4.4.tar.xz 3689492 SHA256 f873b15d42281474fcba5921295d01e48a3cd3cddcbeb3d60176bf30f5f30260 SHA512 b4d3401d1e4f40f74f8eb75194d1edf0107786b942cf5e3fd127e4a268ce31ec4954195519444cc84e34caca4569d6fd41edafa2037116f60320f2c59c6e7cdf WHIRLPOOL 6fd9d4076586f25154cb448315a1492ffe7acfa5bb811c54e342acc4fcf28da423ab0042f23aa579adefbefa6b3f5dc45c949a36744c94d5420780a2175bde85
-DIST git-2.4.6.tar.xz 3690432 SHA256 bdd944571c03474517b6c9941d6f1fd735eccbb164e59fd133d38644b69453b6 SHA512 2c95a00af81d6fbd8f4984e89d7cb23396caacadd684466aeb5a11f1b3acfbc625f832060cbef5aee0748e36c1fddcd88b3b9c26c4d7aec1d185e5f7311346ef WHIRLPOOL 1ae191666bf27a7e18686b910cbe610f85b5b7a43266232359615fa2a22b80bc659277b71b21394eab53df0c912d9ad911c7793c2a041cd6c7d768a5f0416f5b
-DIST git-2.5.0.tar.xz 3740620 SHA256 cc59b1bac6c1c67a9159872863f6c5bbe0d9404cac2a85c3e9d9fa49923ce45c SHA512 ef7538c9f5ba5b2ac08962401c30e5fd51323b54b9fb5315d259adccec346e8fae9362815832dc2b5ce63a259b315c40e419bb2385dde04d84b992e62f6789b6 WHIRLPOOL 653e7aeb966dec44631bbd257a41935b2e957be9324311a4fd91f3a0ba6f1f674e2e59b4c564d70c4eeaea3788f0af9273a1d0a753b3bc820e687f0d63bddf5d
diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.2.1.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.2.1.ebuild
deleted file mode 100644
index ba6a10e0..00000000
--- a/dev-vcs/git-gui-tools/git-gui-tools-2.2.1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_{6,7} )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" )
-inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_PV="${MY_PV/-gui-tools}"
-MY_P="${PN}-${MY_PV}"
-MY_P="${MY_P/-gui-tools}"
-
-DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="http://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
-	KEYWORDS="~amd64 ~x86"
-else
-	#SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	sys-libs/zlib
-	dev-lang/tk"
-
-RDEPEND="${CDEPEND}
-	~dev-vcs/git-${PV}
-	dev-vcs/git[-gtk]
-	dev-vcs/git[-tk]
-	dev-vcs/git[python]
-	>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-	>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-
-DEPEND="${CDEPEND}
-	app-arch/cpio
-	"
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	#if use python ; then
-	python-single-r1_pkg_setup
-	#fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	myopts="${myopts} NO_EXPAT=YesPlease"
-	myopts="${myopts} NO_CURL=YesPlease"
-	# broken assumptions, because of broken build system ...
-	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts="${myopts} INSTALL=install TAR=tar"
-	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts="${myopts} SANE_TOOL_PATH="
-	myopts="${myopts} OLD_ICONV="
-	myopts="${myopts} NO_EXTERNAL_GREP="
-
-	# split ebuild: avoid collisions with dev-vcs/git's .mo files
-	myopts="${myopts} NO_GETTEXT=YesPlease"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	#use nls \
-	#	|| myopts="${myopts} NO_GETTEXT=YesPlease"
-	# use tk \
-	#	|| myopts="${myopts} NO_TCLTK=YesPlease"
-	#use perl \
-	#	&& myopts="${myopts} INSTALLDIRS=vendor" \
-	#	|| myopts="${myopts} NO_PERL=YesPlease"
-	myopts="${myopts} NO_PERL=YesPlease"
-	#use python \
-	#	|| myopts="${myopts} NO_PYTHON=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts="${myopts} NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-	kog-patches_unpack
-}
-
-src_prepare() {
-	# see the git ebuild for the list of patches
-	kog-patches_apply_all
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-}
-
-git_emake() {
-	PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	#if use python && use gtk ; then
-	python_doscript "${S}"/contrib/gitview/gitview
-	dodoc "${S}"/contrib/gitview/gitview.txt
-	#fi
-
-	#find "${ED}"/usr/lib64/perl5/ \
-	#	-name .packlist \
-	#	-exec rm \{\} \;
-
-	rm -r "${ED}"usr/share/git-core || die
-	rm -r "${ED}"usr/libexec/git-core/mergetools || die
-
-	local myfile
-
-	# be sure not to remove tools' lib/python-exec/*
-	for myfile in "${ED}"usr/lib*/python*; do
-		if [[ ! ${myfile} = */python-exec ]]; then
-			rm -r "${myfile}" || die "rm ${myfile} failed"
-		fi
-	done
-
-	for myfile in "${ED}"usr/bin/*; do
-		case "$myfile" in
-			*/gitview*|*/gitk*)
-				true ;;
-			*)
-				rm -f "$myfile" ;;
-		esac
-	done
-
-	for myfile in "${ED}"usr/libexec/git-core/*; do
-		case "$myfile" in
-		*/git-gui|*/git-gui--askpass|*/git-citool)
-			true ;;
-		*)
-			rm -f "$myfile" ;;
-		esac
-	done
-}
diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.2.2.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.2.2.ebuild
deleted file mode 100644
index 43898cec..00000000
--- a/dev-vcs/git-gui-tools/git-gui-tools-2.2.2.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_{6,7} )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" )
-inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_PV="${MY_PV/-gui-tools}"
-MY_P="${PN}-${MY_PV}"
-MY_P="${MY_P/-gui-tools}"
-
-DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="http://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	sys-libs/zlib
-	dev-lang/tk"
-
-RDEPEND="${CDEPEND}
-	~dev-vcs/git-${PV}
-	dev-vcs/git[-gtk]
-	dev-vcs/git[-tk]
-	dev-vcs/git[python]
-	>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-	>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-
-DEPEND="${CDEPEND}
-	app-arch/cpio
-	"
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	#if use python ; then
-	python-single-r1_pkg_setup
-	#fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	myopts+=" NO_EXPAT=YesPlease"
-	myopts+=" NO_CURL=YesPlease"
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# split ebuild: avoid collisions with dev-vcs/git's .mo files
-	myopts+=" NO_GETTEXT=YesPlease"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	myopts+=" NO_PERL=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-	kog-patches_unpack
-}
-
-src_prepare() {
-	# see the git ebuild for the list of patches
-	kog-patches_apply_all
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-}
-
-git_emake() {
-	PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	#if use python && use gtk ; then
-	python_doscript "${S}"/contrib/gitview/gitview
-	dodoc "${S}"/contrib/gitview/gitview.txt
-	#fi
-
-	#find "${ED}"/usr/lib64/perl5/ \
-	#	-name .packlist \
-	#	-exec rm \{\} \;
-
-	rm -r "${ED}"usr/share/git-core || die
-	rm -r "${ED}"usr/libexec/git-core/mergetools || die
-
-	local myfile
-
-	# be sure not to remove tools' lib/python-exec/*
-	for myfile in "${ED}"usr/lib*/python*; do
-		if [[ ! ${myfile} = */python-exec ]]; then
-			rm -r "${myfile}" || die "rm ${myfile} failed"
-		fi
-	done
-
-	for myfile in "${ED}"usr/bin/*; do
-		case "$myfile" in
-			*/gitview*|*/gitk*)
-				true ;;
-			*)
-				rm -f "$myfile" ;;
-		esac
-	done
-
-	for myfile in "${ED}"usr/libexec/git-core/*; do
-		case "$myfile" in
-		*/git-gui|*/git-gui--askpass|*/git-citool)
-			true ;;
-		*)
-			rm -f "$myfile" ;;
-		esac
-	done
-}
diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.3.0.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.3.0.ebuild
deleted file mode 100644
index 43898cec..00000000
--- a/dev-vcs/git-gui-tools/git-gui-tools-2.3.0.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_{6,7} )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" )
-inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_PV="${MY_PV/-gui-tools}"
-MY_P="${PN}-${MY_PV}"
-MY_P="${MY_P/-gui-tools}"
-
-DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="http://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	sys-libs/zlib
-	dev-lang/tk"
-
-RDEPEND="${CDEPEND}
-	~dev-vcs/git-${PV}
-	dev-vcs/git[-gtk]
-	dev-vcs/git[-tk]
-	dev-vcs/git[python]
-	>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-	>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-
-DEPEND="${CDEPEND}
-	app-arch/cpio
-	"
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	#if use python ; then
-	python-single-r1_pkg_setup
-	#fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	myopts+=" NO_EXPAT=YesPlease"
-	myopts+=" NO_CURL=YesPlease"
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# split ebuild: avoid collisions with dev-vcs/git's .mo files
-	myopts+=" NO_GETTEXT=YesPlease"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	myopts+=" NO_PERL=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-	kog-patches_unpack
-}
-
-src_prepare() {
-	# see the git ebuild for the list of patches
-	kog-patches_apply_all
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-}
-
-git_emake() {
-	PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	#if use python && use gtk ; then
-	python_doscript "${S}"/contrib/gitview/gitview
-	dodoc "${S}"/contrib/gitview/gitview.txt
-	#fi
-
-	#find "${ED}"/usr/lib64/perl5/ \
-	#	-name .packlist \
-	#	-exec rm \{\} \;
-
-	rm -r "${ED}"usr/share/git-core || die
-	rm -r "${ED}"usr/libexec/git-core/mergetools || die
-
-	local myfile
-
-	# be sure not to remove tools' lib/python-exec/*
-	for myfile in "${ED}"usr/lib*/python*; do
-		if [[ ! ${myfile} = */python-exec ]]; then
-			rm -r "${myfile}" || die "rm ${myfile} failed"
-		fi
-	done
-
-	for myfile in "${ED}"usr/bin/*; do
-		case "$myfile" in
-			*/gitview*|*/gitk*)
-				true ;;
-			*)
-				rm -f "$myfile" ;;
-		esac
-	done
-
-	for myfile in "${ED}"usr/libexec/git-core/*; do
-		case "$myfile" in
-		*/git-gui|*/git-gui--askpass|*/git-citool)
-			true ;;
-		*)
-			rm -f "$myfile" ;;
-		esac
-	done
-}
diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild
deleted file mode 100644
index 43898cec..00000000
--- a/dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_{6,7} )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" )
-inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_PV="${MY_PV/-gui-tools}"
-MY_P="${PN}-${MY_PV}"
-MY_P="${MY_P/-gui-tools}"
-
-DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="http://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	sys-libs/zlib
-	dev-lang/tk"
-
-RDEPEND="${CDEPEND}
-	~dev-vcs/git-${PV}
-	dev-vcs/git[-gtk]
-	dev-vcs/git[-tk]
-	dev-vcs/git[python]
-	>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-	>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-
-DEPEND="${CDEPEND}
-	app-arch/cpio
-	"
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	#if use python ; then
-	python-single-r1_pkg_setup
-	#fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	myopts+=" NO_EXPAT=YesPlease"
-	myopts+=" NO_CURL=YesPlease"
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# split ebuild: avoid collisions with dev-vcs/git's .mo files
-	myopts+=" NO_GETTEXT=YesPlease"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	myopts+=" NO_PERL=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-	kog-patches_unpack
-}
-
-src_prepare() {
-	# see the git ebuild for the list of patches
-	kog-patches_apply_all
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-}
-
-git_emake() {
-	PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	#if use python && use gtk ; then
-	python_doscript "${S}"/contrib/gitview/gitview
-	dodoc "${S}"/contrib/gitview/gitview.txt
-	#fi
-
-	#find "${ED}"/usr/lib64/perl5/ \
-	#	-name .packlist \
-	#	-exec rm \{\} \;
-
-	rm -r "${ED}"usr/share/git-core || die
-	rm -r "${ED}"usr/libexec/git-core/mergetools || die
-
-	local myfile
-
-	# be sure not to remove tools' lib/python-exec/*
-	for myfile in "${ED}"usr/lib*/python*; do
-		if [[ ! ${myfile} = */python-exec ]]; then
-			rm -r "${myfile}" || die "rm ${myfile} failed"
-		fi
-	done
-
-	for myfile in "${ED}"usr/bin/*; do
-		case "$myfile" in
-			*/gitview*|*/gitk*)
-				true ;;
-			*)
-				rm -f "$myfile" ;;
-		esac
-	done
-
-	for myfile in "${ED}"usr/libexec/git-core/*; do
-		case "$myfile" in
-		*/git-gui|*/git-gui--askpass|*/git-citool)
-			true ;;
-		*)
-			rm -f "$myfile" ;;
-		esac
-	done
-}
diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.4.0.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.4.0.ebuild
deleted file mode 100644
index 1def28e8..00000000
--- a/dev-vcs/git-gui-tools/git-gui-tools-2.4.0.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" )
-inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_PV="${MY_PV/-gui-tools}"
-MY_P="${PN}-${MY_PV}"
-MY_P="${MY_P/-gui-tools}"
-
-DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="http://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-kog-patches_update_SRC_URI
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	sys-libs/zlib
-	dev-lang/tk:="
-
-RDEPEND="${CDEPEND}
-	~dev-vcs/git-${PV}
-	dev-vcs/git[-gtk]
-	dev-vcs/git[-tk]
-	dev-vcs/git[python]
-	>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-	>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-
-DEPEND="${CDEPEND}"
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	#if use python ; then
-	python-single-r1_pkg_setup
-	#fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	myopts+=" NO_EXPAT=YesPlease"
-	myopts+=" NO_CURL=YesPlease"
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# split ebuild: avoid collisions with dev-vcs/git's .mo files
-	myopts+=" NO_GETTEXT=YesPlease"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	myopts+=" NO_PERL=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-	kog-patches_unpack
-}
-
-src_prepare() {
-	# see the git ebuild for the list of patches
-	kog-patches_apply_all
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-}
-
-git_emake() {
-	PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	#if use python && use gtk ; then
-	python_doscript "${S}"/contrib/gitview/gitview
-	dodoc "${S}"/contrib/gitview/gitview.txt
-	#fi
-
-	#find "${ED}"/usr/lib64/perl5/ \
-	#	-name .packlist \
-	#	-exec rm \{\} \;
-
-	rm -r "${ED}"usr/share/git-core || die
-	rm -r "${ED}"usr/libexec/git-core/mergetools || die
-
-	local myfile
-
-	# be sure not to remove tools' lib/python-exec/*
-	for myfile in "${ED}"usr/lib*/python*; do
-		if [[ ! ${myfile} = */python-exec ]]; then
-			rm -r "${myfile}" || die "rm ${myfile} failed"
-		fi
-	done
-
-	for myfile in "${ED}"usr/bin/*; do
-		case "$myfile" in
-			*/gitview*|*/gitk*)
-				true ;;
-			*)
-				rm -f "$myfile" ;;
-		esac
-	done
-
-	for myfile in "${ED}"usr/libexec/git-core/*; do
-		case "$myfile" in
-		*/git-gui|*/git-gui--askpass|*/git-citool)
-			true ;;
-		*)
-			rm -f "$myfile" ;;
-		esac
-	done
-}
diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.4.2.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.4.2.ebuild
deleted file mode 100644
index 1def28e8..00000000
--- a/dev-vcs/git-gui-tools/git-gui-tools-2.4.2.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" )
-inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_PV="${MY_PV/-gui-tools}"
-MY_P="${PN}-${MY_PV}"
-MY_P="${MY_P/-gui-tools}"
-
-DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="http://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-kog-patches_update_SRC_URI
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	sys-libs/zlib
-	dev-lang/tk:="
-
-RDEPEND="${CDEPEND}
-	~dev-vcs/git-${PV}
-	dev-vcs/git[-gtk]
-	dev-vcs/git[-tk]
-	dev-vcs/git[python]
-	>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-	>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-
-DEPEND="${CDEPEND}"
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	#if use python ; then
-	python-single-r1_pkg_setup
-	#fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	myopts+=" NO_EXPAT=YesPlease"
-	myopts+=" NO_CURL=YesPlease"
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# split ebuild: avoid collisions with dev-vcs/git's .mo files
-	myopts+=" NO_GETTEXT=YesPlease"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	myopts+=" NO_PERL=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-	kog-patches_unpack
-}
-
-src_prepare() {
-	# see the git ebuild for the list of patches
-	kog-patches_apply_all
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-}
-
-git_emake() {
-	PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	#if use python && use gtk ; then
-	python_doscript "${S}"/contrib/gitview/gitview
-	dodoc "${S}"/contrib/gitview/gitview.txt
-	#fi
-
-	#find "${ED}"/usr/lib64/perl5/ \
-	#	-name .packlist \
-	#	-exec rm \{\} \;
-
-	rm -r "${ED}"usr/share/git-core || die
-	rm -r "${ED}"usr/libexec/git-core/mergetools || die
-
-	local myfile
-
-	# be sure not to remove tools' lib/python-exec/*
-	for myfile in "${ED}"usr/lib*/python*; do
-		if [[ ! ${myfile} = */python-exec ]]; then
-			rm -r "${myfile}" || die "rm ${myfile} failed"
-		fi
-	done
-
-	for myfile in "${ED}"usr/bin/*; do
-		case "$myfile" in
-			*/gitview*|*/gitk*)
-				true ;;
-			*)
-				rm -f "$myfile" ;;
-		esac
-	done
-
-	for myfile in "${ED}"usr/libexec/git-core/*; do
-		case "$myfile" in
-		*/git-gui|*/git-gui--askpass|*/git-citool)
-			true ;;
-		*)
-			rm -f "$myfile" ;;
-		esac
-	done
-}
diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.4.4.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.4.4.ebuild
deleted file mode 100644
index 7583e839..00000000
--- a/dev-vcs/git-gui-tools/git-gui-tools-2.4.4.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" )
-inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_PV="${MY_PV/-gui-tools}"
-MY_P="${PN}-${MY_PV}"
-MY_P="${MY_P/-gui-tools}"
-
-DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="http://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
-	KEYWORDS="amd64 x86"
-fi
-
-kog-patches_update_SRC_URI
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	sys-libs/zlib
-	dev-lang/tk:="
-
-RDEPEND="${CDEPEND}
-	~dev-vcs/git-${PV}
-	dev-vcs/git[-gtk]
-	dev-vcs/git[-tk]
-	dev-vcs/git[python]
-	>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-	>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-
-DEPEND="${CDEPEND}"
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	#if use python ; then
-	python-single-r1_pkg_setup
-	#fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	myopts+=" NO_EXPAT=YesPlease"
-	myopts+=" NO_CURL=YesPlease"
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# split ebuild: avoid collisions with dev-vcs/git's .mo files
-	myopts+=" NO_GETTEXT=YesPlease"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	myopts+=" NO_PERL=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-	kog-patches_unpack
-}
-
-src_prepare() {
-	# see the git ebuild for the list of patches
-	kog-patches_apply_all
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-}
-
-git_emake() {
-	PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	#if use python && use gtk ; then
-	python_doscript "${S}"/contrib/gitview/gitview
-	dodoc "${S}"/contrib/gitview/gitview.txt
-	#fi
-
-	#find "${ED}"/usr/lib64/perl5/ \
-	#	-name .packlist \
-	#	-exec rm \{\} \;
-
-	rm -r "${ED}"usr/share/git-core || die
-	rm -r "${ED}"usr/libexec/git-core/mergetools || die
-
-	local myfile
-
-	# be sure not to remove tools' lib/python-exec/*
-	for myfile in "${ED}"usr/lib*/python*; do
-		if [[ ! ${myfile} = */python-exec ]]; then
-			rm -r "${myfile}" || die "rm ${myfile} failed"
-		fi
-	done
-
-	for myfile in "${ED}"usr/bin/*; do
-		case "$myfile" in
-			*/gitview*|*/gitk*)
-				true ;;
-			*)
-				rm -f "$myfile" ;;
-		esac
-	done
-
-	for myfile in "${ED}"usr/libexec/git-core/*; do
-		case "$myfile" in
-		*/git-gui|*/git-gui--askpass|*/git-citool)
-			true ;;
-		*)
-			rm -f "$myfile" ;;
-		esac
-	done
-}
diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.4.6.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.4.6.ebuild
deleted file mode 100644
index 1def28e8..00000000
--- a/dev-vcs/git-gui-tools/git-gui-tools-2.4.6.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" )
-inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_PV="${MY_PV/-gui-tools}"
-MY_P="${PN}-${MY_PV}"
-MY_P="${MY_P/-gui-tools}"
-
-DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="http://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-kog-patches_update_SRC_URI
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	sys-libs/zlib
-	dev-lang/tk:="
-
-RDEPEND="${CDEPEND}
-	~dev-vcs/git-${PV}
-	dev-vcs/git[-gtk]
-	dev-vcs/git[-tk]
-	dev-vcs/git[python]
-	>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-	>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-
-DEPEND="${CDEPEND}"
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	#if use python ; then
-	python-single-r1_pkg_setup
-	#fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	myopts+=" NO_EXPAT=YesPlease"
-	myopts+=" NO_CURL=YesPlease"
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# split ebuild: avoid collisions with dev-vcs/git's .mo files
-	myopts+=" NO_GETTEXT=YesPlease"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	myopts+=" NO_PERL=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-	kog-patches_unpack
-}
-
-src_prepare() {
-	# see the git ebuild for the list of patches
-	kog-patches_apply_all
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-}
-
-git_emake() {
-	PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	#if use python && use gtk ; then
-	python_doscript "${S}"/contrib/gitview/gitview
-	dodoc "${S}"/contrib/gitview/gitview.txt
-	#fi
-
-	#find "${ED}"/usr/lib64/perl5/ \
-	#	-name .packlist \
-	#	-exec rm \{\} \;
-
-	rm -r "${ED}"usr/share/git-core || die
-	rm -r "${ED}"usr/libexec/git-core/mergetools || die
-
-	local myfile
-
-	# be sure not to remove tools' lib/python-exec/*
-	for myfile in "${ED}"usr/lib*/python*; do
-		if [[ ! ${myfile} = */python-exec ]]; then
-			rm -r "${myfile}" || die "rm ${myfile} failed"
-		fi
-	done
-
-	for myfile in "${ED}"usr/bin/*; do
-		case "$myfile" in
-			*/gitview*|*/gitk*)
-				true ;;
-			*)
-				rm -f "$myfile" ;;
-		esac
-	done
-
-	for myfile in "${ED}"usr/libexec/git-core/*; do
-		case "$myfile" in
-		*/git-gui|*/git-gui--askpass|*/git-citool)
-			true ;;
-		*)
-			rm -f "$myfile" ;;
-		esac
-	done
-}
diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.5.0.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.5.0.ebuild
deleted file mode 100644
index 1def28e8..00000000
--- a/dev-vcs/git-gui-tools/git-gui-tools-2.5.0.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-# split ebuild providing only ->>> gitk, gitview, git-gui, git-citool
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-KOG_PATCHES_SRC=( "http://bpr.bluepink.ro/~rogentos/distro/dev-vcs/git/git-2.2.2-Gentoo-patches.tar.gz" )
-inherit kog-patches toolchain-funcs eutils python-single-r1 ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_PV="${MY_PV/-gui-tools}"
-MY_P="${PN}-${MY_PV}"
-MY_P="${MY_P/-gui-tools}"
-
-DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="http://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-kog-patches_update_SRC_URI
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	sys-libs/zlib
-	dev-lang/tk:="
-
-RDEPEND="${CDEPEND}
-	~dev-vcs/git-${PV}
-	dev-vcs/git[-gtk]
-	dev-vcs/git[-tk]
-	dev-vcs/git[python]
-	>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-	>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-
-DEPEND="${CDEPEND}"
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	#if use python ; then
-	python-single-r1_pkg_setup
-	#fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	myopts+=" NO_EXPAT=YesPlease"
-	myopts+=" NO_CURL=YesPlease"
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# split ebuild: avoid collisions with dev-vcs/git's .mo files
-	myopts+=" NO_GETTEXT=YesPlease"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	myopts+=" NO_PERL=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-	kog-patches_unpack
-}
-
-src_prepare() {
-	# see the git ebuild for the list of patches
-	kog-patches_apply_all
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-}
-
-git_emake() {
-	PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	#if use python && use gtk ; then
-	python_doscript "${S}"/contrib/gitview/gitview
-	dodoc "${S}"/contrib/gitview/gitview.txt
-	#fi
-
-	#find "${ED}"/usr/lib64/perl5/ \
-	#	-name .packlist \
-	#	-exec rm \{\} \;
-
-	rm -r "${ED}"usr/share/git-core || die
-	rm -r "${ED}"usr/libexec/git-core/mergetools || die
-
-	local myfile
-
-	# be sure not to remove tools' lib/python-exec/*
-	for myfile in "${ED}"usr/lib*/python*; do
-		if [[ ! ${myfile} = */python-exec ]]; then
-			rm -r "${myfile}" || die "rm ${myfile} failed"
-		fi
-	done
-
-	for myfile in "${ED}"usr/bin/*; do
-		case "$myfile" in
-			*/gitview*|*/gitk*)
-				true ;;
-			*)
-				rm -f "$myfile" ;;
-		esac
-	done
-
-	for myfile in "${ED}"usr/libexec/git-core/*; do
-		case "$myfile" in
-		*/git-gui|*/git-gui--askpass|*/git-citool)
-			true ;;
-		*)
-			rm -f "$myfile" ;;
-		esac
-	done
-}
-- 
cgit v1.2.3