--- openvpn-9999.ebuild	2012-03-01 14:10:51.000000000 +0200
+++ openvpn-9999.ebuild	2012-03-24 20:24:01.834982098 +0200
@@ -4,39 +4,37 @@
 
 EAPI=4
 
-inherit eutils multilib toolchain-funcs autotools flag-o-matic git-2
+inherit eutils multilib toolchain-funcs flag-o-matic
 
 DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
-EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}.git"
 HOMEPAGE="http://openvpn.net/"
 
+if [[ "${PV}" = 9999 ]]; then
+	inherit git-2 autotools
+	KEYWORDS=""
+	EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}.git"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+	SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
+fi
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="examples iproute2 minimal pam passwordsave selinux +ssl static pkcs11 userland_BSD"
+IUSE="examples iproute2 minimal pam passwordsave selinux +ssl +lzo static pkcs11 userland_BSD"
 
-DEPEND=">=dev-libs/lzo-1.07
+DEPEND="
 	kernel_linux? (
 		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
 	)
 	!minimal? ( pam? ( virtual/pam ) )
 	selinux? ( sec-policy/selinux-openvpn )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
+	lzo? ( >=dev-libs/lzo-1.07 )
 	pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-pkcs11.patch"
-	sed -i \
-		-e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \
-		-e "s/-shared/-shared \${LDFLAGS}/" \
-		plugin/*/Makefile || die "sed failed"
-
-	# Add GIT commit ID to Product Version
-	sed -i \
-		-e "/^define(PRODUCT_VERSION/s/])/-git-${EGIT_VERSION}])/" \
-		version.m4
-	eautoreconf
+	[ "${PV}" = 9999 ] && eautoreconf
 }
 
 src_configure() {
@@ -60,6 +58,7 @@ src_configure() {
 		$(use_enable passwordsave password-save) \
 		$(use_enable ssl) \
 		$(use_enable ssl crypto) \
+		$(use_enable lzo) \
 		$(use_enable iproute2) \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 }
@@ -73,12 +72,12 @@ src_compile() {
 	emake
 
 	if ! use minimal ; then
-		cd plugin
+		cd src/plugins
 		for i in *; do
 			[[ ${i} == "README" || ${i} == "examples" || ${i} == "defer" ]] && continue
 			[[ ${i} == "auth-pam" ]] && ! use pam && continue
 			einfo "Building ${i} plugin"
-			emake -C "${i}" CC=$(tc-getCC)
+			emake -C "${i}" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 		done
 		cd ..
 	fi
@@ -87,12 +86,8 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	# install openvpn-plugin.h
-	insinto /usr/include
-	doins openvpn-plugin.h
-
 	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README README.IPv6 TODO.IPv6
+	dodoc AUTHORS ChangeLog PORTS README
 
 	# Install some helper scripts
 	keepdir /etc/openvpn
@@ -108,18 +103,12 @@ src_install() {
 	if use examples ; then
 		# dodoc does not supportly support directory traversal, #15193
 		insinto /usr/share/doc/${PF}/examples
-		doins -r sample-{config-files,keys,scripts} contrib
+		doins -r sample contrib
 	fi
 
-	# Install plugins and easy-rsa
-	doenvd "${FILESDIR}/65openvpn" # config-protect easy-rsa
 	if ! use minimal ; then
-		cd easy-rsa/2.0
-		make install "DESTDIR=${D}" "PREFIX=${EPREFIX}/usr/share/${PN}/easy-rsa"
-		cd ../..
-
 		exeinto "/usr/$(get_libdir)/${PN}"
-		doexe plugin/*/*.so
+		doexe src/plugins/*/*.so
 	fi
 }