Switch to EAPI=3, and maintainer from me to sci herd

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 29 insertions, 31 deletions

diff --git a/x11-libs/xbae/ChangeLog b/x11-libs/xbae/ChangeLog
index 6605fd490807..023520104b18 100644
--- a/x11-libs/xbae/ChangeLog
+++ b/x11-libs/xbae/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/xbae
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xbae/ChangeLog,v 1.13 2008/09/18 01:01:59 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xbae/ChangeLog,v 1.14 2010/07/19 18:32:04 bicatali Exp $
+
+  19 Jul 2010; Sébastien Fabbro <bicatali@gentoo.org> xbae-4.60.4.ebuild,
+  metadata.xml:
+  Switch to EAPI=3, and maintainer from me to sci herd
 
   18 Sep 2008; Brent Baude <ranger@gentoo.org> ChangeLog:
   stable ppc64, bug 235754
diff --git a/x11-libs/xbae/metadata.xml b/x11-libs/xbae/metadata.xml
index ea7607302eef..e86f2b27228a 100644
--- a/x11-libs/xbae/metadata.xml
+++ b/x11-libs/xbae/metadata.xml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>bicatali@gentoo.org</email>
-</maintainer>
+<herd>sci</herd>
 <longdescription lang="en">
-XbaeMatrix is a free Motif(R) table widget (also compatible with the free 
-LessTif) which presents an editable array of string data to the user in a 
-scrollable table similar to a spreadsheet. The rows and columns of the Matrix 
-may optionally be labelled. A number of "fixed" and "trailing fixed" rows 
-or columns may be specified.
-
-The XbaeCaption widget is a simple Motif manager widget that associates 
-a label with a child.
-
-In addition the XbaeInput widget is being distributed, a text input field 
-that provides generic customised data entry and formatting for strings.
+  XbaeMatrix is a free Motif(R) table widget (also compatible with the free 
+  LessTif) which presents an editable array of string data to the user in a 
+  scrollable table similar to a spreadsheet. The rows and columns of the Matrix 
+  may optionally be labelled. A number of "fixed" and "trailing fixed" rows 
+  or columns may be specified.
+  
+  The XbaeCaption widget is a simple Motif manager widget that associates 
+  a label with a child.
+  
+  In addition the XbaeInput widget is being distributed, a text input field 
+  that provides generic customised data entry and formatting for strings.
 </longdescription>
 </pkgmetadata>
diff --git a/x11-libs/xbae/xbae-4.60.4.ebuild b/x11-libs/xbae/xbae-4.60.4.ebuild
index 247fd5b8b4f7..f21440e3e788 100644
--- a/x11-libs/xbae/xbae-4.60.4.ebuild
+++ b/x11-libs/xbae/xbae-4.60.4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xbae/xbae-4.60.4.ebuild,v 1.12 2008/09/17 14:49:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xbae/xbae-4.60.4.ebuild,v 1.13 2010/07/19 18:32:04 bicatali Exp $
 
+EAPI=3
 inherit eutils
 
 DESCRIPTION="Motif-based widget to display a grid of cells as a spreadsheet"
@@ -23,20 +24,14 @@ RDEPEND="x11-libs/openmotif
 
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-tmpl.patch
 	epatch "${FILESDIR}"/${P}-lxmp.patch
 	epatch "${FILESDIR}"/${P}-Makefile.in.patch
 }
 
-src_compile() {
-	econf \
-	  --enable-production \
-		|| die "econf failed"
-
-	emake || die "emake failed"
+src_configure() {
+	econf --enable-production
 }
 
 src_test() {
@@ -49,13 +44,15 @@ src_test() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	insinto /usr/share/aclocal
-	doins ac_find_xbae.m4
+	doins ac_find_xbae.m4 || die
 	dodoc README NEWS ChangeLog AUTHORS
-	use doc && dohtml -r doc/*
+	if use doc; then
+		dohtml -r doc/* || die
+	fi
 	if use examples; then
 		find examples -name '*akefile*' -exec rm -f {} \;
 		rm -f examples/{testall,extest}
 		insinto /usr/share/doc/${PF}
-		doins -r examples
+		doins -r examples || die
 	fi
 }