--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -, +, @@ 
--- htp-1.16.ebuild
+++ htp-1.17.ebuild
@@ -1,50 +1,62 @@ 
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-text/htp/htp-1.16.ebuild,v 1.4 2010/12/31 00:45:25 vapier Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="An HTML preprocessor"
 HOMEPAGE="http://htp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? ( mirror://sourceforge/${PN}/${P}-doc.zip )"
 
 LICENSE="Clarified-Artistic"
 SLOT="0"
 KEYWORDS="~alpha ~ppc ~sparc ~x86"
-IUSE=""
+IUSE="doc examples"
 
-# HTP does not use autoconf, have to set options defined in Makefile.config
+DEPEND="doc? ( app-arch/unzip )"
 
-src_prepare() {
-	epatch "${FILESDIR}"/strip.patch #240110
-	# let src_test take care of testing
-	sed -i -e '/SUBDIRS /s:tests::' Makefile || die
-	# don't install doc files with +x perms
-	sed -i -e '$aINSTALL += -m644' homepage/ref/{*/,}Makefile || die
-	# make src_test abort on failure
-	sed -i -e '/DIFF.*FAILED/s/echo/exit 1; :/' tests/Makefile || die
-	# the png file in this test isn't fetchable
-	sed -i -e 's: width="630" height="331"::' tests/png.html.exp || die
+# broken, reported upstream
+# http://sf.net/tracker/?func=detail&aid=3466112&group_id=41382&atid=430444
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+
+	if use doc; then
+		mkdir "${WORKDIR}"/docs || die
+		cd "${WORKDIR}"/docs
+		unpack ${P}-doc.zip
+	fi
 }
 
-src_compile() {
-	emake \
-		CCOPT="-c ${CFLAGS} ${CPPFLAGS} -DHAVE_SNPRINTF -DHAVE_VASPRINTF -DHAVE_ASPRINTF" \
-		CC="$(tc-getCC)" \
-		LINK='$(CC) $(LDFLAGS)' \
-		|| die
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
 }
 
-src_test() {
-	emake -C tests || die
+src_compile() {
+	tc-export CC
+	emake
+	use examples && emake examples
 }
 
 src_install() {
-	emake \
-		DESTDIR="${D}" \
-		prefix='$(DESTDIR)/usr' \
-		pkgdocdir='$(DESTDIR)/usr/share/doc/${PF}/html' \
-		install || die
+	emake DESTDIR="${D}" install
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{def,html,htp,htt}
+	fi
+
+	if use doc; then
+		docinto html
+		cd "${WORKDIR}"/docs/${PN}
+		dodoc -r *.html pic
+
+		cd tut
+		docinto html/tut
+		dodoc *.html
+	fi
 }