ppc64 stable wrt #219373, drop old

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 29 insertions, 71 deletions

diff --git a/app-text/htmldoc/ChangeLog b/app-text/htmldoc/ChangeLog
index 7043126437f2..5c7e5b79293d 100644
--- a/app-text/htmldoc/ChangeLog
+++ b/app-text/htmldoc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/htmldoc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/ChangeLog,v 1.73 2012/04/16 19:23:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/ChangeLog,v 1.74 2012/05/06 11:40:05 xarthisius Exp $
+
+  06 May 2012; Kacper Kowalik <xarthisius@gentoo.org> -htmldoc-1.8.27-r2.ebuild,
+  htmldoc-1.8.27-r3.ebuild:
+  ppc64 stable wrt #219373, drop old
 
   16 Apr 2012; Brent Baude <ranger@gentoo.org> htmldoc-1.8.27-r3.ebuild:
   Marking htmldoc-1.8.27-r3 ppc for bug 219373
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index 96eb8054f7bc..43939b39d794 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,9 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX htmldoc-1.8.27-crash.patch 394 RMD160 5e6c9eafb8591c93303f9d3dc1e627228177754f SHA1 ac79f8552d6ff688c4514e77c071e93724f8acc1 SHA256 1b231571b3a48f81a8a38c4fe99bf0f3b0929f9cb66a9580f1606f4c756e545e
 AUX htmldoc-fortify-fail.patch 815 RMD160 589216f06e7ed5c780e5dffb3d96f8bd84fbf6ea SHA1 6f20f691683b13cb506820c78bae75896a546c96 SHA256 d8d5a5d9ebf5225a32b4f00d80e89a5576122d8c70c5ef60f36c3717c3770746
 AUX htmldoc-libpng15.patch 3809 RMD160 903711ef3bc042ca1b5990f8ec91792d26833d0c SHA1 b6a6ad737987815403ecd640e9de635a3a17856c SHA256 e235431989cf8b5228d395204ae8bff67bdce26d5befdfab637369efdc4f8e16
 AUX htmldoc-sscanf-overflows.patch 1351 RMD160 37ed892d0ebaaca6be134e43568333073536de0b SHA1 9ba341c585f6666f3cd78e4e6934a3ce7aa150c1 SHA256 b6c20cf21b781787f9e2663859646daa8b07c34e96cf39221f68dd2ce1a7f7a7
 DIST htmldoc-1.8.27-source.tar.bz2 3960271 RMD160 9605a5894675439f5fae405fb060972e19f33c7e SHA1 472908e0aafed1cedfbacd8ed3168734aebdec4b SHA256 89ffd223734268375dc959c200622dc5f167576c5cad9d7ce4bd7567faeb9613
-EBUILD htmldoc-1.8.27-r2.ebuild 1899 RMD160 745f50f48533b5dcbf38dbbc82eb64a53102cfcc SHA1 31e0cb217a8d0514a1618ed5d1a0a227a82643c7 SHA256 3ac452e163063b29855f448ee6648e0f05633c8004961e45e23d477ba4209910
-EBUILD htmldoc-1.8.27-r3.ebuild 1860 RMD160 ef03c29986fabc6cc1120feba2a7ed59666902cd SHA1 00402a99aee60315460730a35d7c3e1bcda5b1a9 SHA256 0075630779261addf8a2fc678262ffe12d7fb31a6b1e93655fa663d3ce463d1a
-MISC ChangeLog 9026 RMD160 96eb7d15b598787ffbf8a83eea35adf2a7bc15cf SHA1 901a19ba9a2ae5e96539248bf788d1209e696d4b SHA256 f5b3cde60c427962fd7cdc82aa952960498c5a8522731224b2911effa40b0228
+EBUILD htmldoc-1.8.27-r3.ebuild 1863 RMD160 eb642d70635f242ed52f636c01a19d267bbadef8 SHA1 a1a949d3361fb619f46773eec90af179e81b47a2 SHA256 69d8f6af7693f7fce53f81627c267fe4a37c69d9e04a502bbe1a15fa442ef808
+MISC ChangeLog 9177 RMD160 893a96c37834760b9e6e854a4c96a65ce7fce46a SHA1 7d7b61489bfbae7368c7b704bf664c81bdf1cb30 SHA256 cfe71e520098f3cc4263baaf9e63f19a9987c22f46ba069273c11f22868c216c
 MISC metadata.xml 212 RMD160 f278ca2a473dd949f7d0f359c432cfe4ed026e71 SHA1 b67d9ec2368a50032f536d14dbd7f105b25191cf SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJPpmMfAAoJEF0huFKJUZL51cIP/jQUQugnj4FftbyyA/V0JkaQ
+V4WRGLDF0YdoblSUcUnOEH/0J2Qk0fXfmY9bjWAXnHj/Z8lN7ij58wVFP3xiP0CT
+MK6mVI71WzUEaHs7RuZwOCG+IfRrBzFU9XQI4aX3ZikNRiM2VAb/PjwF5Su8/GtP
+Ktrt+z/sy9blYetRfroLAdDzZQsNXgtigcV/0Wv7FExm+HQNJYdy+LZAETeJdE8X
+wcWsrEnpeEFEiC/ko4MY2tYdcP58eJBziUcKjFc4Zbb/tI6Pjq4bomClkxR14JDS
+o7R5NHm7FeeOLvRcGtrCKyd2GILgRtmU3F7+6KS8tWXVlqOX4TABKvGFbkhBz8T9
+c53wy6I5cD+qOJKWpcnVE3rOjMPJ+bBipQ0gKGAhK32FmY+/JLuiMagYflS4Yk5U
+nSjcXw+aVPcT9/A5bJqUfUqCK+ZXVUv9cYmvluthHy01/GBbWMX/2vA+r7+spqOQ
+ixo/gAl79TccSsCr7c0RVgPnalewCl5y7raAoExJ1WCG4xOp7QZek2sOrKjZV2UZ
+zuxB3nmJ6nDTa2ysNQJHpwRKknhwK7NBk6Lcrvt05ErJnNavQFu30ctFh/fYLGLg
+iqJnf2fZp+9e0xRnaGbgQJmCNVY2VcFjWPjFMx4a/oEGFaYN2eqS51dIvVbGt3jX
+ERGnRXA1qAW073pamkwS
+=3YVM
+-----END PGP SIGNATURE-----
diff --git a/app-text/htmldoc/htmldoc-1.8.27-r2.ebuild b/app-text/htmldoc/htmldoc-1.8.27-r2.ebuild
deleted file mode 100644
index 8e80a9f67d24..000000000000
--- a/app-text/htmldoc/htmldoc-1.8.27-r2.ebuild
+++ /dev/null
@@ -1,65 +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-r2.ebuild,v 1.9 2011/10/23 15:33:27 armin76 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 \
-		"${FILESDIR}"/${PN}-fortify-fail.patch \
-		"${FILESDIR}"/${PN}-libpng15.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-r3.ebuild b/app-text/htmldoc/htmldoc-1.8.27-r3.ebuild
index 3f706a46d3a0..892d27ee4391 100644
--- a/app-text/htmldoc/htmldoc-1.8.27-r3.ebuild
+++ b/app-text/htmldoc/htmldoc-1.8.27-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r3.ebuild,v 1.7 2012/04/16 19:23:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/htmldoc-1.8.27-r3.ebuild,v 1.8 2012/05/06 11:40:05 xarthisius Exp $
 
 EAPI="4"
 inherit eutils
@@ -12,7 +12,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
 	virtual/jpeg