diff options
author | Kacper Kowalik <xarthisius@gentoo.org> | 2012-05-06 11:40:06 +0000 |
---|---|---|
committer | Kacper Kowalik <xarthisius@gentoo.org> | 2012-05-06 11:40:06 +0000 |
commit | f2b4e73f7e16e2f97118def0856ebd7b218916f9 (patch) | |
tree | 55e9c9675520abc3c32dc0bfb16632f8e5ff31f6 /app-text/htmldoc | |
parent | Add patch to fix compilation with GCC 4.7, bug #413859 (diff) | |
download | gentoo-2-f2b4e73f7e16e2f97118def0856ebd7b218916f9.tar.gz gentoo-2-f2b4e73f7e16e2f97118def0856ebd7b218916f9.tar.bz2 gentoo-2-f2b4e73f7e16e2f97118def0856ebd7b218916f9.zip |
ppc64 stable wrt #219373, drop old
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'app-text/htmldoc')
-rw-r--r-- | app-text/htmldoc/ChangeLog | 6 | ||||
-rw-r--r-- | app-text/htmldoc/htmldoc-1.8.27-r2.ebuild | 65 | ||||
-rw-r--r-- | app-text/htmldoc/htmldoc-1.8.27-r3.ebuild | 4 |
3 files changed, 7 insertions, 68 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/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 |