x11-libs/xbae: Moved to EAPI=4 and autotools.eclas to handle static-libs

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 41 insertions, 33 deletions

diff --git a/x11-libs/xbae/ChangeLog b/x11-libs/xbae/ChangeLog
index 6a3564e14219..661138b9ab72 100644
--- a/x11-libs/xbae/ChangeLog
+++ b/x11-libs/xbae/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/xbae
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xbae/ChangeLog,v 1.16 2012/02/09 09:46:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xbae/ChangeLog,v 1.17 2012/05/25 14:24:27 jlec Exp $
+
+  25 May 2012; Justin Lecher <jlec@gentoo.org> xbae-4.60.4.ebuild,
+  metadata.xml:
+  Moved to EAPI=4 and autotools.eclas to handle static-libs
 
   09 Feb 2012; Justin Lecher <jlec@gentoo.org> xbae-4.60.4.ebuild:
   Keyworded for ~-linux prefix
diff --git a/x11-libs/xbae/Manifest b/x11-libs/xbae/Manifest
index 5890abb044fd..54b8bd4bfd3a 100644
--- a/x11-libs/xbae/Manifest
+++ b/x11-libs/xbae/Manifest
@@ -5,13 +5,14 @@ AUX xbae-4.60.4-Makefile.in.patch 824 RMD160 3a418cd1a9ff77e2a7ede1702f423c23214
 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 1357 RMD160 d1ad92fa12af9526645d7b370f659fe94dd12355 SHA1 7193b30339db3695bf4a66cf9e4d79dcdd723c68 SHA256 66e05711620942ff195e2f64054c9c843fa103a72d85df54596bd5290881372b
-MISC ChangeLog 2006 RMD160 44b5fd2c12c85316de7a21527c41bb363613497f SHA1 0824f808774d57a1752a5ee093164293614b1959 SHA256 f1268219e96c1a0aee2233eb57feff51b616ceec50a4ae25ad8736f4cc1591bb
-MISC metadata.xml 802 RMD160 c9206639a88d44dc3214bd92b668fe87ce1631ae SHA1 7a9cedd6c56e9e2c3a1b7bd90f9bb702b60a1d35 SHA256 1fe9a1671d00bb34a9ab261bd10ba0fa1bedf460d165e198291a060e901586c6
+EBUILD xbae-4.60.4.ebuild 1280 RMD160 554e76c6e827ebbe38be9b3f591efe7465b2d3d6 SHA1 e6928580615467ca26044638ecc3996752af2892 SHA256 c3c902592882d11852487a9d1595f48cc55e5b24e777ad1c11cd36b79a9e823e
+MISC ChangeLog 2150 RMD160 636511de7c191d1720a3e00b5138d2b908c7ed3b SHA1 4aa8ed2753eda26eb59baccdc3e302fca2c339b8 SHA256 bd4bf6e9a345850a750bc2a722a55bdd1f0368924784fd3d62030b8b690a3b84
+MISC metadata.xml 804 RMD160 3d38c245b196c14ee50e5748be0141aa8cde5ae1 SHA1 30c7c6a5b7eeb0aedd01102fbb918230cb33c169 SHA256 d62163847ecf9473c0428adedaf238dbc121a9d2a4ea8ee80e3575a25257c5c9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk8zlhUACgkQgAnW8HDreRb1OwCcC91vKan1PSXBCDpeKsrYIHVz
-8coAnjbdJmwe8NBtSagUpPrg2hJntXAH
-=Bzi+
+iEYEAREKAAYFAk+/liEACgkQgAnW8HDreRbmDgCdGdzqzRz9ijX8/A3QNQXI0AMK
+GQ0An3V6+FCrmVfJSVH3ulICNAsWbCyc
+=FYTX
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/xbae/metadata.xml b/x11-libs/xbae/metadata.xml
index e86f2b27228a..d32dd96829a7 100644
--- a/x11-libs/xbae/metadata.xml
+++ b/x11-libs/xbae/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+	<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 
diff --git a/x11-libs/xbae/xbae-4.60.4.ebuild b/x11-libs/xbae/xbae-4.60.4.ebuild
index 755d4038b510..5fa792a08a94 100644
--- a/x11-libs/xbae/xbae-4.60.4.ebuild
+++ b/x11-libs/xbae/xbae-4.60.4.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 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.15 2012/02/09 09:46:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xbae/xbae-4.60.4.ebuild,v 1.16 2012/05/25 14:24:27 jlec Exp $
 
-EAPI=3
-inherit eutils
+EAPI=4
+
+inherit autotools-utils
 
 DESCRIPTION="Motif-based widget to display a grid of cells as a spreadsheet"
 HOMEPAGE="http://xbae.sourceforge.net/"
@@ -12,9 +13,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
-IUSE="doc examples"
+IUSE="doc examples static-libs"
 
-RDEPEND=">=x11-libs/openmotif-2.3:0
+RDEPEND="
+	x11-libs/openmotif:0
 	x11-libs/libXau
 	x11-libs/libXdmcp
 	x11-libs/libXext
@@ -24,35 +26,36 @@ RDEPEND=">=x11-libs/openmotif-2.3:0
 
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tmpl.patch
-	epatch "${FILESDIR}"/${P}-lxmp.patch
-	epatch "${FILESDIR}"/${P}-Makefile.in.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-tmpl.patch
+	"${FILESDIR}"/${P}-lxmp.patch
+	"${FILESDIR}"/${P}-Makefile.in.patch
+	)
 
 src_configure() {
-	econf --enable-production
+	local myeconfargs=( --enable-production )
+	autotools-utils_src_configure
 }
 
 src_test() {
 	cd examples
-	emake || die "emake examples failed"
-	./testall
-	make clean
+	emake
+	./testall || die
+	emake clean
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	autotools-utils_src_install
+
 	insinto /usr/share/aclocal
-	doins ac_find_xbae.m4 || die
-	dodoc README NEWS ChangeLog AUTHORS
-	if use doc; then
-		dohtml -r doc/* || die
-	fi
+	doins ac_find_xbae.m4
+
+	 use doc && dohtml -r doc/*
+
 	if use examples; then
-		find examples -name '*akefile*' -exec rm -f {} \;
-		rm -f examples/{testall,extest}
+		find examples -name '*akefile*' -delete || die
+		rm -f examples/{testall,extest} || die
 		insinto /usr/share/doc/${PF}
-		doins -r examples || die
+		doins -r examples
 	fi
 }