[gentoo-commits] repo/gentoo:master commit in: app-text/catdoc/, app-text/catdoc/files/

[gentoo-commits] repo/gentoo:master commit in: app-text/catdoc/, app-text/catdoc/files/

[Patrice Clement]

commit:     8c3e75af5654b878b05fb231f38770e425919712
Author:     Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sat Sep  3 18:47:59 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 06:45:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3e75af

app-text/catdoc: version bump to 0.95.

* modernize ebuild
* fix parallel make install
* add arm keyword

Gentoo-Bug: https://bugs.gentoo.org/591362
Closes: https://github.com/gentoo/gentoo/pull/2204

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 app-text/catdoc/Manifest                           |  1 +
 app-text/catdoc/catdoc-0.95.ebuild                 | 51 ++++++++++++++++++++++
 .../catdoc/files/catdoc-0.95-parallel-make.patch   | 39 +++++++++++++++++
 3 files changed, 91 insertions(+)

diff --git a/app-text/catdoc/Manifest b/app-text/catdoc/Manifest
index 8959ce1..66997db 100644
--- a/app-text/catdoc/Manifest
+++ b/app-text/catdoc/Manifest
@@ -1 +1,2 @@
+DIST catdoc-0.95.tar.gz 217779 SHA256 514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796 SHA512 dd6bded4b6b70749c007256b182b063ff266f86d53024d8582001678821e8096c5b980bc8f43015d9c82bbe022d71d4ba5fe68aff31b2ff6db3688595e651b2c WHIRLPOOL 1303c74cc6a13183e2ea8ee2bf616da419a8b9f03f4e2fcdce3b0462306084fab85a1cd68bb4ab07caac40c56a91284103e54084d7f523d9894b0eee9359184c
 DIST catdoc_0.94.4.orig.tar.gz 679156 SHA256 c06fd69d2a218fcc2ed1320988cef07a67cf5555a12f25752766d746e25758ee SHA512 63e492c40e0abb82df0c93c43d1bd63f15d0c8b60579cf3858f26a0814731920ff621b3384035c9a85da5c448b699801ff3376e7a02cf8e7a413195bd9847ba9 WHIRLPOOL 73675ee3b2facf03e894257132ee7766802ee3ab347701dfa7cd313855ebb22976b9e44f1d9d4eceee6f87008160df371a0cda409a623f61a35413d480a2a8d5

diff --git a/app-text/catdoc/catdoc-0.95.ebuild b/app-text/catdoc/catdoc-0.95.ebuild
new file mode 100644
index 00000000..75ef745
--- /dev/null
+++ b/app-text/catdoc/catdoc-0.95.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Converter for Microsoft Word, Excel, PowerPoint and RTF files to text"
+HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
+SRC_URI="http://ftp.wagner.pp.ru/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="tk"
+
+DEPEND="tk? ( >=dev-lang/tk-8.1 )"
+
+DOCS="CODING.STD NEWS README TODO"
+# CREDITS missing by accident in catdoc-0.95
+
+PATCHES=(
+	"${FILESDIR}/${P}-parallel-make.patch"
+	)
+
+src_prepare() {
+	default
+
+	# Fix for case-insensitive filesystems
+	echo ".PHONY: all install clean distclean dist" >> Makefile.in || die
+
+	mv configure.{in,ac} || die
+}
+
+src_configure() {
+	econf --with-install-root="${D}" \
+		$(use_with tk wish "${EPREFIX}"/usr/bin/wish) \
+		$(use_enable tk wordview)
+}
+
+src_compile() {
+	emake LIB_DIR="${EPREFIX}"/usr/share/catdoc
+}
+
+src_install() {
+	default
+
+	if [[ -e ${ED}/usr/bin/xls2csv ]]; then
+		einfo "Renaming xls2csv to xls2csv-${PN} because of bug 314657."
+		mv -vf "${ED}"/usr/bin/xls2csv "${ED}"/usr/bin/xls2csv-${PN} || die
+	fi
+}

diff --git a/app-text/catdoc/files/catdoc-0.95-parallel-make.patch b/app-text/catdoc/files/catdoc-0.95-parallel-make.patch
new file mode 100644
index 00000000..b3e2833
--- /dev/null
+++ b/app-text/catdoc/files/catdoc-0.95-parallel-make.patch
@@ -0,0 +1,39 @@
+--- a/charsets/Makefile.in
++++ b/charsets/Makefile.in
+@@ -28,13 +28,13 @@
+ 
+ all: @charsetcheck@
+ clean:
+-install: install-dirs install-spc install-charsets
+-install-spc: tex.spc ascii.spc tex.rpl ascii.rpl
++install: install-spc install-charsets
++install-spc: install-dirs tex.spc ascii.spc tex.rpl ascii.rpl
+ 	    $(INSTALL) -m 644 ascii.spc $(installroot)$(LIB_DIR)/ascii$(SPEC_EXT) 
+ 	    $(INSTALL) -m 644 tex.spc $(installroot)$(LIB_DIR)/tex$(SPEC_EXT) 
+ 	    $(INSTALL) -m 644 ascii.rpl $(installroot)$(LIB_DIR)/ascii$(REPL_EXT)
+ 	    $(INSTALL) -m 644 tex.rpl $(installroot)$(LIB_DIR)/tex$(REPL_EXT)
+-install-charsets:
++install-charsets: install-dirs
+ 	for i in *.txt; do\
+ 	   $(INSTALL) -m 0644 $$i $(installroot)$(LIB_DIR);\
+ 	done
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -29,13 +29,13 @@
+             xls2csv.txt xls2csv.ps \
+             wordview.txt wordview.ps build
+ install: @installtargets@
+-install-catdoc: catdoc.1 xls2csv.1 catppt.1
+-	../mkinstalldirs $(installroot)$(mandir)
++install-dirs:
++	../mkinstalldirs $(installroot)$(mandir)/man1
++install-catdoc: install-dirs catdoc.1 xls2csv.1 catppt.1
+ 	$(INSTALL) -m 644 catdoc.1 $(installroot)$(mandir)/man1/catdoc.1
+ 	$(INSTALL) -m 644 xls2csv.1 $(installroot)$(mandir)/man1/xls2csv.1
+ 	$(INSTALL) -m 644 catppt.1 $(installroot)$(mandir)/man1/catppt.1
+-install-wordview:	
+-	../mkinstalldirs $(installroot)$(mandir)
++install-wordview: install-dirs
+ 	$(INSTALL) -m 644 wordview.1 $(installroot)$(mandir)/man1/wordview.1
+ distclean: clean
+ 	$(RM)  Makefile catdoc.1 xls2csv.1 catppt.1 wordview.1