delete old packages

2012-10-27 18:37:43 +02:00
parent ee2140f939
commit 050cd70c45
202 changed files with 0 additions and 16725 deletions
--- a/eclass/gst-plugins-bad.eclass
+++ b/eclass/gst-plugins-bad.eclass
@@ -1,127 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-bad.eclass,v 1.34 2010/07/30 12:00:43 leio Exp $
-
-#
-# Original Author: Saleem Abdulrasool <compnerd@gentoo.org>
-# Based on the work of foser <foser@gentoo.org> and zaheerm <zaheerm@gentoo.org>
-# Purpose: This elcass is designed to help package external gst-plugins per
-# plugin rather than in a single package.
-#
-
-inherit eutils versionator gst-plugins10
-
-# This list is current for gst-plugins-bad-0.10.18.
-my_gst_plugins_bad="directsound directdraw osx_video quicktime vcd
-alsa assrender amrwb apexsink bz2 cdaudio celt cog dc1394 directfb dirac dts divx
-metadata faac faad fbdev flite gsm jack jp2k kate ladspa lv2 libmms
-modplug mimic mpeg2enc mplex musepack musicbrainz mythtv nas neon ofa rsvg
-timidity wildmidi sdl sdltest sndfile soundtouch spc gme swfdec theoradec xvid
-dvb wininet acm vdpau schro zbar"
-
-# When adding conditionals like below, be careful about having leading spaces
-
-# Changes in 0.10.19:
-# dvdnav configure option changed from --enable-dvdnav to --enable-resindvd
-if version_is_at_least "0.10.19"; then
-	my_gst_plugins_bad+=" resindvd vp8"
-fi
-
-# dvdnav configure option changed from --enable-dvdnav to --enable-resindvd
-# oss4 moved to -good
-if ! version_is_at_least "0.10.19"; then
-	my_gst_plugins_bad+=" dvdnav oss4"
-fi
-
-# Changes in 0.10.18:
-# ivorbis gone (moved to -base-0.10.27 as part of vorbis plugin)
-if ! version_is_at_least "0.10.18"; then
-	my_gst_plugins_bad+=" ivorbis"
-fi
-
-MY_PN="gst-plugins-bad"
-MY_P=${MY_PN}-${PV}
-
-SRC_URI="http://gstreamer.freedesktop.org/src/gst-plugins-bad/${MY_P}.tar.bz2"
-if [ ${PV} == "0.10.14" ]; then
-	SRC_URI="${SRC_URI} http://dev.gentoo.org/~leio/distfiles/gst-plugins-bad-0.10.14-kate-configure-fix.patch.bz2"
-fi
-
-# added to remove circular deps
-# 6/2/2006 - zaheerm
-if [ "${PN}" != "${MY_PN}" ]; then
-RDEPEND="=media-libs/gstreamer-0.10*
-		=media-libs/gst-plugins-base-0.10*
-		>=dev-libs/glib-2.6
-		>=dev-libs/liboil-0.3.8"
-DEPEND="${RDEPEND}
-		sys-apps/sed
-		dev-util/pkgconfig
-		sys-devel/gettext"
-RESTRICT=test
-fi
-S=${WORKDIR}/${MY_P}
-
-gst-plugins-bad_src_unpack() {
-#	local makefiles
-
-	unpack ${A}
-
-	# Link with the syswide installed gst-libs if needed
-	gst-plugins10_find_plugin_dir
-	sed -e "s:\$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-\$(GST_MAJORMINOR).la:-lgstphotography-\$(GST_MAJORMINOR):" \
-		-e "s:\$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-\$(GST_MAJORMINOR).la:-lgstsignalprocessor-\$(GST_MAJORMINOR):" \
-		-e "s:\$(top_builddir)/gst-libs/gst/video/libgstbasevideo-\$(GST_MAJORMINOR).la:-lgstbasevideo-\$(GST_MAJORMINOR):" \
-		-i Makefile.in
-
-	# 0.10.14 configure errors when --disable-kate is passed:
-	# configure: error: conditional "USE_TIGER" was never defined.
-	# Fix it - this has to stay until any 0.10.14 split or main is in tree:
-	if [ ${PV} == "0.10.14" ]; then
-		cd ${S}
-		epatch "${WORKDIR}/gst-plugins-bad-0.10.14-kate-configure-fix.patch"
-	fi
-
-	# Remove generation of any other Makefiles except the plugin's Makefile
-#	if [[ -d "${S}/sys/${GST_PLUGINS_BUILD_DIR}" ]] ; then
-#		makefiles="Makefile sys/Makefile sys/${GST_PLUGINS_BUILD_DIR}/Makefile"
-#	elif [[ -d "${S}/ext/${GST_PLUGINS_BUILD_DIR}" ]] ; then
-#		makefiles="Makefile ext/Makefile ext/${GST_PLUGINS_BUILD_DIR}/Makefile"
-#	fi
-
-#	sed -e "s:ac_config_files=.*:ac_config_files='${makefiles}':" \
-#		-i ${S}/configure
-}
-
-gst-plugins-bad_src_configure() {
-	local plugin gst_conf
-
-	einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..."
-
-	for plugin in ${my_gst_plugins_bad} ; do
-		gst_conf="${gst_conf} --disable-${plugin}"
-	done
-
-	for plugin in ${GST_PLUGINS_BUILD} ; do
-		gst_conf="${gst_conf} --enable-${plugin}"
-	done
-
-	cd ${S}
-	econf ${@} --with-package-name="Gentoo GStreamer Ebuild" --with-package-origin="http://www.gentoo.org" ${gst_conf} || die "configure failed"
-}
-
-gst-plugins-bad_src_compile() {
-	gst-plugins-bad_src_configure ${@}
-
-	gst-plugins10_find_plugin_dir
-	emake || die "compile failure"
-}
-
-gst-plugins-bad_src_install() {
-	gst-plugins10_find_plugin_dir
-	einstall || die "install failed"
-
-	[[ -e README ]] && dodoc README
-}
-
-EXPORT_FUNCTIONS src_unpack src_compile src_install
--- a/eclass/gst-plugins-base.eclass
+++ b/eclass/gst-plugins-base.eclass
@@ -1,147 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-base.eclass,v 1.18 2010/08/12 10:53:57 pva Exp $
-
-# Author : foser <foser@gentoo.org>
-
-# gst-plugins eclass
-#
-# eclass to make external gst-plugins emergable on a per-plugin basis
-# to solve the problem with gst-plugins generating far too much unneeded deps
-#
-# 3rd party applications using gstreamer now should depend on a set of plugins as
-# defined in the source, in case of spider usage obtain recommended plugins to use from
-# Gentoo developers responsible for gstreamer <gnome@gentoo.org>, the application developer
-# or the gstreamer team.
-
-inherit eutils gst-plugins10
-
-GST_EXPF="src_unpack src_compile src_install"
-case ${EAPI:-0} in                                                                  
-	2|3) GST_EXPF="${GST_EXPF} src_prepare src_configure" ;;                
-	1|0) ;;                                                                     
-	*) die "Unknown EAPI" ;;                                                   
-esac                                                                                
-EXPORT_FUNCTIONS ${GST_EXPF}
-
-###
-# variable declarations
-###
-
-MY_PN=gst-plugins-base
-MY_P=${MY_PN}-${PV}
-# All relevant configure options for gst-plugins
-# need a better way to extract these
-# gst-plugins-base 0.9
-my_gst_plugins_base="x xvideo xshm gst_v4l alsa cdparanoia gnome_vfs
-gio libvisual ogg oggtest theora ivorbis vorbis vorbistest examples
-freetypetest pango"
-
-#SRC_URI="mirror://gnome/sources/gst-plugins/${PV_MAJ_MIN}/${MY_P}.tar.bz2"
-SRC_URI="http://gstreamer.freedesktop.org/src/gst-plugins-base/${MY_P}.tar.bz2"
-
-S=${WORKDIR}/${MY_P}
-
-# added to remove circular deps
-# 6/2/2006 - zaheerm
-if [ "${PN}" != "${MY_PN}" ]; then
-RDEPEND=">=media-libs/gst-plugins-base-${PV}"
-DEPEND="${RDEPEND}
-	~media-libs/gst-plugins-base-${PV}
-	>=sys-apps/sed-4
-	dev-util/pkgconfig"
-RESTRICT=test
-fi
-
-###
-# public functions
-###
-
-gst-plugins-base_src_configure() {
-
-	# disable any external plugin besides the plugin we want
-	local plugin gst_conf
-
-	einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..."
-
-	for plugin in ${my_gst_plugins_base}; do
-		gst_conf="${gst_conf} --disable-${plugin} "
-	done
-
-	for plugin in ${GST_PLUGINS_BUILD}; do
-		gst_conf="${gst_conf} --enable-${plugin} "
-	done
-
-	cd "${S}"
-	econf ${@} --with-package-name="Gentoo GStreamer Ebuild" --with-package-origin="http://www.gentoo.org" ${gst_conf}
-
-}
-
-###
-# public inheritable functions
-###
-
-gst-plugins-base_src_unpack() {
-
-	unpack ${A}
-
-	cd "${S}"
-	has src_prepare ${GST_EXPF} || gst-plugins-base_src_prepare
-
-}
-
-gst-plugins-base_src_prepare() {
-
-	# Link with the syswide installed gst-libs if needed
-	gst-plugins10_find_plugin_dir
-	sed -e "s:\$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-\$(GST_MAJORMINOR).la:-lgstinterfaces-\$(GST_MAJORMINOR):" \
-		-e "s:\${top_builddir}/gst-libs/gst/interfaces/libgstinterfaces-\$(GST_MAJORMINOR).la:-lgstinterfaces-\$(GST_MAJORMINOR):" \
-		-e "s:\$(top_builddir)/gst-libs/gst/audio/libgstaudio-\$(GST_MAJORMINOR).la:-lgstaudio-\$(GST_MAJORMINOR):" \
-		-e "s:\${top_builddir}/gst-libs/gst/audio/libgstaudio-\$(GST_MAJORMINOR).la:-lgstaudio-\$(GST_MAJORMINOR):" \
-		-e "s:\$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la:-lgstaudio-@GST_MAJORMINOR@:" \
-		-e "s:\${top_builddir}/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la:-lgstaudio-@GST_MAJORMINOR@:" \
-		-e "s:\$(top_builddir)/gst-libs/gst/cdda/libgstcdda-\$(GST_MAJORMINOR).la:-lgstcdda-\$(GST_MAJORMINOR):" \
-		-e "s:\${top_builddir}/gst-libs/gst/cdda/libgstcdda-\$(GST_MAJORMINOR).la:-lgstcdda-\$(GST_MAJORMINOR):" \
-		-e "s:\$(top_builddir)/gst-libs/gst/riff/libgstriff-\$(GST_MAJORMINOR).la:-lgstriff-\$(GST_MAJORMINOR):" \
-		-e "s:\${top_builddir}/gst-libs/gst/riff/libgstriff-\$(GST_MAJORMINOR).la:-lgstriff-\$(GST_MAJORMINOR):" \
-		-e "s:\$(top_builddir)/gst-libs/gst/tag/libgsttag-\$(GST_MAJORMINOR).la:-lgsttag-\$(GST_MAJORMINOR):" \
-		-e "s:\${top_builddir}/gst-libs/gst/tag/libgsttag-\$(GST_MAJORMINOR).la:-lgsttag-\$(GST_MAJORMINOR):" \
-		-e "s:\$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la:-lgsttag-@GST_MAJORMINOR@:" \
-		-e "s:\${top_builddir}/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la:-lgsttag-@GST_MAJORMINOR@:" \
-		-e "s:\$(top_builddir)/gst-libs/gst/video/libgstvideo-\$(GST_MAJORMINOR).la:-lgstvideo-\$(GST_MAJORMINOR):" \
-		-e "s:\${top_builddir}/gst-libs/gst/video/libgstvideo-\$(GST_MAJORMINOR).la:-lgstvideo-\$(GST_MAJORMINOR):" \
-		-e "s:\$(top_builddir)/gst-libs/gst/netbuffer/libgstnetbuffer-\$(GST_MAJORMINOR).la:-lgstnetbuffer-\$(GST_MAJORMINOR):" \
-		-e "s:\${top_builddir}/gst-libs/gst/netbuffer/libgstnetbuffer-\$(GST_MAJORMINOR).la:-lgstnetbuffer-\$(GST_MAJORMINOR):" \
-		-e "s:\$(top_builddir)/gst-libs/gst/rtp/libgstrtp-\$(GST_MAJORMINOR).la:-lgstrtp-\$(GST_MAJORMINOR):" \
-		-e "s:\${top_builddir}/gst-libs/gst/rtp/libgstrtp-\$(GST_MAJORMINOR).la:-lgstrtp-\$(GST_MAJORMINOR):" \
-		-i Makefile.in
-#	cd ${S}
-
-	# Remove generation of any other Makefiles except the plugin's Makefile
-#	if [ -d "${S}/sys/${GST_PLUGINS_BUILD_DIR}" ]; then
-#		makefiles="Makefile sys/Makefile sys/${GST_PLUGINS_BUILD_DIR}/Makefile"
-#	elif [ -d "${S}/ext/${GST_PLUGINS_BUILD_DIR}" ]; then
-#		makefiles="Makefile ext/Makefile ext/${GST_PLUGINS_BUILD_DIR}/Makefile"
-#	fi
-#	sed -e "s:ac_config_files=.*:ac_config_files='${makefiles}':" \
-#		-i ${S}/configure
-
-}
-
-
-
-gst-plugins-base_src_compile() {
-
-	has src_configure ${GST_EXPF} || gst-plugins-base_src_configure ${@}
-	gst-plugins10_find_plugin_dir
-	emake || die "compile failure"
-
-}
-
-gst-plugins-base_src_install() {
-
-	gst-plugins10_find_plugin_dir
-	einstall || die
-
-	[[ -e README ]] && dodoc README
-}
--- a/eclass/gst-plugins-good.eclass
+++ b/eclass/gst-plugins-good.eclass
@@ -1,127 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-good.eclass,v 1.21 2010/07/30 11:08:44 leio Exp $
-
-# Author : foser <foser@gentoo.org>, zaheerm <zaheerm@gentoo.org>
-
-# gst-plugins-good eclass
-#
-# eclass to make external gst-plugins emergable on a per-plugin basis
-# to solve the problem with gst-plugins generating far too much unneeded deps
-#
-# 3rd party applications using gstreamer now should depend on a set of plugins as
-# defined in the source, obtain recommended plugins to use from
-# Gentoo developers responsible for gstreamer <gnome@gentoo.org>, the application developer
-# or the gstreamer team.
-
-inherit eutils versionator gst-plugins10
-
-
-###
-# variable declarations
-###
-
-MY_PN=gst-plugins-good
-MY_P=${MY_PN}-${PV}
-# All relevant configure options for gst-plugins
-# need a better way to extract these
-
-# First line for non-plugin build related configure options; second line for
-# sys/ plugins; rest is split plugin options in order of ./configure --help output.
-# Good ways of validation are seeing diff of old and new configure.ac, and ./configure --help
-#
-# This list is current to gst-plugins-good-0.10.23:
-my_gst_plugins_good="gconftool zlib bz2
-directsound oss sunaudio osx_audio osx_video gst_v4l2 x xshm xvideo
-aalib aalibtest annodex cairo esd esdtest flac gconf gdk_pixbuf hal jpeg
-libcaca libdv libpng pulse dv1394 shout2 shout2test soup speex taglib wavpack"
-
-# When adding conditionals like below, be careful about having leading spaces in concat
-
-# sys/oss4 moved here since 0.10.23
-if version_is_at_least "0.10.23"; then
-	my_gst_plugins_good+=" oss4"
-fi
-
-
-#SRC_URI="mirror://gnome/sources/gst-plugins/${PV_MAJ_MIN}/${MY_P}.tar.bz2"
-SRC_URI="http://gstreamer.freedesktop.org/src/gst-plugins-good/${MY_P}.tar.bz2"
-
-S=${WORKDIR}/${MY_P}
-# added to remove circular deps
-# 6/2/2006 - zaheerm
-if [ "${PN}" != "${MY_PN}" ]; then
-RDEPEND="=media-libs/gst-plugins-base-0.10*"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-util/pkgconfig"
-RESTRICT=test
-fi
-
-###
-# public functions
-###
-
-gst-plugins-good_src_configure() {
-
-	# disable any external plugin besides the plugin we want
-	local plugin gst_conf
-
-	einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..."
-
-	for plugin in ${my_gst_plugins_good}; do
-		gst_conf="${gst_conf} --disable-${plugin} "
-	done
-
-	for plugin in ${GST_PLUGINS_BUILD}; do
-		gst_conf="${gst_conf} --enable-${plugin} "
-	done
-
-	cd ${S}
-	econf ${@} --with-package-name="Gentoo GStreamer Ebuild" --with-package-origin="http://www.gentoo.org" ${gst_conf} || die "./configure failure"
-
-}
-
-###
-# public inheritable functions
-###
-
-gst-plugins-good_src_unpack() {
-
-#	local makefiles
-
-	unpack ${A}
-
-	# Link with the syswide installed gst-libs if needed
-#	gst-plugins10_find_plugin_dir
-#	cd ${S}
-
-	# Remove generation of any other Makefiles except the plugin's Makefile
-#	if [ -d "${S}/sys/${GST_PLUGINS_BUILD_DIR}" ]; then
-#		makefiles="Makefile sys/Makefile sys/${GST_PLUGINS_BUILD_DIR}/Makefile"
-#	elif [ -d "${S}/ext/${GST_PLUGINS_BUILD_DIR}" ]; then
-#		makefiles="Makefile ext/Makefile ext/${GST_PLUGINS_BUILD_DIR}/Makefile"
-#	fi
-#	sed -e "s:ac_config_files=.*:ac_config_files='${makefiles}':" \
-#		-i ${S}/configure
-
-}
-
-gst-plugins-good_src_compile() {
-
-	gst-plugins-good_src_configure ${@}
-
-	gst-plugins10_find_plugin_dir
-	emake || die "compile failure"
-
-}
-
-gst-plugins-good_src_install() {
-
-	gst-plugins10_find_plugin_dir
-	einstall || die
-
-	[[ -e README ]] && dodoc README
-}
-
-EXPORT_FUNCTIONS src_unpack src_compile src_install
--- a/eclass/gst-plugins-ugly.eclass
+++ b/eclass/gst-plugins-ugly.eclass
@@ -1,118 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-ugly.eclass,v 1.19 2010/07/28 06:24:44 leio Exp $
-
-# Author : foser <foser@gentoo.org>
-
-# gst-plugins-ugly eclass
-#
-# eclass to make external gst-plugins emergable on a per-plugin basis
-# to solve the problem with gst-plugins generating far too much unneeded deps
-#
-# 3rd party applications using gstreamer now should depend on a set of plugins as
-# defined in the source, in case of spider usage obtain recommended plugins to use from
-# Gentoo developers responsible for gstreamer <gnome@gentoo.org>, the application developer
-# or the gstreamer team.
-
-inherit eutils versionator gst-plugins10
-
-
-###
-# variable declarations
-###
-
-MY_PN=gst-plugins-ugly
-MY_P=${MY_PN}-${PV}
-# All relevant configure options for gst-plugins-ugly
-# need a better way to extract these.
-my_gst_plugins_ugly="a52dec amrnb amrwb cdio dvdread lame mad mpeg2dec sidplay
-twolame x264"
-
-# dvdnav and id3tag disabled/removed since -ugly-0.10.13
-if ! version_is_at_least "0.10.13"; then
-	my_gst_plugins_bad+=" dvdnav id3tag"
-fi
-
-#SRC_URI="mirror://gnome/sources/gst-plugins/${PV_MAJ_MIN}/${MY_P}.tar.bz2"
-SRC_URI="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/${MY_P}.tar.bz2"
-
-S=${WORKDIR}/${MY_P}
-
-# added to remove circular deps
-# 6/2/2006 - zaheerm
-if [ "${PN}" != "${MY_PN}" ]; then
-RDEPEND="=media-libs/gst-plugins-base-0.10*"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-util/pkgconfig"
-RESTRICT=test
-fi
-
-###
-# public functions
-###
-
-gst-plugins-ugly_src_configure() {
-
-	# disable any external plugin besides the plugin we want
-	local plugin gst_conf
-
-	einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..."
-
-	for plugin in ${my_gst_plugins_ugly}; do
-		gst_conf="${gst_conf} --disable-${plugin} "
-	done
-
-	for plugin in ${GST_PLUGINS_BUILD}; do
-		gst_conf="${gst_conf} --enable-${plugin} "
-	done
-
-	cd ${S}
-	econf ${@} --with-package-name="Gentoo GStreamer Ebuild" --with-package-origin="http://www.gentoo.org" ${gst_conf} || die "./configure failure"
-
-}
-
-###
-# public inheritable functions
-###
-
-gst-plugins-ugly_src_unpack() {
-
-#	local makefiles
-
-	unpack ${A}
-
-	# Link with the syswide installed gst-libs if needed
-#	gst-plugins10_find_plugin_dir
-#	cd ${S}
-
-	# Remove generation of any other Makefiles except the plugin's Makefile
-#	if [ -d "${S}/sys/${GST_PLUGINS_BUILD_DIR}" ]; then
-#		makefiles="Makefile sys/Makefile sys/${GST_PLUGINS_BUILD_DIR}/Makefile"
-#	elif [ -d "${S}/ext/${GST_PLUGINS_BUILD_DIR}" ]; then
-#		makefiles="Makefile ext/Makefile ext/${GST_PLUGINS_BUILD_DIR}/Makefile"
-#	fi
-#	sed -e "s:ac_config_files=.*:ac_config_files='${makefiles}':" \
-#		-i ${S}/configure
-
-}
-
-gst-plugins-ugly_src_compile() {
-
-	gst-plugins-ugly_src_configure ${@}
-
-	gst-plugins10_find_plugin_dir
-	emake || die "compile failure"
-
-}
-
-gst-plugins-ugly_src_install() {
-
-	gst-plugins10_find_plugin_dir
-	einstall || die
-
-	[[ -e README ]] && dodoc README
-}
-
-
-EXPORT_FUNCTIONS src_unpack src_compile src_install
--- a/eclass/gst-plugins.eclass
+++ b/eclass/gst-plugins.eclass
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins.eclass,v 1.35 2009/11/30 04:19:36 abcd Exp $
-
-# @DEAD
-# To be removed on 2011/11/30.
-ewarn "Please fix your package (${CATEGORY}/${PF}) to not use ${ECLASS}.eclass"
-
-PVP=(${PV//[-\._]/ })
-PV_MAJ_MIN=${PVP[0]}.${PVP[1]}
-SLOT=${PV_MAJ_MIN}
-
-gst-plugins_pkg_postrm() {
-	gst-register-${SLOT}
-}
-
-EXPORT_FUNCTIONS pkg_postrm
--- a/eclass/gst-plugins10.eclass
+++ b/eclass/gst-plugins10.eclass
@@ -1,81 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins10.eclass,v 1.3 2010/08/12 10:48:59 pva Exp $
-
-# Author : foser <foser@gentoo.org>
-
-# gst-plugins eclass
-#
-# eclass to make external gst-plugins emergable on a per-plugin basis
-# to solve the problem with gst-plugins generating far too much unneeded deps
-#
-# 3rd party applications using gstreamer now should depend on a set of plugins as
-# defined in the source, in case of spider usage obtain recommended plugins to use from
-# Gentoo developers responsible for gstreamer <gnome@gentoo.org>, the application developer
-# or the gstreamer team.
-
-inherit eutils
-
-
-###
-# variable declarations
-###
-
-# Create a major/minor combo for our SLOT and executables suffix
-PVP=(${PV//[-\._]/ })
-#PV_MAJ_MIN=${PVP[0]}.${PVP[1]}
-PV_MAJ_MIN=0.10
-
-# Extract the plugin to build from the ebuild name
-# May be set by an ebuild and contain more than one indentifier, space seperated
-# (only src_configure can handle mutiple plugins at this time)
-GST_PLUGINS_BUILD=${PN/gst-plugins-/}
-
-# Actual build dir, is the same as the configure switch name most of the time
-GST_PLUGINS_BUILD_DIR=${PN/gst-plugins-/}
-
-# general common gst-plugins ebuild entries
-DESCRIPTION="${BUILD_GST_PLUGINS} plugin for gstreamer"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-LICENSE="GPL-2"
-
-#SRC_URI="mirror://gnome/sources/gst-plugins/${PV_MAJ_MIN}/${MY_P}.tar.bz2"
-SLOT=${PV_MAJ_MIN}
-###
-# internal functions
-###
-
-gst-plugins10_find_plugin_dir() {
-
-	if [[ ! -d ${S}/ext/${GST_PLUGINS_BUILD_DIR} ]]; then
-		if [[ ! -d ${S}/sys/${GST_PLUGINS_BUILD_DIR} ]]; then
-			ewarn "No such plugin directory"
-			die
-		fi
-		einfo "Building system plugin ..."
-		cd "${S}"/sys/${GST_PLUGINS_BUILD_DIR}
-	else
-		einfo "Building external plugin ..."
-		cd "${S}"/ext/${GST_PLUGINS_BUILD_DIR}
-	fi
-
-}
-
-###
-# public functions
-###
-
-gst-plugins10_remove_unversioned_binaries() {
-
-	# remove the unversioned binaries gstreamer provide
-	# this is to prevent these binaries to be owned by several SLOTs
-
-	cd ${D}/usr/bin
-	for gst_bins in `ls *-${PV_MAJ_MIN}`
-	do
-		rm ${gst_bins/-${PV_MAJ_MIN}/}
-		einfo "Removed ${gst_bins/-${PV_MAJ_MIN}/}"
-	done
-
-}
-
--- a/eclass/mount-efi.eclass
+++ b/eclass/mount-efi.eclass
@@ -1,84 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mount-efi.eclass,v 1.17 2009/10/09 20:57:08 vapier Exp $
-#
-# This eclass is really only useful for efi bootloaders.
-#
-# If the live system has a separate /efi partition configured, then this
-# function tries to ensure that it's mounted in rw mode, exiting with an
-# error if it cant. It does nothing if /efi isn't a separate partition.
-#
-# MAINTAINER: base-system@gentoo.org
-
-inherit mount-boot
-
-EXPORT_FUNCTIONS pkg_preinst pkg_prerm
-
-mount-efi_mount_efi_partition() {
-	if [[ -n ${DONT_MOUNT_EFI} ]] ; then
-		return
-	else
-		elog
-		elog "To avoid automounting and auto(un)installing with /boot/efi,"
-		elog "just export the DONT_MOUNT_EFI variable."
-		elog
-	fi
-
-	# note that /dev/EFI is in the Gentoo default /etc/fstab file
-	local fstabstate=$(awk '!/^#|^[[:blank:]]+#|^\/dev\/EFI/ {print $2}' /etc/fstab | egrep "^/boot/efi$" )
-	local procstate=$(awk '$2 ~ /^\/boot\/efi$/ {print $2}' /proc/mounts)
-	local proc_ro=$(awk '{ print $2 " ," $4 "," }' /proc/mounts | sed -n '/\/boot\/efi .*,ro,/p')
-
-	if [ -n "${fstabstate}" ] && [ -n "${procstate}" ]; then
-		if [ -n "${proc_ro}" ]; then
-			einfo
-			einfo "Your efi partition, detected as being mounted as /boot/efi, is read-only."
-			einfo "Remounting it in read-write mode ..."
-			einfo
-			mount -o remount,rw /boot/efi
-			if [ "$?" -ne 0 ]; then
-				eerror
-				eerror "Unable to remount in rw mode. Please do it manually!"
-				eerror
-				die "Can't remount in rw mode. Please do it manually!"
-			fi
-		else
-			einfo
-			einfo "Your efi partition was detected as being mounted as /boot/efi."
-			einfo "Files will be installed there for ${PN} to function correctly."
-			einfo
-		fi
-	elif [ -n "${fstabstate}" ] && [ -z "${procstate}" ]; then
-		mount /boot/efi -o rw
-		if [ "$?" -eq 0 ]; then
-			einfo
-			einfo "Your efi partition was not mounted as /boot/efi, but portage"
-			einfo "was able to mount it without additional intervention."
-			einfo "Files will be installed there for ${PN} to function correctly."
-			einfo
-		else
-			eerror
-			eerror "Cannot automatically mount your /boot/efi partition."
-			eerror "Your efi partition has to be mounted rw before the installation"
-			eerror "can continue. ${PN} needs to install important files there."
-			eerror
-			die "Please mount your /boot/efi partition manually!"
-		fi
-	else
-		einfo
-		einfo "Assuming you do not have a separate /boot/efi partition."
-		einfo
-	fi
-}
-
-mount-efi_pkg_preinst() {
-	mount-boot_pkg_preinst
-	mount-efi_mount_efi_partition
-}
-
-mount-efi_pkg_prerm() {
-	mount-boot_pkg_prerm
-	touch "${ROOT}"/boot/efi/.keep 2>/dev/null
-	mount-efi_mount_efi_partition
-	touch "${ROOT}"/boot/efi/.keep 2>/dev/null
-}
--- a/eclass/orion5x-kernel.eclass
+++ b/eclass/orion5x-kernel.eclass
@@ -1,226 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: lucianm Exp $
-#
-# Author:
-#   Lucian Muresan <lucianm AT users DOT sourceforge DOT net>
-#   based upon code from the vdr-plugin.eclass by
-#     Matthias Schwarzott <zzam@gentoo.org>
-#     Joerg Bornkessel <hd_brummy@gentoo.org>
-
-# orion5x-kernel.eclass
-#
-
-inherit kernel-2
-
-IUSE_ORION_NAS_DEVICES="linkstation_pro_duo linkstation_pro_live linkstation_mini kurobox_pro qnap_ts_109_209 qnap_ts_409 dlink_dns_323 hp_mv2120 ts_78xx_sbc wrt350_v2 terastation_pro_v2 netronix_nh233 maxtor_shared_storage_2"
-
-DEPEND="${DEPEND}
-	sys-block/devio
-	dev-embedded/u-boot-tools"
-
-PROVIDE="virtual/linux-sources"
-
-MY_MACHINE_TYPE=""
-nasdevice_count=0
-
-for nasdevice in ${IUSE_ORION_NAS_DEVICES}; do
-	IUSE="${IUSE} orion_nas_devices_${nasdevice}"
-done
-
-orion5x-kernel_add_nasdevice() {
-	#: ${nasdevice_count:=0}
-	: $(( nasdevice_count++ ))
-
-	if [[ ${nasdevice_count} -eq 2 ]]; then
-		ewarn
-		ewarn "Only one machine type can be patched after building the zImage!"
-		ewarn "Please select just one of '${IUSE_ORION_NAS_DEVICES}'!"
-		die "Multiple machine types selected"
-	fi
-
-	local dev="${1}"
-	local desc="device ${dev}"
-	if [[ -n "${2}" ]]; then
-		desc="${2}"
-	fi
-
-	einfo "Will patch the zImage for ${desc}"
-	MY_MACHINE_TYPE="${MY_MACHINE_TYPE} ${dev}"
-}
-
-orion5x-kernel_patch_help() {
-	einfo ""
-	einfo ""
-	einfo ""
-	einfo "You may add your own patches like this:"
-	einfo ""
-	einfo " - Add the following variable to your /etc/make.conf:"
-	einfo "   ORION5X_KERNEL_PATCHES_DIR=\"/path/to/my/patches\""
-	einfo ""
-	einfo " - Create the following subdirectories inside your local patch directory:"
-	einfo "   ${PN}/${PV}"
-	einfo ""
-	einfo " - Place your patches ending on *.diff or *.patch in the created"
-	einfo "   \"${PV}\" directory, together with a file called \"0_list\" in which you"
-	einfo "   list them in the order you want them applied."
-	einfo ""
-}
-
-orion5x-kernel_pkg_setup() {
-	kernel-2_pkg_setup
-
-	local nasdevice
-
-	for nasdevice in ${IUSE_ORION_NAS_DEVICES}; do
-		if use orion_nas_devices_${nasdevice}; then
-			orion5x-kernel_add_nasdevice ${nasdevice}
-		fi
-	done
-
-	if [[ ${nasdevice_count} -eq 0 ]]; then
-		ewarn
-		ewarn "You did not select a machine type to be patched after building the zImage!"
-		ewarn "Please set 'ORION_NAS_DEVICES' to just one of '${IUSE_ORION_NAS_DEVICES}'!"
-		die "No Orion machine type selected"
-	fi
-
-	if [ -z "${ORION5X_KERNEL_PATCHES_DIR}" ] ; then
-		orion5x-kernel_patch_help
-	else
-		if ! [ -d "${ORION5X_KERNEL_PATCHES_DIR}/${PN}/${PV}" ] ; then
-			orion5x-kernel_patch_help
-		fi
-	fi
-}
-
-orion5x-kernel_apply_local_patches() {
-	cd ${S}
-	if test -d "${ORION5X_KERNEL_PATCHES_DIR}/${PN}"; then
-		echo
-		local PATCH_LIST=$(cat ${ORION5X_KERNEL_PATCHES_DIR}/${PN}/${PV}/0_list) 
-		einfo "Applying local patches found in"
-		einfo "${ORION5X_KERNEL_PATCHES_DIR}:"
-#		for LOCALPATCH in ${ORION5X_KERNEL_PATCHES_DIR}/${PN}/${PV}/*.{diff,patch}; do
-#			test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
-#		done
-		for LOCALPATCH in ${PATCH_LIST}; do
-			cd ${S}
-			test -f "${ORION5X_KERNEL_PATCHES_DIR}/${PN}/${PV}/${LOCALPATCH}" && patch -p 1 < "${ORION5X_KERNEL_PATCHES_DIR}/${PN}/${PV}/${LOCALPATCH}"
-			#test -f "${ORION5X_KERNEL_PATCHES_DIR}/${PN}/${PV}/${LOCALPATCH}" && epatch "${ORION5X_KERNEL_PATCHES_DIR}/${PN}/${PV}/${LOCALPATCH}"
-		done		
-	fi
-}
-
-orion5x-kernel_generate_mach-type_patch(){
-echo "diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
-index 25f1230..789190e 100644
--- a/arch/arm/boot/Makefile
-+++ b/arch/arm/boot/Makefile
-@@ -55,6 +55,10 @@ \$(obj)/compressed/vmlinux: \$(obj)/Image FORCE
- 
- \$(obj)/zImage:	\$(obj)/compressed/vmlinux FORCE
- 	\$(call if_changed,objcopy)
-+	devio > foo 'wl 0xe3a01c05,4' 'wl 0xe38110e5,4'
-+	cat foo \$(obj)/zImage > zImage.new
-+	mv zImage.new \$(obj)/zImage
-+	rm foo
- 	@echo '  Kernel: \$@ is ready'
- 
- endif" > ${WORKDIR}/force_mach-type.patch
-}
-
-orion5x-kernel_src_unpack(){
-
-	kernel-2_src_unpack
-	orion5x-kernel_apply_local_patches
-
-	# create mach-type patch in the working dir, to modify it according to the
-	# set orion nas device
-	orion5x-kernel_generate_mach-type_patch
-
-	if use orion_nas_devices_linkstation_pro_live; then
-		#devio > foo 'wl 0xe3a01c06,4' 'wl 0xe3811031,4' # Linkstation Pro/Live
-		sed -i -e "s:0xe3a01c05,4:0xe3a01c06,4:" ${WORKDIR}/force_mach-type.patch
-		sed -i -e "s:0xe38110e5,4:0xe3811031,4:" ${WORKDIR}/force_mach-type.patch
-	fi
-
-	#if use orion_nas_devices_kurobox_pro; then
-	#nothing to replace for the Kurobox Pro
-	#fi
-
-	if use orion_nas_devices_qnap_ts_109_209; then
-		#devio > foo 'wl 0xe3a01c06,4' 'wl 0xe381101d,4' # QNAP TS-109/TS-209
-		sed -i -e "s:0xe3a01c05,4:0xe3a01c06,4:" ${WORKDIR}/force_mach-type.patch
-		sed -i -e "s:0xe38110e5,4:0xe381101d,4:" ${WORKDIR}/force_mach-type.patch
-	fi
-
-	if use orion_nas_devices_qnap_ts_409; then
-		#devio > foo 'wl 0xe3a01c06,4' 'wl 0xe3811041,4' # QNAP TS-409
-		sed -i -e "s:0xe3a01c05,4:0xe3a01c06,4:" ${WORKDIR}/force_mach-type.patch
-		sed -i -e "s:0xe38110e5,4:0xe3811041,4:" ${WORKDIR}/force_mach-type.patch
-	fi
-
-	if use orion_nas_devices_dlink_dns_323; then
-		#devio > foo 'wl 0xe3a01c06,4' 'wl 0xe3811006,4' # D-Link DNS-323
-		sed -i -e "s:0xe3a01c05,4:0xe3a01c06,4:" ${WORKDIR}/force_mach-type.patch
-		sed -i -e "s:0xe38110e5,4:0xe3811006,4:" ${WORKDIR}/force_mach-type.patch
-	fi
-
-	if use orion_nas_devices_hp_mv2120; then
-		#devio > foo 'wl 0xe3a01c06,4' 'wl 0xe381109d,4' # HP Media Vault MV2120
-		sed -i -e "s:0xe3a01c05,4:0xe3a01c06,4:" ${WORKDIR}/force_mach-type.patch
-		sed -i -e "s:0xe38110e5,4:0xe381109d,4:" ${WORKDIR}/force_mach-type.patch
-	fi
-
-	if use orion_nas_devices_ts_78xx_sbc; then
-		#devio > foo 'wl 0xe3a01c06,4' 'wl 0xe3811074,4' # Technologic Systems TS-78xx SBC
-		sed -i -e "s:0xe3a01c05,4:0xe3a01c06,4:" ${WORKDIR}/force_mach-type.patch
-		sed -i -e "s:0xe38110e5,4:0xe3811074,4:" ${WORKDIR}/force_mach-type.patch
-	fi
-
-	if use orion_nas_devices_maxtor_shared_storage_2; then
-		#devio > foo 'wl 0xe3a01c06,4' 'wl 0xe38110e6,4' # Maxtor Shared Storage II (2.6.27)
-		sed -i -e "s:0xe3a01c05,4:0xe3a01c06,4:" ${WORKDIR}/force_mach-type.patch
-		sed -i -e "s:0xe38110e5,4:0xe38110e6,4:" ${WORKDIR}/force_mach-type.patch
-	fi
-
-	if use orion_nas_devices_wrt350_v2; then
-		#devio > foo 'wl 0xe3a01c06,4' 'wl 0xe3811061,4' # Linksys WRT350N v2
-		sed -i -e "s:0xe3a01c05,4:0xe3a01c06,4:" ${WORKDIR}/force_mach-type.patch
-		sed -i -e "s:0xe38110e5,4:0xe3811061,4:" ${WORKDIR}/force_mach-type.patch
-	fi
-
-	if use orion_nas_devices_linkstation_pro_duo; then
-		#devio > foo 'wl 0xe3a01c07,4' 'wl 0xe3811027,4' # Buffalo Linkstation Pro Duo (Is this right?)
-		sed -i -e "s:0xe3a01c05,4:0xe3a01c07,4:" ${WORKDIR}/force_mach-type.patch
-		sed -i -e "s:0xe38110e5,4:0xe3811027,4:" ${WORKDIR}/force_mach-type.patch
-	fi
-
-	if use orion_nas_devices_linkstation_mini; then
-		#devio > foo 'wl 0xe3a01c07,4' 'wl 0xe3811042,4' # Buffalo Linkstation Mini (Is this right?)
-		sed -i -e "s:0xe3a01c05,4:0xe3a01c07,4:" ${WORKDIR}/force_mach-type.patch
-		sed -i -e "s:0xe38110e5,4:0xe3811042,4:" ${WORKDIR}/force_mach-type.patch
-	fi
-
-	if use orion_nas_devices_terastation_pro_v2; then
-		#devio > foo 'wl 0xe3a01c06,4' 'wl 0xe3811030,4' # Buffalo TS Pro V2 (not yet supported in Vanilla 2.6.26 as of Aug. 10th, 2008)
-		sed -i -e "s:0xe3a01c05,4:0xe3a01c06,4:" ${WORKDIR}/force_mach-type.patch
-		sed -i -e "s:0xe38110e5,4:0xe3811030,4:" ${WORKDIR}/force_mach-type.patch
-	fi
-
-	if use orion_nas_devices_netronix_nh233; then
-		#devio > foo 'wl 0xe3a01c07,4' 'wl 0xe3811065,4' # Netronix NH-233
-		sed -i -e "s:0xe3a01c05,4:0xe3a01c07,4:" ${WORKDIR}/force_mach-type.patch
-		sed -i -e "s:0xe38110e5,4:0xe3811065,4:" ${WORKDIR}/force_mach-type.patch
-	fi
-
-	# finally patch with the correct orion nas device
-	epatch ${WORKDIR}/force_mach-type.patch
-}
-
-orion5x-kernel_pkg_postinst(){
-	postinst_sources
-}
-
-EXPORT_FUNCTIONS pkg_setup src_unpack pkg_postinst
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,822 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.90 2011/03/10 23:45:51 wired Exp $
-
-# @ECLASS: qt4-build.eclass
-# @MAINTAINER:
-# Ben de Groot <yngwin@gentoo.org>,
-# Markos Chandras <hwoarang@gentoo.org>,
-# Caleb Tennis <caleb@gentoo.org>
-# Alex Alexander <wired@gentoo.org>
-# @BLURB: Eclass for Qt4 split ebuilds.
-# @DESCRIPTION:
-# This eclass contains various functions that are used when building Qt4
-
-inherit base eutils multilib toolchain-funcs flag-o-matic versionator
-
-MY_PV=${PV/_/-}
-if version_is_at_least 4.5.99999999; then
-	MY_P=qt-everywhere-opensource-src-${MY_PV}
-	[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && 
-		[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] && 
-			IUSE="+exceptions"
-else
-	MY_P=qt-x11-opensource-src-${MY_PV}
-fi
-
-HOMEPAGE="http://qt.nokia.com/"
-SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-IUSE+=" debug pch aqua"
-
-RDEPEND="
-	!<x11-libs/qt-assistant-${PV}
-	!>x11-libs/qt-assistant-${PV}-r9999
-	!<x11-libs/qt-core-${PV}
-	!>x11-libs/qt-core-${PV}-r9999
-	!<x11-libs/qt-dbus-${PV}
-	!>x11-libs/qt-dbus-${PV}-r9999
-	!<x11-libs/qt-demo-${PV}
-	!>x11-libs/qt-demo-${PV}-r9999
-	!<x11-libs/qt-gui-${PV}
-	!>x11-libs/qt-gui-${PV}-r9999
-	!<x11-libs/qt-multimedia-${PV}
-	!>x11-libs/qt-multimedia-${PV}-r9999
-	!<x11-libs/qt-opengl-${PV}
-	!>x11-libs/qt-opengl-${PV}-r9999
-	!<x11-libs/qt-phonon-${PV}
-	!>x11-libs/qt-phonon-${PV}-r9999
-	!<x11-libs/qt-qt3support-${PV}
-	!>x11-libs/qt-qt3support-${PV}-r9999
-	!<x11-libs/qt-script-${PV}
-	!>x11-libs/qt-script-${PV}-r9999
-	!<x11-libs/qt-sql-${PV}
-	!>x11-libs/qt-sql-${PV}-r9999
-	!<x11-libs/qt-svg-${PV}
-	!>x11-libs/qt-svg-${PV}-r9999
-	!<x11-libs/qt-test-${PV}
-	!>x11-libs/qt-test-${PV}-r9999
-	!<x11-libs/qt-webkit-${PV}
-	!>x11-libs/qt-webkit-${PV}-r9999
-	!<x11-libs/qt-xmlpatterns-${PV}
-	!>x11-libs/qt-xmlpatterns-${PV}-r9999
-"
-
-S=${WORKDIR}/${MY_P}
-
-# @FUNCTION: qt4-build_pkg_setup
-# @DESCRIPTION:
-# Sets up S, MY_P, PATH, and LD_LIBRARY_PATH
-qt4-build_pkg_setup() {
-	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
-
-	# Protect users by not allowing downgrades between releases
-	# Downgrading revisions within the same release should be allowed
-	if has_version '>'${CATEGORY}/${P}-r9999 ; then
-		if [[ -z $I_KNOW_WHAT_I_AM_DOING ]] ; then
-			eerror "Sanity check to keep you from breaking your system:"
-			eerror "  Downgrading Qt is completely unsupported and will break your system!"
-			die "aborting to save your system"
-		else
-			ewarn "Downgrading Qt is completely unsupported and will break your system!"
-		fi
-	fi
-
-	if [[ "${PN}" == "qt-webkit" ]]; then
-		eshopts_push -s extglob
-		if is-flagq '-g?(gdb)?([1-9])'; then
-			echo
-			ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)."
-			ewarn "You may experience really long compilation times and/or increased memory usage."
-			ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug."
-			ewarn "For more info check out bug #307861"
-			echo
-		fi
-		eshopts_pop
-	fi
-
-	PATH="${S}/bin${PATH:+:}${PATH}"
-	if [[ ${CHOST} != *-darwin* ]]; then
-		LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
-	else
-		DYLD_LIBRARY_PATH="${S}/lib${DYLD_LIBRARY_PATH:+:}${DYLD_LIBRARY_PATH}"
-		# On MacOS we *need* at least src/gui/kernel/qapplication_mac.mm for
-		# platform detection. Note: needs to come before any directories to
-		# avoid extract failure.
-		[[ ${CHOST} == *-apple-darwin* ]] && \
-			QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm
-				${QT4_EXTRACT_DIRECTORIES}"
-	fi
-
-	# Make sure ebuilds use the required EAPI
-	if [[ ${EAPI} != [23] ]]; then
-		eerror "The qt4-build eclass requires EAPI=2 or EAPI=3, but this ebuild is using"
-		eerror "EAPI=${EAPI:-0}. The ebuild author or editor failed. This ebuild needs to be"
-		eerror "fixed. Using qt4-build eclass without EAPI=2 or EAPI=3 will fail."
-		die "qt4-build eclass requires EAPI=2 or EAPI=3"
-	fi
-
-	if ! version_is_at_least 4.1 $(gcc-version); then
-		ewarn "Using a GCC version lower than 4.1 is not supported!"
-	fi
-}
-
-# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
-# @DESCRIPTION:
-# Arguments for build_target_directories. Takes the directories, in which the
-# code should be compiled. This is a space-separated list
-
-# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
-# @DESCRIPTION:
-# Space separated list including the directories that will be extracted from Qt
-# tarball
-
-# @FUNCTION: qt4-build_src_unpack
-# @DESCRIPTION:
-# Unpacks the sources
-qt4-build_src_unpack() {
-	setqtenv
-	local target targets=
-	for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
-		src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
-		${QT4_EXTRACT_DIRECTORIES}; do
-			targets+=" ${MY_P}/${target}"
-	done
-
-	echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
-	tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die
-}
-
-# @ECLASS-VARIABLE: PATCHES
-# @DESCRIPTION:
-# In case you have patches to apply, specify them in PATCHES variable. Make sure
-# to specify the full path. This variable is necessary for src_prepare phase.
-# example:
-# PATCHES="${FILESDIR}"/mypatch.patch
-#   ${FILESDIR}"/mypatch2.patch"
-#
-
-# @FUNCTION: qt4-build_src_prepare
-# @DESCRIPTION:
-# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
-# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf.
-qt4-build_src_prepare() {
-	setqtenv
-	cd "${S}"
-	
-	# fix qt 4.7 regression that skips -fvisibility=hidden
-	if version_is_at_least "4.7.0_beta1"; then
-		sed -e "s/^gcc|g++)/*gcc|*g++)/" \
-			-i config.tests/unix/fvisibility.test ||
-				die "visibility fixing sed failed"
-	fi
-	# fix libx11 dependency on non X packages
-	if version_is_at_least "4.7.0_beta2"; then
-		local NOLIBX11PKG="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
-		hasq ${PN} ${NOLIBX11PKG} && qt_nolibx11
-		[[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup
-	fi
-
-	if use aqua; then
-		# provide a proper macx-g++-64
-		use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
-
-		sed -e '/^CONFIG/s:app_bundle::' \
-			-e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
-			-i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed"
-	fi
-
-	if [[ ${PN} != qt-core ]]; then
-		skip_qmake_build_patch
-		skip_project_generation_patch
-		symlink_binaries_to_buildtree
-	fi
-
-	if [[ ${CHOST} == *86*-apple-darwin* ]] ; then
-		# qmake bus errors with -O2 but -O3 works
-		replace-flags -O2 -O3
-	fi
-
-	# Bug 178652
-	if [[ $(gcc-major-version) == 3 ]] && use amd64; then
-		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
-		append-flags -fno-gcse
-	fi
-
-	# Unsupported old gcc versions - hardened needs this :(
-	if [[ $(gcc-major-version) -lt 4 ]] ; then
-		ewarn "Appending -fno-stack-protector to CXXFLAGS"
-		append-cxxflags -fno-stack-protector
-		# Bug 253127
-		sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
-		-i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
-	fi
-
-	# Bug 261632
-	if use ppc64; then
-		ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
-		append-flags -mminimal-toc
-	fi
-
-	# Bug 282984 && Bug 295530
-	sed -e "s:\(^SYSTEM_VARIABLES\):CC=\"$(tc-getCC)\"\nCXX=\"$(tc-getCXX)\"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \
-		-i configure || die "sed qmake compilers failed"
-	# bug 321335
-	if version_is_at_least 4.6; then
-		find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \
-			xargs -0 \
-			sed -e "s:\(\$MAKE\):\1 CC=\"$(tc-getCC)\" CXX=\"$(tc-getCXX)\" LD=\"$(tc-getCXX)\" LINK=\"$(tc-getCXX)\":g" \
-				-i || die "sed test compilers failed"
-	fi
-
-	# Bug 172219
-	sed -e "s:X11R6/::" \
-		-i "${S}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed ${S}/mkspecs/$(qt_mkspecs_dir)/qmake.conf failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# Set FLAGS *and* remove -arch, since our gcc-apple is multilib
-		# crippled (by design) :/
-		sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-			-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
-			-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
-			-e "s:-arch\s\w*::g" \
-			-i mkspecs/common/mac-g++.conf || die "sed mkspecs/common/mac-g++.conf failed"
-
-		# Fix configure's -arch settings that appear in qmake/Makefile and also
-		# fix arch handling (automagically duplicates our -arch arg and breaks
-		# pch). Additionally disable Xarch support.
-		sed \
-			-e "s:-arch i386::" \
-			-e "s:-arch ppc::" \
-			-e "s:-arch x86_64::" \
-			-e "s:-arch ppc64::" \
-			-e "s:-arch \$i::" \
-			-e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
-			-e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
-			-e "s:-Xarch_x86_64::g" \
-			-e "s:-Xarch_ppc64::g" \
-			-i configure mkspecs/common/mac-g++.conf || die "sed configure failed"
-
-		# On Snow Leopard don't fall back to 10.5 deployment target.
-		if [[ ${CHOST} == *-apple-darwin10 ]] ; then
-			sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
-				-e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
-				-i configure mkspecs/common/mac-g++.conf || die "sed configure failed"
-		fi
-	fi
-
-	# this one is needed for all systems with a separate -liconv, apart from
-	# Darwin, for which the sources already cater for -liconv
-	if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] ; then
-		sed \
-			-e "s|mac:LIBS += -liconv|LIBS += -liconv|g" \
-			-i config.tests/unix/iconv/iconv.pro \
-			|| die "sed on iconv.pro failed"
-	fi
-
-	# we need some patches for Solaris
-	sed -i \
-		-e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
-		mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
-	# use GCC over SunStudio
-	sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
-	# don't flirt with non-Prefix stuff, we're quite possessive
-	sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
-		mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
-	# strip predefined CFLAGS from qmake ( bug #312689 )
-	sed -i '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf
-
-	base_src_prepare
-}
-
-# @FUNCTION: qt4-build_src_configure
-# @DESCRIPTION:
-# Default configure phase
-qt4-build_src_configure() {
-	setqtenv
-	myconf="$(standard_configure_options) ${myconf}"
-
-	# this one is needed for all systems with a separate -liconv, apart from
-	# Darwin, for which the sources already cater for -liconv
-	use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \
-		myconf+=" -liconv"
-
-	if has glib ${IUSE//+} && use glib; then
-		# use -I, -L and -l from configure
-		local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)"
-		# avoid the -pthread argument
-		myconf+=" ${glibflags//-pthread}"
-		unset glibflags
-	fi
-
-	if use aqua ; then
-		# On (snow) leopard use the new (frameworked) cocoa code.
-		if [[ ${CHOST##*-darwin} -ge 9 ]] ; then
-			myconf+=" -cocoa -framework"
-
-			# We are crazy and build cocoa + qt3support :-)
-			if use qt3support; then
-				sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
-					-i configure
-			fi
-
-			# We need the source's headers, not the installed ones.
-			myconf+=" -I${S}/include"
-
-			# Add hint for the framework location.
-			myconf+=" -F${QTLIBDIR}"
-		fi
-	else
-		# freetype2 include dir is non-standard, thus include it on configure
-		# use -I from configure
-		myconf+=" $(pkg-config --cflags freetype2)"
-	fi
-
-	# Disable SSE4.x, since auto-detection is currently broken
-	# Upstream bug http://bugreports.qt.nokia.com/browse/QTBUG-13623
-	[[ ${PV} == "4.7.1" ]] && myconf+=" -no-sse4.1 -no-sse4.2"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die "./configure failed"
-	myconf=""
-
-	prepare_directories ${QT4_TARGET_DIRECTORIES}
-}
-
-# @FUNCTION: qt4-build_src_compile
-# @DESCRIPTION: Actual compile phase
-qt4-build_src_compile() {
-	setqtenv
-
-	build_directories ${QT4_TARGET_DIRECTORIES}
-}
-
-# @FUNCTION: qt4-build_src_test
-# @DESCRIPTION:
-# Runs tests only in target directories.
-qt4-build_src_test() {
-	for dir in ${QT4_TARGET_DIRECTORIES}; do
-		emake -j1 check -C ${dir}
-	done
-}
-
-# @FUNCTION: fix_includes
-# @DESCRIPTION:
-# For MacOSX we need to add some symlinks when frameworks are
-# being used, to avoid complications with some more or less stupid packages.
-fix_includes() {
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
-		# Some packages tend to include <Qt/...>
-		dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
-
-		# Fake normal headers when frameworks are installed... eases life later on
-		local dest f
-		for frw in "${D}${QTLIBDIR}"/*.framework; do
-			[[ -e "${frw}"/Headers ]] || continue
-			f=$(basename ${frw})
-			dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework}
-			dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers "${dest}"
-
-			# Link normal headers as well.
-			for hdr in "${D}/${QTLIBDIR}/${f}"/Headers/*; do
-				h=$(basename ${hdr})
-				dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers/${h} "${QTHEADERDIR#${EPREFIX}}"/Qt/${h}
-			done
-		done
-	fi
-}
-
-# @FUNCTION: qt4-build_src_install
-# @DESCRIPTION:
-# Perform the actual installation including some library fixes.
-qt4-build_src_install() {
-	[[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
-	setqtenv
-	install_directories ${QT4_TARGET_DIRECTORIES}
-	install_qconfigs
-	fix_library_files
-	fix_includes
-	# remove .la files since we are building only shared Qt libraries
-	find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm 
-}
-
-# @FUNCTION: setqtenv
-setqtenv() {
-	# Set up installation directories
-	QTBASEDIR=${EPREFIX}/usr/$(get_libdir)/qt4
-	QTPREFIXDIR=${EPREFIX}/usr
-	QTBINDIR=${EPREFIX}/usr/bin
-	QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4
-	QMAKE_LIBDIR_QT=${QTLIBDIR}
-	QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
-	QTDATADIR=${EPREFIX}/usr/share/qt4
-	QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV}
-	QTHEADERDIR=${EPREFIX}/usr/include/qt4
-	QTPLUGINDIR=${QTLIBDIR}/plugins
-	QTSYSCONFDIR=${EPREFIX}/etc/qt4
-	QTTRANSDIR=${QTDATADIR}/translations
-	QTEXAMPLESDIR=${QTDATADIR}/examples
-	QTDEMOSDIR=${QTDATADIR}/demos
-	QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
-	PLATFORM=$(qt_mkspecs_dir)
-
-	unset QMAKESPEC
-}
-
-# @FUNCTION: standard_configure_options
-# @DESCRIPTION:
-# Sets up some standard configure options, like libdir (if necessary), whether
-# debug info is wanted or not.
-standard_configure_options() {
-	local myconf=
-
-	[[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)"
-
-	# Disable visibility explicitly if gcc version isn't 4
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		myconf+=" -no-reduce-exports"
-	fi
-
-	# precompiled headers doesn't work on hardened, where the flag is masked.
-	myconf+=" $(qt_use pch)"
-
-	if use debug; then
-		myconf+=" -debug"
-	else
-		myconf+=" -release"
-	fi
-	myconf+=" -no-separate-debug-info"
-
-	use aqua && myconf+=" -no-framework"
-
-	# ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
-	# $(tc-arch). Therefore we convert it to supported values.
-	case "$(tc-arch)" in
-		amd64|x64-*) myconf+=" -arch x86_64" ;;
-		ppc-macos) myconf+=" -arch ppc" ;;
-		ppc|ppc64|ppc-*) myconf+=" -arch powerpc" ;;
-		sparc|sparc-*) myconf+=" -arch sparc" ;;
-		x86-macos) myconf+=" -arch x86" ;;
-		x86|x86-*) myconf+=" -arch i386" ;;
-		alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;;
-		hppa|sh) myconf+=" -arch generic" ;;
-		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
-	esac
-
-	# 4.5: build everything but qt-xmlpatterns w/o exceptions
-	# 4.6: exceptions USE flag
-	local exceptions="-exceptions"
-	case "${PV}" in
-		4.5.*)
-			[[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions"
-		;;
-		*)
-			has exceptions "${IUSE//+}" && exceptions="$(qt_use exceptions)"
-		;;
-	esac
-
-	# note about -reduce-relocations:
-	# That flag seems to introduce major breakage to applications,
-	# mostly to be seen as a core dump with the message "QPixmap: Must
-	# construct a QApplication before a QPaintDevice" on Solaris
-	#   -- Daniel Vergien
-	[[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations"
-
-	myconf+=" -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license
-		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
-		-datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
-		-plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
-		-translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
-		-demosdir ${QTDEMOSDIR} -silent -fast -opensource
-		${exceptions}
-		-nomake examples -nomake demos"
-
-	echo "${myconf}"
-}
-
-# @FUNCTION: prepare_directories
-# @USAGE: < directories >
-# @DESCRIPTION:
-# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES
-prepare_directories() {
-	for x in "$@"; do
-		pushd "${S}"/${x} >/dev/null
-		einfo "running qmake in: $x"
-		# avoid running over the maximum argument number, bug #299810
-		{
-			echo "${S}"/mkspecs/common/*.conf
-			find "${S}" -name '*.pr[io]'
-		} | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die
-		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
-		popd >/dev/null
-	done
-}
-
-
-# @FUNCTION: build_directories
-# @USAGE: < directories >
-# @DESCRIPTION:
-# Compiles the code in $QT4_TARGET_DIRECTORIES
-build_directories() {
-	for x in "$@"; do
-		pushd "${S}"/${x} >/dev/null
-		emake CC="$(tc-getCC)" \
-			CXX="$(tc-getCXX)" \
-			LINK="$(tc-getCXX)" || die "emake failed"
-		popd >/dev/null
-	done
-}
-
-# @FUNCTION: install_directories
-# @USAGE: < directories >
-# @DESCRIPTION:
-# run emake install in the given directories, which are separated by spaces
-install_directories() {
-	for x in "$@"; do
-		pushd "${S}"/${x} >/dev/null || die "Can't pushd ${S}/${x}"
-		emake INSTALL_ROOT="${D}" install || die "emake install failed"
-		popd >/dev/null || die "Can't popd from ${S}/${x}"
-	done
-}
-
-# @ECLASS-VARIABLE: QCONFIG_ADD
-# @DESCRIPTION:
-# List options that need to be added to QT_CONFIG in qconfig.pri
-: ${QCONFIG_ADD:=}
-
-# @ECLASS-VARIABLE: QCONFIG_REMOVE
-# @DESCRIPTION:
-# List options that need to be removed from QT_CONFIG in qconfig.pri
-: ${QCONFIG_REMOVE:=}
-
-# @ECLASS-VARIABLE: QCONFIG_DEFINE
-# @DESCRIPTION:
-# List variables that should be defined at the top of QtCore/qconfig.h
-: ${QCONFIG_DEFINE:=}
-
-# @FUNCTION: install_qconfigs
-# @DESCRIPTION: Install gentoo-specific mkspecs configurations
-install_qconfigs() {
-	local x
-	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
-		for x in QCONFIG_ADD QCONFIG_REMOVE; do
-			[[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
-		done
-		insinto ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
-		doins "${T}"/${PN}-qconfig.pri || die "installing ${PN}-qconfig.pri failed"
-	fi
-
-	if [[ -n ${QCONFIG_DEFINE} ]]; then
-		for x in ${QCONFIG_DEFINE}; do
-			echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
-		done
-		insinto ${QTHEADERDIR#${EPREFIX}}/Gentoo
-		doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
-	fi
-}
-
-# @FUNCTION: generate_qconfigs
-# @DESCRIPTION: Generates gentoo-specific configurations
-generate_qconfigs() {
-	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then
-		local x qconfig_add qconfig_remove qconfig_new
-		for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
-			[[ -f ${x} ]] || continue
-			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
-			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
-		done
-
-		# these error checks do not use die because dying in pkg_post{inst,rm}
-		# just makes things worse.
-		if [[ -e "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
-			# start with the qconfig.pri that qt-core installed
-			if ! cp "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri \
-				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
-				eerror "cp qconfig failed."
-				return 1
-			fi
-
-			# generate list of QT_CONFIG entries from the existing list
-			# including qconfig_add and excluding qconfig_remove
-			for x in $(sed -n 's/^QT_CONFIG +=//p' \
-				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
-					hasq ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
-			done
-
-			# replace the existing QT_CONFIG list with qconfig_new
-			if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
-				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
-				eerror "Sed for QT_CONFIG failed"
-				return 1
-			fi
-
-			# create Gentoo/qconfig.h
-			if [[ ! -e ${ROOT}${QTHEADERDIR}/Gentoo ]]; then
-				if ! mkdir -p "${ROOT}${QTHEADERDIR}"/Gentoo; then
-					eerror "mkdir ${QTHEADERDIR}/Gentoo failed"
-					return 1
-				fi
-			fi
-			: > "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
-			for x in "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-*-qconfig.h; do
-				[[ -f ${x} ]] || continue
-				cat "${x}" >> "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
-			done
-		else
-			rm -f "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri
-			rm -f "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
-			rmdir "${ROOT}${QTDATADIR}"/mkspecs \
-				"${ROOT}${QTDATADIR}" \
-				"${ROOT}${QTHEADERDIR}"/Gentoo \
-				"${ROOT}${QTHEADERDIR}" 2>/dev/null
-		fi
-	fi
-}
-
-# @FUNCTION: qt4-build_pkg_postrm
-# @DESCRIPTION: Generate configurations when the package is completely removed
-qt4-build_pkg_postrm() {
-	generate_qconfigs
-}
-
-# @FUNCTION: qt4-build_pkg_postinst
-# @DESCRIPTION: Generate configuration, plus throws a message about possible
-# breakages and proposed solutions.
-qt4-build_pkg_postinst() {
-	generate_qconfigs
-}
-
-# @FUNCTION: skip_qmake_build_patch
-# @DESCRIPTION:
-# Don't need to build qmake, as it's already installed from qt-core
-skip_qmake_build_patch() {
-	# Don't need to build qmake, as it's already installed from qt-core
-	sed -i -e "s:if true:if false:g" "${S}"/configure || die "Sed failed"
-}
-
-# @FUNCTION: skip_project_generation_patch
-# @DESCRIPTION:
-# Exit the script early by throwing in an exit before all of the .pro files are scanned
-skip_project_generation_patch() {
-	# Exit the script early by throwing in an exit before all of the .pro files are scanned
-	sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
-		-i "${S}"/configure || die "Sed failed"
-}
-
-# @FUNCTION: symlink_binaries_to_buildtree
-# @DESCRIPTION:
-# Symlink generated binaries to buildtree so they can be used during compilation
-# time
-symlink_binaries_to_buildtree() {
-	for bin in qmake moc uic rcc; do
-		ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "Symlinking ${bin} to ${S}/bin failed."
-	done
-}
-
-# @FUNCTION: fix_library_files
-# @DESCRIPTION:
-# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and
-# moves the *.pc-files into the pkgconfig directory
-fix_library_files() {
-	for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
-		if [[ -e ${libfile} ]]; then
-			sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "Sed on ${libfile} failed."
-		fi
-	done
-
-	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations.  Fix:
-	for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
-		if [[ -e ${libfile} ]]; then
-			sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed"
-
-		# Move .pc files into the pkgconfig directory
-		dodir ${QTPCDIR#${EPREFIX}}
-		mv ${libfile} "${D}"/${QTPCDIR}/ \
-			|| die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed."
-		fi
-	done
-
-	# Don't install an empty directory
-	rmdir "${D}"/${QTLIBDIR}/pkgconfig
-}
-
-# @FUNCTION: qt_use
-# @USAGE: < flag > [ feature ] [ enableval ]
-# @DESCRIPTION:
-# This will echo "${enableval}-${feature}" if <flag> is enabled, or
-# "-no-${feature} if the flag is disabled. If [feature] is not specified <flag>
-# will be used for that. If [enableval] is not specified, it omits the
-# assignment-part
-qt_use() {
-	local flag=$1
-	local feature=$1
-	local enableval=
-
-	[[ -n $2 ]] && feature=$2
-	[[ -n $3 ]] && enableval=-$3
-
-	if use ${flag}; then
-		echo "${enableval}-${feature}"
-	else
-		echo "-no-${feature}"
-	fi
-}
-
-# @FUNCTION: qt_mkspecs_dir
-# @RETURN: the specs-directory w/o path
-# @DESCRIPTION:
-# Allows us to define which mkspecs dir we want to use.
-qt_mkspecs_dir() {
-	# Allows us to define which mkspecs dir we want to use.
-	local spec
-
-	case ${CHOST} in
-		*-freebsd*|*-dragonfly*)
-			spec=freebsd ;;
-		*-openbsd*)
-			spec=openbsd ;;
-		*-netbsd*)
-			spec=netbsd ;;
-		*-darwin*)
-			if use aqua; then
-				# mac with carbon/cocoa
-				spec=macx
-			else
-				# darwin/mac with x11
-				spec=darwin
-			fi
-			;;
-		*-solaris*)
-			spec=solaris ;;
-		*-linux-*|*-linux)
-			spec=linux ;;
-		*)
-			die "Unknown CHOST, no platform choosen."
-	esac
-
-	CXX=$(tc-getCXX)
-	if [[ ${CXX} == *g++* ]]; then
-		spec+=-g++
-	elif [[ ${CXX} == *icpc* ]]; then
-		spec+=-icc
-	else
-		die "Unknown compiler ${CXX}."
-	fi
-	if [[ -n ${LIBDIR/lib} ]]; then
-		spec+=-${LIBDIR/lib}
-	fi
-
-	# Add -64 for 64bit profiles
-	if use x64-freebsd ||
-		use amd64-linux ||
-		use x64-macos ||
-		use x64-solaris ||
-		use sparc64-solaris
-	then
-		spec+=-64
-	fi
-
-	if [[ "$ABI" == "x86" ]]; then
-		spec+=-32
-	else
-		ewarn "Unknown Arch $ABI."
-	fi
-
-	echo "${spec}"
-}
-
-# @FUNCTION: qt_assistant_cleanup
-# @RETURN: nothing
-# @DESCRIPTION:
-# Tries to clean up tools.pro for qt-assistant ebuilds
-# Meant to be called in src_prepare
-qt_assistant_cleanup() {
-	# different versions (and branches...) may need different handling,
-	# add a case if you need special handling
-	case "${MY_PV_EXTRA}" in
-		*kde-qt*)
-			sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
-				-e "/mac/,/^embedded.*makeqpf$/d" \
-				-i tools/tools.pro || die "patching tools.pro failed"
-		;;
-		*)
-			sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
-				-e "/mac/,/^embedded.*makeqpf$/d" \
-				-e "s/^\([ \t]*pixeltool\) /\1 qdoc3 /" \
-				-i tools/tools.pro || die "patching tools.pro failed"
-		;;
-	esac
-}
-
-# @FUNCTION: qt_nolibx11
-# @RETURN: nothing
-# @DESCRIPTION:
-# Ignore X11 tests for packages that don't need X libraries installed
-qt_nolibx11() {
-	einfo "removing X11 check to allow X-less compilation"
-	sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure ||
-		die "x11 check sed failed"
-}
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst
--- a/eclass/waf-utils.eclass
+++ b/eclass/waf-utils.eclass
@@ -1,122 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.5 2011/03/01 23:02:08 abcd Exp $
-
-# @ECLASS: waf-utils.eclass
-# @MAINTAINER:
-# gnome@gentoo.org
-#
-# @CODE
-# Original Author: Gilles Dartiguelongue <eva@gentoo.org>
-# Various improvements based on cmake-utils.eclass: Tomáš Chvátal <scarabeus@gentoo.org>
-# Proper prefix support: Jonathan Callen <abcd@gentoo.org>
-# @CODE
-# @BLURB: common ebuild functions for waf-based packages
-# @DESCRIPTION:
-# The waf-utils eclass contains functions that make creating ebuild for
-# waf-based packages much easier.
-# Its main features are support of common portage default settings.
-
-inherit base eutils multilib
-
-case ${EAPI:-0} in
-	4|3) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# @FUNCTION: waf-utils_waflibdir
-# @USAGE: [<waf-binary>]
-# @DESCRIPTION:
-# Echoes the absolute path to the directory containing the waf-based
-# project's waflib python module. Ensures that the waflib shipped with a
-# project is unpacked if it isn't already. This waflib may be safely
-# patched because waf-lite will not touch the waflib directory if it
-# already exists. Uses the waf binary specified in WAF_BINARY.
-#
-# @EXAMPLE
-# The simplest case, for a monolithic compilation:
-#
-# @CODE
-# pushd "$(waf-utils_waflibdir)" || die "Unable to patch waflib"
-# epatch "${FILESDIR}"/${P}-waf-fix.patch
-# popd
-# @CODE
-#
-# Note that if you are using the python eclass and installating python
-# modules, you must either call python_set_active_version or call
-# waf-utils_waflibdir() from within a function run by
-# python_execute(). This is because waf uses a different directory for
-# waflib when using python3 than when using python2.
-#
-# @CODE
-# SUPPORT_PYTHON_ABIS=1
-# inherit eutils python waf-utils
-#
-# # Always use the waf associated with the current python ABI.
-# WAF_BINARY=./waf
-#
-# src_prepare() {
-# 	python_copy_sources
-#
-# 	myprepare() {
-# 		epatch "${FILESDIR}"/${P}-sourcecode-fix.patch
-#
-# 		pushd "$(waf-utils_waflibdir)" || die "Unable to patch waflib"
-# 		epatch "${FILESDIR}"/${P}-waf-fix.patch
-# 		popd
-# 	}
-# 	python_execute_function -s myprepare
-# }
-# @CODE
-waf-utils_waflibdir() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	: ${WAF_BINARY:="${S}/waf"}
-
-	python -c "import imp, sys; sys.argv[0] = '${WAF_BINARY}'; waflite = imp.load_source('waflite', '${WAF_BINARY}'); print(waflite.find_lib());" \
-		|| die "Unable to locate or unpack waflib module from the waf script at ${WAF_BINARY}"
-}
-
-# @FUNCTION: waf-utils_src_configure
-# @DESCRIPTION:
-# General function for configuring with waf.
-waf-utils_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# @ECLASS-VARIABLE: WAF_BINARY
-	# @DESCRIPTION:
-	# Eclass can use different waf executable. Usually it is located in "${S}/waf".
-	: ${WAF_BINARY:="${S}/waf"}
-
-	echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr --libdir=${EPREFIX}/usr/$(get_libdir) $@ configure"
-
-	CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
-		"--prefix=${EPREFIX}/usr" \
-		"--libdir=${EPREFIX}/usr/$(get_libdir)" \
-		"$@" \
-		configure || die "configure failed"
-}
-
-# @FUNCTION: waf-utils_src_compile
-# @DESCRIPTION:
-# General function for compiling with waf.
-waf-utils_src_compile() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local jobs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/--jobs=\2/" )
-	echo "\"${WAF_BINARY}\" build ${jobs}"
-	"${WAF_BINARY}" ${jobs} || die "build failed"
-}
-
-# @FUNCTION: waf-utils_src_install
-# @DESCRIPTION:
-# Function for installing the package.
-waf-utils_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	echo "\"${WAF_BINARY}\" --destdir=\"${D}\" install"
-	"${WAF_BINARY}" --destdir="${D}" install  || die "Make install failed"
-
-	# Manual document installation
-	base_src_install_docs
-}