uNF uNF new version :)

16 files changed, 213 insertions, 1438 deletions

diff --git a/x11-wm/enlightenment-cvs/ChangeLog b/x11-wm/enlightenment-cvs/ChangeLog
index ec80e4202827..412ae33c0c2b 100644
--- a/x11-wm/enlightenment-cvs/ChangeLog
+++ b/x11-wm/enlightenment-cvs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/enlightenment-cvs
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment-cvs/ChangeLog,v 1.8 2003/01/12 07:37:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment-cvs/ChangeLog,v 1.9 2003/02/06 07:27:04 vapier Exp $
+
+*enlightenment-cvs-20030205 (06 Feb 2003)
+
+  06 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added updated source (evas api updates).
+  Added enotes, entrance, and evidence.
+  Added some Gentoo theme stuff (thx Andrew Elcock <aje@codewordt.co.uk>).
 
 *enlightenment-cvs-20030111-r1 (12 Jan 2003)
 
diff --git a/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20021027.ebuild b/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20021027.ebuild
deleted file mode 100644
index 08e8740b2d80..000000000000
--- a/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20021027.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20021027.ebuild,v 1.8 2002/12/15 10:44:24 bjb Exp $
-
-IUSE="pic X mmx truetype opengl"
-
-ECVS_SERVER="cvs.enlightenment.sourceforge.net:/cvsroot/enlightenment"
-ECVS_MODULE="e17"
-ECVS_CVS_OPTIONS="-dP"
-
-DEPEND="app-admin/fam-oss 
-	dev-libs/libxml2
-	dev-libs/libpcre
-	dev-lang/ferite
-	media-libs/imlib2"
-
-inherit cvs
-
-DESCRIPTION="Enlightenment Window Manager"
-SRC_URI=""
-HOMEPAGE="http://www.enlightenment.org/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-S=${WORKDIR}/${ECVS_MODULE}
-E_PREFIX=/usr/e17
-
-pkg_setup() {
-	ewarn "A NOTE ABOUT THE COMPILE STAGE:"
-	echo
-	ewarn "Do NOT report a bug about this ebuild on bugs.gentoo.org"
-	ewarn "Chances are that the problem lies with e17, and since its"
-	ewarn "in such an unstable state, Gentoo isnt going to spend time"
-	ewarn "on it :).  If e17 doesnt work for you, then use 0.16.5"
-	echo
-	einfo "If you are 100% sure the problem is with the ebuild, then"
-	einfo "e-mail me at vapier@gentoo.org"
-	echo
-	einfo "Also, if you feel something isnt installed and it should"
-	einfo "be, then also send me an e-mail ;)"
-
-	dodir ${E_PREFIX}
-	[ -e ${E_PREFIX} ] || ln -sf ${D}/${E_PREFIX} ${E_PREFIX}
-}
-
-src_install() {
-	# anytime you see --> echo "all:"$'\n\t'"echo done">test/Makefile
-	# it means i disabled the test building ... i could do a sed on that
-	# Makefile to make it work, but its just a test app ... who cares ...
-	# for some reason, `make LDFLAGS="-L -L -L"` doesnt work, so its punted
-
-	local baseconf
-	local addconf
-	baseconf="--prefix=${E_PREFIX} --with-gnu-ld --enable-shared"
-	use pic	&&	baseconf="${baseconf} --with-pic"
-
-	# the stupid gettextize script prevents non-interactive mode, so we hax it
-	mkdir ${S}/hax
-	cp `which gettextize` ${S}/hax/ || die "could not copy gettextize"
-	cp ${S}/hax/gettextize ${S}/hax/gettextize.old
-	sed -e 's:read dummy < /dev/tty::' ${S}/hax/gettextize.old > ${S}/hax/gettextize
-
-	# find our haxed script first, the -config scripts 2nd, everything else last
-	PATH="${S}/hax:${E_PREFIX}/bin:${PATH}"
-	CFLAGS="${CFLAGS} -I${E_PREFIX}/include -I${E_PREFIX}/include/ewd"
-
-	############
-	### libs ###
-	############
-
-	### imlib2 ###
-	# mmx support in imlib2 makes other things complain it would seem ...
-	# *shrug*, worked for me ;D
-	cd ${S}/libs/imlib2
-	addconf="--disable-mmx"
-	use X		&& addconf="${addconf} --with-x"
-#	use mmx		&& addconf="${addconf} --enable-mmx"
-	use truetype	&& addconf="${addconf} --with-ttf=/usr"
-	env USER=BS ./autogen.sh ${baseconf} ${addconf} || die "could not autogen imlib2"
-	make || die "could not make imlib2"
-	make install DESTDIR=${D} || die "could not install imlib2"
-
-	### edb ###
-	cd ${S}/libs/edb
-	./autogen.sh ${baseconf} || die "could not autogen edb"
-	make || die "could not make edb"
-	make install DESTDIR=${D} || die "could not install edb"
-
-	### imlib2_loaders ###
-	cd ${S}/libs/imlib2_loaders
-	use X		&& addconf="${addconf} --with-x"
-	./autogen.sh ${baseconf} ${addconf} || die "could not autogen imlib2_loaders"
-	make || die "could not make imlib2_loaders"
-	make install DESTDIR=${D} || die "could not install imlib_loaders"
-
-	### evas ###
-	cd ${S}/libs/evas
-	addconf=
-	use X		&& addconf="${addconf} --with-x"
-	use truetype	&& addconf="${addconf} --with-ttf=/usr"
-	use opengl	&& addconf="${addconf} --with-gl=/usr"
-	./autogen.sh ${baseconf} ${addconf} || die "could not autogen evas"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make evas"
-	make install DESTDIR=${D} || die "could not install evas"
-
-	### ewd ###
-	cd ${S}/libs/ewd
-	./autogen.sh ${baseconf} || die "could not autogen ewd"
-	make || die "could not make ewd"
-	make install DESTDIR=${D} || die "could not install ewd"
-
-	### ebits ###
-	cd ${S}/libs/ebits
-	./autogen.sh ${baseconf} || die "could not autogen ebits"
-	make || die "could not make ebits"
-	make install DESTDIR=${D} || die "could not install ebits"
-
-	### ecore ###
-	cd ${S}/libs/ecore
-	addconf=
-	use X		&& addconf="${addconf} --with-x"
-	./autogen.sh ${baseconf} ${addconf} || die "could not autogen ecore"
-	make || die "could not make ecore"
-	make install DESTDIR=${D} || die "could not install ecore"
-
-	### estyle ###
-	cd ${S}/libs/estyle
-	./autogen.sh ${baseconf} || die "could not autogen estyle"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make estyle"
-	make install DESTDIR=${D} || die "could not install estyle"
-
-	### etox ###
-	cd ${S}/libs/etox
-	./autogen.sh ${baseconf} || die "could not autogen etox"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make etox"
-	make install DESTDIR=${D} || die "could not install etox"
-
-	### ebg ###
-	cd ${S}/libs/ebg
-	./autogen.sh ${baseconf} || die "could not autogen ebg"
-	make || die "could not make ebg"
-	make install DESTDIR=${D} || die "could not install ebg"
-
-	### ewl ###
-	cd ${S}/libs/ewl
-	env USER=BS ./autogen.sh ${baseconf} || die "could not autogen ewl"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make ewl"
-	make install DESTDIR=${D} || die "could not install ewl"
-
-	############
-	### apps ###
-	############
-
-	### etcher ###
-	cd ${S}/apps/etcher
-	addconf="--disable-nls --with-included-gettext"
-	./autogen.sh ${baseconf} ${addconf} || die "could not autogen etcher"
-	make CFLAGS="${CFLAGS} -levas" top_builddir=`pwd` || die "could not make etcher"
-	make install DESTDIR="${D}" top_builddir=`pwd` || die "could not install etcher"
-
-	### ebony ###
-	cd ${S}/apps/ebony
-	./autogen.sh ${baseconf} || die "could not autogen ebony"
-	make || die "could not make ebony"
-	make install DESTDIR="${D}" || die "could not install ebony"
-
-	### med ###
-	cd ${S}/apps/med
-	addconf=
-	use X           && addconf="${addconf} --with-x"
-	./autogen.sh ${baseconf} ${addconf} || die "could not autogen med"
-	make || die "could not build med"
-	make install DESTDIR="${D}" || die "could not install med"
-
-	### efsd ###
-	cd ${S}/apps/efsd
-	./autogen.sh ${baseconf} || die "could not autogen efsd"
-	make || die "could not build efsd"
-	make install DESTDIR="${D}" || die "could not install efsd"
-
-	### ebindings ###
-	cd ${S}/apps/ebindings
-	./autogen.sh ${baseconf} || die "could not autogen ebindings"
-	make || die "could not build ebindings"
-	make install DESTDIR="${D}" || die "could not install ebindings"
-
-	### e ###
-	cd ${S}/apps/e
-	# hack it a little ;D
-	cp configure.ac configure.ac.old
-	sed -e 's:AC_MSG_ERROR(Cannot detect:#:' \
-	 -e 's:intl/Makefile::' \
-	 -e 's:po/Makefile.in::' \
-		configure.ac.old > configure.ac
-	cp Makefile.am Makefile.am.old
-	sed -e 's:intl po::' Makefile.am.old > Makefile.am
-	./autogen.sh ${baseconf} || die "could not autogen e"
-	cp Makefile Makefile.old
-	sed -e 's:m4   ::' Makefile.old > Makefile
-	make || die "could not build e"
-	make install DESTDIR="${D}" || die "could not install e"
-
-	# remove improper stuff
-	cd ${D}
-	rm -rf `find -name CVS`
-	rm -rf '@aclocaldir@'
-
-	# make an env.d entry
-	insinto /etc/env.d
-	echo "PATH=${E_PREFIX}/bin" > e.env.d
-	echo "LDPATH=${E_PREFIX}/lib" >> e.env.d
-	newins e.env.d 50enlightenment
-}
-
-pkg_preinst() {
-	# clean up symlink
-	[ -L ${E_PREFIX} ] && rm -f ${E_PREFIX}
-}
diff --git a/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20021219.ebuild b/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20021219.ebuild
deleted file mode 100644
index fdb93d0b417f..000000000000
--- a/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20021219.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20021219.ebuild,v 1.1 2002/12/21 07:57:14 vapier Exp $
-
-ECVS_SERVER="cvs.enlightenment.sourceforge.net:/cvsroot/enlightenment"
-ECVS_MODULE="e17"
-ECVS_CVS_OPTIONS="-dP"
-ECVS_BRANCH="SPLIT"
-
-inherit cvs
-
-DESCRIPTION="Enlightenment Window Manager"
-SRC_URI="mirror://gentoo/${P}.tar.tbz2"
-HOMEPAGE="http://www.enlightenment.org/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE="pic X mmx truetype opengl directfb fbcon png jpeg"
-
-DEPEND="app-admin/fam-oss 
-	dev-libs/libxml2
-	dev-libs/libpcre
-	dev-lang/ferite
-	media-libs/imlib2
-	=x11-libs/gtk+-1.2*
-	=dev-libs/glib-1.2*"
-
-S=${WORKDIR}/${ECVS_MODULE}
-E_PREFIX=/usr/e17
-
-pkg_setup() {
-	einfo "If you are have a problem with the ebuild, then"
-	einfo "e-mail me at vapier@gentoo.org"
-	echo
-	ewarn "this ebuild moves /usr/e17 to /usr/e17.old in the case"
-	ewarn "that you already have a version installed ..."
-	ewarn "this is needed when newer cvs releases rely on my pkgs"
-
-	[ -e ${E_PREFIX}.old -a ! -h ${E_PREFIX} ] && die "do something about /usr/e17.old"
-	dodir ${E_PREFIX}
-	[ -e ${E_PREFIX} ] && mv ${E_PREFIX} ${E_PREFIX}.old
-	ln -sf ${D}/${E_PREFIX} ${E_PREFIX}
-}
-
-src_unpack() {
-	unpack ${A}
-#	cp -rf ${DISTDIR}/cvs-src/e17 ${WORKDIR}
-}
-
-src_install() {
-	# anytime you see --> echo "all:"$'\n\t'"echo done">test/Makefile
-	# it means i disabled the test building ... i could do a sed on that
-	# Makefile to make it work, but its just a test app ... who cares ...
-	# for some reason, `make LDFLAGS="-L -L -L"` doesnt work, so its punted
-
-	export baseconf="--prefix=${E_PREFIX} --with-gnu-ld --enable-shared `use_with pic`"
-	export addconf=""
-
-	# the stupid gettextize script prevents non-interactive mode, so we hax it
-	cp `which gettextize` ${T} || die "could not copy gettextize"
-	cp ${T}/gettextize ${T}/gettextize.old
-	sed -e 's:read dummy < /dev/tty::' ${T}/gettextize.old > ${T}/gettextize
-
-	# HEAD uses autogen.sh but SPLIT doesnt always ...
-	eautogen="
-		#!/bin/bash
-		if [ -x ./autogen.sh ] ; then
-			./autogen.sh \$@
-		else
-			./configure \$@
-		fi"
-	echo "${eautogen}" > ${T}/eautogen
-	chmod a+x ${T}/eautogen
-
-	# find our haxed script first, the -config scripts 2nd, everything else last
-	PATH="${T}:${E_PREFIX}/bin:${PATH}"
-	CFLAGS="${CFLAGS} -I${E_PREFIX}/include -I${E_PREFIX}/include/ewd"
-	export WANT_AUTOCONF_2_5=1
-	export WANT_AUTOMAKE_1_6=1
-
-	############
-	### libs ###
-	############
-
-	### imlib2 ###
-	# mmx support in imlib2 makes other things complain it would seem ...
-	# *shrug*, worked for me ;D
-	einfo "making libs/imlib2"
-	cd ${S}/libs/imlib2
-	addconf="--disable-mmx"
-	use X		&& addconf="${addconf} --with-x"
-#	use mmx		&& addconf="${addconf} --enable-mmx"
-	use truetype	&& addconf="${addconf} --with-ttf=/usr"
-	env USER=BS eautogen ${baseconf} ${addconf} || die "could not autogen imlib2"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make imlib2"
-	make install DESTDIR=${D} || die "could not install imlib2"
-
-	### edb ###
-	einfo "making libs/edb"
-	cd ${S}/libs/edb
-	addconf="--enable-cxx"
-	eautogen ${baseconf} ${addconf} || die "could not autogen edb"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make edb"
-	make install DESTDIR=${D} || die "could not install edb"
-
-	### eet ###
-	einfo "making libs/eet"
-	cd ${S}/libs/eet
-	cp configure.ac{,.old}
-	sed -e "s:src/bin/Makefile:src/bin/Makefile eet-config],\n[\nchmod +x eet-config\n:" \
-		configure.ac.old > configure.ac
-	echo 'bin_SCRIPTS = eet-config' >> Makefile.am
-	eautogen ${baseconf} || die "could not autogen eet"
-	make || die "could not make eet"
-	make install DESTDIR=${D} || die "could not install eet"
-
-	### imlib2_loaders ###
-	einfo "making libs/imlib2_loaders"
-	cd ${S}/libs/imlib2_loaders
-	use X		&& addconf="${addconf} --with-x"
-	env -u CFLAGS eautogen ${baseconf} ${addconf} || die "could not autogen imlib2_loaders"
-	make CFLAGS="${CFLAGS}" || die "could not make imlib2_loaders"
-	make install DESTDIR=${D} || die "could not install imlib_loaders"
-
-	### evas ###
-	einfo "making libs/evas"
-	cd ${S}/libs/evas
-	addconf="--enable-image-loader-eet --enable-image-loader-edb --enable-cpu-c \
-		--enable-scale-smooth --enable-scale-sample"
-	use X		&& addconf="${addconf} --enable-software-x11"
-	use truetype	&& addconf="${addconf} --with-ttf=/usr"
-	use opengl	&& addconf="${addconf} --enable-gl-x11"
-	use directfb	&& addconf="${addconf} --enable-directfb"
-	use fbcon	&& addconf="${addconf} --enable-fb"
-	use png		&& addconf="${addconf} --enable-image-loader-png"
-	use jpeg	&& addconf="${addconf} --enable-image-loader-jpeg"
-	use mmx		&& addconf="${addconf} --enable-cpu-mmx"
-	eautogen ${baseconf} ${addconf} || die "could not autogen evas"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make CFLAGS="${CFLAGS} -leet" || die "could not make evas"
-	make install DESTDIR=${D} || die "could not install evas"
-
-	### ewd ###
-	einfo "making libs/ewd"
-	cd ${S}/libs/ewd
-	eautogen ${baseconf} || die "could not autogen ewd"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make ewd"
-	make install DESTDIR=${D} || die "could not install ewd"
-
-	### ebits ###
-	einfo "making libs/ebits"
-	cd ${S}/libs/ebits
-	eautogen ${baseconf} || die "could not autogen ebits"
-	make || die "could not make ebits"
-	make install DESTDIR=${D} || die "could not install ebits"
-
-	### ecore ###
-	einfo "making libs/ecore"
-	cd ${S}/libs/ecore
-	addconf=
-	use X		&& addconf="${addconf} --with-x"
-	eautogen ${baseconf} ${addconf} || die "could not autogen ecore"
-	make || die "could not make ecore"
-	make install DESTDIR=${D} || die "could not install ecore"
-
-	### estyle ###
-	einfo "making libs/estyle"
-	cd ${S}/libs/estyle
-	eautogen ${baseconf} || die "could not autogen estyle"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make estyle"
-	make install DESTDIR=${D} || die "could not install estyle"
-
-	### etox ###
-	einfo "making libs/etox"
-	cd ${S}/libs/etox
-	eautogen ${baseconf} || die "could not autogen etox"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make etox"
-	make install DESTDIR=${D} || die "could not install etox"
-
-	### ebg ###
-	einfo "making libs/ebg"
-	cd ${S}/libs/ebg
-	eautogen ${baseconf} || die "could not autogen ebg"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make ebg"
-	make install DESTDIR=${D} || die "could not install ebg"
-
-	### ewl ###
-	einfo "making libs/ewl"
-	cd ${S}/libs/ewl
-	env USER=BS eautogen ${baseconf} || die "could not autogen ewl"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make ewl"
-	make install DESTDIR=${D} || die "could not install ewl"
-
-	### eprog ###
-	einfo "making libs/eprog"
-	cd ${S}/libs/eprog
-	cp configure{,.old}
-	sed -e "s:^PREFIX.*:PREFIX=${E_PREFIX}:" \
-		configure.old > configure
-	./configure || die "could not make eprog"
-	echo "PREFIX=${D}${E_PREFIX}" > .config
-	./configure install || die "could not install eprog"
-
-	############
-	### apps ###
-	############
-
-	### entice ###
-	einfo "making apps/entice"
-	cd ${S}/apps/entice
-	addconf="--disable-nls --with-included-gettext"
-	cp Makefile.am Makefile.am.old
-	sed -e "s:intl po::" Makefile.am.old > Makefile.am
-	cp configure.in configure.in.old
-	sed -e "s:intl/Makefile po/Makefile.in::" configure.in.old > configure.in
-	eautogen ${baseconf} ${addconf} || die "could not autogen entice"
-	make || die "could not make entice"
-	make install DESTDIR=${D} || die "could not install entice"
-
-	### esmall ###
-	einfo "making apps/esmall"
-	cd ${S}/apps/esmall
-	eautogen ${baseconf} || die "could not autogen esmall"
-	make || die "could not make esmall"
-	make install DESTDIR=${D} || die "could not install esmall"
-
-	### ewidgetd ###
-# this guy does not build ... doesnt look done anyways
-#	einfo "making apps/ewidgetd"
-#	cd ${S}/apps/ewidgetd
-#	eautogen ${baseconf} || die "could not autogen ewidgetd"
-#	./configure ${baseconf}
-#	cp libewidget/libewidget.c{,.old}
-#	sed -e "s:stdio:stdlib:" libewidget/libewidget.c > libewidget/libewidget.c.old
-#	make CFLAGS="${CFLAGS} -I${S}/apps/ewidgetd/libeipc" || die "could not make ewidgetd"
-#	make install DESTDIR=${D} || die "could not install ewidgetd"
-
-	### essence ###
-# this guy does not build ... doesnt look done anyways
-#	einfo "making apps/essence"
-#	cd ${S}/apps/essence
-#	cp configure.in{,.old}
-#	sed -e "s:intl/Makefile::" configure.in.old > configure.in
-#	eautogen ${baseconf} || die "could not autogen essence"
-#	make || die "could not make essence"
-#	make install DESTDIR=${D} || die "could not install essence"
-
-	### elicit ###
-	einfo "making apps/elicit"
-	cd ${S}/apps/elicit
-	cp configure{,.old}
-	sed -e "s:^PREFIX.*:PREFIX=${E_PREFIX}:" \
-		configure.old > configure
-	./configure || die "could not make elicit"
-	echo "PREFIX=${D}${E_PREFIX}" > .config
-	./configure install || die "could not install elicit"
-
-	### efileinfo ###
-# this guy does not build ... needs to be updated to new evas
-#	einfo "making apps/efileinfo"
-#	cd ${S}/apps/efileinfo
-#	cp Makefile.am{,.old}
-#	sed -e "s:intl po::" Makefile.am.old > Makefile.am
-#	cp configure.in{,.old}
-#	sed -e "s:po/Makefile.in::" \
-#	 -e "s:intl/Makefile::" \
-#	 -e "s:po/Makefile::" \
-#		configure.in.old > configure.in
-#	eautogen ${baseconf} || die "could not autogen efileinfo"
-#	make || die "could not make efileinfo"
-#	make install DESTDIR=${D} || die "could not install efileinfo"
-
-	### imlib2_tools ###
-	einfo "making apps/imlib2_tools"
-	cd ${S}/apps/imlib2_tools
-	env USER=BS eautogen ${baseconf} || die "could not autogen imlib2_tools"
-	make || die "could not make imlib2_tools"
-	make install DESTDIR=${D} || die "could not install imlib2_tools"
-
-	### etcher ###
-	einfo "making apps/etcher"
-	cd ${S}/apps/etcher
-	addconf="--disable-nls --with-included-gettext --disable-gtktest"
-	cp configure.in{,.old}
-	sed -e "s:intl/Makefile::" configure.in.old > configure.in
-	eautogen ${baseconf} ${addconf} || die "could not autogen etcher"
-	make CFLAGS="${CFLAGS} -levas" top_builddir=`pwd` || die "could not make etcher"
-	make install DESTDIR="${D}" top_builddir=`pwd` || die "could not install etcher"
-
-	### ebony ###
-	einfo "making apps/ebony"
-	cd ${S}/apps/ebony
-	eautogen ${baseconf} || die "could not autogen ebony"
-	make || die "could not make ebony"
-	make install DESTDIR="${D}" || die "could not install ebony"
-
-	### med ###
-# this guy does not build ... needs to be updated to new evas
-#	einfo "making apps/med"
-#	cd ${S}/apps/med
-#	addconf=
-#	use X           && addconf="${addconf} --with-x"
-#	eautogen ${baseconf} ${addconf} || die "could not autogen med"
-#	make || die "could not build med"
-#	make install DESTDIR="${D}" || die "could not install med"
-
-	### efsd ###
-	einfo "making apps/efsd"
-	cd ${S}/apps/efsd
-	eautogen ${baseconf} || die "could not autogen efsd"
-	make || die "could not build efsd"
-	make install DESTDIR="${D}" || die "could not install efsd"
-
-	### ebindings ###
-	einfo "making apps/ebindings"
-	cd ${S}/apps/ebindings
-	addconf="--disable-gtktest"
-	eautogen ${baseconf} ${addconf} || die "could not autogen ebindings"
-	make || die "could not build ebindings"
-	make install DESTDIR="${D}" || die "could not install ebindings"
-
-	### e ###
-	einfo "making apps/e"
-	cd ${S}/apps/e
-	addconf="--disable-nls"
-	# hack it a little ;D
-	cp configure.ac configure.ac.old
-	sed -e 's:AC_MSG_ERROR(Cannot detect:#:' \
-	 -e 's:intl/Makefile::' \
-	 -e 's:po/Makefile.in::' \
-		configure.ac.old > configure.ac
-	cp Makefile.am Makefile.am.old
-	sed -e 's:po::' Makefile.am.old > Makefile.am
-	eautogen ${baseconf} ${addconf} || die "could not autogen e"
-	cp Makefile Makefile.old
-	sed -e 's:m4   ::' Makefile.old > Makefile
-	make || die "could not build e"
-	make install DESTDIR="${D}" || die "could not install e"
-
-	# remove improper stuff
-	cd ${D}
-	rm -rf `find -name CVS`
-	rm -rf '@aclocaldir@'
-
-	# make an env.d entry
-	insinto /etc/env.d
-	echo "PATH=${E_PREFIX}/bin" > e.env.d
-	echo "LDPATH=${E_PREFIX}/lib" >> e.env.d
-	newins e.env.d 50enlightenment
-}
-
-pkg_preinst() {
-	[ -h ${E_PREFIX} ] && rm ${E_PREFIX}
-}
-
-pkg_postinst() {
-	ewarn "Remember, your old e17 is at /usr/e17.old"
-	ewarn "be sure to do something with it !"
-}
diff --git a/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20021224.ebuild b/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20021224.ebuild
deleted file mode 100644
index ff1b6980cd55..000000000000
--- a/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20021224.ebuild
+++ /dev/null
@@ -1,389 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20021224.ebuild,v 1.2 2003/01/11 05:10:36 vapier Exp $
-
-ECVS_SERVER="cvs.enlightenment.sourceforge.net:/cvsroot/enlightenment"
-ECVS_MODULE="e17"
-ECVS_CVS_OPTIONS="-dP"
-ECVS_BRANCH="SPLIT"
-
-inherit cvs
-
-DESCRIPTION="Enlightenment Window Manager"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://wh0rd.tk/gentoo/distfiles/${P}.tar.bz2"
-HOMEPAGE="http://www.enlightenment.org/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE="pic X mmx truetype opengl directfb fbcon png jpeg"
-
-DEPEND="app-admin/fam-oss 
-	dev-libs/libxml2
-	dev-libs/libpcre
-	dev-lang/ferite
-	media-libs/imlib2
-	=x11-libs/gtk+-1.2*
-	=dev-libs/glib-1.2*"
-
-S=${WORKDIR}/${ECVS_MODULE}
-E_PREFIX=/usr/e17
-
-pkg_setup() {
-	einfo "If you experience a problem with the ebuild, then"
-	einfo "e-mail me at vapier@gentoo.org"
-	echo
-	ewarn "this ebuild moves ${E_PREFIX} to ${E_PREFIX}.old in the case"
-	ewarn "that you already have a version installed ..."
-	ewarn "this is needed when newer cvs releases depend on newer versions"
-
-	[ -e ${E_PREFIX}.old -a ! -h ${E_PREFIX} ] && die "do something about ${E_PREFIX}.old"
-	dodir ${E_PREFIX}
-	[ -e ${E_PREFIX} ] && mv ${E_PREFIX} ${E_PREFIX}.old
-	ln -sf ${D}/${E_PREFIX} ${E_PREFIX}
-}
-
-src_unpack() {
-	unpack ${A}
-#	cp -rf ${DISTDIR}/cvs-src/e17 ${WORKDIR}
-}
-
-src_install() {
-	# anytime you see --> echo "all:"$'\n\t'"echo done">test/Makefile
-	# it means i disabled the test building ... i could do a sed on that
-	# Makefile to make it work, but its just a test app ... who cares ...
-	# for some reason, `make LDFLAGS="-L -L -L"` doesnt work, so its punted
-
-	export baseconf="--prefix=${E_PREFIX} --with-gnu-ld --enable-shared `use_with pic`"
-	export addconf=""
-
-	# the stupid gettextize script prevents non-interactive mode, so we hax it
-	cp `which gettextize` ${T} || die "could not copy gettextize"
-	cp ${T}/gettextize ${T}/gettextize.old
-	sed -e 's:read dummy < /dev/tty::' ${T}/gettextize.old > ${T}/gettextize
-
-	# HEAD uses autogen.sh but SPLIT doesnt always ...
-	eautogen="
-		#!/bin/bash
-		if [ -x ./autogen.sh ] ; then
-			./autogen.sh \$@
-		else
-			./configure \$@
-		fi"
-	echo "${eautogen}" > ${T}/eautogen
-	chmod a+x ${T}/eautogen
-
-	# find our haxed script first, the -config scripts 2nd, everything else last
-	PATH="${T}:${E_PREFIX}/bin:${PATH}"
-	CFLAGS="${CFLAGS} -I${E_PREFIX}/include -I${E_PREFIX}/include/ewd"
-	export WANT_AUTOCONF_2_5=1
-	export WANT_AUTOMAKE_1_6=1
-
-	############
-	### libs ###
-	############
-
-	### imlib2 ###
-	# mmx support in imlib2 makes other things complain it would seem ...
-	# *shrug*, worked for me ;D
-	einfo "making libs/imlib2"
-	cd ${S}/libs/imlib2
-	addconf="--disable-mmx"
-	use X		&& addconf="${addconf} --with-x"
-#	use mmx		&& addconf="${addconf} --enable-mmx"
-	use truetype	&& addconf="${addconf} --with-ttf=/usr"
-	env USER=BS eautogen ${baseconf} ${addconf} || die "could not autogen imlib2"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make imlib2"
-	make install DESTDIR=${D} || die "could not install imlib2"
-
-	### edb ###
-	einfo "making libs/edb"
-	cd ${S}/libs/edb
-	addconf="--enable-cxx"
-	eautogen ${baseconf} ${addconf} || die "could not autogen edb"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make edb"
-	make install DESTDIR=${D} || die "could not install edb"
-
-	### eet ###
-	einfo "making libs/eet"
-	cd ${S}/libs/eet
-	cp configure.ac{,.old}
-	sed -e "s:src/bin/Makefile:src/bin/Makefile eet-config],\n[\nchmod +x eet-config\n:" \
-		configure.ac.old > configure.ac
-	echo 'bin_SCRIPTS = eet-config' >> Makefile.am
-	eautogen ${baseconf} || die "could not autogen eet"
-	make || die "could not make eet"
-	make install DESTDIR=${D} || die "could not install eet"
-
-	### imlib2_loaders ###
-	einfo "making libs/imlib2_loaders"
-	cd ${S}/libs/imlib2_loaders
-	use X		&& addconf="${addconf} --with-x"
-	env -u CFLAGS eautogen ${baseconf} ${addconf} || die "could not autogen imlib2_loaders"
-	make CFLAGS="${CFLAGS}" || die "could not make imlib2_loaders"
-	make install DESTDIR=${D} || die "could not install imlib_loaders"
-
-	### evas ###
-	einfo "making libs/evas"
-	cd ${S}/libs/evas
-	addconf=" \
-		--enable-image-loader-eet \
-		--enable-image-loader-edb \
-		--enable-fmemopen \
-		--enable-cpu-c \
-		--enable-scale-smooth \
-		--enable-scale-sample \
-		--enable-convert-8-rgb-332 \
-		--enable-convert-8-rgb-666 \
-		--enable-convert-8-rgb-232 \
-		--enable-convert-8-rgb-222 \
-		--enable-convert-8-rgb-221 \
-		--enable-convert-8-rgb-121 \
-		--enable-convert-8-rgb-111 \
-		--enable-convert-16-rgb-565 \
-		--enable-convert-16-rgb-555 \
-		--enable-convert-16-rgb-rot-0 \
-		--enable-convert-32-rgb-8888 \
-		--enable-convert-32-rgbx-8888 \
-		--enable-convert-32-bgr-8888 \
-		--enable-convert-32-bgrx-8888 \
-		--enable-convert-32-rgb-rot-0"
-	use X		&& addconf="${addconf} --enable-software-x11"
-	use opengl	&& addconf="${addconf} --enable-gl-x11"
-	use directfb	&& addconf="${addconf} --enable-directfb"
-	use fbcon	&& addconf="${addconf} --enable-fb"
-	use png		&& addconf="${addconf} --enable-image-loader-png"
-	use jpeg	&& addconf="${addconf} --enable-image-loader-jpeg"
-#	use mmx		&& addconf="${addconf} --enable-cpu-mmx"
-	eautogen ${baseconf} ${addconf} || die "could not autogen evas"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make evas"
-	make install DESTDIR=${D} || die "could not install evas"
-
-	### ewd ###
-	einfo "making libs/ewd"
-	cd ${S}/libs/ewd
-	eautogen ${baseconf} || die "could not autogen ewd"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make ewd"
-	make install DESTDIR=${D} || die "could not install ewd"
-
-	### ebits ###
-	einfo "making libs/ebits"
-	cd ${S}/libs/ebits
-	eautogen ${baseconf} || die "could not autogen ebits"
-	make || die "could not make ebits"
-	make install DESTDIR=${D} || die "could not install ebits"
-
-	### ecore ###
-	einfo "making libs/ecore"
-	cd ${S}/libs/ecore
-	addconf=
-	use X		&& addconf="${addconf} --with-x"
-	eautogen ${baseconf} ${addconf} || die "could not autogen ecore"
-	make || die "could not make ecore"
-	make install DESTDIR=${D} || die "could not install ecore"
-
-	### estyle ###
-	einfo "making libs/estyle"
-	cd ${S}/libs/estyle
-	eautogen ${baseconf} || die "could not autogen estyle"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make estyle"
-	make install DESTDIR=${D} || die "could not install estyle"
-
-	### etox ###
-	einfo "making libs/etox"
-	cd ${S}/libs/etox
-	eautogen ${baseconf} || die "could not autogen etox"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make etox"
-	make install DESTDIR=${D} || die "could not install etox"
-
-	### ebg ###
-	einfo "making libs/ebg"
-	cd ${S}/libs/ebg
-	eautogen ${baseconf} || die "could not autogen ebg"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make ebg"
-	make install DESTDIR=${D} || die "could not install ebg"
-
-	### ewl ###
-	einfo "making libs/ewl"
-	cd ${S}/libs/ewl
-	env USER=BS eautogen ${baseconf} || die "could not autogen ewl"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make ewl"
-	make install DESTDIR=${D} || die "could not install ewl"
-
-	### eprog ###
-	einfo "making libs/eprog"
-	cd ${S}/libs/eprog
-	cp configure{,.old}
-	sed -e "s:^PREFIX.*:PREFIX=${E_PREFIX}:" \
-		configure.old > configure
-	./configure || die "could not make eprog"
-	echo "PREFIX=${D}${E_PREFIX}" > .config
-	./configure install || die "could not install eprog"
-
-	############
-	### apps ###
-	############
-
-	### entice ###
-	einfo "making apps/entice"
-	cd ${S}/apps/entice
-	addconf="--disable-nls --with-included-gettext"
-	cp Makefile.am Makefile.am.old
-	sed -e "s:intl po::" Makefile.am.old > Makefile.am
-	cp configure.in configure.in.old
-	sed -e "s:intl/Makefile po/Makefile.in::" configure.in.old > configure.in
-	eautogen ${baseconf} ${addconf} || die "could not autogen entice"
-	make || die "could not make entice"
-	make install DESTDIR=${D} || die "could not install entice"
-
-	### esmall ###
-	einfo "making apps/esmall"
-	cd ${S}/apps/esmall
-	eautogen ${baseconf} || die "could not autogen esmall"
-	make || die "could not make esmall"
-	make install DESTDIR=${D} || die "could not install esmall"
-
-	### ewidgetd ###
-# this guy does not build ... doesnt look done anyways
-#	einfo "making apps/ewidgetd"
-#	cd ${S}/apps/ewidgetd
-#	eautogen ${baseconf} || die "could not autogen ewidgetd"
-#	./configure ${baseconf}
-#	cp libewidget/libewidget.c{,.old}
-#	sed -e "s:stdio:stdlib:" libewidget/libewidget.c > libewidget/libewidget.c.old
-#	make CFLAGS="${CFLAGS} -I${S}/apps/ewidgetd/libeipc" || die "could not make ewidgetd"
-#	make install DESTDIR=${D} || die "could not install ewidgetd"
-
-	### essence ###
-# this guy does not build ... doesnt look done anyways
-#	einfo "making apps/essence"
-#	cd ${S}/apps/essence
-#	cp configure.in{,.old}
-#	sed -e "s:intl/Makefile::" configure.in.old > configure.in
-#	eautogen ${baseconf} || die "could not autogen essence"
-#	make || die "could not make essence"
-#	make install DESTDIR=${D} || die "could not install essence"
-
-	### elicit ###
-	einfo "making apps/elicit"
-	cd ${S}/apps/elicit
-	cp configure{,.old}
-	sed -e "s:^PREFIX.*:PREFIX=${E_PREFIX}:" \
-		configure.old > configure
-	./configure || die "could not make elicit"
-	echo "PREFIX=${D}${E_PREFIX}" > .config
-	./configure install || die "could not install elicit"
-
-	### efileinfo ###
-# this guy does not build ... needs to be updated to new evas
-#	einfo "making apps/efileinfo"
-#	cd ${S}/apps/efileinfo
-#	cp Makefile.am{,.old}
-#	sed -e "s:intl po::" Makefile.am.old > Makefile.am
-#	cp configure.in{,.old}
-#	sed -e "s:po/Makefile.in::" \
-#	 -e "s:intl/Makefile::" \
-#	 -e "s:po/Makefile::" \
-#		configure.in.old > configure.in
-#	eautogen ${baseconf} || die "could not autogen efileinfo"
-#	make || die "could not make efileinfo"
-#	make install DESTDIR=${D} || die "could not install efileinfo"
-
-	### imlib2_tools ###
-	einfo "making apps/imlib2_tools"
-	cd ${S}/apps/imlib2_tools
-	env USER=BS eautogen ${baseconf} || die "could not autogen imlib2_tools"
-	make || die "could not make imlib2_tools"
-	make install DESTDIR=${D} || die "could not install imlib2_tools"
-
-	### etcher ###
-	einfo "making apps/etcher"
-	cd ${S}/apps/etcher
-	addconf="--disable-nls --with-included-gettext --disable-gtktest"
-	cp configure.in{,.old}
-	sed -e "s:intl/Makefile::" configure.in.old > configure.in
-	eautogen ${baseconf} ${addconf} || die "could not autogen etcher"
-	make CFLAGS="${CFLAGS} -levas" top_builddir=`pwd` || die "could not make etcher"
-	make install DESTDIR="${D}" top_builddir=`pwd` || die "could not install etcher"
-
-	### ebony ###
-	einfo "making apps/ebony"
-	cd ${S}/apps/ebony
-	eautogen ${baseconf} || die "could not autogen ebony"
-	make || die "could not make ebony"
-	make install DESTDIR="${D}" || die "could not install ebony"
-
-	### med ###
-# this guy does not build ... needs to be updated to new evas
-#	einfo "making apps/med"
-#	cd ${S}/apps/med
-#	addconf=
-#	use X           && addconf="${addconf} --with-x"
-#	eautogen ${baseconf} ${addconf} || die "could not autogen med"
-#	make || die "could not build med"
-#	make install DESTDIR="${D}" || die "could not install med"
-
-	### efsd ###
-	einfo "making apps/efsd"
-	cd ${S}/apps/efsd
-	eautogen ${baseconf} || die "could not autogen efsd"
-	make || die "could not build efsd"
-	make install DESTDIR="${D}" || die "could not install efsd"
-
-	### ebindings ###
-	einfo "making apps/ebindings"
-	cd ${S}/apps/ebindings
-	addconf="--disable-gtktest"
-	eautogen ${baseconf} ${addconf} || die "could not autogen ebindings"
-	make || die "could not build ebindings"
-	make install DESTDIR="${D}" || die "could not install ebindings"
-
-	### e ###
-	einfo "making apps/e"
-	cd ${S}/apps/e
-	addconf="--disable-nls"
-	# hack it a little ;D
-	cp configure.ac configure.ac.old
-	sed -e 's:AC_MSG_ERROR(Cannot detect:#:' \
-	 -e 's:intl/Makefile::' \
-	 -e 's:po/Makefile.in::' \
-		configure.ac.old > configure.ac
-	cp Makefile.am Makefile.am.old
-	sed -e 's:po::' Makefile.am.old > Makefile.am
-	eautogen ${baseconf} ${addconf} || die "could not autogen e"
-	cp Makefile Makefile.old
-	sed -e 's:m4   ::' Makefile.old > Makefile
-	make || die "could not build e"
-	make install DESTDIR="${D}" >& /dev/null
-	make install DESTDIR="${D}" || die "could not install e"
-
-	# remove improper stuff
-	cd ${D}
-	rm -rf `find -name CVS`
-	rm -rf '@aclocaldir@'
-
-	# make an env.d entry
-	insinto /etc/env.d
-	echo "PATH=${E_PREFIX}/bin" > e.env.d
-	echo "LDPATH=${E_PREFIX}/lib" >> e.env.d
-	newins e.env.d 50enlightenment
-	rm -f e.env.d
-}
-
-pkg_preinst() {
-	[ -h ${E_PREFIX} ] && rm ${E_PREFIX}
-}
-
-pkg_postinst() {
-	ewarn "Remember, your old e17 is at ${E_PREFIX}.old"
-	ewarn "be sure to do something with it !"
-}
diff --git a/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20030111.ebuild b/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20030111.ebuild
deleted file mode 100644
index ae891982bed3..000000000000
--- a/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20030111.ebuild
+++ /dev/null
@@ -1,409 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20030111.ebuild,v 1.1 2003/01/12 00:08:53 vapier Exp $
-
-ECVS_SERVER="cvs.enlightenment.sourceforge.net:/cvsroot/enlightenment"
-ECVS_MODULE="e17"
-ECVS_CVS_OPTIONS="-dP"
-ECVS_BRANCH="SPLIT"
-
-inherit cvs
-
-DESCRIPTION="Enlightenment Window Manager"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://wh0rd.tk/gentoo/distfiles/${P}.tar.bz2"
-HOMEPAGE="http://www.enlightenment.org/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE="pic X mmx truetype opengl directfb fbcon png jpeg"
-
-RDEPEND="sys-libs/pam"
-DEPEND="app-admin/fam-oss
-	dev-libs/libxml2
-	dev-libs/libpcre
-	dev-lang/ferite
-	media-libs/imlib2
-	=x11-libs/gtk+-1.2*
-	=dev-libs/glib-1.2*
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${ECVS_MODULE}
-E_PREFIX=/usr/e17
-
-pkg_setup() {
-	einfo "If you experience a problem with the ebuild, then"
-	einfo "e-mail me at vapier@gentoo.org and/or file a bug"
-	einfo "assigned to me."
-	echo
-	ewarn "this ebuild moves ${E_PREFIX} to ${E_PREFIX}.old in the case"
-	ewarn "that you already have a version installed ..."
-	ewarn "this is needed when newer cvs releases depend on newer versions"
-	ewarn "of libraries and older versions just cause breakage"
-
-	[ -e ${E_PREFIX}.old -a ! -h ${E_PREFIX} ] && die "do something about ${E_PREFIX}.old"
-	dodir ${E_PREFIX}
-	[ -e ${E_PREFIX} ] && mv ${E_PREFIX} ${E_PREFIX}.old
-	ln -sf ${D}/${E_PREFIX} ${E_PREFIX}
-}
-
-src_unpack() {
-	unpack ${A}
-#	cp -rf ${DISTDIR}/cvs-src/e17 ${WORKDIR}
-}
-
-src_install() {
-	# anytime you see --> echo "all:"$'\n\t'"echo done">test/Makefile
-	# it means i disabled the test building ... i could do a sed on that
-	# Makefile to make it work, but its just a test app ... who cares ...
-	# for some reason, `make LDFLAGS="-L -L -L"` doesnt work, so its punted
-
-	export baseconf="--prefix=${E_PREFIX} --with-gnu-ld --enable-shared `use_with pic`"
-	export addconf=""
-
-	# the stupid gettextize script prevents non-interactive mode, so we hax it
-	cp `which gettextize` ${T} || die "could not copy gettextize"
-	cp ${T}/gettextize ${T}/gettextize.old
-	sed -e 's:read dummy < /dev/tty::' ${T}/gettextize.old > ${T}/gettextize
-
-	# HEAD uses autogen.sh but SPLIT doesnt always ...
-	eautogen="
-		#!/bin/bash
-		if [ -x ./autogen.sh ] ; then
-			./autogen.sh \$@
-		else
-			./configure \$@
-		fi"
-	echo "${eautogen}" > ${T}/eautogen
-	chmod a+x ${T}/eautogen
-
-	# find our haxed script first, the -config scripts 2nd, everything else last
-	PATH="${T}:${E_PREFIX}/bin:${PATH}"
-	CFLAGS="${CFLAGS} -I${E_PREFIX}/include -I${E_PREFIX}/include/ewd"
-	export WANT_AUTOCONF_2_5=1
-	export WANT_AUTOMAKE_1_6=1
-
-	############
-	### libs ###
-	############
-
-	### imlib2 ###
-	# mmx support in imlib2 makes other things complain it would seem ...
-	# *shrug*, worked for me ;D
-	einfo "making libs/imlib2"
-	cd ${S}/libs/imlib2
-	addconf="--disable-mmx"
-	use X		&& addconf="${addconf} --with-x"
-#	use mmx		&& addconf="${addconf} --enable-mmx"
-	use truetype	&& addconf="${addconf} --with-ttf=/usr"
-	env USER=BS eautogen ${baseconf} ${addconf} || die "could not autogen imlib2"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make imlib2"
-	make install DESTDIR=${D} || die "could not install imlib2"
-
-	### edb ###
-	einfo "making libs/edb"
-	cd ${S}/libs/edb
-	addconf="--enable-cxx"
-	eautogen ${baseconf} ${addconf} || die "could not autogen edb"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make edb"
-	make install DESTDIR=${D} || die "could not install edb"
-
-	### eet ###
-	einfo "making libs/eet"
-	cd ${S}/libs/eet
-	cp configure.ac{,.old}
-	sed -e "s:src/bin/Makefile:src/bin/Makefile eet-config],\n[\nchmod +x eet-config\n:" \
-		configure.ac.old > configure.ac
-	echo 'bin_SCRIPTS = eet-config' >> Makefile.am
-	eautogen ${baseconf} || die "could not autogen eet"
-	make || die "could not make eet"
-	make install DESTDIR=${D} || die "could not install eet"
-
-	### imlib2_loaders ###
-	einfo "making libs/imlib2_loaders"
-	cd ${S}/libs/imlib2_loaders
-	use X		&& addconf="${addconf} --with-x"
-	env -u CFLAGS eautogen ${baseconf} ${addconf} || die "could not autogen imlib2_loaders"
-	make CFLAGS="${CFLAGS}" || die "could not make imlib2_loaders"
-	make install DESTDIR=${D} || die "could not install imlib_loaders"
-
-	### evas ###
-	einfo "making libs/evas"
-	cd ${S}/libs/evas
-	addconf=" \
-		--enable-image-loader-eet \
-		--enable-image-loader-edb \
-		--enable-fmemopen \
-		--enable-cpu-c \
-		--enable-scale-smooth \
-		--enable-scale-sample \
-		--enable-convert-8-rgb-332 \
-		--enable-convert-8-rgb-666 \
-		--enable-convert-8-rgb-232 \
-		--enable-convert-8-rgb-222 \
-		--enable-convert-8-rgb-221 \
-		--enable-convert-8-rgb-121 \
-		--enable-convert-8-rgb-111 \
-		--enable-convert-16-rgb-565 \
-		--enable-convert-16-rgb-555 \
-		--enable-convert-16-rgb-rot-0 \
-		--enable-convert-32-rgb-8888 \
-		--enable-convert-32-rgbx-8888 \
-		--enable-convert-32-bgr-8888 \
-		--enable-convert-32-bgrx-8888 \
-		--enable-convert-32-rgb-rot-0"
-	use X		&& addconf="${addconf} --enable-software-x11"
-	use opengl	&& addconf="${addconf} --enable-gl-x11"
-#	use directfb	&& addconf="${addconf} --enable-directfb"
-	use fbcon	&& addconf="${addconf} --enable-fb"
-	use png		&& addconf="${addconf} --enable-image-loader-png"
-	use jpeg	&& addconf="${addconf} --enable-image-loader-jpeg"
-#	use mmx		&& addconf="${addconf} --enable-cpu-mmx"
-	eautogen ${baseconf} ${addconf} || die "could not autogen evas"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make evas"
-	make install DESTDIR=${D} || die "could not install evas"
-
-	### ewd ###
-	einfo "making libs/ewd"
-	cd ${S}/libs/ewd
-	eautogen ${baseconf} || die "could not autogen ewd"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make ewd"
-	make install DESTDIR=${D} || die "could not install ewd"
-
-	### ebits ###
-	einfo "making libs/ebits"
-	cd ${S}/libs/ebits
-	eautogen ${baseconf} || die "could not autogen ebits"
-	make || die "could not make ebits"
-	make install DESTDIR=${D} || die "could not install ebits"
-
-	### ecore ###
-	einfo "making libs/ecore"
-	cd ${S}/libs/ecore
-	addconf=
-	use X		&& addconf="${addconf} --with-x"
-	eautogen ${baseconf} ${addconf} || die "could not autogen ecore"
-	make || die "could not make ecore"
-	make install DESTDIR=${D} || die "could not install ecore"
-
-	### estyle ###
-	einfo "making libs/estyle"
-	cd ${S}/libs/estyle
-	eautogen ${baseconf} || die "could not autogen estyle"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make estyle"
-	make install DESTDIR=${D} || die "could not install estyle"
-
-	### etox ###
-	einfo "making libs/etox"
-	cd ${S}/libs/etox
-	eautogen ${baseconf} || die "could not autogen etox"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make etox"
-	make install DESTDIR=${D} || die "could not install etox"
-
-	### ebg ###
-	einfo "making libs/ebg"
-	cd ${S}/libs/ebg
-	eautogen ${baseconf} || die "could not autogen ebg"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make ebg"
-	make install DESTDIR=${D} || die "could not install ebg"
-
-	### ewl ###
-	einfo "making libs/ewl"
-	cd ${S}/libs/ewl
-	env USER=BS eautogen ${baseconf} || die "could not autogen ewl"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
-	make || die "could not make ewl"
-	make install DESTDIR=${D} || die "could not install ewl"
-
-	### eprog ###
-	einfo "making libs/eprog"
-	cd ${S}/libs/eprog
-	cp configure{,.old}
-	sed -e "s:^PREFIX.*:PREFIX=${E_PREFIX}:" \
-		configure.old > configure
-	./configure || die "could not make eprog"
-	echo "PREFIX=${D}${E_PREFIX}" > .config
-	./configure install || die "could not install eprog"
-
-	############
-	### apps ###
-	############
-
-	### entice ###
-	einfo "making apps/entice"
-	cd ${S}/apps/entice
-	addconf="--disable-nls --with-included-gettext"
-	cp Makefile.am Makefile.am.old
-	sed -e "s:intl po::" Makefile.am.old > Makefile.am
-	cp configure.in configure.in.old
-	sed -e "s:intl/Makefile po/Makefile.in::" configure.in.old > configure.in
-	eautogen ${baseconf} ${addconf} || die "could not autogen entice"
-	make || die "could not make entice"
-	make install DESTDIR=${D} || die "could not install entice"
-
-	### esmall ###
-	einfo "making apps/esmall"
-	cd ${S}/apps/esmall
-	eautogen ${baseconf} || die "could not autogen esmall"
-	make || die "could not make esmall"
-	make install DESTDIR=${D} || die "could not install esmall"
-
-	### ewidgetd ###
-# this guy does not build ... doesnt look done anyways
-#	einfo "making apps/ewidgetd"
-#	cd ${S}/apps/ewidgetd
-#	eautogen ${baseconf} || die "could not autogen ewidgetd"
-#	./configure ${baseconf}
-#	cp libewidget/libewidget.c{,.old}
-#	sed -e "s:stdio:stdlib:" libewidget/libewidget.c > libewidget/libewidget.c.old
-#	make CFLAGS="${CFLAGS} -I${S}/apps/ewidgetd/libeipc" || die "could not make ewidgetd"
-#	make install DESTDIR=${D} || die "could not install ewidgetd"
-
-	### essence ###
-# this guy does not build ... doesnt look done anyways
-#	einfo "making apps/essence"
-#	cd ${S}/apps/essence
-#	cp configure.in{,.old}
-#	sed -e "s:intl/Makefile::" configure.in.old > configure.in
-#	eautogen ${baseconf} || die "could not autogen essence"
-#	make || die "could not make essence"
-#	make install DESTDIR=${D} || die "could not install essence"
-
-	### elicit ###
-	einfo "making apps/elicit"
-	cd ${S}/apps/elicit
-	cp configure{,.old}
-	sed -e "s:^PREFIX.*:PREFIX=${E_PREFIX}:" \
-		configure.old > configure
-	./configure || die "could not make elicit"
-	echo "PREFIX=${D}${E_PREFIX}" > .config
-	./configure install || die "could not install elicit"
-
-	### efileinfo ###
-# this guy does not build ... needs to be updated to new evas
-#	einfo "making apps/efileinfo"
-#	cd ${S}/apps/efileinfo
-#	cp Makefile.am{,.old}
-#	sed -e "s:intl po::" Makefile.am.old > Makefile.am
-#	cp configure.in{,.old}
-#	sed -e "s:po/Makefile.in::" \
-#	 -e "s:intl/Makefile::" \
-#	 -e "s:po/Makefile::" \
-#		configure.in.old > configure.in
-#	eautogen ${baseconf} || die "could not autogen efileinfo"
-#	make || die "could not make efileinfo"
-#	make install DESTDIR=${D} || die "could not install efileinfo"
-
-	### imlib2_tools ###
-	einfo "making apps/imlib2_tools"
-	cd ${S}/apps/imlib2_tools
-	env USER=BS eautogen ${baseconf} || die "could not autogen imlib2_tools"
-	make || die "could not make imlib2_tools"
-	make install DESTDIR=${D} || die "could not install imlib2_tools"
-
-	### etcher ###
-	einfo "making apps/etcher"
-	cd ${S}/apps/etcher
-	addconf="--disable-nls --with-included-gettext --disable-gtktest"
-	cp configure.in{,.old}
-	sed -e "s:intl/Makefile::" configure.in.old > configure.in
-	eautogen ${baseconf} ${addconf} || die "could not autogen etcher"
-	make CFLAGS="${CFLAGS} -levas" top_builddir=`pwd` || die "could not make etcher"
-	make install DESTDIR="${D}" top_builddir=`pwd` || die "could not install etcher"
-
-	### ebony ###
-	einfo "making apps/ebony"
-	cd ${S}/apps/ebony
-	eautogen ${baseconf} || die "could not autogen ebony"
-	make || die "could not make ebony"
-	make install DESTDIR="${D}" || die "could not install ebony"
-
-	### med ###
-	einfo "making apps/med"
-	cd ${S}/apps/med
-	addconf=
-	use X           && addconf="${addconf} --with-x"
-	eautogen ${baseconf} ${addconf} || die "could not autogen med"
-	make || die "could not build med"
-	make install DESTDIR="${D}" || die "could not install med"
-
-	### efsd ###
-	einfo "making apps/efsd"
-	cd ${S}/apps/efsd
-	eautogen ${baseconf} || die "could not autogen efsd"
-	make || die "could not build efsd"
-	make install DESTDIR="${D}" || die "could not install efsd"
-
-	### ebindings ###
-	einfo "making apps/ebindings"
-	cd ${S}/apps/ebindings
-	addconf="--disable-gtktest"
-	eautogen ${baseconf} ${addconf} || die "could not autogen ebindings"
-	make || die "could not build ebindings"
-	make install DESTDIR="${D}" || die "could not install ebindings"
-
-	### e ###
-	einfo "making apps/e"
-	cd ${S}/apps/e
-	addconf="--disable-nls"
-	# hack it a little ;D
-	cp configure.ac configure.ac.old
-	sed -e 's:AC_MSG_ERROR(Cannot detect:#:' \
-	 -e 's:intl/Makefile::' \
-	 -e 's:po/Makefile.in::' \
-		configure.ac.old > configure.ac
-	cp Makefile.am Makefile.am.old
-	sed -e 's:po::' Makefile.am.old > Makefile.am
-	eautogen ${baseconf} ${addconf} || die "could not autogen e"
-	cp Makefile Makefile.old
-	sed -e 's:m4   ::' Makefile.old > Makefile
-	make || die "could not build e"
-	make install DESTDIR="${D}" >& /dev/null
-	make install DESTDIR="${D}" || die "could not install e"
-
-	############
-	### misc ###
-	############
-
-	### elogin ###
-	einfo "making misc/elogin"
-	cd ${S}/misc/elogin
-	eautogen ${baseconf} || die "could not autogen elogin"
-	make || die "could not build elogin"
-	make install DESTDIR="${D}" || die "could not install elogin"
-	insinto /etc/pam.d
-	doins config/elogin
-
-	############
-	### fine ###
-	############
-
-	# remove improper stuff
-	cd ${D}
-	rm -rf `find -name CVS`
-	rm -rf '@aclocaldir@'
-
-	# make an env.d entry
-	insinto /etc/env.d
-	echo "PATH=${E_PREFIX}/bin" > e.env.d
-	echo "LDPATH=${E_PREFIX}/lib" >> e.env.d
-	newins e.env.d 50enlightenment
-	rm -f e.env.d
-}
-
-pkg_preinst() {
-	[ -h ${E_PREFIX} ] && rm ${E_PREFIX}
-}
-
-pkg_postinst() {
-	ewarn "Remember, your old e17 is at ${E_PREFIX}.old"
-	ewarn "be sure to do something with it !"
-}
diff --git a/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20030111-r1.ebuild b/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20030205.ebuild
index 4bbdcc4b1f67..4ca4c723ffe1 100644
--- a/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20030111-r1.ebuild
+++ b/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20030205.ebuild
@@ -1,26 +1,29 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20030111-r1.ebuild,v 1.3 2003/01/12 21:18:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment-cvs/enlightenment-cvs-0.17.20030205.ebuild,v 1.1 2003/02/06 07:27:04 vapier Exp $
 
 ECVS_SERVER="cvs.enlightenment.sourceforge.net:/cvsroot/enlightenment"
 ECVS_MODULE="e17"
 ECVS_CVS_OPTIONS="-dP"
 ECVS_BRANCH="SPLIT"
 
