[gentoo-commits] gentoo-x86 commit in eclass: enlightenment.eclass

[Thomas Sachau (tommy)]

tommy       10/02/28 10:52:07

  Modified:             enlightenment.eclass
  Log:
  Update enlightenment eclass as discussed on enlightenment alias

Revision  Changes    Path
1.81                 eclass/enlightenment.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/enlightenment.eclass?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/enlightenment.eclass?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/enlightenment.eclass?r1=1.80&r2=1.81

Index: enlightenment.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- enlightenment.eclass	7 Mar 2009 22:28:16 -0000	1.80
+++ enlightenment.eclass	28 Feb 2010 10:52:06 -0000	1.81
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.80 2009/03/07 22:28:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.81 2010/02/28 10:52:06 tommy Exp $
 #
 # Author: vapier@g.o
 
@@ -62,6 +62,13 @@
 	inherit autotools
 fi
 
+ENLIGHTENMENT_EXPF="pkg_setup src_unpack src_compile src_install pkg_postinst"
+case "${EAPI:-0}" in
+        2|3|4) ENLIGHTENMENT_EXPF+=" src_prepare src_configure" ;;
+        *) ;;
+esac
+EXPORT_FUNCTIONS ${ENLIGHTENMENT_EXPF}
+
 DESCRIPTION="A DR17 production"
 HOMEPAGE="http://www.enlightenment.org/"
 case ${EURI_STATE:-${E_STATE}} in
@@ -117,15 +124,6 @@
 	: enlightenment_warning_msg
 }
 
-# the stupid gettextize script prevents non-interactive mode, so we hax it
-gettext_modify() {
-	use nls || return 0
-	cp $(type -P gettextize) "${T}"/ || die "could not copy gettextize"
-	sed -i \
-		-e 's:read dummy < /dev/tty::' \
-		"${T}"/gettextize
-}
-
 enlightenment_src_unpack() {
 	if [[ ${E_STATE} == "live" ]] ; then
 		case ${E_LIVE_SOURCE} in
@@ -136,34 +134,31 @@
 	else
 		unpack ${A}
 	fi
-	gettext_modify
-	[[ -s gendoc ]] && chmod a+rx gendoc
+	hasq src_prepare ${ENLIGHTENMENT_EXPF} || enlightenment_src_prepare
 }
 
-enlightenment_src_compile() {
-	# gstreamer sucks, work around it doing stupid stuff
-	export GST_REGISTRY="${S}/registry.xml"
-
-	if [[ ! -e configure ]] ; then
-		env \
-			PATH="${T}:${PATH}" \
-			NOCONFIGURE=yes \
-			USER=blah \
-			./autogen.sh \
-			|| enlightenment_die "autogen failed"
-		# symlinked files will cause sandbox violation
-		local x
-		for x in config.{guess,sub} ; do
-			[[ ! -L ${x} ]] && continue
-			rm -f ${x}
-			touch ${x}
-		done
-	elif [[ ${WANT_AUTOTOOLS} == "yes" ]] ; then
+enlightenment_src_prepare() {
+	[[ -s gendoc ]] && chmod a+rx gendoc
+	if [[ ${WANT_AUTOTOOLS} == "yes" ]] ; then
+		[[ -d po ]] && eautopoint -f
+		# autotools require README, when README.in is around, but README
+		# is created later in configure step
+		[[ -f README.in ]] && touch README
 		eautoreconf
 	fi
 	epunt_cxx
 	elibtoolize
-	econf ${MY_ECONF} || enlightenment_die "econf failed"
+}
+
+enlightenment_src_configure() {
+	# gstreamer sucks, work around it doing stupid stuff
+	export GST_REGISTRY="${S}/registry.xml"
+
+	econf ${MY_ECONF}
+}
+
+enlightenment_src_compile() {
+	hasq src_configure ${ENLIGHTENMENT_EXPF} || enlightenment_src_configure
 	emake || enlightenment_die "emake failed"
 	use doc && [[ -x ./gendoc ]] && { ./gendoc || enlightenment_die "gendoc failed" ; }
 }
@@ -181,4 +176,3 @@
 	: enlightenment_warning_msg
 }
 
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst