Fix slot-deps on gtk+ and other libs

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

3 files changed, 26 insertions, 18 deletions

diff --git a/app-editors/gphpedit/ChangeLog b/app-editors/gphpedit/ChangeLog
index e2cfe4f5bdf7..ae1b30b7f2fd 100644
--- a/app-editors/gphpedit/ChangeLog
+++ b/app-editors/gphpedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/gphpedit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/ChangeLog,v 1.21 2011/02/24 18:35:00 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/ChangeLog,v 1.22 2011/03/07 00:11:05 nirbheek Exp $
+
+  07 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  gphpedit-0.9.91.ebuild, gphpedit-0.9.91-r1.ebuild:
+  Fix slot-deps on gtk+ and other libs
 
   24 Feb 2011; Thomas Kahle <tomka@gentoo.org> gphpedit-0.9.91-r1.ebuild:
   x86 stable per bug 353436
diff --git a/app-editors/gphpedit/gphpedit-0.9.91-r1.ebuild b/app-editors/gphpedit/gphpedit-0.9.91-r1.ebuild
index 4e3fff1ecd27..727bc1a07261 100644
--- a/app-editors/gphpedit/gphpedit-0.9.91-r1.ebuild
+++ b/app-editors/gphpedit/gphpedit-0.9.91-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/gphpedit-0.9.91-r1.ebuild,v 1.3 2011/02/24 18:35:00 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/gphpedit-0.9.91-r1.ebuild,v 1.4 2011/03/07 00:11:05 nirbheek Exp $
+
+EAPI="2"
 
 inherit gnome2 eutils
 
@@ -13,11 +15,11 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
+RDEPEND=">=x11-libs/gtk+-2.0:2
+	>=dev-libs/glib-2.0:2
 	>=gnome-base/libgnomeui-2.0
-	>=gnome-base/gnome-vfs-2.0
-	=gnome-extra/gtkhtml-2*"
+	>=gnome-base/gnome-vfs-2.0:2
+	gnome-extra/gtkhtml:2"
 
 DEPEND="${RDEPEND}
 		sys-devel/gettext
@@ -28,10 +30,10 @@ DOCS="AUTHORS ChangeLog README TODO"
 # Parallel build unhappy (bug #145351)
 MAKEOPTS="${MAKEOPTS} -j1"
 
-src_unpack() {
-	gnome2_src_unpack
-
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.9.91-empty-apply-prefs.patch
 	# Fix crash when finding and replacing, see bug #248497
 	epatch "${FILESDIR}"/${PN}-0.9.91-find_replace.patch
+
+	gnome2_src_prepare
 }
diff --git a/app-editors/gphpedit/gphpedit-0.9.91.ebuild b/app-editors/gphpedit/gphpedit-0.9.91.ebuild
index 25b07962df43..5775e70c1e5d 100644
--- a/app-editors/gphpedit/gphpedit-0.9.91.ebuild
+++ b/app-editors/gphpedit/gphpedit-0.9.91.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/gphpedit-0.9.91.ebuild,v 1.5 2008/03/27 21:29:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/gphpedit-0.9.91.ebuild,v 1.6 2011/03/07 00:11:05 nirbheek Exp $
+
+EAPI="2"
 
 inherit gnome2 eutils
 
@@ -13,11 +15,11 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
+RDEPEND=">=x11-libs/gtk+-2.0:2
+	>=dev-libs/glib-2.0:2
 	>=gnome-base/libgnomeui-2.0
-	>=gnome-base/gnome-vfs-2.0
-	=gnome-extra/gtkhtml-2*"
+	>=gnome-base/gnome-vfs-2.0:2
+	gnome-extra/gtkhtml:2"
 
 DEPEND="${RDEPEND}
 		sys-devel/gettext
@@ -28,8 +30,8 @@ DOCS="AUTHORS ChangeLog README TODO"
 # Parallel build unhappy (bug #145351)
 MAKEOPTS="${MAKEOPTS} -j1"
 
-src_unpack() {
-	gnome2_src_unpack
-
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.9.91-empty-apply-prefs.patch
+
+	gnome2_src_prepare
 }