From: Alexandre Rostovtsev Date: Wed, 7 Dec 2011 07:36:52 +0000 (+0000) Subject: Do not pull in libgweather-3 (bug #393253, thanks to megabaks for reporting). X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=cd6eb7e142dea8c77db2948869f1f5396f6533b7;p=gentoo.git Do not pull in libgweather-3 (bug #393253, thanks to megabaks for reporting). Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog index 6513cfeaa08d..835536c28ca1 100644 --- a/gnome-base/gnome-applets/ChangeLog +++ b/gnome-base/gnome-applets/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/gnome-applets # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.345 2011/11/24 15:09:45 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.346 2011/12/07 07:32:41 tetromino Exp $ + + 07 Dec 2011; Alexandre Rostovtsev + gnome-applets-2.32.1.1.ebuild: + Do not pull in libgweather-3 (bug #393253, thanks to megabaks for reporting). 24 Nov 2011; Justin Lecher gnome-applets-2.32.1.1.ebuild, +files/gnome-applets-2.32.1.1-underlinking.patch: diff --git a/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild index 6a58bdff623a..3b5622cd6160 100644 --- a/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild +++ b/gnome-base/gnome-applets/gnome-applets-2.32.1.1.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/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild,v 1.15 2011/11/24 15:09:45 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild,v 1.16 2011/12/07 07:32:41 tetromino Exp $ EAPI="3" GCONF_DEBUG="no" @@ -31,6 +31,7 @@ RDEPEND=">=x11-libs/gtk+-2.20:2 >=dev-libs/libxml2-2.5.0:2 >=x11-themes/gnome-icon-theme-2.15.91 >=dev-libs/libgweather-2.22.1:2 + + gnome-panel-2.32.1-r1.ebuild, gnome-panel-2.32.1-r2.ebuild, + gnome-panel-2.32.1-r3.ebuild: + Do not pull in libgweather-3 (bug #393253, thanks to megabaks for reporting). 16 Nov 2011; Alexandre Rostovtsev gnome-panel-2.32.1-r1.ebuild, gnome-panel-2.32.1-r2.ebuild, diff --git a/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild index 69bb1c4f6dfd..8dc0db23eaf0 100644 --- a/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild +++ b/gnome-base/gnome-panel/gnome-panel-2.32.1-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/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild,v 1.12 2011/11/16 00:38:55 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild,v 1.13 2011/12/07 07:32:03 tetromino Exp $ EAPI="3" GCONF_DEBUG="no" @@ -22,6 +22,7 @@ RDEPEND=">=gnome-base/gnome-desktop-2.26:2 >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.22:2[introspection?] >=dev-libs/libgweather-2.27.90:2 + =gnome-base/gconf-2.6.1:2[introspection?] >=media-libs/libcanberra-0.23[gtk] diff --git a/gnome-base/gnome-panel/gnome-panel-2.32.1-r2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.32.1-r2.ebuild index e2cffae5afc4..ed0c665398d3 100644 --- a/gnome-base/gnome-panel/gnome-panel-2.32.1-r2.ebuild +++ b/gnome-base/gnome-panel/gnome-panel-2.32.1-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/gnome-base/gnome-panel/gnome-panel-2.32.1-r2.ebuild,v 1.9 2011/11/16 00:38:55 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r2.ebuild,v 1.10 2011/12/07 07:32:03 tetromino Exp $ EAPI="3" GCONF_DEBUG="no" @@ -23,6 +23,7 @@ RDEPEND=">=gnome-base/gnome-desktop-2.26:2 >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.22:2[introspection?] >=dev-libs/libgweather-2.27.90:2 + =gnome-base/gconf-2.6.1:2[introspection?] >=media-libs/libcanberra-0.23[gtk] diff --git a/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild index 7b7e4f7d5994..b044461a16ec 100644 --- a/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild +++ b/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.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/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild,v 1.8 2011/11/16 00:38:55 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild,v 1.9 2011/12/07 07:32:03 tetromino Exp $ EAPI="3" GCONF_DEBUG="no" @@ -24,6 +24,7 @@ RDEPEND=">=gnome-base/gnome-desktop-2.26:2 >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.22:2[introspection?] >=dev-libs/libgweather-2.27.90:2 + =gnome-base/gconf-2.6.1:2[introspection?] >=media-libs/libcanberra-0.23[gtk] diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog index 92e9c3324807..5d50210c4927 100644 --- a/gnome-base/gnome/ChangeLog +++ b/gnome-base/gnome/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/gnome # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.429 2011/11/21 23:36:43 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.430 2011/12/07 07:36:52 tetromino Exp $ + + 07 Dec 2011; Alexandre Rostovtsev + gnome-2.32.1-r1.ebuild: + Do not pull in libgweather-3 (bug #393253, thanks to megabaks for reporting). 21 Nov 2011; Pacho Ramos -gnome-2.32.1.ebuild: Drop old. diff --git a/gnome-base/gnome/gnome-2.32.1-r1.ebuild b/gnome-base/gnome/gnome-2.32.1-r1.ebuild index 215425e2fc2d..56a086a6a95b 100644 --- a/gnome-base/gnome/gnome-2.32.1-r1.ebuild +++ b/gnome-base/gnome/gnome-2.32.1-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/gnome-base/gnome/gnome-2.32.1-r1.ebuild,v 1.6 2011/10/30 18:10:55 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.32.1-r1.ebuild,v 1.7 2011/12/07 07:36:52 tetromino Exp $ EAPI="4" @@ -88,6 +88,7 @@ RDEPEND=" >=gnome-base/gnome-desktop-2.32.1:2 >=gnome-base/gnome-session-2.32.1 >=dev-libs/libgweather-2.30.3:2 + =gnome-base/gnome-applets-2.32.0 >=gnome-base/gnome-panel-2.32.1 >=gnome-base/gnome-menus-2.30.5