Fix slot-deps on gtk+ and other libs, remove old

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 11 insertions, 110 deletions

diff --git a/www-client/galeon/ChangeLog b/www-client/galeon/ChangeLog
index 23f0accf2dab..37b47ff5c943 100644
--- a/www-client/galeon/ChangeLog
+++ b/www-client/galeon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/galeon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/ChangeLog,v 1.61 2011/01/03 21:59:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/ChangeLog,v 1.62 2011/03/20 22:25:06 nirbheek Exp $
+
+  20 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -galeon-2.0.7-r1.ebuild, galeon-2.0.7-r2.ebuild,
+  -files/galeon-2.0.7-build-with-xulrunner-1.9.1.patch:
+  Fix slot-deps on gtk+ and other libs, remove old
 
   03 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org> galeon-2.0.7-r2.ebuild:
   Pin gtk+ and gnome-desktop to slot 2.
diff --git a/www-client/galeon/files/galeon-2.0.7-build-with-xulrunner-1.9.1.patch b/www-client/galeon/files/galeon-2.0.7-build-with-xulrunner-1.9.1.patch
deleted file mode 100644
index 4ef4da4b9aca..000000000000
--- a/www-client/galeon/files/galeon-2.0.7-build-with-xulrunner-1.9.1.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Fix building with xulrunner-1.9.1, bug 275252
-
-Patch taken from http://cvs.fedoraproject.org/viewvc/devel/galeon/galeon-2.0.7-moz191.patch?view=log
-
-Addendum from bug 278917 -- patch adapted from bug 263990 by Michael Mauch
-
---
---- a/mozilla/MozRegisterComponents.cpp
-+++ b/mozilla/MozRegisterComponents.cpp
-@@ -44,6 +44,7 @@
- 
- #ifdef HAVE_NSIXULAPPINFO_H
- #include <nsXULAppAPI.h>
-+#include <nsXPCOMCIDInternal.h>
- #include "EphyXULAppInfo.h"
- #endif
- 
---- a/mozilla/EventContext.cpp
-+++ b/mozilla/EventContext.cpp
-@@ -35,6 +35,7 @@
- #include <nsIDOMXULDocument.h>
- #include <nsIURI.h>
- #include <nsIDOMNSEvent.h>
-+#include <nsIDOMNSElement.h>
- #include <nsIDOMNSHTMLElement.h>
- #include <nsIDOMCharacterData.h>
- #include <nsIDOMHTMLButtonElement.h>
-@@ -518,20 +519,21 @@
- nsresult EventContext::GetTargetCoords (nsIDOMEventTarget *aTarget, PRInt32 *aX, PRInt32 *aY)
- {
- 	/* Calculate the node coordinates relative to the widget origin */
--	nsCOMPtr<nsIDOMNSHTMLElement> elem = do_QueryInterface(aTarget);
-+	nsCOMPtr<nsIDOMNSHTMLElement> nsHTMLElem (do_QueryInterface(aTarget));
- 
- 	PRInt32 x = 0, y = 0;
--	while (elem)
-+	while (nsHTMLElem)
- 	{
- 		PRInt32 val;
--		elem->GetOffsetTop(&val);	y += val;
--		elem->GetScrollTop(&val);	y -= val;
--		elem->GetOffsetLeft(&val);	x += val;
--		elem->GetScrollLeft(&val);	x -= val;
-+		nsCOMPtr<nsIDOMNSElement> nsElem (do_QueryInterface(nsHTMLElem));   
-+		nsHTMLElem->GetOffsetTop(&val);         y += val;
-+		nsElem->GetScrollTop(&val);             y -= val;
-+		nsHTMLElem->GetOffsetLeft(&val);        x += val;
-+		nsElem->GetScrollLeft(&val);    x -= val;
- 
- 		nsCOMPtr<nsIDOMElement> parent;
--		elem->GetOffsetParent(getter_AddRefs(parent));
--		elem = do_QueryInterface(parent);
-+		nsHTMLElem->GetOffsetParent (getter_AddRefs (parent));
-+		nsHTMLElem = do_QueryInterface(parent);
- 	}
- 	*aX = x;
- 	*aY = y;
diff --git a/www-client/galeon/galeon-2.0.7-r1.ebuild b/www-client/galeon/galeon-2.0.7-r1.ebuild
deleted file mode 100644
index 626793370b23..000000000000
--- a/www-client/galeon/galeon-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-2.0.7-r1.ebuild,v 1.6 2010/01/10 17:22:05 hanno Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="A GNOME Web browser based on gecko (mozilla's rendering engine)"
-HOMEPAGE="http://galeon.sourceforge.net"
-SRC_URI="mirror://sourceforge/galeon/${P}.tar.bz2
-	mirror://gentoo/${P}-patches.tar.lzma"
-
-LICENSE="GPL-2"
-IUSE=""
-KEYWORDS="amd64 ~ia64 ppc -sparc x86"
-SLOT="0"
-RDEPEND=">=net-libs/xulrunner-1.9.1
-	>=x11-libs/gtk+-2.4.0
-	>=dev-libs/libxml2-2.6.6
-	>=gnome-base/libgnomeui-2.5.2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gnome-desktop-2.10.0
-	>=gnome-base/libglade-2.3.1"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.30
-	>=sys-devel/gettext-0.11"
-
-DOCS="AUTHORS ChangeLog FAQ README README.ExtraPrefs THANKS TODO NEWS"
-
-src_unpack() {
-	gnome2_src_unpack
-	cd "${S}"
-	for i in "${WORKDIR}/${P}-patches/*"; do
-		epatch $i || die "patch $i failed"
-	done
-
-	# bug 275252, patch => no building with <1.9.1
-	epatch "${FILESDIR}/${P}-build-with-xulrunner-1.9.1.patch"
-}
-
-src_compile() {
-	myconf="--with-mozilla=libxul-embedding-unstable"
-
-	econf ${myconf} || die "configure failed"
-	emake || die "compile failed"
-}
diff --git a/www-client/galeon/galeon-2.0.7-r2.ebuild b/www-client/galeon/galeon-2.0.7-r2.ebuild
index 2f605786269f..983eac125fa4 100644
--- a/www-client/galeon/galeon-2.0.7-r2.ebuild
+++ b/www-client/galeon/galeon-2.0.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-2.0.7-r2.ebuild,v 1.6 2011/01/03 21:59:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-2.0.7-r2.ebuild,v 1.7 2011/03/20 22:25:06 nirbheek Exp $
 
 EAPI="2"
 inherit autotools gnome2 eutils
@@ -14,13 +14,13 @@ LICENSE="GPL-2"
 IUSE=""
 KEYWORDS="amd64 ~ia64 ppc -sparc x86"
 SLOT="0"
-RDEPEND=">=net-libs/xulrunner-1.9.2
+RDEPEND=">=net-libs/xulrunner-1.9.2:1.9
 	>=x11-libs/gtk+-2.12.0:2
-	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libxml2-2.6.6:2
 	>=gnome-base/libgnomeui-2.5.2
-	>=gnome-base/gnome-vfs-2
+	>=gnome-base/gnome-vfs-2:2
 	>=gnome-base/gnome-desktop-2.10.0:2
-	>=gnome-base/libglade-2.3.1"
+	>=gnome-base/libglade-2.3.1:2.0"
 DEPEND="${RDEPEND}
 	app-text/rarian
 	dev-util/pkgconfig