--- eclass/enlightenment.eclass	2004/12/27 14:23:14	1.38
+++ eclass/enlightenment.eclass	2005/08/23 23:53:26	1.56
@@ -1,44 +1,67 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.38 2004/12/27 14:23:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.56 2005/08/23 23:53:26 vapier Exp $
 #
 # Author: vapier@gentoo.org
 
-ECLASS=enlightenment
-INHERITED="$INHERITED $ECLASS"
+inherit eutils
+
+# ECVS_STATE's:
+#	release      [default]
+#		KEYWORDS arch
+#		SRC_URI  $P.tar.gz
+#		S        $WORKDIR/$P
+#
+#	snap         $PV has .200##### datestamp or .### counter
+#		KEYWORDS ~arch
+#		SRC_URI  $P.tar.bz2
+#		S        $WORKDIR/$P
+#
+#	live         $PV has a 9999 marker
+#		KEYWORDS -*
+#		SRC_URI  `cvs up`
+#		S        $WORKDIR/$ECVS_MODULE
+#
+# Overrides:
+#	KEYWORDS    EKEY_STATE
+#	SRC_URI     EURI_STATE
+#	S           EURI_STATE
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst
 
 ECVS_STATE="release"
 if [[ ${PV/9999} != ${PV} ]] ; then
 	if [[ -z ${ECVS_MODULE} ]] ; then
-		ECVS_MODULE="${PN}"
+		ECVS_MODULE=${PN}
 		if [[ ${CATEGORY/libs} != ${CATEGORY} ]] ; then
 			ECVS_MODULE="e17/libs/${PN}"
 		else
 			ECVS_MODULE="e17/apps/${PN}"
 		fi
 	fi
-	ECVS_SERVER="${ECVS_SERVER:-cvs.sourceforge.net:/cvsroot/enlightenment}"
+	ECVS_SERVER=${ECVS_SERVER:-cvs.sourceforge.net:/cvsroot/enlightenment}
 	ECVS_STATE="live"
 	inherit cvs
-elif [[ ${PV/.200?????/} != ${PV} ]] || [[ ${PV/2003????} != ${PV} ]] ; then
+elif [[ ${PV/.200[3-9][0-1][0-9][0-3][0-9]/} != ${PV} ]] ; then
+	ECVS_STATE="snap"
+elif [[ ${PV%%.[0-9][0-9][0-9]} != ${PV} ]] ; then
 	ECVS_STATE="snap"
+	EURI_STATE="release"
 fi
 
 DESCRIPTION="A DR17 production"
 HOMEPAGE="http://www.enlightenment.org/"
-case ${ECVS_STATE} in
-	release) SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz";;
+case ${EURI_STATE:-${ECVS_STATE}} in
+	release) SRC_URI="http://enlightenment.freedesktop.org/files/${P}.tar.gz mirror://sourceforge/enlightenment/${P}.tar.gz";;
 	snap)    SRC_URI="mirror://gentoo/${P}.tar.bz2";;
 	live)    SRC_URI="";;
 esac
 
 LICENSE="BSD"
 SLOT="0"
-case ${ECVS_STATE} in
-	release) KEYWORDS="alpha amd64 arm hppa ia64 mips ppc sparc x86";;
-	snap)    KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86";;
+case ${EKEY_STATE:-${ECVS_STATE}} in
+	release) KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86";;
+	snap)    KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86";;
 	live)    KEYWORDS="-*";;
 esac
 IUSE="nls doc"
@@ -46,19 +69,19 @@
 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND="nls? ( sys-devel/gettext )"
 
-case ${ECVS_STATE} in
+case ${EURI_STATE:-${ECVS_STATE}} in
 	release) S=${WORKDIR}/${P};;
 	snap)    S=${WORKDIR}/${PN};;
 	live)    S=${WORKDIR}/${ECVS_MODULE};;
 esac
 
 enlightenment_warning_msg() {
-	if [[ ${PV/200} != ${PV} ]] ; then
+	if [[ ${ECVS_STATE} == "snap" ]] ; then
 		ewarn "Please do not contact the E team about bugs in Gentoo."
 		ewarn "Only contact vapier@gentoo.org via e-mail or bugzilla."
 		ewarn "Remember, this stuff is CVS only code so dont cry when"
 		ewarn "I break you :)."
-	elif [[ ${PV/9999} != ${PV} ]] ; then
+	elif [[ ${ECVS_STATE} == "live" ]] ; then
 		eerror "This is a LIVE CVS ebuild."
 		eerror "That means there are NO promises it will work."
 		eerror "If it fails to build, FIX THE CODE YOURSELF"
@@ -78,9 +101,10 @@
 # the stupid gettextize script prevents non-interactive mode, so we hax it
 gettext_modify() {
 	use nls || return 0
-	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
+	cp $(which gettextize) "${T}"/ || die "could not copy gettextize"
+	sed -i \
+		-e 's:read dummy < /dev/tty::' \
+		"${T}"/gettextize
 }
 
 enlightenment_src_unpack() {
@@ -90,32 +114,39 @@
 		unpack ${A}
 	fi
 	gettext_modify
+	[[ -s gendoc ]] && chmod a+rx gendoc
 }
 
 enlightenment_src_compile() {
-	if [[ ${ECVS_STATE} != "release" ]] ; then
-		[[ ! -z ${EHACKAUTOGEN} ]] && sed -i 's:.*configure.*::' autogen.sh
-		export WANT_AUTOMAKE="${EAUTOMAKE:-1.8}"
+	if [[ ! -e configure ]] ; then
+		export WANT_AUTOMAKE=${EAUTOMAKE:-1.8}
 		env \
 			PATH="${T}:${PATH}" \
 			NOCONFIGURE=yes \
 			USER=blah \
 			./autogen.sh \
 			|| enlightenment_die "autogen failed"
+		# symlinked files will cause sandbox violation
+		for x in config.{guess,sub} ; do
+			[[ ! -L ${x} ]] && continue
+			rm -f ${x}
+			touch ${x}
+		done
 		if [[ ! -z ${EHACKLIBLTDL} ]] ; then
 			cd libltdl
 			autoconf || enlightenment_die "autogen in libltdl failed"
 			cd ..
 		fi
 	fi
+	epunt_cxx
 	econf ${MY_ECONF} || enlightenment_die "econf failed"
 	emake || enlightenment_die "emake failed"
 	use doc && [[ -x ./gendoc ]] && { ./gendoc || enlightenment_die "gendoc failed" ; }
 }
 
 enlightenment_src_install() {
-	make install DESTDIR=${D} || enlightenment_die
-	find ${D} -name CVS -type d -exec rm -rf '{}' \; 2>/dev/null
+	make install DESTDIR="${D}" || enlightenment_die
+	find "${D}" -name CVS -type d -exec rm -rf '{}' \; 2>/dev/null
 	dodoc AUTHORS ChangeLog NEWS README TODO ${EDOCS}
 	use doc && [[ -d doc ]] && dohtml -r doc/*
 }