alpha/ia64/sparc stable wrt #385767

(Portage version: 2.1.10.11/cvs/Linux ia64)

3 files changed, 7 insertions, 65 deletions

diff --git a/app-text/htmldoc/ChangeLog b/app-text/htmldoc/ChangeLog
index 58f6e5f1fbe3..ed9a56e891de 100644
--- a/app-text/htmldoc/ChangeLog
+++ b/app-text/htmldoc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/htmldoc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/ChangeLog,v 1.65 2011/10/15 07:14:58 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/ChangeLog,v 1.66 2011/10/23 15:33:27 armin76 Exp $
+
+  23 Oct 2011; Raúl Porcel <armin76@gentoo.org> -htmldoc-1.8.27-r1.ebuild,
+  htmldoc-1.8.27-r2.ebuild:
+  alpha/ia64/sparc stable wrt #385767
 
   15 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> htmldoc-1.8.27-r2.ebuild:
   ppc stable wrt #385767
diff --git a/app-text/htmldoc/htmldoc-1.8.27-r1.ebuild b/app-text/htmldoc/htmldoc-1.8.27-r1.ebuild
deleted file mode 100644
index 6ecf0d104531..000000000000
--- a/app-text/htmldoc/htmldoc-1.8.27-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/htmldoc-1.8.27-r1.ebuild,v 1.11 2011/03/20 20:19:53 jlec Exp $
-
-EAPI=1
-
-inherit eutils
-
-DESCRIPTION="Convert HTML pages into a PDF document"
-SRC_URI="mirror://easysw/htmldoc/${PV}/${P}-source.tar.bz2"
-HOMEPAGE="http://www.easysw.com/htmldoc/"
-
-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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# 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"
-
-	sed -i "s:^#define DOCUMENTATION \"\$prefix/share/doc/htmldoc\":#define DOCUMENTATION \"\$prefix/share/doc/${PF}/html\":" \
-		configure
-}
-
-src_compile() {
-	local myconf="$(use_enable ssl openssl) $(use_with fltk gui)"
-
-	econf ${myconf} || die "econf failed"
-
-	# Add missing -lfltk_images to LIBS
-	use fltk && sed -i 's:-lfltk :-lfltk -lfltk_images :g' Makedefs
-
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall bindir="${D}/usr/bin" || die "einstall failed"
-
-	# 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"
-}
diff --git a/app-text/htmldoc/htmldoc-1.8.27-r2.ebuild b/app-text/htmldoc/htmldoc-1.8.27-r2.ebuild
index cbb3051d462e..8e80a9f67d24 100644
--- a/app-text/htmldoc/htmldoc-1.8.27-r2.ebuild
+++ b/app-text/htmldoc/htmldoc-1.8.27-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/htmldoc-1.8.27-r2.ebuild,v 1.8 2011/10/15 07:14:58 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/htmldoc-1.8.27-r2.ebuild,v 1.9 2011/10/23 15:33:27 armin76 Exp $
 
 EAPI=1
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.easysw.com/htmldoc/"
 IUSE="fltk ssl"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 
 DEPEND="
 	>=media-libs/libpng-1.4