-inherit cvs
+inherit cvs eutils
 
 DESCRIPTION="Enlightenment Window Manager"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://wh0rd.tk/gentoo/distfiles/${P}.tar.bz2"
+	http://wh0rd.tk/gentoo/distfiles/${P}.tar.bz2
+	mirror://gentoo/gentoo-themes-e17-${PV}.tbz2
+	http://wh0rd.tk/gentoo/distfiles/gentoo-themes-e17-${PV}.tbz2"
 HOMEPAGE="http://www.enlightenment.org/"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE="pic X mmx truetype opengl directfb fbcon png jpeg"
+IUSE="pic X mmx truetype opengl directfb fbcon png jpeg oggvorbis"
 
 RDEPEND="sys-libs/pam"
-DEPEND="app-admin/fam-oss
+DEPEND="!x11-libs/evas
+	app-admin/fam-oss
 	dev-libs/libxml2
 	dev-libs/libpcre
 	dev-lang/ferite
@@ -28,8 +31,9 @@ DEPEND="app-admin/fam-oss
 	=x11-libs/gtk+-1.2*
 	=dev-libs/glib-1.2*
 	dev-util/pkgconfig
-	>=media-libs/freetype-2.1.3"
-#	fbcon? ( >=dev-libs/DirectFB-0.9.16 )
+	>=media-libs/freetype-2.1.3
+	directfb? ( >=dev-libs/DirectFB-0.9.16 )
+	oggvorbis? ( media-libs/libvorbis )"
 
 S=${WORKDIR}/${ECVS_MODULE}
 E_PREFIX=/usr/e17
