--- haproxy-1.3.22-r1.ebuild	2009-12-05 10:04:28.000000000 +0100
+++ haproxy-1.4.3.ebuild	2010-03-26 01:12:58.944986270 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.22-r1.ebuild,v 1.1 2009/12/05 09:04:28 mrness Exp $
 
-inherit versionator eutils
+inherit eutils versionator
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://haproxy.1wt.eu"
@@ -11,7 +11,7 @@ SRC_URI="http://haproxy.1wt.eu/download/
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="pcre"
+IUSE="examples pcre vim-syntax"
 
 DEPEND="pcre? ( dev-libs/libpcre )"
 RDEPEND="${DEPEND}"
@@ -23,23 +23,36 @@ pkg_setup() {
 
 src_compile() {
 	local ARGS="TARGET=linux26"
+
 	use pcre && ARGS="${ARGS} USE_PCRE=1"
+
 	use kernel_linux && ARGS="${ARGS} USE_LINUX_SPLICE=1"
 	use kernel_linux && ARGS="${ARGS} USE_LINUX_TPROXY=1"
-	emake ADDINC="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${ARGS}
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${ARGS} || die
 }
 
 src_install() {
-	exeinto /usr/bin
-	doexe haproxy
-	newinitd "${FILESDIR}/haproxy.initd" haproxy
+	dobin haproxy || die
+	newinitd "${FILESDIR}/haproxy.initd" haproxy || die
 
 	# Don't install useless files
 	rm examples/build.cfg doc/*gpl.txt
 
-	dodoc CHANGELOG ROADMAP TODO doc/*.txt
-	docinto examples
-	dodoc examples/*.cfg
+	dodoc CHANGELOG ROADMAP TODO doc/{configuration,haproxy-en}.txt
+	doman doc/haproxy.1
+
+	if use examples;
+	then
+		docinto examples
+		dodoc examples/*.cfg || die
+	fi
+
+	if use vim-syntax;
+	then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/haproxy.vim || die
+	fi
 }
 
 pkg_postinst() {