[gentoo-commits] gentoo-x86 commit in app-text/catdoc: ChangeLog catdoc-0.94.2-r1.ebuild

[Jonathan Callen (abcd)]

abcd        10/02/22 21:07:23

  Modified:             ChangeLog catdoc-0.94.2-r1.ebuild
  Log:
  Transfer prefix keywords, bump EAPI
  (Portage version: -svn/cvs/Linux i686)

Revision  Changes    Path
1.25                 app-text/catdoc/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ChangeLog	9 Jun 2009 12:39:47 -0000	1.24
+++ ChangeLog	22 Feb 2010 21:07:22 -0000	1.25
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/catdoc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.24 2009/06/09 12:39:47 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.25 2010/02/22 21:07:22 abcd Exp $
+
+  22 Feb 2010; Jonathan Callen <abcd@g.o> catdoc-0.94.2-r1.ebuild:
+  Transfer prefix keywords, bump EAPI
 
   09 Jun 2009; Diego E. Pettenò <flameeyes@g.o>
   catdoc-0.94.2-r1.ebuild, +files/catdoc-0.94.2+autoconf-2.63.patch:



1.3                  app-text/catdoc/catdoc-0.94.2-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r1.ebuild?r1=1.2&r2=1.3

Index: catdoc-0.94.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- catdoc-0.94.2-r1.ebuild	9 Jun 2009 12:39:47 -0000	1.2
+++ catdoc-0.94.2-r1.ebuild	22 Feb 2010 21:07:22 -0000	1.3
@@ -1,7 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r1.ebuild,v 1.2 2009/06/09 12:39:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r1.ebuild,v 1.3 2010/02/22 21:07:22 abcd Exp $
 
+EAPI=3
 WANT_AUTOMAKE=none
 
 inherit autotools eutils
@@ -19,30 +20,27 @@
 
 DOCS="CODING.STD CREDITS NEWS README TODO"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${P}-flags.patch"
 	epatch "${FILESDIR}/${P}+autoconf-2.63.patch"
-	eautoconf
-}
 
-src_compile() {
+	# Fix for case-insensitive filesystems
+	echo ".PHONY: all install clean distclean dist" >> Makefile.in
 
-	local myconf="--with-install-root=${D}"
+	eautoconf
+}
 
-	use tk \
-		&& myconf="${myconf} --with-wish=/usr/bin/wish" \
-		|| myconf="${myconf} --disable-wordview"
+src_configure() {
+	econf --with-install-root="${D}" \
+		$(use_with tk wish "${EPREFIX}"/usr/bin/wish) \
+		$(use_with !tk wordview)
+}
 
-	econf ${myconf} || die
+src_compile() {
 	emake LIB_DIR=/usr/share/catdoc || die
-
 }
 
 src_install() {
-
-	emake -j1 mandir=/usr/share/man/man1 install || die
+	emake -j1 mandir="${EPREFIX}"/usr/share/man/man1 install || die
 	dodoc ${DOCS}
-
 }