diff options
| -rw-r--r-- | app-text/catdoc/ChangeLog | 10 | ||||
| -rw-r--r-- | app-text/catdoc/catdoc-0.94.4.ebuild | 54 | ||||
| -rw-r--r-- | app-text/catdoc/files/catdoc-0.94.4-desktop.patch | 11 | ||||
| -rw-r--r-- | app-text/catdoc/files/catdoc-0.94.4-destdir.patch | 17 |
4 files changed, 90 insertions, 2 deletions
diff --git a/app-text/catdoc/ChangeLog b/app-text/catdoc/ChangeLog index 42d1695961c9..c714b12a2fd1 100644 --- a/app-text/catdoc/ChangeLog +++ b/app-text/catdoc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-text/catdoc -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.28 2010/09/15 11:22:35 grobian Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.29 2014/09/11 20:33:11 radhermit Exp $ + +*catdoc-0.94.4 (11 Sep 2014) + + 11 Sep 2014; Tim Harder <radhermit@gentoo.org> +catdoc-0.94.4.ebuild, + +files/catdoc-0.94.4-desktop.patch, +files/catdoc-0.94.4-destdir.patch: + Security bump (bug #440942). 15 Sep 2010; Fabian Groffen <grobian@gentoo.org> catdoc-0.94.2-r2.ebuild: Make ebuild completely Prefix aware (instead of half), fix wordview logic diff --git a/app-text/catdoc/catdoc-0.94.4.ebuild b/app-text/catdoc/catdoc-0.94.4.ebuild new file mode 100644 index 000000000000..32e51ba4f1d1 --- /dev/null +++ b/app-text/catdoc/catdoc-0.94.4.ebuild @@ -0,0 +1,54 @@ +# 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.ebuild,v 1.1 2014/09/11 20:33:11 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 + + # 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/files/catdoc-0.94.4-desktop.patch b/app-text/catdoc/files/catdoc-0.94.4-desktop.patch new file mode 100644 index 000000000000..f92792293cea --- /dev/null +++ b/app-text/catdoc/files/catdoc-0.94.4-desktop.patch @@ -0,0 +1,11 @@ +--- catdoc-0.94.4/desktop/wordview.desktop ++++ catdoc-0.94.4/desktop/wordview.desktop +@@ -2,7 +2,7 @@ + Name=Wordview Microsoft doc Viewer + Comment=Microsoft doc document file viewer + Exec=wordview +-Icon=wordview.xpm ++Icon=wordview + Terminal=false + Categories=Office;GNOME; + Type=Application diff --git a/app-text/catdoc/files/catdoc-0.94.4-destdir.patch b/app-text/catdoc/files/catdoc-0.94.4-destdir.patch new file mode 100644 index 000000000000..9e6ac0986b2a --- /dev/null +++ b/app-text/catdoc/files/catdoc-0.94.4-destdir.patch @@ -0,0 +1,17 @@ +--- catdoc-0.94.4/desktop/Makefile.in ++++ catdoc-0.94.4/desktop/Makefile.in +@@ -20,10 +20,10 @@ + clean: + + install: all +- ../mkinstalldirs $(prefix)$(desktopdir) +- ../mkinstalldirs $(prefix)$(iconsdir) +- $(INSTALL) -m 644 wordview.desktop $(prefix)$(desktopdir)/wordview.desktop +- $(INSTALL) -m 644 wordview.xpm $(prefix)$(iconsdir)/wordview.xpm ++ ../mkinstalldirs $(installroot)$(prefix)$(desktopdir) ++ ../mkinstalldirs $(installroot)$(prefix)$(iconsdir) ++ $(INSTALL) -m 644 wordview.desktop $(installroot)$(prefix)$(desktopdir)/wordview.desktop ++ $(INSTALL) -m 644 wordview.xpm $(installroot)$(prefix)$(iconsdir)/wordview.xpm + + distclean: clean + rm Makefile |