app-text/htmldoc: security cleanup wrt bug #554262

Package-Manager: portage-2.3.0

diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index 356f17d7793add3212b648e9270ca81ef0767e1d..db40799ac30e46f9dcb774bf9eb9b1082221bd1d 100644 (file)
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,2 +1 @@
-DIST htmldoc-1.8.27-source.tar.bz2 3960271 SHA256 89ffd223734268375dc959c200622dc5f167576c5cad9d7ce4bd7567faeb9613 SHA512 f0b2b6fec4925e549e74d6721f15b5de00c8c4889b0c67689945c408ed88074acb1330cae155655a1986adc0ca549cea32e242aa1ecac8e6338a1739f7c85438 WHIRLPOOL 0716ef8e70d11208668685b3b2cc742111940c91264a97531e705351721f3f14260c05479f35f73c2961238e163e0f5407c5bb2769984ccbcb5063736ebd4b39
 DIST htmldoc-1.8.29-source.tar.bz2 4089227 SHA256 e8c96ad740d19169eab8305c8e2ee1c795c4afa59ba99d18786ad191a2853f31 SHA512 06c4367b84005624564dfb33d2cc632cbfc711268ffce9efe00c17760da17637949fc7415fd29fcd63edc26ba96ff18cf57d1e9d36e7205b92ac2095cf4acfc8 WHIRLPOOL 3efe016ce4e071d164e3ca44fe3c8cba9ba830eb0847215116fbccab45b7ae913bfe94c723d4c8ba952c48ce31c68e5c4a71bd7048030a03c8fb3dffe42ea6d3

diff --git a/app-text/htmldoc/htmldoc-1.8.27-r3.ebuild b/app-text/htmldoc/htmldoc-1.8.27-r3.ebuild
deleted file mode 100644 (file)
index b863c8b..0000000
--- a/app-text/htmldoc/htmldoc-1.8.27-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils
-
-DESCRIPTION="Convert HTML pages into a PDF document"
-SRC_URI="http://www.msweet.org/files/project1/${P}-source.tar.bz2"
-HOMEPAGE="http://www.msweet.org/projects.php?Z1"
-
-IUSE="fltk ssl"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-
-DEPEND=">=media-libs/libpng-1.4
-       virtual/jpeg
-       fltk? ( x11-libs/fltk:1 )
-       ssl? ( >=dev-libs/openssl-0.9.6e )"
-RDEPEND="${DEPEND}"
-
-# this needs to be figured out, since htmldoc looks for all three libs
-# right now there's no virtual/ssl
-#
-#   --enable-openssl        use OpenSSL for SSL/TLS support, default=yes
-#   --enable-gnutls         use GNU TLS for SSL/TLS support, default=yes
-#   --enable-cdsassl        use CDSA for SSL/TLS support, default=yes
-
-src_prepare() {
-       # make sure not to use the libs htmldoc ships with
-       mkdir foo ; mv jpeg foo/ ; mv png foo/ ; mv zlib foo/
-
-       epatch \
-               "${FILESDIR}"/${PN}-sscanf-overflows.patch \
-               "${FILESDIR}"/${PN}-fortify-fail.patch \
-               "${FILESDIR}"/${PN}-libpng15.patch \
-               "${FILESDIR}"/${P}-crash.patch
-
-       sed -i "s:^#define DOCUMENTATION \"\$prefix/share/doc/htmldoc\":#define DOCUMENTATION \"\$prefix/share/doc/${PF}/html\":" \
-               configure || die
-}
-
-src_configure() {
-       local myconf="$(use_enable ssl openssl) $(use_with fltk gui)"
-       econf ${myconf}
-       # Add missing -lfltk_images to LIBS
-       if use fltk; then
-               sed -i 's:-lfltk :-lfltk -lfltk_images :g' Makedefs || die
-       fi
-}
-
-src_install() {
-       einstall bindir="${D}/usr/bin"
-
-       # Minor cleanups
-       mv "${D}/usr/share/doc/htmldoc" "${D}/usr/share/doc/${PF}"
-       dodir /usr/share/doc/${PF}/html
-       mv "${D}"/usr/share/doc/${PF}/*.html "${D}/usr/share/doc/${PF}/html"
-}