Version bump.

Package-Manager: portage-2.0.54

4 files changed, 67 insertions, 34 deletions

diff --git a/app-text/htmldoc/ChangeLog b/app-text/htmldoc/ChangeLog
index 813e2426c580..3203ac8ae818 100644
--- a/app-text/htmldoc/ChangeLog
+++ b/app-text/htmldoc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/htmldoc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/ChangeLog,v 1.30 2006/04/01 14:27:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/ChangeLog,v 1.31 2006/04/04 23:43:24 carlo Exp $
+
+*htmldoc-1.8.26 (04 Apr 2006)
+
+  04 Apr 2006; Carsten Lohrke <carlo@gentoo.org> +htmldoc-1.8.26.ebuild:
+  Version bump.
 
   01 Apr 2006; Aron Griffis <agriffis@gentoo.org> htmldoc-1.8.20-r1.ebuild,
   htmldoc-1.8.23.ebuild, htmldoc-1.8.24.ebuild, htmldoc-1.8.25.ebuild:
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index e4a63da98e3f..17db1d592b57 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,43 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3eae587e6fdee10ea1b670be26b8af4e ChangeLog 3769
-RMD160 2b7ccd1bcbf81670aeaaa213fcb4d0ef406f6379 ChangeLog 3769
-SHA256 80438308b52cb882dfaf75f293a4be34678f0f788dfe336ecb389b082774ec1a ChangeLog 3769
+MD5 1890bf54e1b289a662107ce62570f27d ChangeLog 3887
 MD5 4fd3b7ec1b30af0be9c2fd4695062c0c files/digest-htmldoc-1.8.20-r1 77
-RMD160 e0bf6b526cded93d0df6e3605b0dfd5b4f64b770 files/digest-htmldoc-1.8.20-r1 77
-SHA256 79fbe950adcf4a82889ab82060e52ef005446fa8457b058430353ef445891267 files/digest-htmldoc-1.8.20-r1 77
 MD5 37ab4f0733aa74e1862ba433b9a56936 files/digest-htmldoc-1.8.23 75
-RMD160 30a0487f5d8c792b140850386a4a6d1485573c63 files/digest-htmldoc-1.8.23 75
-SHA256 1db3e92021c23f6516b92820e72a4fcb09bf27459ba4d122b8022c50383ee949 files/digest-htmldoc-1.8.23 75
 MD5 a1859265d921a0a2270b8db008396c83 files/digest-htmldoc-1.8.24 75
-RMD160 bf3be885f7fcf1a8c7bb6c42fb97a08b83c72294 files/digest-htmldoc-1.8.24 75
-SHA256 9c02e362380003ba0960827c5a1fb074b7e08b514620ee7aed450d9b3683abcd files/digest-htmldoc-1.8.24 75
 MD5 b79d29b902a435885317c21b81b45847 files/digest-htmldoc-1.8.25 75
-RMD160 27a791895bab9837941d9b3f073a1ad9a9861fa0 files/digest-htmldoc-1.8.25 75
-SHA256 a3bcc2f52e4acb842f372393bd6c7bc5c442c107f41acfdf6b943c5278b46aec files/digest-htmldoc-1.8.25 75
+MD5 65ef7b7e02ddc206362837968e85e407 files/digest-htmldoc-1.8.26 75
 MD5 06678439bd4de915b822ec99aa90b426 files/fonts.diff 353
-RMD160 92c7ee3f60cdbb27bf965ec1dabb77a43a07bb75 files/fonts.diff 353
-SHA256 bdd29ab7253d6943e85e139c5a587aef822a9d9813083942ad0ab2a16e9610bb files/fonts.diff 353
 MD5 e45ce1edd2dc1a87c5810e9d2f2e9ef3 htmldoc-1.8.20-r1.ebuild 1323
-RMD160 e7c59ddb4be76b9885175585d65fb22210b11989 htmldoc-1.8.20-r1.ebuild 1323
-SHA256 d07be717f2606ae2b33221696acf5c956ad7517ab3dfc4c4ea48839f2df118b7 htmldoc-1.8.20-r1.ebuild 1323
 MD5 288d2473b7844898dad326a7c7f349cc htmldoc-1.8.23.ebuild 1262
-RMD160 9cd9a8dab6776c3d3d95f00fcc4c806ed04a1d4a htmldoc-1.8.23.ebuild 1262
-SHA256 46d21d82c744e4929636d1b5a250b9bf08d94511cf190e4f25750598f4afc652 htmldoc-1.8.23.ebuild 1262
 MD5 c13ad7b747af76b1a4048f83726a8ce0 htmldoc-1.8.24.ebuild 1296
-RMD160 1278df4a772b6d52de5f0f0be350af16a7e8804b htmldoc-1.8.24.ebuild 1296
-SHA256 22a6c60eed7fa9c30f79d0af179d21783f53370f1518ac172ac254fbd36bb517 htmldoc-1.8.24.ebuild 1296
 MD5 8f3a8e6319bc758be5ea5ade451b05eb htmldoc-1.8.25.ebuild 1722
-RMD160 7e37736bac27ed6609829051cc042050322c0ef0 htmldoc-1.8.25.ebuild 1722
-SHA256 d6b5e14a02a50e1a33cea3f03d8b6b5161cd54ea53af6bbaebf60e8bc10e4eba htmldoc-1.8.25.ebuild 1722
+MD5 adf4d58087815d225c43e25d018da485 htmldoc-1.8.26.ebuild 1719
 MD5 ad57f9f8342c8d705da0060ad496c84c metadata.xml 251
-RMD160 f62b7fdfc94b049ff5d8c1898bd9816f09fa5f7c metadata.xml 251
-SHA256 1bb399941c480f3c388bba23fc61399818897b9a232fd1171750675a01353a8d metadata.xml 251
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFELo3yJrHF4yAQTrARAr/+AJwK665vx7K7VD5/5V6VLjYrE8krrgCgsyR0
-9Ijh5bZYrCYjWYQfojrP1kM=
-=HqCq
------END PGP SIGNATURE-----
diff --git a/app-text/htmldoc/files/digest-htmldoc-1.8.26 b/app-text/htmldoc/files/digest-htmldoc-1.8.26
new file mode 100644
index 000000000000..3bc57f4beca8
--- /dev/null
+++ b/app-text/htmldoc/files/digest-htmldoc-1.8.26
@@ -0,0 +1 @@
+MD5 5bb7d68b90a17d4aaf85011706879143 htmldoc-1.8.26-source.tar.bz2 3958339
diff --git a/app-text/htmldoc/htmldoc-1.8.26.ebuild b/app-text/htmldoc/htmldoc-1.8.26.ebuild
new file mode 100644
index 000000000000..4f579df6c2ec
--- /dev/null
+++ b/app-text/htmldoc/htmldoc-1.8.26.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/htmldoc-1.8.26.ebuild,v 1.1 2006/04/04 23:43:24 carlo Exp $
+
+inherit eutils
+
+DESCRIPTION="Convert HTML pages into a PDF document"
+SRC_URI="http://ftp.easysw.com/pub/htmldoc/${PV}/${P}-source.tar.bz2"
+HOMEPAGE="http://www.easysw.com/htmldoc/"
+
+IUSE="fltk ssl"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="media-libs/jpeg
+	media-libs/libpng
+	fltk? ( >=x11-libs/fltk-1.0.11 )
+	ssl? ( >=dev-libs/openssl-0.9.6e )"
+
+# 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/
+
+	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
+}