remove dbus useflag. it is no longer optional. fixes #132784

(Portage version: 2.1_pre10-r5)
 (Unsigned Manifest commit)

3 files changed, 11 insertions, 99 deletions

diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index f83125a51ec0..c4e43597df09 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -57,14 +57,14 @@ EBUILD epiphany-1.8.4.1.ebuild 1817 RMD160 983f69a2ee756c8f0e82d7643337cb2da851e
 MD5 8a9d604bd0df162154fc85372470052c epiphany-1.8.4.1.ebuild 1817
 RMD160 983f69a2ee756c8f0e82d7643337cb2da851e43b epiphany-1.8.4.1.ebuild 1817
 SHA256 df7e9556413855c1f6ce1fe87668e9a22523311195b0ac85c509da5559ad9996 epiphany-1.8.4.1.ebuild 1817
-EBUILD epiphany-2.14.1.ebuild 2373 RMD160 68da7bc44a282732d60fb7cf7f44a77ad51eee3b SHA1 73d125fcf57a85aadbac43347a149bb9eb6e5a28 SHA256 b82f44745e78d5a824e9ff51ce09491f6e521ce22b6380bb325497b9e3f62c0e size 2373
-MD5 b6980b61879ba8c28a3d52f37407229e epiphany-2.14.1.ebuild 2373
-RMD160 68da7bc44a282732d60fb7cf7f44a77ad51eee3b epiphany-2.14.1.ebuild 2373
-SHA256 b82f44745e78d5a824e9ff51ce09491f6e521ce22b6380bb325497b9e3f62c0e epiphany-2.14.1.ebuild 2373
-MISC ChangeLog 21152 RMD160 5736f771b1b476e445234e805178455e1d499eb8 SHA1 01894145537a030ac9937bb420fe16a227863f21 SHA256 f37f9272569f35f9a8cd1bf46a4e0f9aea810330544a8ed278a2077825b48cd9 size 21152
-MD5 b5b0c7171a39c8acfdec2624d793b37d ChangeLog 21152
-RMD160 5736f771b1b476e445234e805178455e1d499eb8 ChangeLog 21152
-SHA256 f37f9272569f35f9a8cd1bf46a4e0f9aea810330544a8ed278a2077825b48cd9 ChangeLog 21152
+EBUILD epiphany-2.14.1-r1.ebuild 2331 RMD160 3e52fff70c6c20f24750a7c536e7627f446e3184 SHA1 b4d92056aea403c488458da218a6abf5bdd0c8c3 SHA256 60d2dfe0cdf9478f13a5794cf7037c6faf93f73106273399db12abfa52b32e46 size 2331
+MD5 5613e275a68c9d73c2bb02b4142c3af7 epiphany-2.14.1-r1.ebuild 2331
+RMD160 3e52fff70c6c20f24750a7c536e7627f446e3184 epiphany-2.14.1-r1.ebuild 2331
+SHA256 60d2dfe0cdf9478f13a5794cf7037c6faf93f73106273399db12abfa52b32e46 epiphany-2.14.1-r1.ebuild 2331
+MISC ChangeLog 21363 RMD160 2bf6f488b52e16fdd26185f7d8594a2555f14bd8 SHA1 8c8927b16867a170c9ecd23c5562976bd0c211f6 SHA256 f7a6edf66f53d4c85285fc25ca5e8aa41f3327f5b8f37c16cb2c7838533f8264 size 21363
+MD5 f6ae38319caffb8cf77541f22e28fcc3 ChangeLog 21363
+RMD160 2bf6f488b52e16fdd26185f7d8594a2555f14bd8 ChangeLog 21363
+SHA256 f7a6edf66f53d4c85285fc25ca5e8aa41f3327f5b8f37c16cb2c7838533f8264 ChangeLog 21363
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 size 158
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -87,6 +87,6 @@ SHA256 3194daec5c4e995c4ef229b7843caae8a2914024a56ac8cc6ba501e0b16ba527 files/di
 MD5 c1c5c058f46fd7d3f0993a3799bf6883 files/digest-epiphany-1.8.4.1 256
 RMD160 b45f694013b20ef2e4e632eb5b6e0b01cefdace7 files/digest-epiphany-1.8.4.1 256
 SHA256 fc4db14b7380baa26e2ac416baa0a6c00a52f44f0285387c798331ab3017fec5 files/digest-epiphany-1.8.4.1 256
