From de693f4fec7aa113ad500262f581ded9b0e3020c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Porcel?= Date: Sun, 23 Oct 2011 15:33:28 +0000 Subject: [PATCH] alpha/ia64/sparc stable wrt #385767 Package-Manager: portage-2.1.10.11/cvs/Linux ia64 --- app-text/htmldoc/ChangeLog | 6 ++- app-text/htmldoc/Manifest | 15 +++--- app-text/htmldoc/htmldoc-1.8.27-r1.ebuild | 62 ----------------------- app-text/htmldoc/htmldoc-1.8.27-r2.ebuild | 4 +- 4 files changed, 13 insertions(+), 74 deletions(-) delete mode 100644 app-text/htmldoc/htmldoc-1.8.27-r1.ebuild 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 -htmldoc-1.8.27-r1.ebuild, + htmldoc-1.8.27-r2.ebuild: + alpha/ia64/sparc stable wrt #385767 15 Oct 2011; Kacper Kowalik htmldoc-1.8.27-r2.ebuild: ppc stable wrt #385767 diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest index 1a0c5dea8039..d57fb5ca1e93 100644 --- a/app-text/htmldoc/Manifest +++ b/app-text/htmldoc/Manifest @@ -5,16 +5,13 @@ AUX htmldoc-fortify-fail.patch 815 RMD160 589216f06e7ed5c780e5dffb3d96f8bd84fbf6 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-r1.ebuild 1811 RMD160 9bdfbf232b18c52df34e14836d644016004f154e SHA1 e56b92cb201ed10817a850518f6d47a5f8b095dc SHA256 5376e617e72862bb687c48507fc8a8f11b6859aae54f5c9dc632889723bec1d2 -EBUILD htmldoc-1.8.27-r2.ebuild 1905 RMD160 6cab580d5fa9da6424860389a5333b41b47b8bab SHA1 d1f603bdb3f824834c02a3ec33c32e7772df419c SHA256 ae7423f14784e8107c9dee309544690726651cf632476c30c480a43438a115d4 -MISC ChangeLog 8029 RMD160 2c51a4779342b384f619c09a6e2b56ee6855aef5 SHA1 28fd9648eb1b37a79c04fb40b41412e17d5282de SHA256 1b81c7eb681148019a672661862249fa7aea5adf76ea759e7c5c3018377d0f68 +EBUILD htmldoc-1.8.27-r2.ebuild 1899 RMD160 745f50f48533b5dcbf38dbbc82eb64a53102cfcc SHA1 31e0cb217a8d0514a1618ed5d1a0a227a82643c7 SHA256 3ac452e163063b29855f448ee6648e0f05633c8004961e45e23d477ba4209910 +MISC ChangeLog 8169 RMD160 a6f36553fdae1d653a682d0d56e819ea3a0aa85f SHA1 b80d24a176f58fe01bbda9e144d19fd9b3d4c98e SHA256 de792a58b1ac4289733222e6561986b9cf1e03d2c90f585c89a159f492f3708c MISC metadata.xml 212 RMD160 f278ca2a473dd949f7d0f359c432cfe4ed026e71 SHA1 b67d9ec2368a50032f536d14dbd7f105b25191cf SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iJwEAQECAAYFAk6ZMvwACgkQIiMqcbOVdxQjAgP/QNDYyj2tgSw+guDod5tQDgXw -H/htYE8Li0vpxtE00TJ/eBUGSPcIsfaw10sdgGAhzN3MLX/sKpTPQR921YACqSvI -+qyzRy56Gh55XAgoff1+BPwtmCizPhyosRaf7XGYgNd5HO4ZULPMnjaJQgS1/rk7 -jrXGqkP8vOdpG20i0bU= -=e8R5 +iEYEARECAAYFAk6kM84ACgkQuQc30/atMkBK/gCfcKcQ+ttnFqulFcjFSzHAWQtd +WHkAn0KpjEUaji23AtO5dfw4pN2jEBY7 +=fPLF -----END PGP SIGNATURE----- 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 -- 2.26.2