Only install wordview.desktop when tk support is enabled (bug #522766), add myself as maintainer.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 72 insertions, 2 deletions

diff --git a/app-text/catdoc/ChangeLog b/app-text/catdoc/ChangeLog
index 4eab90113982..adf8aecabbe4 100644
--- a/app-text/catdoc/ChangeLog
+++ b/app-text/catdoc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/catdoc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.32 2014/10/27 05:18:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.33 2014/10/27 05:27:08 radhermit Exp $
+
+*catdoc-0.94.4-r1 (27 Oct 2014)
+
+  27 Oct 2014; Tim Harder <radhermit@gentoo.org> +catdoc-0.94.4-r1.ebuild,
+  metadata.xml:
+  Only install wordview.desktop when tk support is enabled (bug #522766), add
+  myself as maintainer.
 
   27 Oct 2014; Tim Harder <radhermit@gentoo.org> -catdoc-0.94.2.ebuild,
   -catdoc-0.94.2-r2.ebuild:
diff --git a/app-text/catdoc/catdoc-0.94.4-r1.ebuild b/app-text/catdoc/catdoc-0.94.4-r1.ebuild
new file mode 100644
index 000000000000..a31e488ec1e5
--- /dev/null
+++ b/app-text/catdoc/catdoc-0.94.4-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.4-r1.ebuild,v 1.1 2014/10/27 05:27:08 radhermit Exp $
+
+EAPI=5
+WANT_AUTOMAKE=none
+
+inherit autotools eutils
+
+DESCRIPTION="Converter for Microsoft Word, Excel, PowerPoint and RTF files to text"
+HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="tk"
+
+DEPEND="tk? ( >=dev-lang/tk-8.1 )"
+
+DOCS="CODING.STD CREDITS NEWS README TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.94.2-flags.patch
+	epatch "${FILESDIR}"/${PN}-0.94.2+autoconf-2.63.patch
+	epatch "${FILESDIR}"/${P}-destdir.patch
+	epatch "${FILESDIR}"/${P}-desktop.patch
+
+	# only install wordview.desktop when tk is enabled (bug #522766)
+	if ! use tk ; then
+		sed -i 's/ desktop//' Makefile.in || die
+	fi
+
+	# Fix for case-insensitive filesystems
+	echo ".PHONY: all install clean distclean dist" >> Makefile.in
+
+	eautoconf
+}
+
+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() {
+	emake -j1 mandir="${EPREFIX}"/usr/share/man/man1 install
+
+	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
+
+	dodoc ${DOCS}
+}
diff --git a/app-text/catdoc/metadata.xml b/app-text/catdoc/metadata.xml
index ba6a8a8800d5..f3fcf97ba32f 100644
--- a/app-text/catdoc/metadata.xml
+++ b/app-text/catdoc/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<herd>tex</herd>
 </pkgmetadata>