Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-editors/conglomerate/ChangeLog8
-rw-r--r--app-editors/conglomerate/conglomerate-0.9.0.ebuild18
-rw-r--r--app-editors/conglomerate/conglomerate-0.9.1.ebuild20
-rw-r--r--app-editors/gedit/ChangeLog6
-rw-r--r--app-editors/gedit/gedit-2.30.3.ebuild21
-rw-r--r--app-editors/gedit/gedit-2.30.4.ebuild6
-rw-r--r--app-editors/gphpedit/ChangeLog6
-rw-r--r--app-editors/gphpedit/gphpedit-0.9.91-r1.ebuild18
-rw-r--r--app-editors/gphpedit/gphpedit-0.9.91.ebuild20
9 files changed, 72 insertions, 51 deletions
diff --git a/app-editors/conglomerate/ChangeLog b/app-editors/conglomerate/ChangeLog
index db0c059b0f50..1e13f2f5f54a 100644
--- a/app-editors/conglomerate/ChangeLog
+++ b/app-editors/conglomerate/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/conglomerate
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/ChangeLog,v 1.19 2010/05/31 21:13:48 eva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/ChangeLog,v 1.20 2011/03/07 00:03:17 nirbheek Exp $
+
+ 06 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+ conglomerate-0.9.0.ebuild, conglomerate-0.9.1.ebuild:
+ Fix slot-deps on gtk+ and other libs
31 May 2010; Gilles Dartiguelongue <eva@gentoo.org>
-conglomerate-0.7.11.ebuild, -conglomerate-0.7.12.ebuild:
diff --git a/app-editors/conglomerate/conglomerate-0.9.0.ebuild b/app-editors/conglomerate/conglomerate-0.9.0.ebuild
index ba2199040180..9e9a2d9df779 100644
--- a/app-editors/conglomerate/conglomerate-0.9.0.ebuild
+++ b/app-editors/conglomerate/conglomerate-0.9.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 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/conglomerate/conglomerate-0.9.0.ebuild,v 1.6 2007/10/11 19:01:43 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/conglomerate-0.9.0.ebuild,v 1.7 2011/03/07 00:03:17 nirbheek Exp $
+
+EAPI="2"
inherit gnome2
@@ -13,16 +15,16 @@ SLOT="0"
KEYWORDS="~amd64 ppc x86"
IUSE="doc spell"
-RDEPEND=">=x11-libs/gtk+-2.4
- dev-libs/libxml2
+RDEPEND=">=x11-libs/gtk+-2.4:2
+ dev-libs/libxml2:2
dev-libs/libxslt
- >=gnome-base/libgnomeprint-1.116
- >=gnome-base/libgnomeprintui-1.116
+ >=gnome-base/libgnomeprint-1.116:2.2
+ >=gnome-base/libgnomeprintui-1.116:2.2
>=gnome-base/libbonobo-2
>=gnome-base/libbonoboui-2
>=gnome-base/libgnomeui-2
- >=gnome-base/libglade-2
- =x11-libs/gtksourceview-1*
+ >=gnome-base/libglade-2:2.0
+ x11-libs/gtksourceview:1.0
spell? ( >=app-text/enchant-0.1 )
"
diff --git a/app-editors/conglomerate/conglomerate-0.9.1.ebuild b/app-editors/conglomerate/conglomerate-0.9.1.ebuild
index 41af49e628da..eb7bf3a74934 100644
--- a/app-editors/conglomerate/conglomerate-0.9.1.ebuild
+++ b/app-editors/conglomerate/conglomerate-0.9.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 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/conglomerate/conglomerate-0.9.1.ebuild,v 1.2 2007/10/11 19:01:43 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/conglomerate-0.9.1.ebuild,v 1.3 2011/03/07 00:03:17 nirbheek Exp $
+
+EAPI="2"
inherit gnome2
@@ -13,17 +15,17 @@ SLOT="0"
KEYWORDS="~x86 ~ppc ~amd64"
IUSE="doc spell"
-RDEPEND=">=x11-libs/gtk+-2.4
- dev-libs/libxml2
+RDEPEND=">=x11-libs/gtk+-2.4:2
+ dev-libs/libxml2:2
dev-libs/libxslt
- >=gnome-base/libgnomeprint-1.116
- >=gnome-base/libgnomeprintui-1.116
+ >=gnome-base/libgnomeprint-1.116:2.2
+ >=gnome-base/libgnomeprintui-1.116:2.2
>=gnome-base/libbonobo-2
>=gnome-base/libbonoboui-2
>=gnome-base/libgnomeui-2
- >=gnome-base/libglade-2
- >=gnome-base/gconf-2
- =x11-libs/gtksourceview-1*
+ >=gnome-base/libglade-2:2.0
+ >=gnome-base/gconf-2:2
+ x11-libs/gtksourceview:1.0
spell? ( >=app-text/enchant-0.1 )
"
diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 74042be9a9cb..e3db91848517 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/gedit
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.324 2011/01/30 17:30:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.325 2011/03/07 00:07:04 nirbheek Exp $
+
+ 07 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gedit-2.30.3.ebuild,
+ gedit-2.30.4.ebuild:
+ Fix slot-deps on gtk+ and other libs
30 Jan 2011; Raúl Porcel <armin76@gentoo.org> gedit-2.30.4.ebuild:
alpha/arm/ia64/sh/sparc stable wrt #348987
diff --git a/app-editors/gedit/gedit-2.30.3.ebuild b/app-editors/gedit/gedit-2.30.3.ebuild
index 136632213566..4be30f78bd3f 100644
--- a/app-editors/gedit/gedit-2.30.3.ebuild
+++ b/app-editors/gedit/gedit-2.30.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 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/gedit/gedit-2.30.3.ebuild,v 1.10 2010/10/17 15:27:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.30.3.ebuild,v 1.11 2011/03/07 00:07:04 nirbheek Exp $
+EAPI="1"
GCONF_DEBUG="no"
PYTHON_DEPEND="python? 2:2.5"
@@ -15,20 +16,20 @@ SLOT="0"
KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="doc python spell"
-RDEPEND=">=gnome-base/gconf-2
+RDEPEND=">=gnome-base/gconf-2:2
>=x11-libs/libSM-1.0
- >=dev-libs/libxml2-2.5.0
- >=dev-libs/glib-2.23.1
- >=x11-libs/gtk+-2.19.0
- >=x11-libs/gtksourceview-2.9.7
+ >=dev-libs/libxml2-2.5.0:2
+ >=dev-libs/glib-2.23.1:2
+ >=x11-libs/gtk+-2.19.0:2
+ >=x11-libs/gtksourceview-2.9.7:2.0
spell? (
>=app-text/enchant-1.2
>=app-text/iso-codes-0.35
)
python? (
- >=dev-python/pygobject-2.15.4
- >=dev-python/pygtk-2.12
- >=dev-python/pygtksourceview-2.9.2
+ >=dev-python/pygobject-2.15.4:2
+ >=dev-python/pygtk-2.12:2
+ >=dev-python/pygtksourceview-2.9.2:2
)"
DEPEND="${RDEPEND}
diff --git a/app-editors/gedit/gedit-2.30.4.ebuild b/app-editors/gedit/gedit-2.30.4.ebuild
index 092c74e1e6e0..587c0c825760 100644
--- a/app-editors/gedit/gedit-2.30.4.ebuild
+++ b/app-editors/gedit/gedit-2.30.4.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/app-editors/gedit/gedit-2.30.4.ebuild,v 1.7 2011/01/30 17:30:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.30.4.ebuild,v 1.8 2011/03/07 00:07:04 nirbheek Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -16,9 +16,9 @@ SLOT="0"
KEYWORDS="alpha amd64 arm ia64 ~mips ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="doc python spell"
-RDEPEND=">=gnome-base/gconf-2
+RDEPEND=">=gnome-base/gconf-2:2
>=x11-libs/libSM-1.0
- >=dev-libs/libxml2-2.5.0
+ >=dev-libs/libxml2-2.5.0:2
>=dev-libs/glib-2.23.1:2
>=x11-libs/gtk+-2.19.0:2
>=x11-libs/gtksourceview-2.9.7:2.0
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
}