Don't depend on app-emacs/w3; Resolves Bug #144616.

Package-Manager: portage-2.1.1_pre5-r1

5 files changed, 17 insertions, 22 deletions

diff --git a/app-emacs/gnus-cvs/ChangeLog b/app-emacs/gnus-cvs/ChangeLog
index 62e161a4d5ef..9f7fca0f015e 100644
--- a/app-emacs/gnus-cvs/ChangeLog
+++ b/app-emacs/gnus-cvs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/gnus-cvs
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnus-cvs/ChangeLog,v 1.12 2006/02/27 19:50:43 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnus-cvs/ChangeLog,v 1.13 2006/08/21 17:52:16 mkennedy Exp $
+
+  21 Aug 2006; Matthew Kennedy <mkennedy@gentoo.org> gnus-cvs-5.11.ebuild:
+  Don't depend on app-emacs/w3; Resolves Bug #144616.
 
   27 Feb 2006; Matthew Kennedy <mkennedy@gentoo.org> gnus-cvs-5.11.ebuild:
   Remove SANDBOX_DISABLED=1 since it is not a problem with Emacs Lisp
diff --git a/app-emacs/gnus-cvs/files/digest-gnus-cvs-5.11 b/app-emacs/gnus-cvs/files/digest-gnus-cvs-5.11
index e69de29bb2d1..8b137891791f 100644
--- a/app-emacs/gnus-cvs/files/digest-gnus-cvs-5.11
+++ b/app-emacs/gnus-cvs/files/digest-gnus-cvs-5.11
@@ -0,0 +1 @@
+
diff --git a/app-emacs/gnus-cvs/gnus-cvs-5.11.ebuild b/app-emacs/gnus-cvs/gnus-cvs-5.11.ebuild
index 05f087296bef..9aedfeeae5ab 100644
--- a/app-emacs/gnus-cvs/gnus-cvs-5.11.ebuild
+++ b/app-emacs/gnus-cvs/gnus-cvs-5.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnus-cvs/gnus-cvs-5.11.ebuild,v 1.9 2006/02/27 19:50:43 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnus-cvs/gnus-cvs-5.11.ebuild,v 1.10 2006/08/21 17:52:16 mkennedy Exp $
 
 ECVS_SERVER="cvs.gnus.org:/usr/local/cvsroot"
 ECVS_MODULE="gnus"
@@ -10,7 +10,7 @@ ECVS_CVS_OPTIONS="-dP"
 
 inherit elisp cvs
 
-IUSE="emacs-w3"
+IUSE=""
 
 S=${WORKDIR}/${ECVS_MODULE}
 DESCRIPTION="Current alpha branch of the Gnus news- and mail-reader"
@@ -22,17 +22,11 @@ KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
 
 RESTRICT="$RESTRICT nostrip"
 
-DEPEND="virtual/emacs
-	emacs-w3? ( app-emacs/w3 )"
+DEPEND="virtual/emacs"
 
 src_compile() {
 	local myconf
-	if use emacs-w3; then
-		myconf="${myconf} --with-w3=/usr/share/emacs/site-lisp/w3"
-		myconf="${myconf} --with-url=/usr/share/emacs/site-lisp/w3"
-	else
-		myconf="${myconf} --without-w3 --without-url"
-	fi
+	myconf="${myconf} --without-w3 --without-url"
 	econf \
 		--with-emacs \
 		--with-lispdir=/usr/share/emacs/site-lisp/gnus-cvs \
diff --git a/app-emacs/gnus/ChangeLog b/app-emacs/gnus/ChangeLog
index 4f5176c093a5..bbb754b3512d 100644
--- a/app-emacs/gnus/ChangeLog
+++ b/app-emacs/gnus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/gnus
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnus/ChangeLog,v 1.16 2006/08/08 07:14:06 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnus/ChangeLog,v 1.17 2006/08/21 17:50:58 mkennedy Exp $
+
+  21 Aug 2006; Matthew Kennedy <mkennedy@gentoo.org> gnus-5.10.8.ebuild:
+  Don't depend on app-emacs/w3; Resolves Bug #144616.
 
 *gnus-5.10.8 (08 Aug 2006)
 
diff --git a/app-emacs/gnus/gnus-5.10.8.ebuild b/app-emacs/gnus/gnus-5.10.8.ebuild
index b7f6141d94e1..823ddbb488ac 100644
--- a/app-emacs/gnus/gnus-5.10.8.ebuild
+++ b/app-emacs/gnus/gnus-5.10.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnus/gnus-5.10.8.ebuild,v 1.1 2006/08/08 07:14:06 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnus/gnus-5.10.8.ebuild,v 1.2 2006/08/21 17:50:58 mkennedy Exp $
 
 inherit elisp
 
-IUSE="emacs-w3"
+IUSE=""
 
 DESCRIPTION="The Gnus newsreader and mail-reader"
 HOMEPAGE="http://www.gnus.org/"
@@ -13,17 +13,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
-DEPEND="virtual/emacs
-	emacs-w3? ( app-emacs/w3 )"
+DEPEND="virtual/emacs"
 
 src_compile() {
 	local myconf
-	if use emacs-w3 ; then
-		myconf="${myconf} --with-w3=/usr/share/emacs/site-lisp/w3"
-		myconf="${myconf} --with-url=/usr/share/emacs/site-lisp/w3"
-	else
-		myconf="${myconf} --without-w3 --without-url"
-	fi
+	myconf="${myconf} --without-w3 --without-url"
 	econf \
 		--with-emacs \
 		--with-lispdir=/usr/share/emacs/site-lisp/gnus \