@@ -100,7 +104,6 @@ src_install() {
 #	use mmx		&& addconf="${addconf} --enable-mmx"
 	use truetype	&& addconf="${addconf} --with-ttf=/usr"
 	env USER=BS eautogen ${baseconf} ${addconf} || die "could not autogen imlib2"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
 	make || die "could not make imlib2"
 	make install DESTDIR=${D} || die "could not install imlib2"
 
@@ -109,17 +112,12 @@ src_install() {
 	cd ${S}/libs/edb
 	addconf="--enable-cxx"
 	eautogen ${baseconf} ${addconf} || die "could not autogen edb"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
 	make || die "could not make edb"
 	make install DESTDIR=${D} || die "could not install edb"
 
 	### eet ###
 	einfo "making libs/eet"
 	cd ${S}/libs/eet
-	cp configure.ac{,.old}
-	sed -e "s:src/bin/Makefile:src/bin/Makefile eet-config],\n[\nchmod +x eet-config\n:" \
-		configure.ac.old > configure.ac
-	echo 'bin_SCRIPTS = eet-config' >> Makefile.am
 	eautogen ${baseconf} || die "could not autogen eet"
 	make || die "could not make eet"
 	make install DESTDIR=${D} || die "could not install eet"
@@ -129,7 +127,7 @@ src_install() {
 	cd ${S}/libs/imlib2_loaders
 	use X		&& addconf="${addconf} --with-x"
 	env -u CFLAGS eautogen ${baseconf} ${addconf} || die "could not autogen imlib2_loaders"
-	make CFLAGS="${CFLAGS}" || die "could not make imlib2_loaders"
+	make || die "could not make imlib2_loaders"
 	make install DESTDIR=${D} || die "could not install imlib_loaders"
 
 	### evas ###
@@ -160,12 +158,11 @@ src_install() {
 	use X		&& addconf="${addconf} --enable-software-x11"
 #	use opengl	&& addconf="${addconf} --enable-gl-x11"
 #	use directfb	&& addconf="${addconf} --enable-directfb"
-	use fbcon	&& addconf="${addconf} --enable-fb"
+#	use fbcon	&& addconf="${addconf} --enable-fb"
 	use png		&& addconf="${addconf} --enable-image-loader-png"
 	use jpeg	&& addconf="${addconf} --enable-image-loader-jpeg"
 #	use mmx		&& addconf="${addconf} --enable-cpu-mmx"
 	eautogen ${baseconf} ${addconf} || die "could not autogen evas"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
 	make || die "could not make evas"
 	make install DESTDIR=${D} || die "could not install evas"
 
@@ -173,7 +170,6 @@ src_install() {
 	einfo "making libs/ewd"
 	cd ${S}/libs/ewd
 	eautogen ${baseconf} || die "could not autogen ewd"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
 	make || die "could not make ewd"
 	make install DESTDIR=${D} || die "could not install ewd"
 
@@ -197,7 +193,6 @@ src_install() {
 	einfo "making libs/estyle"
 	cd ${S}/libs/estyle
 	eautogen ${baseconf} || die "could not autogen estyle"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
 	make || die "could not make estyle"
 	make install DESTDIR=${D} || die "could not install estyle"
 
@@ -205,7 +200,6 @@ src_install() {
 	einfo "making libs/etox"
 	cd ${S}/libs/etox
 	eautogen ${baseconf} || die "could not autogen etox"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
 	make || die "could not make etox"
 	make install DESTDIR=${D} || die "could not install etox"
 
@@ -213,7 +207,6 @@ src_install() {
 	einfo "making libs/ebg"
 	cd ${S}/libs/ebg
 	eautogen ${baseconf} || die "could not autogen ebg"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
 	make || die "could not make ebg"
 	make install DESTDIR=${D} || die "could not install ebg"
 
@@ -221,19 +214,15 @@ src_install() {
 	einfo "making libs/ewl"
 	cd ${S}/libs/ewl
 	env USER=BS eautogen ${baseconf} || die "could not autogen ewl"
-	cp ${FILESDIR}/dummy.Makefile test/Makefile
 	make || die "could not make ewl"
 	make install DESTDIR=${D} || die "could not install ewl"
 
 	### eprog ###
 	einfo "making libs/eprog"
 	cd ${S}/libs/eprog
-	cp configure{,.old}
-	sed -e "s:^PREFIX.*:PREFIX=${E_PREFIX}:" \
-		configure.old > configure
-	./configure || die "could not make eprog"
-	echo "PREFIX=${D}${E_PREFIX}" > .config
-	./configure install || die "could not install eprog"
+	eautogen ${baseconf} || die "could not autogen eprog"
+	make || die "could not make eprog"
+	make install DESTDIR=${D} || die "could not install eprog"
 
 	############
 	### apps ###
@@ -243,10 +232,6 @@ src_install() {
 	einfo "making apps/entice"
 	cd ${S}/apps/entice
 	addconf="--disable-nls --with-included-gettext"
-	cp Makefile.am Makefile.am.old
-	sed -e "s:intl po::" Makefile.am.old > Makefile.am
-	cp configure.in configure.in.old
-	sed -e "s:intl/Makefile po/Makefile.in::" configure.in.old > configure.in
 	eautogen ${baseconf} ${addconf} || die "could not autogen entice"
 	make || die "could not make entice"
 	make install DESTDIR=${D} || die "could not install entice"
@@ -321,11 +306,18 @@ src_install() {
 	einfo "making apps/etcher"
 	cd ${S}/apps/etcher
 	addconf="--disable-nls --with-included-gettext --disable-gtktest"
-	cp configure.in{,.old}
-	sed -e "s:intl/Makefile::" configure.in.old > configure.in
+	cp Makefile.am Makefile.am.old
+	sed -e 's:intl::' \
+		-e 's:po::' \
+		 Makefile.am.old > Makefile.am
+	cp configure.in configure.in.old
+	sed -e 's:intl/Makefile::' \
+		-e 's:po/Makefile.in::' \
+		-e 's:m4/Makefile::' \
+		configure.in.old > configure.in
 	eautogen ${baseconf} ${addconf} || die "could not autogen etcher"
-	make CFLAGS="${CFLAGS} -levas" top_builddir=`pwd` || die "could not make etcher"
-	make install DESTDIR="${D}" top_builddir=`pwd` || die "could not install etcher"
+	make || die "could not make etcher"
+	make install DESTDIR="${D}" || die "could not install etcher"
 
 	### ebony ###
 	einfo "making apps/ebony"
@@ -358,6 +350,15 @@ src_install() {
 	make || die "could not build ebindings"
 	make install DESTDIR="${D}" || die "could not install ebindings"
 
+	### entrance ###
+	einfo "making apps/entrance"
+	cd ${S}/apps/entrance
+	eautogen ${baseconf} || die "could not autogen entrance"
+	make || die "could not build entrance"
+	make install DESTDIR="${D}" || die "could not install entrance"
+	insinto /etc/pam.d
+	doins data/pam.d/entrance
+
 	### e ###
 	einfo "making apps/e"
 	cd ${S}/apps/e
@@ -365,8 +366,8 @@ src_install() {
 	# hack it a little ;D
 	cp configure.ac configure.ac.old
 	sed -e 's:AC_MSG_ERROR(Cannot detect:#:' \
-	 -e 's:intl/Makefile::' \
-	 -e 's:po/Makefile.in::' \
+		-e 's:intl/Makefile::' \
+		-e 's:po/Makefile.in::' \
 		configure.ac.old > configure.ac
 	cp Makefile.am Makefile.am.old
 	sed -e 's:po::' Makefile.am.old > Makefile.am
@@ -405,10 +406,36 @@ src_install() {
 	insinto /etc/pam.d
 	doins config/elogin
 
+	### enotes ###
+	einfo "making misc/enotes"
+	cd ${S}/misc/enotes
+	make || die "could not build enotes"
+	insinto ${E_PREFIX}/share/enotes
+	doins data/*
+	exeinto ${E_PREFIX}/bin
+	newexe ${FILESDIR}/enotes_wrapper enotes
+	newexe enotes enotes_exe || die "could not install enotes"
+
+	### evidence ###
+	einfo "making misc/evidence"
+	cd ${S}/misc/evidence
+	addconf="--enable-canvas-evas2 --enable-extra-themes"
+	use oggvorbis && addconf="${addconf} --enable-plugin-vorbis"
+	epatch ${FILESDIR}/evidence-destdir.patch
+	eautogen ${baseconf} || die "could not autogen evidence"
+	make || die "could not build evidence"
+	make install DESTDIR="${D}" || die "could not install evidence"
+
 	############
 	### fine ###
 	############
 
+	# add some Gentoo theme stuff
+	dodir ${E_PREFIX}/share/enlightenment/data/backgrounds
+	cd ${D}/${E_PREFIX}/share/enlightenment/data/backgrounds
+	mv default.bg.db default-e17.bg.db
+	mv ${WORKDIR}/gentoo-themes/background.db default.bg.db
+
 	# remove improper stuff
 	cd ${D}
 	rm -rf `find -name CVS`
@@ -417,6 +444,7 @@ src_install() {
 	# make an env.d entry
 	insinto /etc/env.d
 	echo "PATH=${E_PREFIX}/bin:${E_PREFIX}/sbin" > e.env.d
+	echo "ROOTPATH=${E_PREFIX}/sbin" >> e.env.d
 	echo "LDPATH=${E_PREFIX}/lib" >> e.env.d
 	newins e.env.d 50enlightenment
 	rm -f e.env.d
@@ -432,8 +460,4 @@ pkg_postinst() {
 		ewarn "be sure to do something with it !"
 		echo
 	fi
-	einfo "If you wish you can use elogin as your login"
-	einfo "manager.  For now, remove xdm from your startup"
-	einfo "and add '/usr/e17/sbin/elogind' to the"
-	einfo "/etc/conf.d/local.start file."
 }
diff --git a/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20021027 b/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20021027
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20021027
+++ /dev/null
diff --git a/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20021219 b/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20021219
deleted file mode 100644
index 894cd443ce5c..000000000000
--- a/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20021219
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fbb05f7b36f4b86a989ea8f05fc2540e enlightenment-cvs-0.17.20021219.tar.tbz2 18222283
diff --git a/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20021224 b/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20021224
deleted file mode 100644
index 3609ad5d0dff..000000000000
--- a/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20021224
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f1ad3526ce46e7caf6c4caf50615cd44 enlightenment-cvs-0.17.20021224.tar.bz2 18143318
diff --git a/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20030111 b/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20030111
deleted file mode 100644
index a7d236bec2fb..000000000000
--- a/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20030111
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fbc4c2b68ffb9719d58322ca122084c1 enlightenment-cvs-0.17.20030111.tar.bz2 18900154
diff --git a/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20030111-r1 b/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20030111-r1
deleted file mode 100644
index a7d236bec2fb..000000000000
--- a/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20030111-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fbc4c2b68ffb9719d58322ca122084c1 enlightenment-cvs-0.17.20030111.tar.bz2 18900154
diff --git a/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20030205 b/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20030205
new file mode 100644
index 000000000000..d45e7944c3e2
--- /dev/null
+++ b/x11-wm/enlightenment-cvs/files/digest-enlightenment-cvs-0.17.20030205
@@ -0,0 +1,2 @@
+MD5 ab2febcf964bc4e537d9b637943c4a96 enlightenment-cvs-0.17.20030205.tar.bz2 25847136
+MD5 1fa706554b715cf134ca002e0fc1a943 gentoo-themes-e17-0.17.20030205.tbz2 833286
diff --git a/x11-wm/enlightenment-cvs/files/dummy.Makefile b/x11-wm/enlightenment-cvs/files/dummy.Makefile
deleted file mode 100644
index f73c9978a1de..000000000000
--- a/x11-wm/enlightenment-cvs/files/dummy.Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-	echo "made all!"
-install:
-	echo "install all!"
diff --git a/x11-wm/enlightenment-cvs/files/e17-checkout b/x11-wm/enlightenment-cvs/files/e17-checkout
new file mode 100644
index 000000000000..e84507d1f5ff
--- /dev/null
+++ b/x11-wm/enlightenment-cvs/files/e17-checkout
@@ -0,0 +1,90 @@
+#!/bin/bash
+. /sbin/functions.sh
+
+ROOTDIR="/var/tmp/portage"
+EVIDENCE_VER=0.9.3
+DATESTAMP="`date +%Y%m%d`"
+HEAD="${ROOTDIR}/e17-HEAD-${DATESTAMP}"
+SPLIT="${ROOTDIR}/e17-SPLIT-${DATESTAMP}"
+MISC="${ROOTDIR}/e17-MISC-${DATESTAMP}"
+COMBINE="${ROOTDIR}/e17"
+
+ebegin "Checking ${HEAD}"
+if [ ! -e ${HEAD} ] ; then
+	mkdir ${HEAD} && cd ${HEAD}
+	cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/enlightenment co -rHEAD e17
+fi
+H="${HEAD}/e17"
+eend 0
+
+ebegin "Checking ${SPLIT}"
+if [ ! -e ${SPLIT} ] ; then
+	mkdir ${SPLIT} && cd ${SPLIT}
+	cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/enlightenment co -rSPLIT e17
+fi
+S="${SPLIT}/e17"
+eend 0
+
+ebegin "Checking ${MISC}"
+if [ ! -e ${MISC} ] ; then
+	mkdir ${MISC} && cd ${MISC}
+	pwd && ls
+	cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/enlightenment co misc/elogin
+	cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/enlightenment co misc/enotes
+	cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/evidence co evidence
+	mv evidence misc/
+fi
+M="${MISC}"
+eend 0
+
+ebegin "Making ${COMBINE}"
+rm -rf ${COMBINE}
+mkdir ${COMBINE}/{libs,apps,misc} -p
+C=${COMBINE}
+eend 0
+
+ebegin "Making ${COMBINE}/libs"
+cp -rf ${H}/libs/imlib2		${C}/libs/
+cp -rf ${H}/libs/edb		${C}/libs/
+cp -rf ${H}/libs/eet		${C}/libs/
+cp -rf ${H}/libs/imlib2_loaders	${C}/libs/
+cp -rf ${H}/libs/evas		${C}/libs/
+cp -rf ${H}/libs/ewd		${C}/libs/ #hax
+cp -rf ${H}/libs/ebits		${C}/libs/ #hax
+cp -rf ${H}/libs/ecore		${C}/libs/
+cp -rf ${H}/libs/estyle		${C}/libs/
+cp -rf ${H}/libs/etox		${C}/libs/
+cp -rf ${H}/libs/ebg		${C}/libs/
+cp -rf ${H}/libs/ewl		${C}/libs/
+cp -rf ${H}/libs/eprog		${C}/libs/
+eend 0
+
+ebegin "Making ${COMBINE}/apps"
+cp -rf ${H}/apps/entice		${C}/apps/
+cp -rf ${H}/apps/esmall		${C}/apps/
+cp -rf ${S}/apps/ewidgetd	${C}/apps/
+cp -rf ${S}/apps/essence	${C}/apps/
+cp -rf ${S}/apps/elicit		${C}/apps/
+cp -rf ${S}/apps/efileinfo	${C}/apps/
+cp -rf ${H}/apps/imlib2_tools	${C}/apps/ #hax
+cp -rf ${H}/apps/etcher		${C}/apps/
+cp -rf ${H}/apps/ebony		${C}/apps/
+cp -rf ${H}/apps/med		${C}/apps/
+cp -rf ${H}/apps/efsd		${C}/apps/
+cp -rf ${H}/apps/ebindings	${C}/apps/ #hax
+cp -rf ${H}/apps/entrance	${C}/apps/
+cp -rf ${H}/apps/e		${C}/apps/
+eend 0
+
+ebegin "Making ${COMBINE}/misc"
+cp -rf ${M}/misc/elogin		${C}/misc/
+cp -rf ${M}/misc/enotes		${C}/misc/
+cp -rf ${M}/misc/evidence	${C}/misc/
+eend 0
+
+ebegin "Packing it all up"
+cd ${ROOTDIR}
+rm -f enlightenment-cvs-0.17.${DATESTAMP}.tar.bz2
+tar -jcf enlightenment-cvs-0.17.${DATESTAMP}.tar.bz2 e17
+mv enlightenment-cvs-0.17.${DATESTAMP}.tar.bz2 /usr/portage/distfiles/
+eend $?
diff --git a/x11-wm/enlightenment-cvs/files/enotes_wrapper b/x11-wm/enlightenment-cvs/files/enotes_wrapper
new file mode 100644
index 000000000000..d3037ba7bd08
--- /dev/null
+++ b/x11-wm/enlightenment-cvs/files/enotes_wrapper
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+if [ ! -e ~/.e/enotes/data ] ; then
+	cd /usr/e17/share/enotes
+	cp data/arial.ttf ~/.e/enotes/data -rf
+	cp data/bg.jpg ~/.e/enotes/data -rf
+	mkdir ~/.e/enotes/
+	mkdir ~/.e/enotes/data
+	cp data/samplenotes ~/.e/enotes/notes
+	cp data/sampleconfig ~/.e/enotes/config
+	cp data/* ~/.e/enotes/data
+fi
+
+[ -z "$@" ] \
+	&& enotes_exe -N \
+	|| enotes_exe $@
diff --git a/x11-wm/enlightenment-cvs/files/evidence-destdir.patch b/x11-wm/enlightenment-cvs/files/evidence-destdir.patch
new file mode 100644
index 000000000000..bbb74f103982
--- /dev/null
+++ b/x11-wm/enlightenment-cvs/files/evidence-destdir.patch
@@ -0,0 +1,32 @@
+--- ./evidence.themes/engines/Makefile.am.orig	2003-02-04 22:24:04.000000000 -0500
++++ ./evidence.themes/engines/Makefile.am	2003-02-04 22:24:11.000000000 -0500
+@@ -11,7 +11,7 @@
+ 		       @EVIDENCE_CFLAGS@
+ LIBADD               = -L$(top_builddir)/src
+ 
+-pkgdir =  $(DESTDIR)$(pkgdatadir)/themes/engines
++pkgdir =  $(pkgdatadir)/themes/engines
+ 
+ .o.so:
+ 	$(CC) $(INCLUDES) $(LDFLAGS) $< -o $@
+--- ./evidence.themes/Makefile.am.orig	2003-02-04 22:24:15.000000000 -0500
++++ ./evidence.themes/Makefile.am	2003-02-04 22:24:32.000000000 -0500
+@@ -23,7 +23,7 @@
+ 	-(cd metallo; cp * $(DESTDIR)$(pkgdatadir)/themes/metallo)
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/themes/nautilus
+ 	-(cd nautilus; cp * $(DESTDIR)$(pkgdatadir)/themes/nautilus)
+-	-(ln -s $(pkgdatadir)/themes/transwarp $(pkgdatadir)/themes/default)
++	-(ln -s $(pkgdatadir)/themes/transwarp $(DESTDIR)$(pkgdatadir)/themes/default)
+ 	-rm $(DESTDIR)$(pkgdatadir)/themes/engines/*.a
+ 	-rm $(DESTDIR)$(pkgdatadir)/themes/engines/*.la
+ 
+--- ./icons/Makefile.am.orig	2003-02-04 22:24:35.000000000 -0500
++++ ./icons/Makefile.am	2003-02-04 22:24:40.000000000 -0500
+@@ -11,6 +11,6 @@
+ 	tar -zxvf ento_64.tar.gz -C $(DESTDIR)$(pkgdatadir)/icons
+ 	tar -zxvf gorilla_36.tar.gz -C $(DESTDIR)$(pkgdatadir)/icons
+ 	tar -zxvf gorilla_48.tar.gz -C $(DESTDIR)$(pkgdatadir)/icons
+-	-(ln -s $(pkgdatadir)/icons/gfilerunner $(pkgdatadir)/icons/default)
++	-(ln -s $(pkgdatadir)/icons/gfilerunner $(DESTDIR)$(pkgdatadir)/icons/default)
+ 
+ install: install-data-local