HTML docs installation fixed. bug #189729 thanks to Arfrever Frehtes Taifersar Arahesis.

(Portage version: 2.1.2.11)

4 files changed, 27 insertions, 25 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 568e3af13c4c..060c4d77ea35 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.83 2007/08/02 13:25:05 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.84 2007/08/21 18:28:23 coldwind Exp $
+
+  21 Aug 2007; Santiago M. Mola <coldwind@gentoo.org> fltk-1.1.7.ebuild,
+  fltk-1.1.7-r1.ebuild, fltk-1.1.7-r2.ebuild:
+  HTML docs installation fixed. bug #189729 thanks to Arfrever Frehtes
+  Taifersar Arahesis.
 
   02 Aug 2007; Roy Marples <uberlord@gentoo.org> fltk-1.1.7.ebuild,
   fltk-1.1.7-r1.ebuild, fltk-1.1.7-r2.ebuild:
diff --git a/x11-libs/fltk/fltk-1.1.7-r1.ebuild b/x11-libs/fltk/fltk-1.1.7-r1.ebuild
index a251550e6358..69c6e78e504b 100644
--- a/x11-libs/fltk/fltk-1.1.7-r1.ebuild
+++ b/x11-libs/fltk/fltk-1.1.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7-r1.ebuild,v 1.3 2007/08/02 13:25:05 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7-r1.ebuild,v 1.4 2007/08/21 18:28:23 coldwind Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -77,10 +77,10 @@ src_compile() {
 
 src_install() {
 	einstall \
-		includedir=${D}${INCDIR} \
-		libdir=${D}${LIBDIR} || die "Installation Failed"
+		includedir="${D}${INCDIR}" \
+		libdir="${D}${LIBDIR}" || die "Installation Failed"
 
-	ranlib ${D}${LIBDIR}/*.a
+	ranlib "${D}${LIBDIR}"/*.a
 
 	insinto /usr/share/cmake/Modules
 	doins "${FILESDIR}"/FLTKConfig.cmake CMake/FLTKUse.cmake
@@ -92,10 +92,9 @@ src_install() {
 
 	doenvd 99fltk-${SLOT}
 
-	dodir /usr/share/doc/${P}/html
-	mv ${D}/usr/share/doc/fltk/* ${D}/usr/share/doc/${PF}/html
-	rmdir ${D}/usr/share/doc/fltk
-	rm -rf ${D}/usr/share/man/cat{1,3}
+	dohtml -A xbm,xpm,h,cxx,fl -r "${D}"/usr/share/doc/fltk/*
+	rm -rf "${D}"/usr/share/doc/fltk
+	rm -rf "${D}"/usr/share/man/cat{1,3}
 }
 
 pkg_postinst() {
diff --git a/x11-libs/fltk/fltk-1.1.7-r2.ebuild b/x11-libs/fltk/fltk-1.1.7-r2.ebuild
index b88c353c403c..4cc991c1370f 100644
--- a/x11-libs/fltk/fltk-1.1.7-r2.ebuild
+++ b/x11-libs/fltk/fltk-1.1.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7-r2.ebuild,v 1.4 2007/08/02 13:25:05 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7-r2.ebuild,v 1.5 2007/08/21 18:28:23 coldwind Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -78,10 +78,10 @@ src_compile() {
 
 src_install() {
 	einstall \
-		includedir=${D}${INCDIR} \
-		libdir=${D}${LIBDIR} || die "Installation Failed"
+		includedir="${D}${INCDIR}" \
+		libdir="${D}${LIBDIR}" || die "Installation Failed"
 
-	ranlib ${D}${LIBDIR}/*.a
+	ranlib "${D}${LIBDIR}"/*.a
 
 	insinto /usr/share/cmake/Modules
 	doins "${FILESDIR}"/FLTKConfig.cmake CMake/FLTKUse.cmake
@@ -93,10 +93,9 @@ src_install() {
 
 	doenvd 99fltk-${SLOT}
 
-	dodir /usr/share/doc/${P}/html
-	mv ${D}/usr/share/doc/fltk/* ${D}/usr/share/doc/${PF}/html
-	rmdir ${D}/usr/share/doc/fltk
-	rm -rf ${D}/usr/share/man/cat{1,3}
+	dohtml -A xbm,xpm,h,cxx,fl -r "${D}"/usr/share/doc/fltk/*
+	rm -rf "${D}"/usr/share/doc/fltk
+	rm -rf "${D}"/usr/share/man/cat{1,3}
 }
 
 pkg_postinst() {
diff --git a/x11-libs/fltk/fltk-1.1.7.ebuild b/x11-libs/fltk/fltk-1.1.7.ebuild
index dc05a49a9c3b..5353a80a61d8 100644
--- a/x11-libs/fltk/fltk-1.1.7.ebuild
+++ b/x11-libs/fltk/fltk-1.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7.ebuild,v 1.15 2007/08/02 13:25:05 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7.ebuild,v 1.16 2007/08/21 18:28:23 coldwind Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -76,10 +76,10 @@ src_compile() {
 
 src_install() {
 	einstall \
-		includedir=${D}${INCDIR} \
-		libdir=${D}${LIBDIR} || die "Installation Failed"
+		includedir="${D}${INCDIR}" \
+		libdir="${D}${LIBDIR}" || die "Installation Failed"
 
-	ranlib ${D}${LIBDIR}/*.a
+	ranlib "${D}${LIBDIR}"/*.a
 
 	dodoc CHANGES README
 
@@ -88,10 +88,9 @@ src_install() {
 
 	doenvd 99fltk-${SLOT}
 
-	dodir /usr/share/doc/${P}/html
-	mv ${D}/usr/share/doc/fltk/* ${D}/usr/share/doc/${PF}/html
-	rmdir ${D}/usr/share/doc/fltk
-	rm -rf ${D}/usr/share/man/cat{1,3}
+	dohtml -A xbm,xpm,h,cxx,fl -r "${D}"/usr/share/doc/fltk/*
+	rm -rf "${D}"/usr/share/doc/fltk
+	rm -rf "${D}"/usr/share/man/cat{1,3}
 }
 
 pkg_postinst() {