--- /usr/portage/net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild	2009-09-08 19:36:19.000000000 +0200
+++ /var/my_portage/net-misc/hamachi/hamachi-0.9.9.9_p20-r5.ebuild	2010-06-19 17:50:26.000000000 +0200
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild,v 1.3 2009/09/08 17:11:21 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hamachi/hamachi-0.9.9.9_p20-r5.ebuild,v 1.3 2010/06/19 00:28:45 rkj_katana Exp $
 
 inherit eutils linux-info
 
@@ -17,14 +17,9 @@
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="sse"
-RESTRICT="strip mirror"
+RESTRICT="mirror"
+QA_PRESTRIPPED="/opt/${PN}/bin/hamachi"
 
-# Set workdir for both hamachi versions
-if use sse; then
-	S=${WORKDIR}/${MY_P}
-else
-	S=${WORKDIR}/${MY_P}-pentium
-fi
 
 pkg_preinst() {
 	# Add group "hamachi" & user "hamachi"
@@ -36,38 +31,54 @@
 	einfo "Checking your kernel configuration for TUN/TAP support."
 	CONFIG_CHECK="~TUN"
 	check_extra_config
+# Set workdir for both hamachi versions
+	if use sse; then
+		S=${WORKDIR}/${MY_P}
+	else
+		S=${WORKDIR}/${MY_P}-pentium
+	fi
 }
 
 src_compile() {
+	# Patching Makefile and tuncfg source code
+	epatch ${FILESDIR}/tuncfg-forcebuild.patch
+	# forcing compile of tuncfg
+	rm -f ${S}/tuncfg/tuncfg
 	# Compile Tuncfg
-	make -sC "${S}"/tuncfg || die "Compiling of tunecfg failed"
+	emake -sC ${S}/tuncfg || die "Compiling of tunecfg failed"
 }
 
 src_install() {
 	# Hamachi
 	einfo "Installing Hamachi"
-	insinto /usr/bin
+	dodir /opt/${PN}/bin
+	insinto /opt/${PN}/bin
 	insopts -m0755
-	doins hamachi
-	dosym /usr/bin/hamachi /usr/bin/hamachi-init
+	doins hamachi || die "Couldn't Install hamachi"
+	dosym /opt/${PN}/bin/hamachi /usr/bin/hamachi || die "Couldn't create hamachi symlinks"
+	dosym /opt/${PN}/bin/hamachi /usr/bin/hamachi-init || die "Couldn't create hamachi symlinks"
 
 	# Tuncfg
 	einfo "Installing Tuncfg"
-	insinto /usr/sbin
 	insopts -m0700
 	doins tuncfg/tuncfg
+	dosym /opt/${PN}/bin/tuncfg /usr/sbin/tuncfg
 
 	# Create log directory
 	dodir /var/log/${PN}
 
 	# Config files
 	einfo "Installing config files"
+	insopts -m0644
 	newinitd "${FILESDIR}"/tuncfg.initd tuncfg
 	newconfd "${FILESDIR}"/hamachi.confd hamachi
 	newinitd "${FILESDIR}"/hamachi.initd.2 hamachi
 
 	# Docs
-	dodoc CHANGES README LICENSE LICENSE.openssh LICENSE.openssl LICENSE.tuncfg
+	dodir /opt/${PN}/licenses
+	insinto /opt/${PN}/licenses
+	doins LICENSE LICENSE.openssh LICENSE.openssl LICENSE.tuncfg
+	dodoc CHANGES README
 
 }
 
@@ -79,5 +90,5 @@
 	einfo "If the 'hamachi' command shows no output, use the following command"
 	einfo "to extract the hamachi executable either with app-arch/upx or"
 	einfo "app-arch/upx-ucl:"
-	einfo "/opt/bin/upx -d /usr/bin/hamachi"
+	einfo "/opt/bin/upx -d /opt/${PN}/bin/hamachi"
 }