I removed virtual/x11 since it already has gtk+ in RDEPEND.

(Portage version: 2.1_pre3-r1)

4 files changed, 10 insertions, 61 deletions

diff --git a/net-misc/cisco-aironet-client-utils/ChangeLog b/net-misc/cisco-aironet-client-utils/ChangeLog
index eab768248af4..2d6255ae72f6 100644
--- a/net-misc/cisco-aironet-client-utils/ChangeLog
+++ b/net-misc/cisco-aironet-client-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/cisco-aironet-client-utils
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-aironet-client-utils/ChangeLog,v 1.8 2005/03/10 20:14:24 wolf31o2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-aironet-client-utils/ChangeLog,v 1.9 2006/01/20 15:52:17 wolf31o2 Exp $
+
+  20 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  -cisco-aironet-client-utils-2.0.ebuild,
+  cisco-aironet-client-utils-2.1.ebuild:
+  I removed virtual/x11 since it already has gtk+ in RDEPEND.
 
   10 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   cisco-aironet-client-utils-2.0.ebuild,
diff --git a/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.0.ebuild b/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.0.ebuild
deleted file mode 100644
index 287e415bcbbf..000000000000
--- a/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.0.ebuild,v 1.5 2005/03/10 20:14:24 wolf31o2 Exp $
-
-DESCRIPTION="Cisco Aironet Client Utilities"
-HOMEPAGE="http://www.cisco.com/pcgi-bin/tablebuild.pl/aironet-utils-linux"
-SRC_URI="Linux-ACU-Driver-v${PV}.tar.gz"
-
-LICENSE="cisco"
-SLOT=0
-KEYWORDS="-* x86"
-RESTRICT="fetch"
-IUSE="pcmcia"
-
-DEPEND="virtual/libc
-	pcmcia? ( sys-apps/pcmcia-cs )"
-
-RDEPEND="virtual/x11
-	=x11-libs/gtk+-1.2*"
-
-S=${WORKDIR}/acu
-
-
-pkg_nofetch() {
-	eerror "Please goto:"
-	eerror " ${HOMEPAGE}"
-	eerror "and download"
-	eerror " ${A}"
-	eerror "to ${DISTDIR}"
-}
-
-src_unpack() {
-	mkdir -p ${S}
-	cd ${S}
-	unpack ${A}
-}
-
-src_install() {
-	exeinto /opt/cisco/bin
-	doexe utilities/{acu,bcard,leap{set,script,login}}
-
-	insinto /opt/cisco
-	doins ACU.PRFS
-	chmod a+rw ${D}/opt/cisco/ACU.PRFS
-
-	doins helpml.tar.gz
-	pushd ${D}/opt/cisco > /dev/null
-	tar zxf helpml.tar.gz
-	rm -f helpml.tar.gz
-	popd > /dev/null
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/90cisco
-}
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 b5b62c439936..64210e20b617 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-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # 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.6 2005/03/10 20:14:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.1.ebuild,v 1.7 2006/01/20 15:52:17 wolf31o2 Exp $
 
 DESCRIPTION="Cisco Aironet Client Utilities"
 HOMEPAGE="http://www.cisco.com/pcgi-bin/tablebuild.pl/aironet-utils-linux"
@@ -15,8 +15,7 @@ IUSE="pcmcia"
 DEPEND="virtual/libc
 	pcmcia? ( sys-apps/pcmcia-cs )"
 
-RDEPEND="virtual/x11
-	=x11-libs/gtk+-1.2*
+RDEPEND="=x11-libs/gtk+-1.2*
 	<=dev-cpp/gtkmm-2.0"
 
 S=${WORKDIR}
diff --git a/net-misc/cisco-aironet-client-utils/files/digest-cisco-aironet-client-utils-2.0 b/net-misc/cisco-aironet-client-utils/files/digest-cisco-aironet-client-utils-2.0
deleted file mode 100644
index f7bf8cbdaeab..000000000000
--- a/net-misc/cisco-aironet-client-utils/files/digest-cisco-aironet-client-utils-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5985ebe4cf6b7b7e8535bb73031c4a6d Linux-ACU-Driver-v2.0.tar.gz 1565492