9 files changed, 73 insertions, 235 deletions
diff --git a/app-text/htmldoc/ChangeLog b/app-text/htmldoc/ChangeLog
index 5bb7b435ae27..e870f117fb0a 100644
--- a/app-text/htmldoc/ChangeLog
+++ b/app-text/htmldoc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/htmldoc
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/ChangeLog,v 1.46 2009/02/02 15:49:56 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/ChangeLog,v 1.47 2009/08/16 18:21:40 a3li Exp $
+
+*htmldoc-1.8.27-r1 (16 Aug 2009)
+
+  16 Aug 2009; Alex Legler <a3li@gentoo.org> -htmldoc-1.8.20-r1.ebuild,
+  -htmldoc-1.8.23.ebuild, -htmldoc-1.8.24.ebuild, -htmldoc-1.8.25.ebuild,
+  -htmldoc-1.8.26.ebuild, +htmldoc-1.8.27-r1.ebuild, -files/fonts.diff,
+  +files/htmldoc-sscanf-overflows.patch:
+  Non-maintainer commit: Version bump for security bug 278186. Removing
+  unneded vulnerable versions. Also making repoman happy.
 
   02 Feb 2009; Brent Baude <ranger@gentoo.org> htmldoc-1.8.27.ebuild:
   Marking htmldoc-1.8.27 ~ppc64 for bug 254386
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index 10135e7f22c9..fd6a75a18d2b 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,15 +1,16 @@
-AUX fonts.diff 353 RMD160 92c7ee3f60cdbb27bf965ec1dabb77a43a07bb75 SHA1 5824fc5acadbc7841061c7347e398b7d921ae6da SHA256 bdd29ab7253d6943e85e139c5a587aef822a9d9813083942ad0ab2a16e9610bb
-DIST htmldoc-1.8.20-1-source.tar.bz2 2314154 RMD160 6c4586510a0eef433f01b802469829f6c4ee4f4a SHA1 1890e7ed2dcb3969f8e1cf06a16973d978256066 SHA256 2dad3a63d16810e37d6006e37d5096d882067e0be76efc1de48424fbbee32dde
-DIST htmldoc-1.8.23-source.tar.bz2 2329977 RMD160 64a52393d35de86ed21616c5c7b08e68cc340f69 SHA1 4bcb4d472862197a35da9f25cc1e6634a9dcac9f SHA256 b76d2a65b4f18ab6b502899ba768c965cbf5a453fc7636b21259f14d5808bde6
-DIST htmldoc-1.8.24-source.tar.bz2 2576593 RMD160 af65ed3d9a09555e1541f8b0384eeec60feef6d7 SHA1 c37fd227bf96eb44c10622140ba8ef5915092bf2 SHA256 c57e40d8fce0da2746b6d9dcd5cb63bf8e620fcfa6fc7b56ef757a6402f5612f
-DIST htmldoc-1.8.25-source.tar.bz2 3954893 RMD160 cf30b0d368f1534b23dc5656bf08ab8fbcd0afd2 SHA1 8e0f0878d41d2dd8116b837bc842321d4aeb93c2 SHA256 b22a5124094511c5045160b54ac7e1e4dc658c07d4ac8e55abb7832cf2ed6f92
-DIST htmldoc-1.8.26-source.tar.bz2 3958339 RMD160 9846a2ff1f9cf1e39958ec6489189f6d6199ace5 SHA1 b99cc63bdeac16d6f3c293f0ad7b60d2afb6675b SHA256 325a87ee26021cd56ee07cd1079a9ccb13f532730627859224159f3f7580b82c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+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.20-r1.ebuild 1323 RMD160 e7c59ddb4be76b9885175585d65fb22210b11989 SHA1 fc80ddd04c8aaa314f73367926669339647f44c0 SHA256 d07be717f2606ae2b33221696acf5c956ad7517ab3dfc4c4ea48839f2df118b7
-EBUILD htmldoc-1.8.23.ebuild 1262 RMD160 9cd9a8dab6776c3d3d95f00fcc4c806ed04a1d4a SHA1 a7a09a84c50872279ca5669d962567d252187271 SHA256 46d21d82c744e4929636d1b5a250b9bf08d94511cf190e4f25750598f4afc652
-EBUILD htmldoc-1.8.24.ebuild 1296 RMD160 1278df4a772b6d52de5f0f0be350af16a7e8804b SHA1 9c79b766e701019bf1e9d38e790c03dea94a66e1 SHA256 22a6c60eed7fa9c30f79d0af179d21783f53370f1518ac172ac254fbd36bb517
-EBUILD htmldoc-1.8.25.ebuild 1722 RMD160 7e37736bac27ed6609829051cc042050322c0ef0 SHA1 7a077c7657d85594f8a88d73d8d4edd9bb73e69a SHA256 d6b5e14a02a50e1a33cea3f03d8b6b5161cd54ea53af6bbaebf60e8bc10e4eba
-EBUILD htmldoc-1.8.26.ebuild 1717 RMD160 85d36a079241a4a150bab2e7d62faf536714f6fe SHA1 74e6aae368f6ea0e56524d2f7cf531b362560469 SHA256 4b8dec5367edc5bdb408ec9526e291d94b437f2a5be3c6e9d07ea1a1d099cddf
+EBUILD htmldoc-1.8.27-r1.ebuild 1809 RMD160 1d9f44955a64a9c0126111a1c11403ba6d017977 SHA1 c7907ace599bab9f599715a175573e77a234c2e8 SHA256 28510e0dc5f5443085abd8ee825249137cb7aba9a123112c31554c9cb57598ab
 EBUILD htmldoc-1.8.27.ebuild 1727 RMD160 1a1290b9ac40ec0b9d730d841545ef8d5dff3501 SHA1 c31e015e44db5bc579413ebb4e3c03fac4c9e2ab SHA256 c6319eca8d182ac63dcc3f173db1113c0f5523d396d1384c37aaaf9b98ed54ed
