fix accidental /usr/usr/ install path

(Portage version: 2.1.11.12/cvs/Linux x86_64)

3 files changed, 67 insertions, 3 deletions

diff --git a/net-wireless/kismet-ubertooth/ChangeLog b/net-wireless/kismet-ubertooth/ChangeLog
index 300654514803..b27bec185f00 100644
--- a/net-wireless/kismet-ubertooth/ChangeLog
+++ b/net-wireless/kismet-ubertooth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/kismet-ubertooth
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet-ubertooth/ChangeLog,v 1.7 2012/08/19 15:14:12 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet-ubertooth/ChangeLog,v 1.8 2012/08/30 23:18:08 zerochaos Exp $
+
+*kismet-ubertooth-0.0_p534-r1 (30 Aug 2012)
+
+  30 Aug 2012; Rick Farina <zerochaos@gentoo.org>
+  +kismet-ubertooth-0.0_p534-r1.ebuild, kismet-ubertooth-9999.ebuild:
+  fix accidental /usr/usr/ install path
 
   19 Aug 2012; Rick Farina <zerochaos@gentoo.org>
   files/kismet-ubertooth-0.0_p534-respect-cflags.patch:
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-0.0_p534-r1.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-0.0_p534-r1.ebuild
new file mode 100644
index 000000000000..a61400d72f22
--- /dev/null
+++ b/net-wireless/kismet-ubertooth/kismet-ubertooth-0.0_p534-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet-ubertooth/kismet-ubertooth-0.0_p534-r1.ebuild,v 1.1 2012/08/30 23:18:08 zerochaos Exp $
+
+EAPI="4"
+
+inherit eutils multilib
+
+DESCRIPTION="Provides basic bluetooth support in kismet"
+HOMEPAGE="http://ubertooth.sourceforge.net/"
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://ubertooth.svn.sourceforge.net/svnroot/ubertooth/trunk/host"
+	SRC_URI=""
+	inherit subversion
+	KEYWORDS=""
+else
+	MY_PV="${PV/p/r}"
+	MY_PV="${MY_PV/0.0_/}"
+	SRC_URI="mirror://sourceforge/ubertooth/ubertooth-${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/ubertooth-${MY_PV}/host/"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=net-wireless/kismet-2011.03.2-r1 \
+		>=net-libs/libbtbb-0.8 \
+		virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-respect-cflags.patch
+}
+
+src_compile() {
+	if has_version =net-wireless/kismet-9999; then
+		cd "${S}/kismet/plugin-ubertooth-phyneutral" || die
+	else
+		cd "${S}/kismet/plugin-ubertooth" || die
+	fi
+	emake KIS_SRC_DIR="/usr/include/kismet/"
+}
+
+src_install() {
+	if has_version =net-wireless/kismet-9999; then
+		cd "${S}/kismet/plugin-ubertooth-phyneutral" || die
+	else
+		cd "${S}/kismet/plugin-ubertooth" || die
+	fi
+	emake DESTDIR="${ED}" LIBDIR="/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" install
+}
+
+pkg_postinst() {
+	ewarn "This package must be rebuilt every time kismet is rebuilt. Or else."
+}
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild
index 6d6d705178d1..8504f8e2ec36 100644
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild
+++ b/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild,v 1.5 2012/07/28 09:30:45 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild,v 1.6 2012/08/30 23:18:08 zerochaos Exp $
 
 EAPI="4"
 
@@ -47,7 +47,7 @@ src_install() {
 	else
 		cd "${S}/kismet/plugin-ubertooth" || die
 	fi
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" KIS_DEST_DIR="${D}/usr/" install
+	emake DESTDIR="${ED}" LIBDIR="/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" install
 }
 
 pkg_postinst() {