diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2013-05-14 20:51:53 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2013-05-14 20:51:53 +0000 |
| commit | 023409f7c53f5a1820b5d14b7978f5d8e5d1f12b (patch) | |
| tree | b0c20d735a37ad79d931ae8d5934319a362b3d9c /gnome-extra/gcalctool | |
| parent | Version bump (diff) | |
| download | gentoo-2-023409f7c53f5a1820b5d14b7978f5d8e5d1f12b.tar.gz gentoo-2-023409f7c53f5a1820b5d14b7978f5d8e5d1f12b.tar.bz2 gentoo-2-023409f7c53f5a1820b5d14b7978f5d8e5d1f12b.zip | |
Fix blockers
(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'gnome-extra/gcalctool')
| -rw-r--r-- | gnome-extra/gcalctool/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-extra/gcalctool/gcalctool-5.32.2.ebuild | 11 | ||||
| -rw-r--r-- | gnome-extra/gcalctool/gcalctool-6.6.2.ebuild | 7 |
3 files changed, 16 insertions, 8 deletions
diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog index 4226a4c8aa49..69468a5b70b3 100644 --- a/gnome-extra/gcalctool/ChangeLog +++ b/gnome-extra/gcalctool/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/gcalctool # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.226 2013/04/06 09:32:46 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.227 2013/05/14 20:51:53 pacho Exp $ + + 14 May 2013; Pacho Ramos <pacho@gentoo.org> gcalctool-5.32.2.ebuild, + gcalctool-6.6.2.ebuild: + Fix blockers 06 Apr 2013; Pacho Ramos <pacho@gentoo.org> gcalctool-6.6.2.ebuild: gnome-calculator deprecates gcalctool (#464544 by Maciej Piechotka) diff --git a/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild b/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild index c15fe9f89dd9..9a4624921b42 100644 --- a/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild +++ b/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild,v 1.9 2012/05/05 06:25:17 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild,v 1.10 2013/05/14 20:51:53 pacho Exp $ EAPI="4" GCONF_DEBUG="no" @@ -19,13 +19,16 @@ IUSE="" RDEPEND=">=x11-libs/gtk+-2.18:2 >=dev-libs/glib-2.25.10:2 dev-libs/libxml2:2 - !<gnome-extra/gnome-utils-2.3" + !<gnome-extra/gnome-utils-2.3 + !gnome-extra/gnome-calculator +" DEPEND="${RDEPEND} sys-devel/gettext app-text/scrollkeeper >=dev-util/intltool-0.35 virtual/pkgconfig - >=app-text/gnome-doc-utils-0.3.2" + >=app-text/gnome-doc-utils-0.3.2 +" pkg_setup() { G2CONF="${G2CONF} diff --git a/gnome-extra/gcalctool/gcalctool-6.6.2.ebuild b/gnome-extra/gcalctool/gcalctool-6.6.2.ebuild index 200b08c02c1a..d63b12490e6f 100644 --- a/gnome-extra/gcalctool/gcalctool-6.6.2.ebuild +++ b/gnome-extra/gcalctool/gcalctool-6.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-6.6.2.ebuild,v 1.2 2013/04/06 09:32:46 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-6.6.2.ebuild,v 1.3 2013/05/14 20:51:53 pacho Exp $ EAPI="5" GCONF_DEBUG="no" @@ -21,12 +21,13 @@ COMMON_DEPEND=" dev-libs/libxml2:2 " RDEPEND="${COMMON_DEPEND} - !<gnome-extra/gnome-utils-2.3" + !<gnome-extra/gnome-utils-2.3 + !gnome-extra/gnome-calculator +" DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig - !gnome-extra/gnome-calculator " src_configure() { |