-MD5 6d783a7edc5fa85710893a6d992bf897 files/digest-epiphany-2.14.1 253
-RMD160 5ab6497c2b5870e7c841ec707004eaa7e0a20412 files/digest-epiphany-2.14.1 253
-SHA256 bc07fba6c17f10159930aaa2f91c8d34231f477de1a3c6ddb4f8931c7c159a72 files/digest-epiphany-2.14.1 253
+MD5 6d783a7edc5fa85710893a6d992bf897 files/digest-epiphany-2.14.1-r1 253
+RMD160 5ab6497c2b5870e7c841ec707004eaa7e0a20412 files/digest-epiphany-2.14.1-r1 253
+SHA256 bc07fba6c17f10159930aaa2f91c8d34231f477de1a3c6ddb4f8931c7c159a72 files/digest-epiphany-2.14.1-r1 253
diff --git a/www-client/epiphany/epiphany-2.14.1.ebuild b/www-client/epiphany/epiphany-2.14.1.ebuild
deleted file mode 100644
index 5d675802f084..000000000000
--- a/www-client/epiphany/epiphany-2.14.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.14.1.ebuild,v 1.4 2006/05/05 13:22:01 allanonjl Exp $
-
-inherit eutils gnome2 multilib autotools
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus doc firefox python"
-
-# Note that there is no libgnomeprint dep, while it is 
-# specified in configure.in . This could in some rare
-# situations break portage dep resolution.
-#
-# Marinus <foser@gentoo.org> 14-9-2005
-
-RDEPEND=">=dev-libs/glib-2.8
-	>=x11-libs/gtk+-2.8.3
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/gnome-vfs-2.9.2
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-desktop-2.9.91
-	>=x11-libs/startup-notification-0.5
-	>=gnome-base/libgnomeprintui-2.4
-	>=gnome-base/libbonobo-2
-	>=gnome-base/orbit-2
-	>=gnome-base/gconf-2
-	>=app-text/iso-codes-0.35
-	!firefox? ( >=www-client/mozilla-1.7.9 )
-	firefox? ( >=www-client/mozilla-firefox-1.0.5 )
-	dbus? ( >=sys-apps/dbus-0.35 )
-	python? (
-		>=dev-lang/python-2.3
-		>=dev-python/pygtk-2.7.1
-		>=dev-python/gnome-python-2.6 )
-	x11-themes/gnome-icon-theme"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.29
-	app-text/gnome-doc-utils
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	G2CONF="--disable-scrollkeeper \
-		$(use_enable dbus) \
-		$(use_enable python)"
-
-	if use firefox; then
-		G2CONF="${G2CONF} --with-mozilla=firefox"
-	else
-		G2CONF="${G2CONF} --with-mozilla=mozilla"
-	fi
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	epatch ${FILESDIR}/${PN}-1.9.2-broken-firefox.patch
-	epatch ${FILESDIR}/${P}-as-needed.patch
-
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR=". ${S}/m4" WANT_AUTOCONF="2.59" \
-	eautoreconf || die "Failed to reconfigure"
-}
-
-src_compile() {
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/compreg.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
-	gnome2_src_compile
-}
diff --git a/www-client/epiphany/files/digest-epiphany-2.14.1 b/www-client/epiphany/files/digest-epiphany-2.14.1
deleted file mode 100644
index 40eb72db6724..000000000000
--- a/www-client/epiphany/files/digest-epiphany-2.14.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 69f9760646b736d953f24442e0e38f7b epiphany-2.14.1.tar.bz2 3520979
-RMD160 bb755beacab63470381daf32b9d25cf74886e80e epiphany-2.14.1.tar.bz2 3520979
-SHA256 4eb5f8f8dacc81f47c54e3a579af3059cca3a7fa59d6cc270ed5b50d0b6a37a2 epiphany-2.14.1.tar.bz2 3520979