Bump to EAPI=3, add prefix keywords

Package-Manager: portage--svn/cvs/Linux i686

diff --git a/app-text/sablotron/ChangeLog b/app-text/sablotron/ChangeLog
index 5fbb58abc8fcc0a521cd4ae3d931fc306d6b0ab5..689c72a53b9b255eb443bda81e39f3ac14f8b507 100644 (file)
--- a/app-text/sablotron/ChangeLog
+++ b/app-text/sablotron/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/sablotron
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sablotron/ChangeLog,v 1.67 2010/02/06 14:19:59 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sablotron/ChangeLog,v 1.68 2010/04/06 00:26:07 abcd Exp $
+
+  06 Apr 2010; Jonathan Callen <abcd@gentoo.org> sablotron-1.0.3.ebuild:
+  Bump to EAPI=3, add prefix keywords
 
   06 Feb 2010; Torsten Veller <tove@gentoo.org> sablotron-1.0.3.ebuild:
   Prepare in the correct directory (#300798)

diff --git a/app-text/sablotron/Manifest b/app-text/sablotron/Manifest
index 95575bf1166fd8dcdb460c2cecc3acd397074197..61720671b6835f6da72e7d06b1964d101f7b3012 100644 (file)
--- a/app-text/sablotron/Manifest
+++ b/app-text/sablotron/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.0.3-libsablot-expat.patch 286 RMD160 a80fd29614a14b0a6b3e5fb800176c13c9ee63f8 SHA1 644b881c7f2658eaaea57c3df24dbffe4cb1179b SHA256 5721c00006a06a991bb171c85ffc794348bbe732bae68447a26457621eedda89
 DIST Sablot-1.0.3.tar.gz 607597 RMD160 bbf2b57d95efbe1fce0ba42813560df4dbde9e3a SHA1 4e60a6aef32b661d7887b3ffd28339f47e2565e1 SHA256 a0c737ada78d0d305a2a964595167e0c6d17ff0afd3b801714768deb681bf362
-EBUILD sablotron-1.0.3.ebuild 1273 RMD160 75b2e49831b5fc5f5707fb2cfdb74f4686e7bc94 SHA1 8df816b37dacc913506a3d889cd63705bef59718 SHA256 4ac1e55e98b2d607622d8785951631011e1faef4efe43b0f2093f2f8b3a85b4c
-MISC ChangeLog 9081 RMD160 e01d32b4bf5f15dace928174bb974b151aa582cd SHA1 2ad7b7583d40bb08ca81aedd3c112d970cee0fda SHA256 c88518fbdbd9ad909f7eeef87d765d6868d3eccbf6eaa31d6e28038d2ba823b2
+EBUILD sablotron-1.0.3.ebuild 1126 RMD160 506511484f0323be89d63c1df4dd7415a82c0b18 SHA1 0067eb815ca65c4306b38ddbac03f9423e242506 SHA256 8a5ccfc42820d206edb586603d43da8ef442c6714bdef07d00cf41d21ca0067c
+MISC ChangeLog 9193 RMD160 1f38e3dfa3da261250ca11324cc54b4f312fa315 SHA1 0d9a75a553edeebd1c8b9797eba501a3115e92e5 SHA256 5370a8fb2482da23e4f3df5b8445ab518f61b261552eedfea0b37943bdae82bc
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAku6f6cACgkQOypDUo0oQOq8iwCgvRtf0QcCG5soDP/ZKSZBY8ji
+nmsAoJKjHhRruVF8TDTxPx6jdcrFx5G2
+=lcX4
+-----END PGP SIGNATURE-----

diff --git a/app-text/sablotron/sablotron-1.0.3.ebuild b/app-text/sablotron/sablotron-1.0.3.ebuild
index d6cc9625d92aa948a95e18f0638862b3cc61bbc3..aef982ced0972577e37f8d46edf08ea2194ae65e 100644 (file)
--- a/app-text/sablotron/sablotron-1.0.3.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sablotron/sablotron-1.0.3.ebuild,v 1.12 2010/02/06 14:19:59 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sablotron/sablotron-1.0.3.ebuild,v 1.13 2010/04/06 00:26:07 abcd Exp $
+
+EAPI="3"
 
 inherit base autotools
 
@@ -15,7 +17,7 @@ SRC_URI="http://download-1.gingerall.cz/download/sablot/${MY_P}.tar.gz"
 # Sablotron can optionally be built under GPL, using MPL for now
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="perl"
 
 RDEPEND=">=dev-libs/expat-1.95.6-r1"
@@ -24,27 +26,19 @@ DEPEND="${RDEPEND}
 
 PATCHES="${FILESDIR}/1.0.3-libsablot-expat.patch"
 
-src_unpack() {
-       base_src_unpack
-
-       cd "${S}"
+src_prepare() {
        eautoreconf
        elibtoolize
 }
 
-src_compile() {
-       # Don't use --without-html-dir, since that ends up installing files under
-       # the /no directory
-       local myconf="--with-html-dir=/usr/share/doc/${PF}/html"
-
-       use perl && myconf="${myconf} --enable-perlconnect"
-
-       econf ${myconf} || die "Configure failed"
-       emake || die "Make failed"
+src_configure() {
+       econf \
+               $(use_enable perl perlconnect) \
+               --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
 }
 
 src_install() {
-       make DESTDIR="${D}" install || die "Install failed"
+       emake DESTDIR="${D}" install || die "Install failed"
 
        dodoc README README_JS RELEASE src/TODO
 }