Fixing broken uncompress/S location and closing bug #52731.

3 files changed, 15 insertions, 9 deletions

diff --git a/net-misc/cisco-aironet-client-utils/ChangeLog b/net-misc/cisco-aironet-client-utils/ChangeLog
index 60db59de9203..dd844848f00d 100644
--- a/net-misc/cisco-aironet-client-utils/ChangeLog
+++ b/net-misc/cisco-aironet-client-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/cisco-aironet-client-utils
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-aironet-client-utils/ChangeLog,v 1.4 2004/06/02 02:44:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-aironet-client-utils/ChangeLog,v 1.5 2004/06/02 11:44:25 wolf31o2 Exp $
+
+  02 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-aironet-client-utils-2.1.ebuild:
+  Fixing broken uncompress/S location and closing bug #52731.
 
   01 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
   cisco-aironet-client-utils-2.1.ebuild:
diff --git a/net-misc/cisco-aironet-client-utils/Manifest b/net-misc/cisco-aironet-client-utils/Manifest
index f3f2d909b632..d2136d8c2edc 100644
--- a/net-misc/cisco-aironet-client-utils/Manifest
+++ b/net-misc/cisco-aironet-client-utils/Manifest
@@ -1,6 +1,6 @@
 MD5 38e3d4c5b0e0c281b0a381976e0cfa34 cisco-aironet-client-utils-2.0.ebuild 1119
-MD5 bafcb5ea6d12c20cd456972ff000fbd2 cisco-aironet-client-utils-2.1.ebuild 1163
-MD5 86850c4741438976c5f681d2fa343942 ChangeLog 904
+MD5 78c0aff7d65e74b62b091c64bc0ca3cf cisco-aironet-client-utils-2.1.ebuild 1255
+MD5 bc42bd1e0ca9b6f6c1c8fad3ea9aa6d4 ChangeLog 1062
 MD5 9064d8240c7226834b86c4e84b34a343 metadata.xml 434
 MD5 366a70339e8bde9b5f98c82de54e7ee1 files/90cisco 20
 MD5 873c008583c916c4c822dea9098cf21c files/digest-cisco-aironet-client-utils-2.0 74
diff --git a/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.1.ebuild b/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.1.ebuild
index e6358170a119..df2f924761d2 100644
--- a/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.1.ebuild
+++ b/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.1.ebuild,v 1.2 2004/06/02 02:44:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.1.ebuild,v 1.3 2004/06/02 11:44:25 wolf31o2 Exp $
 
 DESCRIPTION="Cisco Aironet Client Utilities"
 HOMEPAGE="http://www.cisco.com/pcgi-bin/tablebuild.pl/aironet-utils-linux"
@@ -19,7 +19,7 @@ RDEPEND="virtual/x11
 	=x11-libs/gtk+-1.2*
 	<=dev-cpp/gtkmm-2.0"
 
-S=${WORKDIR}/linux
+S=${WORKDIR}
 
 
 pkg_nofetch() {
@@ -37,14 +37,16 @@ src_unpack() {
 }
 
 src_install() {
+	pwd
 	exeinto /opt/cisco/bin
-	doexe ${S}/utilities/redhat90/{acu,bcard,leap{set,script,login}}
+	doexe linux/utilities/redhat90/{acu,bcard,leap{set,script,login}} \
+		|| die "Copying binaries"
 
 	insinto /opt/cisco
-	doins ${S}/ACU.PRFS
-	chmod a+rw ${D}/opt/cisco/ACU.PRFS
+	doins linux/ACU.PRFS || die "Copying defaults"
+	chmod a+rw ${D}/opt/cisco/ACU.PRFS || die "Making defaults writable"
 
-	doins ${S}/helpml.tar.gz
+	doins linux/helpml.tar.gz
 	pushd ${D}/opt/cisco > /dev/null
 	tar zxf helpml.tar.gz
 	rm -f helpml.tar.gz