[gentoo-commits] gentoo-x86 commit in app-text/sablotron: ChangeLog sablotron-1.0.3.ebuild

[Jonathan Callen (abcd)]

abcd        10/04/06 00:26:07

  Modified:             ChangeLog sablotron-1.0.3.ebuild
  Log:
  Bump to EAPI=3, add prefix keywords
  (Portage version: -svn/cvs/Linux i686)

Revision  Changes    Path
1.68                 app-text/sablotron/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/sablotron/ChangeLog?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/sablotron/ChangeLog?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/sablotron/ChangeLog?r1=1.67&r2=1.68

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/sablotron/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ChangeLog	6 Feb 2010 14:19:59 -0000	1.67
+++ ChangeLog	6 Apr 2010 00:26:07 -0000	1.68
@@ -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@g.o> sablotron-1.0.3.ebuild:
+  Bump to EAPI=3, add prefix keywords
 
   06 Feb 2010; Torsten Veller <tove@g.o> sablotron-1.0.3.ebuild:
   Prepare in the correct directory (#300798)



1.13                 app-text/sablotron/sablotron-1.0.3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/sablotron/sablotron-1.0.3.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/sablotron/sablotron-1.0.3.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/sablotron/sablotron-1.0.3.ebuild?r1=1.12&r2=1.13

Index: sablotron-1.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/sablotron/sablotron-1.0.3.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sablotron-1.0.3.ebuild	6 Feb 2010 14:19:59 -0000	1.12
+++ sablotron-1.0.3.ebuild	6 Apr 2010 00:26:07 -0000	1.13
@@ -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 @@
 # 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 @@
 
 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
 }