diff options
| author |   Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-03-16 07:45:18 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-03-16 07:45:18 +0000 |
| commit | 69c81d252b03dac86ab56bc2871ed5f405454dfa (patch) | |
| tree | e0b3be8e3e6bd4fdb90de89b00492579eabde06b /app-office/abiword | |
| parent | Bug #304447: ps is at /bin/ps in Gentoo. Bug #340301: optional memcache check... (diff) | |
| download | gentoo-2-69c81d252b03dac86ab56bc2871ed5f405454dfa.tar.gz gentoo-2-69c81d252b03dac86ab56bc2871ed5f405454dfa.tar.bz2 gentoo-2-69c81d252b03dac86ab56bc2871ed5f405454dfa.zip | |
Fix slot-deps on gtk+ and other libs
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'app-office/abiword')
| -rw-r--r-- | app-office/abiword/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/abiword/abiword-2.4.6.ebuild | 16 | ||||
| -rw-r--r-- | app-office/abiword/abiword-2.8.6-r1.ebuild | 8 | ||||
| -rw-r--r-- | app-office/abiword/abiword-2.8.6.ebuild | 12 |
4 files changed, 24 insertions, 18 deletions
diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog index 9aeee191ba9d..eeb02e7324d4 100644 --- a/app-office/abiword/ChangeLog +++ b/app-office/abiword/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/abiword # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.237 2011/03/12 19:34:14 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.238 2011/03/16 07:45:18 nirbheek Exp $ + + 16 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> abiword-2.4.6.ebuild, + abiword-2.8.6.ebuild, abiword-2.8.6-r1.ebuild: + Fix slot-deps on gtk+ and other libs 12 Mar 2011; Raúl Porcel <armin76@gentoo.org> abiword-2.8.6-r1.ebuild: alpha/ia64/sparc stable wrt #353436 diff --git a/app-office/abiword/abiword-2.4.6.ebuild b/app-office/abiword/abiword-2.4.6.ebuild index bc6bbc67c44c..ee0bdd4a1b0b 100644 --- a/app-office/abiword/abiword-2.4.6.ebuild +++ b/app-office/abiword/abiword-2.4.6.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-office/abiword/abiword-2.4.6.ebuild,v 1.19 2011/02/13 14:39:39 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.6.ebuild,v 1.20 2011/03/16 07:45:18 nirbheek Exp $ + +EAPI="1" inherit alternatives eutils fdo-mime @@ -15,14 +17,14 @@ IUSE="debug gnome spell xml" RDEPEND="dev-libs/popt sys-libs/zlib - >=dev-libs/glib-2 - >=x11-libs/gtk+-2.4 + >=dev-libs/glib-2:2 + >=x11-libs/gtk+-2.4:2 >=x11-libs/pango-1.2 x11-libs/libXft - >=gnome-base/libglade-2 - >=gnome-base/libgnomeprint-2.2 - >=gnome-base/libgnomeprintui-2.2 - >=media-libs/libpng-1.2 + >=gnome-base/libglade-2:2.0 + >=gnome-base/libgnomeprint-2.2:2.2 + >=gnome-base/libgnomeprintui-2.2:2.2 + >=media-libs/libpng-1.2:1.2 >=media-libs/fontconfig-2.1 >=app-text/wv-1 >=dev-libs/fribidi-0.10.4 diff --git a/app-office/abiword/abiword-2.8.6-r1.ebuild b/app-office/abiword/abiword-2.8.6-r1.ebuild index 1ebe0adf6c2b..ee23d31e99fc 100644 --- a/app-office/abiword/abiword-2.8.6-r1.ebuild +++ b/app-office/abiword/abiword-2.8.6-r1.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-office/abiword/abiword-2.8.6-r1.ebuild,v 1.4 2011/03/12 19:34:14 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.8.6-r1.ebuild,v 1.5 2011/03/16 07:45:18 nirbheek Exp $ EAPI="3" @@ -23,13 +23,13 @@ IUSE="collab cups gnome grammar latex math ots openxml plugins readline spell wo RDEPEND=" >=app-text/wv-1.2 >=dev-libs/fribidi-0.10.4 - >=dev-libs/glib-2.16 - >=gnome-base/librsvg-2.16 + >=dev-libs/glib-2.16:2 + >=gnome-base/librsvg-2.16:2 >=gnome-extra/libgsf-1.14.15 >=media-libs/libpng-1.2 virtual/jpeg:0 >=x11-libs/cairo-1.8[X] - >=x11-libs/gtk+-2.14[cups?] + >=x11-libs/gtk+-2.14:2[cups?] gnome? ( >=gnome-extra/gucharmap-2 >=x11-libs/goffice-0.8:0.8 ) diff --git a/app-office/abiword/abiword-2.8.6.ebuild b/app-office/abiword/abiword-2.8.6.ebuild index 21ab8202e8c1..37b03ab95656 100644 --- a/app-office/abiword/abiword-2.8.6.ebuild +++ b/app-office/abiword/abiword-2.8.6.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-office/abiword/abiword-2.8.6.ebuild,v 1.14 2011/02/05 20:35:04 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.8.6.ebuild,v 1.15 2011/03/16 07:45:18 nirbheek Exp $ EAPI="3" @@ -23,13 +23,13 @@ IUSE="collab cups gnome grammar latex libgda math ots openxml plugins readline s RDEPEND=" >=app-text/wv-1.2 >=dev-libs/fribidi-0.10.4 - >=dev-libs/glib-2.16 - >=gnome-base/librsvg-2.16 + >=dev-libs/glib-2.16:2 + >=gnome-base/librsvg-2.16:2 >=gnome-extra/libgsf-1.14.15 >=media-libs/libpng-1.2 virtual/jpeg:0 >=x11-libs/cairo-1.8[X] - >=x11-libs/gtk+-2.14[cups?] + >=x11-libs/gtk+-2.14:2[cups?] gnome? ( >=gnome-extra/gucharmap-2 >=x11-libs/goffice-0.8:0.8 ) @@ -43,8 +43,8 @@ RDEPEND=" grammar? ( >=dev-libs/link-grammar-4.2.1 ) latex? ( dev-libs/libxslt ) libgda? ( - =gnome-extra/libgda-1* - =gnome-extra/libgnomedb-1* ) + gnome-extra/libgda:1 + gnome-extra/libgnomedb:0 ) math? ( >=x11-libs/gtkmathview-0.7.5 ) openxml? ( dev-libs/boost ) ots? ( >=app-text/ots-0.5 ) |