--- lilypond-2.7.0.ebuild	2006-02-16 12:55:00.000000000 -0800
+++ lilypond-2.7.34.ebuild	2006-02-16 12:47:03.000000000 -0800
@@ -5,7 +5,6 @@
 inherit eutils alternatives
 
 IUSE="doc"
-#IUSE=""
 
 MY_PVv="v$(echo ${PV} | cut -d. -f1,2)"
 MY_PV="$(echo ${PV} | cut -d. -f1,2)"
@@ -92,16 +91,14 @@
 	doins elisp/out/lilypond-words.el \
 		|| die "doins failed"
 
-	# vim support, should this be done differently?
-	# is done by make install
-	# "make web" packages all the docs into a nice tarball for us.
-	# NOTE: this is different than the way we did this in 2.4;
-	# If we try it the old way, the ebuild will hang because of
-	# circular symlink dereferencing
+	# For versions of Lilypond in the 2.6 branch and in the 2.7 branch prior
+	# to about 2.7.31, web documentation was nicely tarballed for us.
+	# As of 2.7.31 or thereabouts, this tarball was no longer created,
+	# so now we copy all the docs by hand.
 	if use doc; then
-		install -d ${D}/usr/share/doc/${PN} -m 755
-		cd ${D}/usr/share/doc/${PN}
-		tar xzf ${S}/out-www/web.tar.gz
+		install -d ${D}/usr/share/doc/${PN}/Documentation -m 755
+		cp -dr ${S}/out-www/web-root/Documentation/* \
+			${D}/usr/share/doc/${PN}/Documentation
 	fi
 }