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

[Aaron Bauman]

commit:     ded9a39cd0cdea45db5b5d11d2267b9a38b3d17a
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 11:09:31 2016 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 11:09:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ded9a39c

app-text/catdoc: cleanup vulnerable wrt sec bug #571820

 app-text/catdoc/Manifest                |  1 -
 app-text/catdoc/catdoc-0.94.4-r1.ebuild | 59 ---------------------------------
 app-text/catdoc/catdoc-0.94.4.ebuild    | 54 ------------------------------
 3 files changed, 114 deletions(-)

diff --git a/app-text/catdoc/Manifest b/app-text/catdoc/Manifest
index 66997db..d1d7030 100644
--- a/app-text/catdoc/Manifest
+++ b/app-text/catdoc/Manifest
@@ -1,2 +1 @@
 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.94.4-r1.ebuild b/app-text/catdoc/catdoc-0.94.4-r1.ebuild
deleted file mode 100644
index 099c9bf..00000000
--- a/app-text/catdoc/catdoc-0.94.4-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/catdoc-0.94.4.ebuild b/app-text/catdoc/catdoc-0.94.4.ebuild
deleted file mode 100644
index 183893d..00000000
--- a/app-text/catdoc/catdoc-0.94.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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}
-}