* [gentoo-commits] proj/gnome:master commit in: gnome-extra/zenity/files/, gnome-extra/mousetweaks/, gnome-extra/gcalctool/, ...
@ 2011-08-19 12:53 Nirbheek Chauhan
0 siblings, 0 replies; only message in thread
From: Nirbheek Chauhan @ 2011-08-19 12:53 UTC (permalink / raw
To: gentoo-commits
commit: 8b41735190c2ced8c8906ee856674244ef59df46
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 12:29:12 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 12:29:12 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8b417351
More and more packages: moved to the tree
---
| 84 ---------
| 23 ---
| 35 ----
| 45 -----
| 34 ----
.../files/gnome-color-manager-3.0.0-cc-panel.patch | 54 ------
.../gnome-color-manager-3.0.0-packagename.patch | 13 --
.../gnome-color-manager-3.0.0-r2.ebuild | 87 ---------
| 16 --
...games-2.91.90-fix-conditional-ac-prog-cxx.patch | 30 ---
.../files/gnome-games-fix-staging-games.patch | 44 -----
| 193 --------------------
.../gnome-power-manager-3.0.2-idle-status.patch | 31 ---
.../gnome-power-manager-3.0.2-screensaver.patch | 146 ---------------
.../gnome-power-manager-3.0.2-r1.ebuild | 101 ----------
.../files/gentoologo-floaters.desktop | 12 --
.../files/gnome-screensaver-3.0.0-clock-skew.patch | 100 ----------
...ome-screensaver-3.0.0-user-switcher-crash.patch | 28 ---
...me-screensaver-3.0.0-watchdog-add_seconds.patch | 44 -----
.../gnome-screensaver/files/xss-conversion-2.txt | 22 ---
.../gnome-screensaver-3.0.0-r1.ebuild | 83 ---------
...or-3.0.1-32-bit-network-totals-overflow-1.patch | 68 -------
...or-3.0.1-32-bit-network-totals-overflow-2.patch | 150 ---------------
...or-3.0.1-32-bit-network-totals-overflow-3.patch | 102 ----------
.../gnome-system-monitor-3.0.1-linux-nice.patch | 21 --
.../gnome-system-monitor-3.0.1-r1.ebuild | 49 -----
| 78 --------
| 47 -----
| 44 -----
| 29 ---
.../yelp/files/yelp-3.0.3-man-compatibility.patch | 117 ------------
| 55 ------
.../files/zenity-3.0.0-libnotify-ifdef.patch | 30 ---
| 51 -----
34 files changed, 0 insertions(+), 2066 deletions(-)
diff --git a/gnome-extra/at-spi/at-spi-1.32.0-r1.ebuild b/gnome-extra/at-spi/at-spi-1.32.0-r1.ebuild
deleted file mode 100644
index 87c7a03..0000000
--- a/gnome-extra/at-spi/at-spi-1.32.0-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.32.0.ebuild,v 1.7 2011/03/22 20:04:56 ranger Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.4"
-
-inherit gnome2 python
-
-DESCRIPTION="The Gnome Accessibility Toolkit"
-HOMEPAGE="http://projects.gnome.org/accessibility/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/atk-1.29.2
- >=x11-libs/gtk+-2.19.7:2
- >=gnome-base/libbonobo-1.107
- >=gnome-base/orbit-2
- >=dev-libs/dbus-glib-0.76
- >=gnome-base/gconf-2
- dev-libs/popt
-
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXtst"
-
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.9
- >=dev-util/intltool-0.40
- doc? ( >=dev-util/gtk-doc-1 )
-
- x11-libs/libXt
- x11-proto/xextproto
- x11-proto/inputproto
- x11-proto/xproto"
-# eautoreconf needs:
-# gnome-base/gnome-common
-# dev-util/gtk-doc-am
-
-# needs a live properly configured environment. Not really suited to
-# an ebuild restricted environment
-RESTRICT="test"
-
-pkg_setup() {
- # relocate must be explicitely set
- G2CONF="${G2CONF}
- --enable-sm
- --enable-relocate
- --disable-xevie"
- DOCS="AUTHORS ChangeLog NEWS README TODO"
- python_set_active_version 2
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- # disable pyc compiling
- mv py-compile py-compile.orig
- ln -s $(type -P true) py-compile
-}
-
-src_install() {
- gnome2_src_install
-
- find "${ED}"/usr/$(get_libdir)/orbit-2.0 -name "*.la" -delete
- find "${ED}"/usr/$(get_libdir)/gtk-2.0 -name "*.la" -delete
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- python_need_rebuild
- python_mod_optimize pyatspi_corba
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
- python_mod_cleanup pyatspi_corba
-}
diff --git a/gnome-extra/at-spi/at-spi-2.0.0.ebuild b/gnome-extra/at-spi/at-spi-2.0.0.ebuild
deleted file mode 100644
index d6fbbcd..0000000
--- a/gnome-extra/at-spi/at-spi-2.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-DESCRIPTION="The Gnome Accessibility Toolkit"
-HOMEPAGE="http://projects.gnome.org/accessibility/"
-SRC_URI=""
-
-LICENSE="AS-IS"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
- >=app-accessibility/at-spi2-atk-${PV}:2
- >=app-accessibility/at-spi2-core-${PV}:2
- >=dev-python/pyatspi-${PV}
- !<gnome-extra/at-spi-1.32.0-r1
-"
-DEPEND=""
-
diff --git a/gnome-extra/drwright/drwright-3.0.2.ebuild b/gnome-extra/drwright/drwright-3.0.2.ebuild
deleted file mode 100644
index e2df79b..0000000
--- a/gnome-extra/drwright/drwright-3.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="A GNOME 3 tool that forces you to take regular breaks to prevent RSI"
-HOMEPAGE="http://git.gnome.org/browse/drwright"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
- >=x11-libs/gtk+-3.0.0:3
- >=gnome-base/gnome-settings-daemon-2.91.8
- >=gnome-base/gnome-control-center-2.91.6
- >=x11-libs/libnotify-0.7
- media-libs/libcanberra[gtk3]
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXScrnSaver
-"
-DEPEND="${RDEPEND}
- x11-proto/scrnsaverproto
- sys-devel/gettext
- >=dev-util/intltool-0.35.0
- >=dev-util/pkgconfig-0.12.0
-"
-DOCS="AUTHORS ChangeLog NEWS"
diff --git a/gnome-extra/gcalctool/gcalctool-6.0.2.ebuild b/gnome-extra/gcalctool/gcalctool-6.0.2.ebuild
deleted file mode 100644
index 08d8637..0000000
--- a/gnome-extra/gcalctool/gcalctool-6.0.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 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.1 2010/11/28 14:53:45 pacho Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="http://live.gnome.org/Gcalctool http://calctool.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-fi
-
-COMMON_DEPEND=">=x11-libs/gtk+-2.90.7:3
- >=dev-libs/glib-2.25.10:2
- dev-libs/libxml2"
-DEPEND="${COMMON_DEPEND}
- >=app-text/gnome-doc-utils-0.3.2
- app-text/scrollkeeper
- >=dev-util/intltool-0.35
- >=dev-util/pkgconfig-0.9
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext"
-RDEPEND="${COMMON_DEPEND}
- !<gnome-extra/gnome-utils-2.3"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-maintainer-mode
- --disable-schemas-compile
- --with-gtk=3.0"
- DOCS="AUTHORS ChangeLog* NEWS README"
-}
diff --git a/gnome-extra/gconf-editor/gconf-editor-3.0.0.ebuild b/gnome-extra/gconf-editor/gconf-editor-3.0.0.ebuild
deleted file mode 100644
index 9a99af2..0000000
--- a/gnome-extra/gconf-editor/gconf-editor-3.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/gconf-editor-2.32.0.ebuild,v 1.4 2011/02/24 19:29:35 tomka Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="An editor to the GNOME 2 config system"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-3.0.0:3
- >=gnome-base/gconf-2.12:2"
-DEPEND="${RDEPEND}
- app-text/scrollkeeper
- sys-devel/gettext
- app-text/gnome-doc-utils
- >=dev-util/intltool-0.35
- >=dev-util/pkgconfig-0.19
- ~app-text/docbook-xml-dtd-4.1.2"
-# gnome-common for eautoreconf
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
- G2CONF="${G2CONF}
- --disable-maintainer-mode
- --disable-scrollkeeper"
-}
diff --git a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-cc-panel.patch b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-cc-panel.patch
deleted file mode 100644
index 92f9588..0000000
--- a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-cc-panel.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 66e2933c29964e72fa96f95d518763f2b4e95f79 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 13 May 2011 18:32:16 +0000
-Subject: Ensure we cancel the initial panel startup if the panel was created and destroyed without ever getting control of the mainloop
-
-This can happen if you plug in a color sensor, with the color control center
-panel already open.
-In this case, the g-s-d plugin creates a new instance which seemingly gets
-loaded and unloaded and control is returned to to original instance.
-
-A workaround is either to not have the control panel panel open when pushing in
-the device, or to restart the control center after plugging in the hardware.
----
-diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c
-index 34ce173..898004e 100644
---- a/src/cc-color-panel.c
-+++ b/src/cc-color-panel.c
-@@ -61,6 +61,7 @@ struct _CcColorPanelPrivate {
- GSettings *settings;
- guint save_and_apply_id;
- guint apply_all_devices_id;
-+ guint session_startup_id;
- GCancellable *cancellable;
- };
-
-@@ -2270,6 +2271,7 @@ cc_color_panel_startup_idle_cb (CcColorPanel *panel)
- g_debug ("getting installed");
- cc_color_panel_is_color_profiles_extra_installed (panel);
- out:
-+ panel->priv->session_startup_id = 0;
- g_free (colorspace_rgb);
- g_free (colorspace_cmyk);
- return FALSE;
-@@ -2452,6 +2454,8 @@ cc_color_panel_finalize (GObject *object)
- g_source_remove (panel->priv->save_and_apply_id);
- if (panel->priv->apply_all_devices_id != 0)
- g_source_remove (panel->priv->apply_all_devices_id);
-+ if (panel->priv->session_startup_id > 0)
-+ g_source_remove (panel->priv->session_startup_id);
-
- G_OBJECT_CLASS (cc_color_panel_parent_class)->finalize (object);
- }
-@@ -2644,7 +2648,8 @@ cc_color_panel_init (CcColorPanel *panel)
- if(0) cc_color_panel_setup_drag_and_drop (GTK_WIDGET (panel->priv->main_window));
-
- /* do all this after the window has been set up */
-- g_idle_add ((GSourceFunc) cc_color_panel_startup_idle_cb, panel);
-+ panel->priv->session_startup_id =
-+ g_idle_add ((GSourceFunc) cc_color_panel_startup_idle_cb, panel);
- out:
- return;
- }
---
-cgit v0.9
diff --git a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-packagename.patch b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-packagename.patch
deleted file mode 100644
index 53ab593..0000000
--- a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-packagename.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c
-index 34ce173..f4307cc 100644
---- a/src/cc-color-panel.c
-+++ b/src/cc-color-panel.c
-@@ -2150,7 +2150,7 @@ cc_color_panel_is_color_profiles_extra_installed (CcColorPanel *panel)
- GError *error = NULL;
-
- #ifndef HAVE_PACKAGEKIT
-- g_warning ("cannot query %s: this package was not compiled with --enable-packagekit", package_name);
-+ g_warning ("cannot query %s: this package was not compiled with --enable-packagekit", GCM_PREFS_PACKAGE_NAME_COLOR_PROFILES_EXTRA);
- return;
- #endif
-
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0-r2.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0-r2.ebuild
deleted file mode 100644
index 5fd8621..0000000
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.ebuild,v 1.6 2011/03/23 06:10:42 ssuominen Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Color profile manager for the GNOME desktop"
-HOMEPAGE="http://projects.gnome.org/gnome-color-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection packagekit raw scanner"
-
-# FIXME: raise libusb:1 to 1.0.9 when available
-# FIXME: fix detection of docbook2man
-COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
- >=dev-libs/libusb-1:1
- >=gnome-base/gnome-control-center-3
- gnome-base/gnome-settings-daemon
-
- media-libs/lcms:2
- >=media-libs/libcanberra-0.10[gtk3]
- media-libs/libexif
- media-libs/tiff
- net-print/cups
-
- || ( sys-fs/udev[gudev] sys-fs/udev[extras] )
- x11-libs/libX11
- x11-libs/libXrandr
- >=x11-libs/gtk+-2.91:3
- >=x11-libs/libnotify-0.7
- >=x11-libs/vte-0.25.1:2.90
-
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
- scanner? ( media-gfx/sane-backends )
- packagekit? ( app-admin/packagekit-base )
- raw? ( media-gfx/exiv2 )
-"
-RDEPEND="${RDEPEND}
- media-gfx/shared-color-profiles
-"
-# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
-DEPEND="${RDEPEND}
- app-text/docbook-sgml-dtd:4.1
- app-text/docbook-sgml-utils
- app-text/gnome-doc-utils
- dev-libs/libxslt
- >=dev-util/intltool-0.35
-"
-
-# FIXME: run test-suite with files on live file-system
-RESTRICT="test"
-
-pkg_setup() {
- # Always enable tests since they are check_PROGRAMS anyway
- G2CONF="${G2CONF}
- --disable-static
- --disable-schemas-compile
- --disable-scrollkeeper
- --enable-tests
- $(use_enable packagekit)
- $(use_enable introspection)
- $(use_enable raw exiv)
- $(use_enable scanner sane)"
-}
-
-src_prepare() {
- # Fix build
- epatch "${FILESDIR}/${P}-packagename.patch"
-
- # Upstream renamed 95-gcm-colorimeters.rules to 69-gcm-colorimeters.rules
- # for next release (see commit dc276cbe) to fix colorimeter udev ACLs.
- mv -f rules/{95,69}-gcm-colorimeters.rules || die "mv failed"
- sed -e 's:95-gcm-colorimeters.rules:69-gcm-colorimeters.rules:' \
- -i rules/Makefile.* || die "sed rules/Makefile.* failed"
-
- # Upstream patch to fix a bug in control center panel when plugging in a
- # colorimeter; will be in next release
- epatch "${FILESDIR}/${P}-cc-panel.patch"
-
- gnome2_src_prepare
-}
diff --git a/gnome-extra/gnome-games-extra-data/gnome-games-extra-data-3.0.0.ebuild b/gnome-extra/gnome-games-extra-data/gnome-games-extra-data-3.0.0.ebuild
deleted file mode 100644
index 73ea461..0000000
--- a/gnome-extra/gnome-games-extra-data/gnome-games-extra-data-3.0.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games-extra-data/gnome-games-extra-data-2.30.0.ebuild,v 1.8 2010/10/17 15:46:21 armin76 Exp $
-
-inherit gnome2
-
-DESCRIPTION="Optional additional graphics for gnome-games"
-HOMEPAGE="http://live.gnome.org/GnomeGames/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ia64 ppc ppc64 sh sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="!<gnome-extra/gnome-games-3.0.0"
-DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch b/gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch
deleted file mode 100644
index 8f35064..0000000
--- a/gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Don't call AC_PROG_CXX conditionally
-
-Results in the following error during configure:
-
-"""
-configure: error: conditional "am__fastdepCXX" was never defined.
-Usually this means the macro was only invoked conditionally.
-"""
-
-When need_cxx=no because quadrapassel isn't being built.
-
---- configure.in
-+++ configure.in
-@@ -227,6 +227,7 @@
- PKG_PROG_PKG_CONFIG([0.15])
-
- AC_PROG_CC
-+AC_PROG_CXX
- AC_PROG_CPP
- AC_PROG_LN_S
- AC_PROG_SED
-@@ -236,8 +237,6 @@
- fi
-
- if test "$need_cxx" = "yes"; then
-- AC_PROG_CXX
--
- # Check whether a C++ was found (AC_PROG_CXX sets $CXX to "g++" even when it
- # doesn't exist)
- AC_LANG_PUSH([C++])
diff --git a/gnome-extra/gnome-games/files/gnome-games-fix-staging-games.patch b/gnome-extra/gnome-games/files/gnome-games-fix-staging-games.patch
deleted file mode 100644
index eef7f23..0000000
--- a/gnome-extra/gnome-games/files/gnome-games-fix-staging-games.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-The --enable-staging flag was enabling *all* games, regardless of what
-$enable_omitgames contained.
-
----
---- configure.in
-+++ configure.in
-@@ -60,6 +60,18 @@
- gamelist="$allgames"
- fi
-
-+## This is the staging area
-+## These games aren't quite ready for prime-time
-+
-+AC_MSG_CHECKING([whether to enable staging games])
-+AC_ARG_ENABLE([staging],
-+ [AS_HELP_STRING([--enable-staging],[whether to enable beta game support (default: disabled)])],[],[])
-+AC_MSG_RESULT([$enable_staging])
-+
-+if test "$enable_staging" = "yes"; then
-+ allgames="${allgames} ${staginggames}"
-+fi
-+
- ## This has a particularly silly name because autoconf doesn't allow
- ## --disable-foo to have arguments so we have to use an --enable-fubar form.
- AC_ARG_ENABLE(omitgames,
-@@ -90,18 +102,6 @@
- gamelist=${allgames}
- fi
-
--## This is the staging area
--## These games aren't quite ready for prime-time
--
--AC_MSG_CHECKING([whether to enable staging games])
--AC_ARG_ENABLE([staging],
-- [AS_HELP_STRING([--enable-staging],[whether to enable beta game support (default: disabled)])],[],[])
--AC_MSG_RESULT([$enable_staging])
--
--if test "$enable_staging" = "yes"; then
-- gamelist="${gamelist} ${staginggames}"
--fi
--
- AC_MSG_RESULT([$gamelist])
-
- AC_SUBST([gamelist])
diff --git a/gnome-extra/gnome-games/gnome-games-3.0.2.ebuild b/gnome-extra/gnome-games/gnome-games-3.0.2.ebuild
deleted file mode 100644
index e148baa..0000000
--- a/gnome-extra/gnome-games/gnome-games-3.0.2.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.30.1.ebuild,v 1.1 2010/06/13 21:47:18 pacho Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-WANT_AUTOMAKE="1.11"
-
-# make sure games is inherited first so that the gnome2
-# functions will be called if they are not overridden
-inherit autotools games games-ggz eutils gnome2 python virtualx
-
-DESCRIPTION="Collection of games for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/GnomeGames/"
-
-LICENSE="GPL-2 GPL-3 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="artworkextra +aisleriot +clutter +introspection glchess seed +sudoku test"
-
-COMMON_DEPEND="
- >=dev-games/libggz-0.0.14
- >=dev-games/ggz-client-libs-0.0.14
- >=dev-libs/dbus-glib-0.75
- >=dev-libs/glib-2.25.7
- >=dev-libs/libxml2-2.4.0
- >=gnome-base/gconf-2.31.1
- >=gnome-base/librsvg-2.32
- >=x11-libs/cairo-1
- >=x11-libs/gtk+-2.91.7:3[introspection?]
-
- media-libs/libcanberra[gtk3]
- x11-libs/libSM
-
- aisleriot? ( >=dev-scheme/guile-1.6.5[deprecated,regex] )
- artworkextra? ( >=gnome-extra/gnome-games-extra-data-3.0.0 )
- clutter? (
- >=dev-libs/gobject-introspection-0.6.3
- >=x11-libs/gtk+-2.90:3[introspection]
- >=gnome-base/gconf-2.31.1[introspection]
- >=media-libs/clutter-gtk-0.91.6:1.0[introspection]
- seed? ( dev-libs/seed ) )
- introspection? (
- >=dev-libs/gobject-introspection-0.6.3
- media-libs/clutter:1.0[introspection] )
- glchess? (
- dev-db/sqlite:3
- >=dev-lang/vala-0.11.6:0.12
- >=gnome-base/librsvg-2.32
- virtual/opengl
- x11-libs/libX11 )"
-RDEPEND="${COMMON_DEPEND}
- sudoku? (
- dev-libs/glib:2[introspection]
- dev-python/pygobject:2[introspection]
- dev-python/pycairo
- x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/pango[introspection] )
- >=x11-libs/gtk+-3.0.0:3[introspection]
-
- !<gnome-extra/gnome-games-extra-data-3.0.0"
-DEPEND="${COMMON_DEPEND}
- sys-apps/lsb-release
- >=dev-util/pkgconfig-0.15
- >=dev-util/intltool-0.40.4
- >=sys-devel/gettext-0.10.40
- >=gnome-base/gnome-common-2.12.0
- >=app-text/scrollkeeper-0.3.8
- >=app-text/gnome-doc-utils-0.10
- test? ( >=dev-libs/check-0.9.4 )"
-
-# Others are installed below; multiples in this package.
-DOCS="AUTHORS HACKING MAINTAINERS TODO"
-
-# dang make-check fails on docs with -j > 1. Restrict them for the moment until
-# it can be chased down.
-RESTRICT="test"
-
-_omitgame() {
- G2CONF="${G2CONF},${1}"
-}
-
-pkg_setup() {
- # create the games user / group
- games_pkg_setup
-
- G2CONF="${G2CONF}
- --disable-maintainer-mode
- --disable-schemas-compile
- --enable-sound
- $(use_enable introspection)"
-
- # Should be after $(use_enable introspection), but before --enable-omitgames
- use clutter && G2CONF="${G2CONF} --enable-introspection"
-
- # Staging games are needed for sudoku, glchess, swell-foop, and lightsoff
- G2CONF="${G2CONF}
- --enable-staging
- --with-scores-group=${GAMES_GROUP}
- --with-platform=gnome
- --with-card-theme-formats=default
- --with-smclient
- --with-gtk=3.0
- --enable-omitgames=none" # This line should be last for _omitgame
-
- if ! use clutter; then
- ewarn "USE='-clutter' => quadrapassel, swell-foop, lightsoff, gnibbles won't be installed"
- _omitgame quadrapassel
- _omitgame gnibbles
- _omitgame swell-foop
- _omitgame lightsoff
- use seed && ewarn "USE='seed' has no effect with USE='-clutter'"
- elif ! use seed; then
- ewarn "USE='-seed' => swell-foop, lightsoff won't be installed"
- _omitgame swell-foop
- _omitgame lightsoff
- fi
-
- if ! use aisleriot; then
- _omitgame aisleriot
- fi
-
- if ! use glchess; then
- _omitgame glchess
- fi
-
- if ! use sudoku; then
- _omitgame gnome-sudoku
- fi
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- use sudoku && python_convert_shebangs 2 gnome-sudoku/src/gnome-sudoku.in.in
-
- # TODO: File upstream bug for this
- epatch "${FILESDIR}/${PN}-2.91.90-fix-conditional-ac-prog-cxx.patch"
-
- # Without this, --enable-staging enables all those games unconditionally
- epatch "${FILESDIR}/${PN}-fix-staging-games.patch"
-
- eautoreconf
-
- # disable pyc compiling
- mv py-compile py-compile.orig
- ln -s $(type -P true) py-compile
-}
-
-src_test() {
- Xemake check || die "tests failed"
-}
-
-src_install() {
- gnome2_src_install
-
- # Documentation install for each of the games
- for game in \
- $(find . -maxdepth 1 -type d ! -name po ! -name libgames-support); do
- docinto ${game}
- for doc in AUTHORS ChangeLog NEWS README TODO; do
- [ -s ${game}/${doc} ] && dodoc ${game}/${doc}
- done
- done
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
- # Avoid overwriting previous .scores files
- local basefile
- for scorefile in "${ED}"/var/lib/games/*.scores; do
- basefile=$(basename $scorefile)
- if [ -s "${EROOT}/var/lib/games/${basefile}" ]; then
- cp "${EROOT}/var/lib/games/${basefile}" \
- "${ED}/var/lib/games/${basefile}"
- fi
- done
-}
-
-pkg_postinst() {
- games_pkg_postinst
- games-ggz_update_modules
- gnome2_pkg_postinst
- python_need_rebuild
- use sudoku && python_mod_optimize gnome_sudoku
-}
-
-pkg_postrm() {
- games-ggz_update_modules
- gnome2_pkg_postrm
- python_mod_cleanup gnome_sudoku
-}
diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-idle-status.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-idle-status.patch
deleted file mode 100644
index acd9093..0000000
--- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-idle-status.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 44503c5bca065290ce73b0d064a1a0db7de2936d Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 02 May 2011 23:18:58 +0000
-Subject: gpm-idle: manually update the status property
-
-gnome-session doesn't emit PropertyChanged since it uses dbus-glib,
-therefore we need to manually update the cached property when
-receiving a SessionChanged signal.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=679083
-
-Signed-off-by: Richard Hughes <richard@hughsie.com>
----
-diff --git a/src/gpm-idle.c b/src/gpm-idle.c
-index 04225fc..0f2f1ee 100644
---- a/src/gpm-idle.c
-+++ b/src/gpm-idle.c
-@@ -424,6 +424,11 @@ gpm_idle_dbus_signal_cb (GDBusProxy *proxy, const gchar *sender_name, const gcha
- return;
- }
- if (g_strcmp0 (signal_name, "StatusChanged") == 0) {
-+ guint status;
-+
-+ g_variant_get (parameters, "(u)", &status);
-+ g_dbus_proxy_set_cached_property (proxy, "status",
-+ g_variant_new ("u", status));
- g_debug ("Received gnome session status change");
- gpm_idle_evaluate (idle);
- return;
---
-cgit v0.9
diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-screensaver.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-screensaver.patch
deleted file mode 100644
index 1ff7cc6..0000000
--- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-screensaver.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From c36c35b2ecd818e54de975fe81885eca05a1be98 Mon Sep 17 00:00:00 2001
-From: Gary Ching-Pang Lin <chingpang@gmail.com>
-Date: Wed, 08 Jun 2011 16:01:33 +0000
-Subject: Query gnome-screensaver settings with GSettings
-
-https://bugzilla.gnome.org/show_bug.cgi?id=650464
----
-diff --git a/configure.ac b/configure.ac
-index 90bbe5f..3134ae4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -107,7 +107,6 @@ PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= 0.10)
-
- PKG_CHECK_MODULES(GNOME, [
- gtk+-3.0 >= 2.91.0
-- gconf-2.0 >= 2.31.1
- gnome-keyring-1 >= 0.6.0
- cairo >= 1.0.0])
-
-diff --git a/src/gpm-common.h b/src/gpm-common.h
-index b540c05..dabda1a 100644
---- a/src/gpm-common.h
-+++ b/src/gpm-common.h
-@@ -129,8 +129,8 @@ G_BEGIN_DECLS
- #define GPM_SETTINGS_INFO_LAST_DEVICE "info-last-device"
-
- /* gnome-screensaver */
--#define GS_CONF_DIR "/apps/gnome-screensaver"
--#define GS_CONF_PREF_LOCK_ENABLED GS_CONF_DIR "/lock_enabled"
-+#define GS_SETTINGS_SCHEMA "org.gnome.desktop.screensaver"
-+#define GS_SETTINGS_PREF_LOCK_ENABLED "lock-enabled"
-
- typedef enum {
- GPM_ICON_POLICY_PRESENT,
-diff --git a/src/gpm-control.c b/src/gpm-control.c
-index 0fc864d..902db44 100644
---- a/src/gpm-control.c
-+++ b/src/gpm-control.c
-@@ -38,7 +38,6 @@
-
- #include <glib/gi18n.h>
- #include <gnome-keyring.h>
--#include <gconf/gconf-client.h>
- #include <libupower-glib/upower.h>
-
- #include "egg-console-kit.h"
-@@ -51,8 +50,8 @@
-
- struct GpmControlPrivate
- {
-- GConfClient *conf;
- GSettings *settings;
-+ GSettings *settings_ss;
- UpClient *client;
- };
-
-@@ -118,7 +117,7 @@ gpm_control_get_lock_policy (GpmControl *control, const gchar *policy)
- See bug #331164 for all the juicy details. :-) */
- use_ss_setting = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_USE_SCREENSAVER);
- if (use_ss_setting) {
-- do_lock = gconf_client_get_bool (control->priv->conf, GS_CONF_PREF_LOCK_ENABLED, NULL);
-+ do_lock = g_settings_get_boolean (control->priv->settings_ss, GS_SETTINGS_PREF_LOCK_ENABLED);
- g_debug ("Using ScreenSaver settings (%i)", do_lock);
- } else {
- do_lock = g_settings_get_boolean (control->priv->settings, policy);
-@@ -256,8 +255,8 @@ gpm_control_finalize (GObject *object)
- g_return_if_fail (GPM_IS_CONTROL (object));
- control = GPM_CONTROL (object);
-
-- g_object_unref (control->priv->conf);
- g_object_unref (control->priv->settings);
-+ g_object_unref (control->priv->settings_ss);
- g_object_unref (control->priv->client);
-
- g_return_if_fail (control->priv != NULL);
-@@ -306,7 +305,7 @@ gpm_control_init (GpmControl *control)
-
- control->priv->client = up_client_new ();
- control->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
-- control->priv->conf = gconf_client_get_default ();
-+ control->priv->settings_ss = g_settings_new (GS_SETTINGS_SCHEMA);
- }
-
- /**
-diff --git a/src/gpm-screensaver.c b/src/gpm-screensaver.c
-index 842ea7c..f41baed 100644
---- a/src/gpm-screensaver.c
-+++ b/src/gpm-screensaver.c
-@@ -25,7 +25,6 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <gio/gio.h>
--#include <gconf/gconf-client.h>
-
- #include "gpm-screensaver.h"
- #include "gpm-common.h"
-@@ -41,7 +40,7 @@ static void gpm_screensaver_finalize (GObject *object);
- struct GpmScreensaverPrivate
- {
- GDBusProxy *proxy;
-- GConfClient *conf;
-+ GSettings *settings;
- };
-
- enum {
-@@ -63,7 +62,7 @@ gpm_screensaver_lock_enabled (GpmScreensaver *screensaver)
- {
- gboolean enabled;
- g_return_val_if_fail (GPM_IS_SCREENSAVER (screensaver), FALSE);
-- enabled = gconf_client_get_bool (screensaver->priv->conf, GS_CONF_PREF_LOCK_ENABLED, NULL);
-+ enabled = g_settings_get_boolean (screensaver->priv->settings, GS_SETTINGS_PREF_LOCK_ENABLED);
- return enabled;
- }
-
-@@ -296,7 +295,7 @@ gpm_screensaver_init (GpmScreensaver *screensaver)
- g_warning ("failed to setup screensaver proxy: %s", error->message);
- g_error_free (error);
- }
-- screensaver->priv->conf = gconf_client_get_default ();
-+ screensaver->priv->settings = g_settings_new (GS_SETTINGS_SCHEMA) ;
- }
-
- /**
-@@ -313,7 +312,7 @@ gpm_screensaver_finalize (GObject *object)
- screensaver = GPM_SCREENSAVER (object);
- screensaver->priv = GPM_SCREENSAVER_GET_PRIVATE (screensaver);
-
-- g_object_unref (screensaver->priv->conf);
-+ g_object_unref (screensaver->priv->settings);
- g_object_unref (screensaver->priv->proxy);
-
- G_OBJECT_CLASS (gpm_screensaver_parent_class)->finalize (object);
-diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c
-index e7eb21b..a444c2e 100644
---- a/src/gpm-statistics.c
-+++ b/src/gpm-statistics.c
-@@ -27,7 +27,6 @@
- #include <glib/gi18n.h>
-
- #include <gtk/gtk.h>
--#include <gconf/gconf-client.h>
- #include <libupower-glib/upower.h>
-
- #include "gpm-array-float.h"
---
-cgit v0.9
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild
deleted file mode 100644
index 25829e6..0000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild,v 1.5 2010/12/12 16:53:55 armin76 Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="Gnome Power Manager"
-HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-IUSE="doc test"
-
-# FIXME: Interactive testsuite (upstream ? I'm so...pessimistic)
-RESTRICT="test"
-
-# Latest libcanberra is needed due to gtk+:3 API changes
-COMMON_DEPEND=">=dev-libs/glib-2.25.9
- >=x11-libs/gtk+-2.91.7:3
- >=gnome-base/gnome-keyring-0.6.0
- >=x11-libs/libnotify-0.7.0
- >=x11-libs/cairo-1.0.0
- >=gnome-base/gconf-2.31.1:2
- >=media-libs/libcanberra-0.26-r2[gtk3]
- >=sys-power/upower-0.9.1
- >=x11-apps/xrandr-1.3
- >=x11-proto/xproto-7.0.15
- x11-libs/libX11
- x11-libs/libXext"
-RDEPEND="${COMMON_DEPEND}
- >=sys-auth/consolekit-0.4[policykit]
- sys-auth/polkit
- gnome-extra/polkit-gnome"
-DEPEND="${COMMON_DEPEND}
- x11-proto/randrproto
-
- sys-devel/gettext
- app-text/scrollkeeper
- app-text/docbook-xml-dtd:4.3
- >=dev-util/pkgconfig-0.9
- >=dev-util/intltool-0.35
- >=app-text/gnome-doc-utils-0.3.2
- doc? (
- app-text/xmlto
- app-text/docbook-sgml-utils
- app-text/docbook-xml-dtd:4.4
- app-text/docbook-sgml-dtd:4.1
- app-text/docbook-xml-dtd:4.1.2 )
- test? ( sys-apps/dbus )"
-
-# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
-# (files under ${S}/man).
-# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
-
-pkg_setup() {
- G2CONF="${G2CONF}
- $(use_enable test tests)
- $(use_enable doc docbook-docs)
- --disable-strict
- --enable-compile-warnings=minimum
- --disable-schemas-compile"
- DOCS="AUTHORS ChangeLog NEWS README TODO"
-
- if ! use doc; then
- G2CONF="${G2CONF} DOCBOOK2MAN=$(type -p false)"
- fi
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- # https://bugzilla.redhat.com/show_bug.cgi?id=679083
- # will be in next release
- epatch "${FILESDIR}/${P}-idle-status.patch"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=650464
- # will be in next release
- epatch "${FILESDIR}/${P}-screensaver.patch"
-
- # Drop debugger CFLAGS from configure
- # XXX: touch configure.ac only if running eautoreconf, otherwise
- # maintainer mode gets triggered -- even if the order is correct
- sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
- -i configure || die "debugger sed failed"
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- Xemake check || die "Test phase failed"
-}
diff --git a/gnome-extra/gnome-screensaver/files/gentoologo-floaters.desktop b/gnome-extra/gnome-screensaver/files/gentoologo-floaters.desktop
deleted file mode 100644
index 4d7173c..0000000
--- a/gnome-extra/gnome-screensaver/files/gentoologo-floaters.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Floating Gentoo Logo
-Name[fr]=Logo Gentoo flottant
-Comment=Bubbles the Gentoo logo around the screen
-Comment[fr]=Le logo de Gentoo apparaît ça et là sur l'écran
-Exec=/usr/libexec/gnome-screensaver/floaters /usr/share/pixmaps/gentoo-logo.svg
-TryExec=/usr/libexec/gnome-screensaver/floaters
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=GNOME;Screensaver;
-OnlyShowIn=GNOME;
diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-clock-skew.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-clock-skew.patch
deleted file mode 100644
index 8a453ef..0000000
--- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-clock-skew.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 9f98f3a20b5eec6a1fa13e5a4972eadc2d728acf Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Wed, 20 Jul 2011 18:00:43 +0000
-Subject: gs-window-x11: shorten clock timeout to detect skew
-
-The timer for the panel clock currently wakes up once a minute in
-the default case. This means, if the clock changes while the
-screen is locked (say from a resume following suspend, or from
-ntp) then it becomes out of date for up to a minute.
-
-There's no good way right now to detect when clock skew happens,
-so this commit changes the timeout to expire every couple of
-seconds instead of once a minute.
-
-Minor-Updates-By: Ray Strode <rstrode@redhat.com>
-
-http://bugzilla.gnome.org/show_bug.cgi?id=648145
----
-diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
-index e7a475e..a723c4d 100644
---- a/src/gs-window-x11.c
-+++ b/src/gs-window-x11.c
-@@ -26,6 +26,7 @@
- #include <errno.h>
- #include <sys/wait.h>
- #include <string.h>
-+#include <stdlib.h>
-
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-@@ -101,6 +102,8 @@ struct GSWindowPrivate
- guint info_bar_timer_id;
- guint clock_update_id;
-
-+ gint64 clock_update_time;
-+
- gint lock_pid;
- gint lock_watch_id;
- gint dialog_response;
-@@ -2201,7 +2204,8 @@ update_clock (GSWindow *window)
- /* Translators, this is the 12h date format used in the panel clock */
- clock_format = _("%a %l:%M %p");
-
-- dt = g_date_time_new_now_local ();
-+ window->priv->clock_update_time = g_get_real_time ();
-+ dt = g_date_time_new_from_unix_local (window->priv->clock_update_time / G_USEC_PER_SEC);
- text = g_date_time_format (dt, clock_format);
- markup = g_strdup_printf ("<b><span foreground=\"#ccc\">%s</span></b>", text);
- gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
-@@ -2219,6 +2223,28 @@ update_clock_timer (GSWindow *window)
- return FALSE;
- }
-
-+static gboolean
-+check_clock_timer (GSWindow *window)
-+{
-+ /* Update the panel clock when necessary.
-+ This happens:
-+
-+ - Once a minute in the normal case
-+ - When the machine resumes from suspend
-+ - When the system time is adjusted
-+
-+ Right now this function is called much more frequently than any of the
-+ above 3 events happen (see queue_clock_update ()).
-+
-+ We can wake up less often if bug 655129 gets fixed. */
-+ if (ABS (g_get_real_time () - window->priv->clock_update_time) > 60 * G_USEC_PER_SEC) {
-+ update_clock (window);
-+ }
-+
-+ queue_clock_update (window);
-+ return FALSE;
-+}
-+
- static void
- queue_clock_update (GSWindow *window)
- {
-@@ -2228,10 +2254,17 @@ queue_clock_update (GSWindow *window)
- gettimeofday (&tv, NULL);
- timeouttime = (G_USEC_PER_SEC - tv.tv_usec) / 1000 + 1;
-
-- /* timeout of one minute if we don't care about the seconds */
-+ /* time until next minute */
- timeouttime += 1000 * (59 - tv.tv_sec % 60);
-
-- window->priv->clock_update_id = g_timeout_add (timeouttime, (GSourceFunc)update_clock_timer, window);
-+ /* If we are more than 2.5 seconds from the start of the next minute,
-+ schedule less precise but more power friendly 2 second add_seconds
-+ timeout to check if the system realtime clock has changed under us. */
-+ if (timeouttime > 2500) {
-+ window->priv->clock_update_id = g_timeout_add_seconds (2, (GSourceFunc)check_clock_timer, window);
-+ } else {
-+ window->priv->clock_update_id = g_timeout_add (timeouttime, (GSourceFunc)update_clock_timer, window);
-+ }
- }
-
- static char *
---
-cgit v0.9
diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-user-switcher-crash.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-user-switcher-crash.patch
deleted file mode 100644
index bfdea6e..0000000
--- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-user-switcher-crash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 338b86c4f0c2cdc4241dbf5cda913f0184afc105 Mon Sep 17 00:00:00 2001
-From: Huzaifa Sidhpurwala <huzaifas@redhat.com>
-Date: Tue, 26 Apr 2011 17:15:56 +0000
-Subject: dialog: Fix crash in user switcher code
-
-The user switch button currently causes the lock dialog to crash
-because of an inverted conditional in the error checking code.
-
-This commit addresses the crash by performing the proper check
-in the conditional.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=648234
----
-diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
-index 67ab36a..6706fde 100644
---- a/src/gs-lock-plug.c
-+++ b/src/gs-lock-plug.c
-@@ -167,7 +167,7 @@ do_user_switch (GSLockPlug *plug)
- g_object_unref (context);
- g_object_unref (app);
-
-- if (!error) {
-+ if (error != NULL) {
- gs_debug ("Unable to start GDM greeter: %s", error->message);
- g_error_free (error);
- }
---
-cgit v0.9
diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-watchdog-add_seconds.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-watchdog-add_seconds.patch
deleted file mode 100644
index 4dddf15..0000000
--- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-3.0.0-watchdog-add_seconds.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 742b77d217dced55b8b07616bf6a70ec167ffc01 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Mon, 25 Jul 2011 15:03:00 +0000
-Subject: gs-window-x11: use g_timeout_add_seconds for watch dog
-
-The watch dog timer runs sort of arbitrarily every 30 seconds.
-We don't need much precision on when it runs, it just needs to
-run once in a while.
-
-This commit changes the timer setup call from g_timeout_add
-to g_timeout_add_seconds so the watch dog will wake up with
-any other pending timeouts that happen to expire around the same
-time, saving a little power.
-
-http://bugzilla.gnome.org/show_bug.cgi?id=648145
----
-diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
-index 5120476..e7a475e 100644
---- a/src/gs-window-x11.c
-+++ b/src/gs-window-x11.c
-@@ -481,9 +481,9 @@ static void
- add_watchdog_timer (GSWindow *window,
- glong timeout)
- {
-- window->priv->watchdog_timer_id = g_timeout_add (timeout,
-- (GSourceFunc)watchdog_timer,
-- window);
-+ window->priv->watchdog_timer_id = g_timeout_add_seconds (timeout,
-+ (GSourceFunc)watchdog_timer,
-+ window);
- }
-
- static void
-@@ -671,7 +671,7 @@ gs_window_real_show (GtkWidget *widget)
- window->priv->timer = g_timer_new ();
-
- remove_watchdog_timer (window);
-- add_watchdog_timer (window, 30000);
-+ add_watchdog_timer (window, 30);
-
- select_popup_events ();
- window_select_shape_events (window);
---
-cgit v0.9
diff --git a/gnome-extra/gnome-screensaver/files/xss-conversion-2.txt b/gnome-extra/gnome-screensaver/files/xss-conversion-2.txt
deleted file mode 100644
index d69e506..0000000
--- a/gnome-extra/gnome-screensaver/files/xss-conversion-2.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-There is a conversion script which you can use to convert XScreenSaver
-screensavers to the gnome-screensaver format. The conversion script is located
-in the documentation directory (/usr/share/doc/${PF}/).
-
-The migrate-xscreensaver-config.sh and xscreensaver-config.xsl files will be
-needed to convert the screensaver. Make sure to enable the executable bit on
-the script (chmod +x migrate-xscreensaver-config.sh).
-
-The script takes the module to convert and creates a .desktop file corresponding
-to the module.
-
-migrate-xscreensaver-config.sh /usr/share/xscreensaver/config/*.xml
-
-The above command should convert all xscreensaver modules.
-
-You must copy the desktop files into /usr/share/applications/gnome-screensavers (cp
-*.desktop /usr/share/applications/screensavers), and the executables from
-/usr/lib/misc/xscreensaver into /usr/libexec/gnome-screensaver
-(cp /usr/lib/misc/xscreensaver/* /usr/libexec/gnome-screensaver)
-
-Going to the gnome-screensaver-preferences dialog should now show the new
-modules in the list.
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild
deleted file mode 100644
index d6a1971..0000000
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild,v 1.2 2010/11/02 02:33:58 ford_prefect Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
-HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug doc pam"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-
-RDEPEND="
- >=dev-libs/glib-2.25.6:2
- >=x11-libs/gtk+-2.99.3:3
- >=gnome-base/gnome-desktop-2.91.5:3
- >=gnome-base/gnome-menus-2.12
- >=gnome-base/gsettings-desktop-schemas-0.1.7
- >=gnome-base/libgnomekbd-0.1
- >=dev-libs/dbus-glib-0.71
-
- sys-apps/dbus
- x11-libs/libxklavier
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- x11-libs/libXScrnSaver
- x11-libs/libXxf86misc
- x11-libs/libXxf86vm
-
- pam? ( virtual/pam )
-"
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.9
- >=dev-util/intltool-0.35
- sys-devel/gettext
- doc? (
- app-text/xmlto
- ~app-text/docbook-xml-dtd-4.1.2
- ~app-text/docbook-xml-dtd-4.4 )
- x11-proto/xextproto
- x11-proto/randrproto
- x11-proto/scrnsaverproto
- x11-proto/xf86miscproto
-"
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog HACKING NEWS README"
- G2CONF="${G2CONF}
- $(use_enable doc docbook-docs)
- $(use_enable pam locking)
- --with-mit-ext
- --with-pam-prefix=/etc
- --with-xf86gamma-ext
- --with-kbd-layout-indicator
- --disable-schemas-compile"
- # xscreensaver and custom screensaver capability removed
- # poke and inhibit commands were also removed, bug 579430
-}
-
-src_prepare() {
- # Upstream patch to fix crash in user switcher; will be in next release
- epatch "${FILESDIR}/${P}-user-switcher-crash.patch"
-
- # Upstream patches to fix timers and update the clock properly; will be
- # in next release
- epatch "${FILESDIR}/${P}-watchdog-add_seconds.patch"
- epatch "${FILESDIR}/${P}-clock-skew.patch"
-
- gnome2_src_prepare
-}
diff --git a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.0.1-32-bit-network-totals-overflow-1.patch b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.0.1-32-bit-network-totals-overflow-1.patch
deleted file mode 100644
index 156845f..0000000
--- a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.0.1-32-bit-network-totals-overflow-1.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 3ea7303181e80e188e72a4fcd98b9970fe554b3b Mon Sep 17 00:00:00 2001
-From: Chris Kühl <chrisk@openismus.com>
-Date: Sat, 16 Apr 2011 23:07:20 +0000
-Subject: Added SI prefix tera to network counter
-
-https://bugzilla.gnome.org/show_bug.cgi?id=639212
----
-diff --git a/src/util.cpp b/src/util.cpp
-index 90073fe..234e6fc 100644
---- a/src/util.cpp
-+++ b/src/util.cpp
-@@ -149,10 +149,12 @@ procman_make_label_for_mmaps_or_ofiles(const char *format,
- gchar*
- procman::format_size(guint64 size, guint64 max_size, bool want_bits)
- {
-+
- enum {
- K_INDEX,
- M_INDEX,
-- G_INDEX
-+ G_INDEX,
-+ T_INDEX
- };
-
- struct Format {
-@@ -160,16 +162,18 @@ procman::format_size(guint64 size, guint64 max_size, bool want_bits)
- const char* string;
- };
-
-- const Format all_formats[2][3] = {
-- { { 1UL << 10, N_("%.1f KiB") },
-- { 1UL << 20, N_("%.1f MiB") },
-- { 1UL << 30, N_("%.1f GiB") } },
-- { { 1000, N_("%.1f kbit") },
-- { 1000000, N_("%.1f Mbit") },
-- { 1000000000, N_("%.1f Gbit") } }
-+ const Format all_formats[2][4] = {
-+ { { 1UL << 10, N_("%.1f KiB") },
-+ { 1UL << 20, N_("%.1f MiB") },
-+ { 1UL << 30, N_("%.1f GiB") },
-+ { 1UL << 40, N_("%.1f TiB") } },
-+ { { 1000, N_("%.1f kbit") },
-+ { 1000000, N_("%.1f Mbit") },
-+ { 1000000000, N_("%.1f Gbit") },
-+ { 1000000000000, N_("%.1f Tbit") } }
- };
-
-- const Format (&formats)[3] = all_formats[want_bits ? 1 : 0];
-+ const Format (&formats)[4] = all_formats[want_bits ? 1 : 0];
-
- if (want_bits) {
- size *= 8;
-@@ -194,9 +198,12 @@ procman::format_size(guint64 size, guint64 max_size, bool want_bits)
- } else if (max_size < formats[G_INDEX].factor) {
- factor = formats[M_INDEX].factor;
- format = formats[M_INDEX].string;
-- } else {
-+ } else if (max_size < formats[T_INDEX].factor) {
- factor = formats[G_INDEX].factor;
- format = formats[G_INDEX].string;
-+ } else {
-+ factor = formats[T_INDEX].factor;
-+ format = formats[T_INDEX].string;
- }
-
- return g_strdup_printf(_(format), size / (double)factor);
---
-cgit v0.9
diff --git a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.0.1-32-bit-network-totals-overflow-2.patch b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.0.1-32-bit-network-totals-overflow-2.patch
deleted file mode 100644
index 4fdc57a..0000000
--- a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.0.1-32-bit-network-totals-overflow-2.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From c7275791a89623ad1edc820a6ef16faae37a18aa Mon Sep 17 00:00:00 2001
-From: Chris Kühl <chrisk@openismus.com>
-Date: Sun, 17 Apr 2011 22:31:00 +0000
-Subject: Fix network totals overflow on 32-bit machines.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=639212
----
-diff --git a/src/load-graph.cpp b/src/load-graph.cpp
-index 57bca17..a6d2a7e 100644
---- a/src/load-graph.cpp
-+++ b/src/load-graph.cpp
-@@ -368,16 +368,16 @@ get_memory (LoadGraph *g)
- }
-
- static void
--net_scale (LoadGraph *g, unsigned din, unsigned dout)
-+net_scale (LoadGraph *g, guint64 din, guint64 dout)
- {
- g->data[0][0] = 1.0f * din / g->net.max;
- g->data[0][1] = 1.0f * dout / g->net.max;
-
-- unsigned dmax = std::max(din, dout);
-+ guint64 dmax = std::max(din, dout);
- g->net.values[g->net.cur] = dmax;
- g->net.cur = (g->net.cur + 1) % LoadGraph::NUM_POINTS;
-
-- unsigned new_max;
-+ guint64 new_max;
- // both way, new_max is the greatest value
- if (dmax >= g->net.max)
- new_max = dmax;
-@@ -389,7 +389,7 @@ net_scale (LoadGraph *g, unsigned din, unsigned dout)
- // Round network maximum
- //
-
-- const unsigned bak_max(new_max);
-+ const guint64 bak_max(new_max);
-
- if (ProcData::get_instance()->config.network_in_bits) {
- // TODO: fix logic to give a nice scale with bits
-@@ -399,7 +399,7 @@ net_scale (LoadGraph *g, unsigned din, unsigned dout)
- new_max = 1.1 * new_max;
- // make sure max is not 0 to avoid / 0
- // default to 125 bytes == 1kbit
-- new_max = std::max(new_max, 125U);
-+ new_max = std::max(new_max, 125UL);
-
- } else {
- // round up to get some extra space
-@@ -407,7 +407,7 @@ net_scale (LoadGraph *g, unsigned din, unsigned dout)
- new_max = 1.1 * new_max;
- // make sure max is not 0 to avoid / 0
- // default to 1 KiB
-- new_max = std::max(new_max, 1024U);
-+ new_max = std::max(new_max, 1024UL);
-
- // decompose new_max = coef10 * 2**(base10 * 10)
- // where coef10 and base10 are integers and coef10 < 2**10
-@@ -415,16 +415,16 @@ net_scale (LoadGraph *g, unsigned din, unsigned dout)
- // e.g: ceil(100.5 KiB) = 101 KiB = 101 * 2**(1 * 10)
- // where base10 = 1, coef10 = 101, pow2 = 16
-
-- unsigned pow2 = std::floor(log2(new_max));
-- unsigned base10 = pow2 / 10;
-- unsigned coef10 = std::ceil(new_max / double(1UL << (base10 * 10)));
-+ guint64 pow2 = std::floor(log2(new_max));
-+ guint64 base10 = pow2 / 10.0;
-+ guint64 coef10 = std::ceil(new_max / double(1UL <<(base10 * 10)));
- g_assert(new_max <= (coef10 * (1UL << (base10 * 10))));
-
- // then decompose coef10 = x * 10**factor10
- // where factor10 is integer and x < 10
- // so we new_max has only 1 significant digit
-
-- unsigned factor10 = std::pow(10.0, std::floor(std::log10(coef10)));
-+ guint64 factor10 = std::pow(10.0, std::floor(std::log10(coef10)));
- coef10 = std::ceil(coef10 / double(factor10)) * factor10;
-
- // then make coef10 divisible by num_bars
-@@ -432,12 +432,12 @@ net_scale (LoadGraph *g, unsigned din, unsigned dout)
- coef10 = coef10 + (g->num_bars() - coef10 % g->num_bars());
- g_assert(coef10 % g->num_bars() == 0);
-
-- new_max = coef10 * (1UL << (base10 * 10));
-- procman_debug("bak %u new_max %u pow2 %u coef10 %u", bak_max, new_max, pow2, coef10);
-+ new_max = coef10 * (1UL << guint64(base10 * 10));
-+ procman_debug("bak %lu new_max %lu pow2 %lu coef10 %lu", bak_max, new_max, pow2, coef10);
- }
-
- if (bak_max > new_max) {
-- procman_debug("overflow detected: bak=%u new=%u", bak_max, new_max);
-+ procman_debug("overflow detected: bak=%lu new=%lu", bak_max, new_max);
- new_max = bak_max;
- }
-
-@@ -446,7 +446,7 @@ net_scale (LoadGraph *g, unsigned din, unsigned dout)
- if ((0.8 * g->net.max) < new_max && new_max <= g->net.max)
- return;
-
-- const float scale = 1.0f * g->net.max / new_max;
-+ const double scale = 1.0f * g->net.max / new_max;
-
- for (size_t i = 0; i < LoadGraph::NUM_POINTS; i++) {
- if (g->data[i][0] >= 0.0f) {
-@@ -455,7 +455,7 @@ net_scale (LoadGraph *g, unsigned din, unsigned dout)
- }
- }
-
-- procman_debug("rescale dmax = %u max = %u new_max = %u", dmax, g->net.max, new_max);
-+ procman_debug("rescale dmax = %lu max = %lu new_max = %lu", dmax, g->net.max, new_max);
-
- g->net.max = new_max;
-
-@@ -471,7 +471,7 @@ get_net (LoadGraph *g)
- guint32 i;
- guint64 in = 0, out = 0;
- GTimeVal time;
-- unsigned din, dout;
-+ guint64 din, dout;
-
- ifnames = glibtop_get_netlist(&netlist);
-
-@@ -510,9 +510,9 @@ get_net (LoadGraph *g)
- g->net.time.tv_sec != 0) {
- float dtime;
- dtime = time.tv_sec - g->net.time.tv_sec +
-- (float) (time.tv_usec - g->net.time.tv_usec) / G_USEC_PER_SEC;
-- din = static_cast<unsigned>((in - g->net.last_in) / dtime);
-- dout = static_cast<unsigned>((out - g->net.last_out) / dtime);
-+ (double) (time.tv_usec - g->net.time.tv_usec) / G_USEC_PER_SEC;
-+ din = static_cast<guint64>((in - g->net.last_in) / dtime);
-+ dout = static_cast<guint64>((out - g->net.last_out) / dtime);
- } else {
- /* Don't calc anything if new data is less than old (interface
- removed, counters reset, ...) or if it is the first time */
-diff --git a/src/load-graph.h b/src/load-graph.h
-index d90cf38..9b43c86 100644
---- a/src/load-graph.h
-+++ b/src/load-graph.h
-@@ -87,7 +87,7 @@ struct LoadGraph {
- struct {
- guint64 last_in, last_out;
- GTimeVal time;
-- unsigned int max;
-+ guint64 max;
- unsigned values[NUM_POINTS];
- size_t cur;
- } net;
---
-cgit v0.9
diff --git a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.0.1-32-bit-network-totals-overflow-3.patch b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.0.1-32-bit-network-totals-overflow-3.patch
deleted file mode 100644
index d3ac4d9..0000000
--- a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.0.1-32-bit-network-totals-overflow-3.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 843cc40119d36873f9670975c7815fbd38481093 Mon Sep 17 00:00:00 2001
-From: Chris Kühl <chrisk@openismus.com>
-Date: Thu, 12 May 2011 21:43:31 +0000
-Subject: Fix for issues on 32-bit machines.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=649842
----
-diff --git a/src/load-graph.cpp b/src/load-graph.cpp
-index a6d2a7e..9291179 100644
---- a/src/load-graph.cpp
-+++ b/src/load-graph.cpp
-@@ -399,7 +399,7 @@ net_scale (LoadGraph *g, guint64 din, guint64 dout)
- new_max = 1.1 * new_max;
- // make sure max is not 0 to avoid / 0
- // default to 125 bytes == 1kbit
-- new_max = std::max(new_max, 125UL);
-+ new_max = std::max(new_max, G_GUINT64_CONSTANT(125));
-
- } else {
- // round up to get some extra space
-@@ -407,7 +407,7 @@ net_scale (LoadGraph *g, guint64 din, guint64 dout)
- new_max = 1.1 * new_max;
- // make sure max is not 0 to avoid / 0
- // default to 1 KiB
-- new_max = std::max(new_max, 1024UL);
-+ new_max = std::max(new_max, G_GUINT64_CONSTANT(1024));
-
- // decompose new_max = coef10 * 2**(base10 * 10)
- // where coef10 and base10 are integers and coef10 < 2**10
-@@ -417,8 +417,8 @@ net_scale (LoadGraph *g, guint64 din, guint64 dout)
-
- guint64 pow2 = std::floor(log2(new_max));
- guint64 base10 = pow2 / 10.0;
-- guint64 coef10 = std::ceil(new_max / double(1UL <<(base10 * 10)));
-- g_assert(new_max <= (coef10 * (1UL << (base10 * 10))));
-+ guint64 coef10 = std::ceil(new_max / double(G_GUINT64_CONSTANT(1) << (base10 * 10)));
-+ g_assert(new_max <= (coef10 * (G_GUINT64_CONSTANT(1) << (base10 * 10))));
-
- // then decompose coef10 = x * 10**factor10
- // where factor10 is integer and x < 10
-@@ -431,13 +431,16 @@ net_scale (LoadGraph *g, guint64 din, guint64 dout)
- if (coef10 % g->num_bars() != 0)
- coef10 = coef10 + (g->num_bars() - coef10 % g->num_bars());
- g_assert(coef10 % g->num_bars() == 0);
--
-- new_max = coef10 * (1UL << guint64(base10 * 10));
-- procman_debug("bak %lu new_max %lu pow2 %lu coef10 %lu", bak_max, new_max, pow2, coef10);
-+ new_max = coef10 * (G_GUINT64_CONSTANT(1) << guint64(base10 * 10));
-+ procman_debug("bak %" G_GUINT64_FORMAT " new_max %" G_GUINT64_FORMAT
-+ "pow2 %" G_GUINT64_FORMAT " coef10 %" G_GUINT64_FORMAT,
-+ bak_max, new_max, pow2, coef10);
- }
-
- if (bak_max > new_max) {
-- procman_debug("overflow detected: bak=%lu new=%lu", bak_max, new_max);
-+ procman_debug("overflow detected: bak=%" G_GUINT64_FORMAT
-+ " new=%" G_GUINT64_FORMAT,
-+ bak_max, new_max);
- new_max = bak_max;
- }
-
-@@ -455,7 +458,10 @@ net_scale (LoadGraph *g, guint64 din, guint64 dout)
- }
- }
-
-- procman_debug("rescale dmax = %lu max = %lu new_max = %lu", dmax, g->net.max, new_max);
-+ procman_debug("rescale dmax = %" G_GUINT64_FORMAT
-+ " max = %" G_GUINT64_FORMAT
-+ " new_max = %" G_GUINT64_FORMAT,
-+ dmax, g->net.max, new_max);
-
- g->net.max = new_max;
-
-diff --git a/src/util.cpp b/src/util.cpp
-index 234e6fc..7183ff4 100644
---- a/src/util.cpp
-+++ b/src/util.cpp
-@@ -163,14 +163,14 @@ procman::format_size(guint64 size, guint64 max_size, bool want_bits)
- };
-
- const Format all_formats[2][4] = {
-- { { 1UL << 10, N_("%.1f KiB") },
-- { 1UL << 20, N_("%.1f MiB") },
-- { 1UL << 30, N_("%.1f GiB") },
-- { 1UL << 40, N_("%.1f TiB") } },
-- { { 1000, N_("%.1f kbit") },
-- { 1000000, N_("%.1f Mbit") },
-- { 1000000000, N_("%.1f Gbit") },
-- { 1000000000000, N_("%.1f Tbit") } }
-+ { { G_GUINT64_CONSTANT(1) << 10, N_("%.1f KiB") },
-+ { G_GUINT64_CONSTANT(1) << 20, N_("%.1f MiB") },
-+ { G_GUINT64_CONSTANT(1) << 30, N_("%.1f GiB") },
-+ { G_GUINT64_CONSTANT(1) << 40, N_("%.1f TiB") } },
-+ { { G_GUINT64_CONSTANT(1000), N_("%.1f kbit") },
-+ { G_GUINT64_CONSTANT(1000000), N_("%.1f Mbit") },
-+ { G_GUINT64_CONSTANT(1000000000), N_("%.1f Gbit") },
-+ { G_GUINT64_CONSTANT(1000000000000), N_("%.1f Tbit") } }
- };
-
- const Format (&formats)[4] = all_formats[want_bits ? 1 : 0];
---
-cgit v0.9
diff --git a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.0.1-linux-nice.patch b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.0.1-linux-nice.patch
deleted file mode 100644
index 55d4e41..0000000
--- a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.0.1-linux-nice.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 7c493352b24fb6d0d8b003f25043b070244eeb2e Mon Sep 17 00:00:00 2001
-From: Chris Kühl <chrisk@openismus.com>
-Date: Fri, 15 Apr 2011 09:18:10 +0000
-Subject: Make maximum nice value 19 instead of 20 on Linux.
-
----
-diff --git a/src/procdialogs.h b/src/procdialogs.h
-index eba3212..61decf8 100644
---- a/src/procdialogs.h
-+++ b/src/procdialogs.h
-@@ -26,7 +26,7 @@
- /* These are the actual range of settable values. Values outside this range
- are scaled back to these limits. So show these limits in the slider
- */
--#ifdef linux
-+#ifdef __linux__
- #define RENICE_VAL_MIN -20
- #define RENICE_VAL_MAX 19
- #else /* ! linux */
---
-cgit v0.9
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.0.1-r1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.0.1-r1.ebuild
deleted file mode 100644
index 6162a1e..0000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2.ebuild,v 1.6 2011/01/30 18:56:15 armin76 Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.28:2
- >=x11-libs/libwnck-2.91.0:3
- >=gnome-base/libgtop-2.28.2:2
- >=x11-libs/gtk+-3.0:3
- >=x11-themes/gnome-icon-theme-2.31
- >=dev-cpp/gtkmm-2.99:3.0
- >=dev-cpp/glibmm-2.27:2
- >=dev-libs/libxml2-2.0:2
- >=gnome-base/librsvg-2.12:2"
-
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.19
- >=dev-util/intltool-0.41.0
- >=sys-devel/gettext-0.17
- >=app-text/gnome-doc-utils-0.20"
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog NEWS README"
- G2CONF="${G2CONF}
- --disable-schemas-compile
- --disable-scrollkeeper"
-}
-
-src_prepare() {
- # Add some useful patches from upstream git master
- # Use the correct maximum nice value on Linux
- epatch "${FILESDIR}/${PN}-3.0.1-linux-nice.patch"
- # Don't overflow the network history totals counters on 32-bit machines
- epatch "${FILESDIR}/${PN}"-3.0.1-32-bit-network-totals-overflow-{1,2,3}.patch
-
- gnome2_src_prepare
-}
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.0.1.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.0.1.ebuild
deleted file mode 100644
index c91b48c..0000000
--- a/gnome-extra/gnome-utils/gnome-utils-3.0.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild,v 1.1 2010/12/04 18:08:10 pacho Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="Utilities for the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc ipv6 test"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-fi
-
-# libcanberra 0.26-r2 is needed for gtk+:3 fixes
-COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
- >=x11-libs/gtk+-3.0.3:3
- >=gnome-base/gconf-2:2
- >=gnome-base/gsettings-desktop-schemas-0.1.0
- >=gnome-base/libgtop-2.12:2
- >=media-libs/libcanberra-0.26-r2[gtk3]
- x11-libs/libXext
- x11-libs/libX11"
-
-DEPEND="${COMMON_DEPEND}
- x11-proto/xextproto
- app-text/scrollkeeper
- >=dev-util/intltool-0.40
- >=dev-util/pkgconfig-0.9
- doc? ( >=dev-util/gtk-doc-1.10 )"
-
-# file collisions
-RDEPEND="${COMMON_DEPEND}
- !<gnome-base/gnome-control-center-2.90"
-
-pkg_setup() {
- if ! use debug; then
- G2CONF="${G2CONF} --enable-debug=minimum"
- fi
-
- G2CONF="${G2CONF}
- $(use_enable ipv6)
- --enable-zlib
- --disable-maintainer-flags
- --disable-static
- --disable-schemas-install
- --disable-schemas-compile
- --disable-scrollkeeper"
- DOCS="AUTHORS ChangeLog NEWS README THANKS"
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- # Remove idiotic -D.*DISABLE_DEPRECATED cflags
- # This method is kinda prone to breakage. Recheck carefully with next bump.
- # bug 339074
- find . -iname 'Makefile.am' -exec \
- sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
- # Do Makefile.in after Makefile.am to avoid automake maintainer-mode
- find . -iname 'Makefile.in' -exec \
- sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
-
- if ! use test ; then
- sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 2 failed"
- fi
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.0.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.0.1.ebuild
deleted file mode 100644
index 958be18..0000000
--- a/gnome-extra/gtkhtml/gtkhtml-4.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.32.1.ebuild,v 1.1 2010/11/28 14:43:21 pacho Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE=""
-
-# orbit is referenced in configure, but is not used anywhere else
-RDEPEND=">=x11-libs/gtk+-3.0:3
- >=x11-libs/cairo-1.10
- >=x11-themes/gnome-icon-theme-2.22.0
- >=app-text/enchant-1.1.7
- gnome-base/gconf:2
- >=app-text/iso-codes-0.49
- >=net-libs/libsoup-2.26.0:2.4"
-DEPEND="${RDEPEND}
- x11-proto/xproto
- sys-devel/gettext
- >=dev-util/intltool-0.40.0
- >=dev-util/pkgconfig-0.9"
-
-pkg_setup() {
- ELTCONF="--reverse-deps"
- G2CONF="${G2CONF}
- --disable-static
- --disable-deprecated-warning-flags"
- DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-}
-
-src_install() {
- gnome2_src_install
-
- elog "The gtkhtml-editor-test utility is now called gtkhtml-editor-test-${SLOT}"
- # Don't collide with 3.14 slot
- mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
-}
diff --git a/gnome-extra/mousetweaks/mousetweaks-3.0.2.ebuild b/gnome-extra/mousetweaks/mousetweaks-3.0.2.ebuild
deleted file mode 100644
index a15032e..0000000
--- a/gnome-extra/mousetweaks/mousetweaks-3.0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mousetweaks/mousetweaks-2.32.1.ebuild,v 1.8 2011/03/23 08:21:12 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Mouse accessibility enhancements for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Mousetweaks/Home"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="applet"
-
-RDEPEND="
- >=dev-libs/glib-2.25.9:2
- >=x11-libs/gtk+-3:3
- >=gnome-base/gsettings-desktop-schemas-0.1
-
- x11-libs/libX11
- x11-libs/libXtst
- x11-libs/libXfixes
- x11-libs/libXcursor
-
- applet? (
- >=gnome-base/gnome-panel-2.32
- <gnome-base/gnome-panel-2.90 )
-"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40
- >=dev-util/pkgconfig-0.17"
-# eautoreconf needs:
-# gnome-base/gnome-common
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
- G2CONF="${G2CONF}
- --disable-schemas-compile
- $(use_enable applet pointer-capture)
- $(use_enable applet dwell-click)"
-}
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.0.2.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.0.2.ebuild
deleted file mode 100644
index b4c06cf..0000000
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit gnome.org
-
-DESCRIPTION="XSL stylesheets for yelp"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.6.12
- >=dev-libs/libxslt-1.1.8"
-DEPEND="${RDEPEND}
- sys-apps/gawk
- sys-devel/gettext
- >=dev-util/intltool-0.40
- >=dev-util/pkgconfig-0.9"
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/gnome-extra/yelp/files/yelp-3.0.3-man-compatibility.patch b/gnome-extra/yelp/files/yelp-3.0.3-man-compatibility.patch
deleted file mode 100644
index b57591c..0000000
--- a/gnome-extra/yelp/files/yelp-3.0.3-man-compatibility.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 7e181e8d74f7e67b8b3acb8524fc85157ed39c8e Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sun, 1 May 2011 22:52:14 -0400
-Subject: [PATCH] Enable compatibility with traditional man (#648854)
-
-As of commit 46a82ade3e6f0fac8f08b18e7fc23d8665f6f728, Yelp runs
-"man -Z -Tutf8 -EUTF-8 [FILE]" to obtain the groff intermediate format
-of the man page. However, the only implementation of man that accepts
-these options is man-db (used by Debian, Fedora, SUSE & Ubuntu).
-The traditional Linux man used by other distros and man implementations
-on non-Linux Unixes (FreeBSD, Solaris) do not have command-line options
-for outputting groff intermediate format.
-Therefore, on systems that do not use man-db, we need to manually
-uncompress the nroff source file and feed it to groff. This is best done
-using a small shell script (/usr/libexec/yelp-groff), both for for
-clarity and for ease of modification on systems with weird man setups.
-
-Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
----
- libyelp/Makefile.am | 2 +
- libyelp/yelp-groff | 49 +++++++++++++++++++++++++++++++++++++++++++++
- libyelp/yelp-man-parser.c | 4 +-
- 3 files changed, 53 insertions(+), 2 deletions(-)
- create mode 100755 libyelp/yelp-groff
-
-diff --git a/libyelp/Makefile.am b/libyelp/Makefile.am
-index a4dd68b..5d55bf1 100644
---- a/libyelp/Makefile.am
-+++ b/libyelp/Makefile.am
-@@ -1,4 +1,5 @@
- lib_LTLIBRARIES = libyelp.la
-+libexec_SCRIPTS = yelp-groff
-
- libyelp_la_SOURCES = \
- yelp-bookmarks.c \
-@@ -49,6 +50,7 @@ endif
- libyelp_la_CFLAGS = \
- $(YELP_CFLAGS) \
- -DDATADIR=\""$(datadir)"\" \
-+ -DLIBEXECDIR=\"$(libexecdir)\" \
- -DYELP_ICON_PATH=\"$(YELP_ICON_PATH)\"
-
- libyelp_la_LIBADD = $(YELP_LIBS)
-diff --git a/libyelp/yelp-groff b/libyelp/yelp-groff
-new file mode 100755
-index 0000000..5348024
---- /dev/null
-+++ b/libyelp/yelp-groff
-@@ -0,0 +1,49 @@
-+#!/bin/sh
-+#
-+# Copyright (c) 2011 Alexandre Rostovtsev <tetromino@gmail.com>
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of the
-+# License, or (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public
-+# License along with this program; if not, write to the
-+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+# Boston, MA 02110-1301, USA.
-+#
-+###
-+#
-+# Process the requested compressed source nroff file and output groff
-+# intermediate format.
-+#
-+
-+filename=$1
-+
-+if [ -z ${filename} ] ; then
-+ echo "Usage: yelp-groff [FILE]" >&2
-+ echo "Process a man FILE and output groff intermediate format."
-+ exit 1
-+fi
-+
-+# If "man -Z -Tutf8 -EUTF-8" works (i.e. if man is man-db), use that.
-+man -Z -Tutf8 -EUTF-8 ${filename} 2>/dev/null && exit 0
-+
-+# Otherwise, manually uncompress the file ...
-+cat="cat"
-+case ${filename} in
-+ *.bz2) cat="bzip2 -c -d" ;;
-+ *.gz) cat="gunzip -c" ;;
-+ *.lzma) cat="unlzma -c -d" ;;
-+ *.xz) cat="unxz -c" ;;
-+ *.Z) cat="zcat" ;;
-+esac
-+
-+# ... and run groff to get the intermediate format; preprocess with tbl
-+# unless MANROFFSEQ is defined.
-+${cat} ${filename} | groff -${MANROFFSEQ:-t} -man -Z -Tutf8
-diff --git a/libyelp/yelp-man-parser.c b/libyelp/yelp-man-parser.c
-index 4001d38..9818803 100644
---- a/libyelp/yelp-man-parser.c
-+++ b/libyelp/yelp-man-parser.c
-@@ -371,9 +371,9 @@ get_troff (gchar *path, GError **error)
- {
- gint stdout;
- GError *err = NULL;
-- gchar *argv[] = { "man", "-Z", "-Tutf8", "-EUTF-8", NULL, NULL };
-+ gchar *argv[] = { LIBEXECDIR "/yelp-groff", NULL, NULL };
-
-- argv[4] = path;
-+ argv[1] = path;
-
- if (!g_spawn_async_with_pipes (NULL, argv, NULL,
- G_SPAWN_SEARCH_PATH, NULL, NULL,
---
-1.7.5.rc3
-
diff --git a/gnome-extra/yelp/yelp-3.0.4.ebuild b/gnome-extra/yelp/yelp-3.0.4.ebuild
deleted file mode 100644
index e223a13..0000000
--- a/gnome-extra/yelp/yelp-3.0.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.1-r1.ebuild,v 1.1 2010/06/13 20:04:06 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="
- >=x11-libs/gtk+-2.91.8:3
- >=dev-libs/glib-2.25.11:2
- >=dev-libs/libxml2-2.6.5:2
- >=dev-libs/libxslt-1.1.4
- >=dev-libs/dbus-glib-0.71
- >=gnome-extra/yelp-xsl-3.0.1
- >=net-libs/webkit-gtk-1.3.2:3
- >=app-arch/xz-utils-4.9
- app-arch/bzip2
- dev-db/sqlite:3"
-DEPEND="${RDEPEND}
- >=sys-devel/gettext-0.17
- >=dev-util/intltool-0.41.0
- >=dev-util/pkgconfig-0.9
- gnome-base/gnome-common
- doc? ( >=dev-util/gtk-doc-1.13 )"
-# If eautoreconf:
-# gnome-base/gnome-common
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog NEWS README TODO"
- G2CONF="${G2CONF}
- --disable-static
- --disable-schemas-compile
- --enable-bz2
- --enable-lzma"
-}
-
-src_prepare() {
- # Fix compatibility with Gentoo's sys-apps/man
- # https://bugzilla.gnome.org/show_bug.cgi?id=648854
- epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch"
- eautoreconf
-
- gnome2_src_prepare
-}
diff --git a/gnome-extra/zenity/files/zenity-3.0.0-libnotify-ifdef.patch b/gnome-extra/zenity/files/zenity-3.0.0-libnotify-ifdef.patch
deleted file mode 100644
index 1599677..0000000
--- a/gnome-extra/zenity/files/zenity-3.0.0-libnotify-ifdef.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3388135658e8a8f56da7fd01015490c2c97958ee Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@gentoo.org>
-Date: Thu, 2 Jun 2011 22:42:33 +0530
-Subject: [PATCH] Fix bug 651723, don't look for libnotify.h if not requested
-
----
- src/notification.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/notification.c b/src/notification.c
-index 41d64e2..3f4c454 100644
---- a/src/notification.c
-+++ b/src/notification.c
-@@ -29,12 +29,12 @@
- #include <gtk/gtk.h>
- #include <time.h>
- #include <string.h>
-+#ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-
- #include "zenity.h"
- #include "util.h"
-
--#ifdef HAVE_LIBNOTIFY
- static char *icon_file;
-
- static void
---
-1.7.3.4
-
diff --git a/gnome-extra/zenity/zenity-3.0.0.ebuild b/gnome-extra/zenity/zenity-3.0.0.ebuild
deleted file mode 100644
index 39a5fd6..0000000
--- a/gnome-extra/zenity/zenity-3.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-2.32.1.ebuild,v 1.1 2010/11/29 18:40:56 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
-HOMEPAGE="http://live.gnome.org/Zenity"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="libnotify"
-
-RDEPEND=">=x11-libs/gtk+-3.0.0:3
- >=dev-libs/glib-2.8:2
- libnotify? ( >=x11-libs/libnotify-0.6.1 )"
-
-DEPEND="${RDEPEND}
- app-text/scrollkeeper
- app-text/docbook-xml-dtd:4.1.2
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.14
- >=dev-util/pkgconfig-0.9
- >=app-text/gnome-doc-utils-0.10.1"
-# eautoreconf needs:
-# >=gnome-base/gnome-common-2.12
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-scrollkeeper
- $(use_enable libnotify)
- PERL=$(type -P false)"
- DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-libnotify-ifdef.patch"
- gnome2_src_prepare
-}
-
-src_install() {
- gnome2_src_install
-
- rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-08-19 12:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-19 12:53 [gentoo-commits] proj/gnome:master commit in: gnome-extra/zenity/files/, gnome-extra/mousetweaks/, gnome-extra/gcalctool/, Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox