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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 42 insertions, 34 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/Manifest b/x11-libs/xbae/Manifest
index 89125c33143c..9a194a83e164 100644
--- a/x11-libs/xbae/Manifest
+++ b/x11-libs/xbae/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xbae-4.60.4-Makefile.in.patch 824 RMD160 3a418cd1a9ff77e2a7ede1702f423c23214e676d SHA1 8d7bb91f9ddf7082a2ba24dd69ec034b3209f5ad SHA256 fa45eaff3ae3c2342b5f509fb028b7ffeacb46ddadb0384b17c310e95586ecd4
 AUX xbae-4.60.4-lxmp.patch 437 RMD160 3f4f7f8b5444422e28f0ba03c9849f03caecc2b5 SHA1 c9dea87ac83d5994dcb4d6a76aa6c3f75de8a39c SHA256 7c61dfbc26491d7655d82277994001ff4ae81c9d67d455483c7fd135ac14785a
 AUX xbae-4.60.4-tmpl.patch 255 RMD160 6c2e18dba720fcad6793d5d13f1460d78378ed63 SHA1 03d160933472250bfc7af406ea40f712ea98f0c9 SHA256 be3893a4a083419a7e1e2b95fef7fa523a92887f14d4b691a87402d1b54fa32b
 DIST xbae-4.60.4.tar.gz 1770938 RMD160 9d737a63ae34ac6cf30b8302927cae73514b9a15 SHA1 4fe20d86813e0c4fbb07b2ac333a1140e161d1f9 SHA256 eb72702ed0a36d043f2075a9d5a4545556da1b8dab4d67d85fca92f37aeb04a8
-EBUILD xbae-4.60.4.ebuild 1369 RMD160 73d91fc13e00416a41e7ada28195a740feddc590 SHA1 aa6af05c47982e4faf64e5da30af9b1ced3d205c SHA256 c4593678a7fd302a1bcb6961b91f7db13059c89493b70b30ba9e02affae28dde
-MISC ChangeLog 1666 RMD160 1ccb157908e503d63a0c89d0d5b75787e852d68a SHA1 31656b9696ec98f00387284825c4ab8fd9edc8da SHA256 ae291da20d014139138e8d1ebfeef61b4636bb20ac9718dff265354a06a1aba7
-MISC metadata.xml 848 RMD160 04971a92f7b8e32e58c3f4c607e8e85b5c8e4522 SHA1 052cd3e5597b60ff579a869d0bd1026aec659f13 SHA256 3b897ebb476b53a5defd6ff6ff61b0e8e2b10f49eef712b219ac1d664717c8e6
+EBUILD xbae-4.60.4.ebuild 1329 RMD160 d6b92c7b9bb61644e539fa4e5f8b6117127337f5 SHA1 387b3e51702d867c0b2c805c41b6065c42bcdca1 SHA256 98fad418c39d2918fb43e846b2586510b3593e7fd02bb07d77d26ab8271a472e
+MISC ChangeLog 1815 RMD160 b2963917f9843154747da30c787644799565230b SHA1 d5a85091e7127635990e0c35ea1950c8b6366fa2 SHA256 51b37278e32565cc86819c2ec978f3ae6e55659ecb5750a9ecb7b3134440c42a
+MISC metadata.xml 802 RMD160 c9206639a88d44dc3214bd92b668fe87ce1631ae SHA1 7a9cedd6c56e9e2c3a1b7bd90f9bb702b60a1d35 SHA256 1fe9a1671d00bb34a9ab261bd10ba0fa1bedf460d165e198291a060e901586c6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxEmi0ACgkQ1ycZbhPLE2BUUQCfV6WQJzJhpTjgnpx6oBttTsdG
+STsAn0iu/Teom1JEZV4mdRDOWCojD8uE
+=lJjE
+-----END PGP SIGNATURE-----
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
 }