-MISC ChangeLog 5417 RMD160 925f1f0b21c8d31a1335a63adaeb105b79278f60 SHA1 fb04eb0f7794789f0d891a30c9be546b92711e51 SHA256 fb37e0bdb599870a877ae4a7415aef4ef537b8ad6285a8c786563c9270aad4bd
+MISC ChangeLog 5839 RMD160 35a875cc7c264c47967d438a97723c2b5b555aab SHA1 e4cbab9164c95a7e573662c5ea0210bd50fd62f1 SHA256 6591e7a215be0f6212e330818018e68ba61957721abd71d5bc71ad60f45584b8
 MISC metadata.xml 251 RMD160 f62b7fdfc94b049ff5d8c1898bd9816f09fa5f7c SHA1 a427a7f873d1f0a3be2e4ffe3c46cfd1e7405432 SHA256 1bb399941c480f3c388bba23fc61399818897b9a232fd1171750675a01353a8d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqITi8ACgkQaGsKqSU7eCRRHgCeIFpb5xUCSaD3sZyzQz+nsIS3
+phcAoKMTBPqd3OV5kD1JNWefCdsTtzpC
+=6C+o
+-----END PGP SIGNATURE-----
diff --git a/app-text/htmldoc/files/fonts.diff b/app-text/htmldoc/files/fonts.diff
deleted file mode 100644
index 5d7c83d2586b..000000000000
--- a/app-text/htmldoc/files/fonts.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN htmldoc-1.8.20/fonts/Makefile htmldoc-1.8.20-modified/fonts/Makefile
---- htmldoc-1.8.20/fonts/Makefile	Thu Jun  6 07:10:24 2002
-+++ htmldoc-1.8.20-modified/fonts/Makefile	Mon Aug  5 16:11:52 2002
-@@ -46,9 +46,7 @@
- 		Times-Bold \
- 		Times-BoldItalic \
- 		Times-Italic \
--		Times-Roman \
--		ZapfChancery \
--		ZapfDingbats
-+		Times-Roman
- 
- 
- #
diff --git a/app-text/htmldoc/files/htmldoc-sscanf-overflows.patch b/app-text/htmldoc/files/htmldoc-sscanf-overflows.patch
new file mode 100644
index 000000000000..3a8d4edd31a2
--- /dev/null
+++ b/app-text/htmldoc/files/htmldoc-sscanf-overflows.patch
@@ -0,0 +1,38 @@
+Fix several insecure calls to sscanf(), bug 278186. Patch by a3li@gentoo.org.
+
+diff -ru a/htmldoc/htmllib.cxx b/htmldoc/htmllib.cxx
+--- a/htmldoc/htmllib.cxx	2006-06-07 19:43:52.000000000 +0200
++++ b/htmldoc/htmllib.cxx	2009-08-01 19:52:46.301099436 +0200
+@@ -2139,7 +2139,7 @@
+ 	  * assigned charset...
+ 	  */
+ 
+-          if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%s", &width, glyph) != 2)
++          if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%63s", &width, glyph) != 2)
+ 	    continue;
+ 
+           for (ch = 0; ch < 256; ch ++)
+diff -ru a/htmldoc/ps-pdf.cxx b/htmldoc/ps-pdf.cxx
+--- a/htmldoc/ps-pdf.cxx	2006-08-01 18:58:50.000000000 +0200
++++ b/htmldoc/ps-pdf.cxx	2009-08-01 19:53:14.300610480 +0200
+@@ -12512,7 +12512,7 @@
+ 	  * assigned charset...
+ 	  */
+ 
+-	  if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%s", &width, glyph) != 2)
++	  if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%63s", &width, glyph) != 2)
+ 	    continue;
+ 
+ 	  for (ch = 0; ch < 256; ch ++)
+diff -ru a/htmldoc/util.cxx b/htmldoc/util.cxx
+--- a/htmldoc/util.cxx	2005-04-24 21:20:32.000000000 +0200
++++ b/htmldoc/util.cxx	2009-08-01 19:52:14.469652088 +0200
+@@ -484,7 +484,7 @@
+     PageWidth  = 595;
+     PageLength = 792;
+   }
+-  else if (sscanf(size, "%fx%f%s", &width, &length, units) >= 2)
++  else if (sscanf(size, "%fx%f%254s", &width, &length, units) >= 2)
+   {
+    /*
+     * Custom size...
diff --git a/app-text/htmldoc/htmldoc-1.8.20-r1.ebuild b/app-text/htmldoc/htmldoc-1.8.20-r1.ebuild
deleted file mode 100644
index aaa83b7c5513..000000000000
--- a/app-text/htmldoc/htmldoc-1.8.20-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.20-r1.ebuild,v 1.11 2006/04/01 14:27:53 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Convert HTML pages into a PDF document"
-HOMEPAGE="http://www.easysw.com/htmldoc/"
-SRC_URI="ftp://ftp.easysw.com/pub/htmldoc/1.8.20/${P}-1-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc"
-IUSE=""
-
-DEPEND=">=dev-libs/openssl-0.9.6e
-	>=x11-libs/fltk-1.0.11"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/fonts.diff
-	## fix path for online-help:
-	sed -i -e "s@^#define DOCUMENTATION \"\$prefix/share/doc/htmldoc\"@#define DOCUMENTATION \"\$prefix/share/doc/${PF}/html\"@" \
-		configure
-}
-
-src_compile() {
-	econf \
-		--with-x \
-		--with-gui \
-		--with-openssl-libs=/usr/lib \
-		--with-openssl-includes=/usr/include/openssl || die "econf failed"
-
-	# Add missing -lfltk_images to LIBS
-	mv Makedefs Makedefs.orig
-	sed -e 's/-lfltk /-lfltk -lfltk_images /g' \
-		Makedefs.orig > Makedefs || die "failed to detect -lfltk"
-
-	make || die
-}
-
-src_install() {
-	einstall || die
-
-	# 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.23.ebuild b/app-text/htmldoc/htmldoc-1.8.23.ebuild
deleted file mode 100644
index 6569d638a522..000000000000
--- a/app-text/htmldoc/htmldoc-1.8.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.23.ebuild,v 1.14 2006/04/01 14:27:53 agriffis Exp $
-
-DESCRIPTION="Convert HTML pages into a PDF document"
-SRC_URI="ftp://ftp.easysw.com/pub/${PN}/${PV}/${P}-source.tar.bz2"
-HOMEPAGE="http://www.easysw.com/htmldoc/"
-
-IUSE="X ssl"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ppc alpha"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6e )
-	X? ( >=x11-libs/fltk-1.0.11 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i "s@^#define DOCUMENTATION \"\$prefix/share/doc/htmldoc\"@#define DOCUMENTATION \"\$prefix/share/doc/${PF}/html\"@" \
-		configure
-}
-
-src_compile() {
-	local myconf
-	use X && myconf="--with-x --with-gui"
-	use ssl && myconf="${myconf} --with-openssl-libs=/usr/lib \
-		--with-openssl-includes=/usr/include/openssl"
-
-	econf ${myconf} || die "econf failed"
-
-	# Add missing -lfltk_images to LIBS
-	use X && sed -i 's/-lfltk /-lfltk -lfltk_images /g' Makedefs
-
-	make || die "make failed"
-}
-
-src_install() {
-	einstall
-
-	# 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.24.ebuild b/app-text/htmldoc/htmldoc-1.8.24.ebuild
deleted file mode 100644
index 9fba4a913fff..000000000000
--- a/app-text/htmldoc/htmldoc-1.8.24.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.24.ebuild,v 1.7 2006/04/01 14:27:53 agriffis Exp $
-
-DESCRIPTION="Convert HTML pages into a PDF document"
-SRC_URI="http://ftp.easysw.com/pub/${PN}/${PV}/${P}-source.tar.bz2"
-HOMEPAGE="http://www.easysw.com/htmldoc/"
-
-IUSE="X ssl"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ppc sparc x86"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6e )
-	X? ( >=x11-libs/fltk-1.0.11 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i "s@^#define DOCUMENTATION \"\$prefix/share/doc/htmldoc\"@#define DOCUMENTATION \"\$prefix/share/doc/${PF}/html\"@" \
-		configure
-}
-
-src_compile() {
-	local myconf
-	use X && myconf="--with-x --with-gui"
-	use ssl && myconf="${myconf} --with-openssl-libs=/usr/lib \
-		--with-openssl-includes=/usr/include/openssl"
-
-	econf ${myconf} || die "econf failed"
-
-	# Add missing -lfltk_images to LIBS
-	use X && sed -i 's/-lfltk /-lfltk -lfltk_images /g' Makedefs
-
-	make || die "make failed"
-}
-
-src_install() {
-	einstall bindir=${D}/usr/bin || die
-
-	# 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.26.ebuild b/app-text/htmldoc/htmldoc-1.8.26.ebuild
deleted file mode 100644
index 1b55e5be2c4d..000000000000
--- a/app-text/htmldoc/htmldoc-1.8.26.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.6 2006/12/29 15:31:24 gustavoz 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
-}
diff --git a/app-text/htmldoc/htmldoc-1.8.25.ebuild b/app-text/htmldoc/htmldoc-1.8.27-r1.ebuild
index ecf49de771b8..3c1b54e09907 100644
--- a/app-text/htmldoc/htmldoc-1.8.25.ebuild
+++ b/app-text/htmldoc/htmldoc-1.8.27-r1.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/htmldoc-1.8.25.ebuild,v 1.2 2006/04/01 14:27:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/htmldoc-1.8.27-r1.ebuild,v 1.1 2009/08/16 18:21:40 a3li Exp $
 
 inherit eutils
 
 DESCRIPTION="Convert HTML pages into a PDF document"
-SRC_URI="http://ftp.easysw.com/pub/htmldoc/${PV}/${P}-source.tar.bz2"
+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 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="media-libs/jpeg
 	media-libs/libpng
 	fltk? ( >=x11-libs/fltk-1.0.11 )
 	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
@@ -28,10 +29,12 @@ DEPEND="media-libs/jpeg
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	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
 }
@@ -48,10 +51,10 @@ src_compile() {
 }
 
 src_install() {
-	einstall bindir=${D}/usr/bin || die "einstall failed"
+	einstall bindir="${D}/usr/bin" || die "einstall failed"
 
 	# Minor cleanups
-	mv ${D}/usr/share/doc/htmldoc ${D}/usr/share/doc/${PF}
+	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
+	mv "${D}"/usr/share/doc/${PF}/*.html "${D}/usr/share/doc/${PF}/html"
 }