1 |
commit: 8c3e75af5654b878b05fb231f38770e425919712 |
2 |
Author: Felix Janda <felix.janda <AT> posteo <DOT> de> |
3 |
AuthorDate: Sat Sep 3 18:47:59 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 4 06:45:05 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3e75af |
7 |
|
8 |
app-text/catdoc: version bump to 0.95. |
9 |
|
10 |
* modernize ebuild |
11 |
* fix parallel make install |
12 |
* add arm keyword |
13 |
|
14 |
Gentoo-Bug: https://bugs.gentoo.org/591362 |
15 |
Closes: https://github.com/gentoo/gentoo/pull/2204 |
16 |
|
17 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
18 |
|
19 |
app-text/catdoc/Manifest | 1 + |
20 |
app-text/catdoc/catdoc-0.95.ebuild | 51 ++++++++++++++++++++++ |
21 |
.../catdoc/files/catdoc-0.95-parallel-make.patch | 39 +++++++++++++++++ |
22 |
3 files changed, 91 insertions(+) |
23 |
|
24 |
diff --git a/app-text/catdoc/Manifest b/app-text/catdoc/Manifest |
25 |
index 8959ce1..66997db 100644 |
26 |
--- a/app-text/catdoc/Manifest |
27 |
+++ b/app-text/catdoc/Manifest |
28 |
@@ -1 +1,2 @@ |
29 |
+DIST catdoc-0.95.tar.gz 217779 SHA256 514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796 SHA512 dd6bded4b6b70749c007256b182b063ff266f86d53024d8582001678821e8096c5b980bc8f43015d9c82bbe022d71d4ba5fe68aff31b2ff6db3688595e651b2c WHIRLPOOL 1303c74cc6a13183e2ea8ee2bf616da419a8b9f03f4e2fcdce3b0462306084fab85a1cd68bb4ab07caac40c56a91284103e54084d7f523d9894b0eee9359184c |
30 |
DIST catdoc_0.94.4.orig.tar.gz 679156 SHA256 c06fd69d2a218fcc2ed1320988cef07a67cf5555a12f25752766d746e25758ee SHA512 63e492c40e0abb82df0c93c43d1bd63f15d0c8b60579cf3858f26a0814731920ff621b3384035c9a85da5c448b699801ff3376e7a02cf8e7a413195bd9847ba9 WHIRLPOOL 73675ee3b2facf03e894257132ee7766802ee3ab347701dfa7cd313855ebb22976b9e44f1d9d4eceee6f87008160df371a0cda409a623f61a35413d480a2a8d5 |
31 |
|
32 |
diff --git a/app-text/catdoc/catdoc-0.95.ebuild b/app-text/catdoc/catdoc-0.95.ebuild |
33 |
new file mode 100644 |
34 |
index 00000000..75ef745 |
35 |
--- /dev/null |
36 |
+++ b/app-text/catdoc/catdoc-0.95.ebuild |
37 |
@@ -0,0 +1,51 @@ |
38 |
+# Copyright 1999-2016 Gentoo Foundation |
39 |
+# Distributed under the terms of the GNU General Public License v2 |
40 |
+# $Id$ |
41 |
+ |
42 |
+EAPI=6 |
43 |
+ |
44 |
+DESCRIPTION="Converter for Microsoft Word, Excel, PowerPoint and RTF files to text" |
45 |
+HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/" |
46 |
+SRC_URI="http://ftp.wagner.pp.ru/pub/${PN}/${P}.tar.gz" |
47 |
+ |
48 |
+LICENSE="GPL-2" |
49 |
+SLOT="0" |
50 |
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" |
51 |
+IUSE="tk" |
52 |
+ |
53 |
+DEPEND="tk? ( >=dev-lang/tk-8.1 )" |
54 |
+ |
55 |
+DOCS="CODING.STD NEWS README TODO" |
56 |
+# CREDITS missing by accident in catdoc-0.95 |
57 |
+ |
58 |
+PATCHES=( |
59 |
+ "${FILESDIR}/${P}-parallel-make.patch" |
60 |
+ ) |
61 |
+ |
62 |
+src_prepare() { |
63 |
+ default |
64 |
+ |
65 |
+ # Fix for case-insensitive filesystems |
66 |
+ echo ".PHONY: all install clean distclean dist" >> Makefile.in || die |
67 |
+ |
68 |
+ mv configure.{in,ac} || die |
69 |
+} |
70 |
+ |
71 |
+src_configure() { |
72 |
+ econf --with-install-root="${D}" \ |
73 |
+ $(use_with tk wish "${EPREFIX}"/usr/bin/wish) \ |
74 |
+ $(use_enable tk wordview) |
75 |
+} |
76 |
+ |
77 |
+src_compile() { |
78 |
+ emake LIB_DIR="${EPREFIX}"/usr/share/catdoc |
79 |
+} |
80 |
+ |
81 |
+src_install() { |
82 |
+ default |
83 |
+ |
84 |
+ if [[ -e ${ED}/usr/bin/xls2csv ]]; then |
85 |
+ einfo "Renaming xls2csv to xls2csv-${PN} because of bug 314657." |
86 |
+ mv -vf "${ED}"/usr/bin/xls2csv "${ED}"/usr/bin/xls2csv-${PN} || die |
87 |
+ fi |
88 |
+} |
89 |
|
90 |
diff --git a/app-text/catdoc/files/catdoc-0.95-parallel-make.patch b/app-text/catdoc/files/catdoc-0.95-parallel-make.patch |
91 |
new file mode 100644 |
92 |
index 00000000..b3e2833 |
93 |
--- /dev/null |
94 |
+++ b/app-text/catdoc/files/catdoc-0.95-parallel-make.patch |
95 |
@@ -0,0 +1,39 @@ |
96 |
+--- a/charsets/Makefile.in |
97 |
++++ b/charsets/Makefile.in |
98 |
+@@ -28,13 +28,13 @@ |
99 |
+ |
100 |
+ all: @charsetcheck@ |
101 |
+ clean: |
102 |
+-install: install-dirs install-spc install-charsets |
103 |
+-install-spc: tex.spc ascii.spc tex.rpl ascii.rpl |
104 |
++install: install-spc install-charsets |
105 |
++install-spc: install-dirs tex.spc ascii.spc tex.rpl ascii.rpl |
106 |
+ $(INSTALL) -m 644 ascii.spc $(installroot)$(LIB_DIR)/ascii$(SPEC_EXT) |
107 |
+ $(INSTALL) -m 644 tex.spc $(installroot)$(LIB_DIR)/tex$(SPEC_EXT) |
108 |
+ $(INSTALL) -m 644 ascii.rpl $(installroot)$(LIB_DIR)/ascii$(REPL_EXT) |
109 |
+ $(INSTALL) -m 644 tex.rpl $(installroot)$(LIB_DIR)/tex$(REPL_EXT) |
110 |
+-install-charsets: |
111 |
++install-charsets: install-dirs |
112 |
+ for i in *.txt; do\ |
113 |
+ $(INSTALL) -m 0644 $$i $(installroot)$(LIB_DIR);\ |
114 |
+ done |
115 |
+--- a/doc/Makefile.in |
116 |
++++ b/doc/Makefile.in |
117 |
+@@ -29,13 +29,13 @@ |
118 |
+ xls2csv.txt xls2csv.ps \ |
119 |
+ wordview.txt wordview.ps build |
120 |
+ install: @installtargets@ |
121 |
+-install-catdoc: catdoc.1 xls2csv.1 catppt.1 |
122 |
+- ../mkinstalldirs $(installroot)$(mandir) |
123 |
++install-dirs: |
124 |
++ ../mkinstalldirs $(installroot)$(mandir)/man1 |
125 |
++install-catdoc: install-dirs catdoc.1 xls2csv.1 catppt.1 |
126 |
+ $(INSTALL) -m 644 catdoc.1 $(installroot)$(mandir)/man1/catdoc.1 |
127 |
+ $(INSTALL) -m 644 xls2csv.1 $(installroot)$(mandir)/man1/xls2csv.1 |
128 |
+ $(INSTALL) -m 644 catppt.1 $(installroot)$(mandir)/man1/catppt.1 |
129 |
+-install-wordview: |
130 |
+- ../mkinstalldirs $(installroot)$(mandir) |
131 |
++install-wordview: install-dirs |
132 |
+ $(INSTALL) -m 644 wordview.1 $(installroot)$(mandir)/man1/wordview.1 |
133 |
+ distclean: clean |
134 |
+ $(RM) Makefile catdoc.1 xls2csv.1 catppt.1 wordview.1 |