From: Marinus Schraal Date: Wed, 14 Sep 2005 14:57:43 +0000 (+0000) Subject: dep fix to work around a problem with portage -D X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=71af7ca248bb6a12acae3dfc87a7f5cfdc692e85;p=gentoo.git dep fix to work around a problem with portage -D Package-Manager: portage-2.0.51.22-r2 --- diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog index dc3c84f24419..301015376452 100644 --- a/www-client/epiphany/ChangeLog +++ b/www-client/epiphany/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-client/epiphany # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.39 2005/09/12 16:47:44 allanonjl Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.40 2005/09/14 14:57:43 foser Exp $ + + 14 Sep 2005; Marinus Schraal epiphany-1.8.0.ebuild : + Remove libgnomeprint dep because it caused trouble with portage -D option *epiphany-1.8.0 (12 Sep 2005) diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest index f8a057b1deb1..bb4b31547414 100644 --- a/www-client/epiphany/Manifest +++ b/www-client/epiphany/Manifest @@ -1,10 +1,10 @@ MD5 5ef08e685400da84661b9f037d81a668 epiphany-1.6.0-r3.ebuild 1539 MD5 d89a18b9e1f3c752a5ea444c4ccfc52f epiphany-1.6.3.ebuild 1387 MD5 367a39d041ceb2efe66ccac8426e610d epiphany-1.4.8.ebuild 1458 -MD5 8f1a0182df7097ebff12b7dcb118e06d ChangeLog 17698 +MD5 4fff8d0acd76c753f8e75a75599addcd ChangeLog 17845 MD5 4c5adfec221fca880f8114d80bcaf86c epiphany-1.6.4.ebuild 1540 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 37ebbb0c8e526b3b2c252a1b8f1a5867 epiphany-1.8.0.ebuild 1666 +MD5 afa899fbb80bede70e99a017779361fa epiphany-1.8.0.ebuild 1825 MD5 2a6d9343d321b67fb737cb87301facfc files/epiphany-1.6.0-wallet_password.patch 1307 MD5 3e5d6d82d44078ec1c95566207f9bad1 files/epiphany-1.6.3-fix_includes.patch 369 MD5 a9590e1794335ecb9fb376a3b128570b files/epiphany-1.6.0-view_source.patch 11178 diff --git a/www-client/epiphany/epiphany-1.8.0.ebuild b/www-client/epiphany/epiphany-1.8.0.ebuild index 3839db0cf690..a3658f1ce0e4 100644 --- a/www-client/epiphany/epiphany-1.8.0.ebuild +++ b/www-client/epiphany/epiphany-1.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.8.0.ebuild,v 1.1 2005/09/12 16:47:44 allanonjl Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.8.0.ebuild,v 1.2 2005/09/14 14:57:43 foser Exp $ inherit eutils gnome2 @@ -12,6 +12,12 @@ SLOT="0" KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~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 14-9-2005 + RDEPEND=">=dev-libs/glib-2.8 >=x11-libs/gtk+-2.8.3 >=dev-libs/libxml2-2.6.12 @@ -21,7 +27,6 @@ RDEPEND=">=dev-libs/glib-2.8 >=gnome-base/libgnomeui-2.6 >=gnome-base/gnome-desktop-2.9.91 >=x11-libs/startup-notification-0.5 - >=gnome-base/libgnomeprint-2.4 >=gnome-base/libgnomeprintui-2.4 >=gnome-base/libbonobo-2 >=gnome-base/orbit-2