+++ /dev/null
-
-From: Daniel Drake <dsd@gentoo.org>
-
-2.6.21 compatibility fix (based on patch by Alan Swanson). Also improved error
-passing/handling. (#427562)
-
-http://bugzilla.gnome.org/show_bug.cgi?id=427562
-https://bugs.gentoo.org/show_bug.cgi?id=176757
-
-Index: battstat/acpi-linux.c
-===================================================================
---- battstat/acpi-linux.c (revision 10278)
-+++ battstat/acpi-linux.c (revision 10280)
-@@ -191,7 +191,6 @@
- static gboolean update_battery_info(struct acpi_info * acpiinfo)
- {
- char batt_info[60];
-- gulong acpi_ver;
- GHashTable *hash;
- DIR * procdir;
- struct dirent * procdirentry;
-@@ -201,23 +200,6 @@
- acpiinfo->low_capacity = 0;
- acpiinfo->critical_capacity = 0;
-
-- hash = read_file ("/proc/acpi/info", buf, sizeof (buf));
-- if (!hash)
-- return FALSE;
--
-- acpi_ver = read_ulong (hash, "version");
-- g_hash_table_destroy (hash);
--
-- if (acpi_ver < (gulong)20020208) {
-- acpiinfo->ac_state_state = "status";
-- acpiinfo->batt_state_state = "status";
-- acpiinfo->charging_state = "state";
-- } else {
-- acpiinfo->ac_state_state = "state";
-- acpiinfo->batt_state_state = "state";
-- acpiinfo->charging_state = "charging state";
-- }
--
- procdir=opendir("/proc/acpi/battery/");
- if (!procdir)
- return FALSE;
-@@ -252,16 +234,40 @@
- * initializes the stored battery and AC adapter information. */
- gboolean acpi_linux_init(struct acpi_info * acpiinfo)
- {
-+ GHashTable *hash;
-+ char buf[BUFSIZ];
-+ gchar *pbuf;
-+ gulong acpi_ver;
- int fd;
-
- g_assert(acpiinfo);
-+
-+ if (g_file_get_contents ("/sys/module/acpi/parameters/acpica_version", &pbuf, NULL, NULL)) {
-+ acpi_ver = strtoul (pbuf, NULL, 10);
-+ g_free (pbuf);
-+ } else if (hash = read_file ("/proc/acpi/info", buf, sizeof (buf))) {
-+ acpi_ver = read_ulong (hash, "version");
-+ g_hash_table_destroy (hash);
-+ } else
-+ return FALSE;
-+
-+ if (acpi_ver < (gulong)20020208) {
-+ acpiinfo->ac_state_state = "status";
-+ acpiinfo->batt_state_state = "status";
-+ acpiinfo->charging_state = "state";
-+ } else {
-+ acpiinfo->ac_state_state = "state";
-+ acpiinfo->batt_state_state = "state";
-+ acpiinfo->charging_state = "charging state";
-+ }
-+
-+ if (!update_battery_info(acpiinfo) || !update_ac_info(acpiinfo))
-+ return FALSE;
-
- fd = open("/proc/acpi/event", 0);
- if (fd >= 0) {
- acpiinfo->event_fd = fd;
- acpiinfo->channel = g_io_channel_unix_new(fd);
-- update_battery_info(acpiinfo);
-- update_ac_info(acpiinfo);
- return TRUE;
- }
-
-@@ -273,8 +279,6 @@
- if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == 0) {
- acpiinfo->event_fd = fd;
- acpiinfo->channel = g_io_channel_unix_new(fd);
-- update_battery_info(acpiinfo);
-- update_ac_info(acpiinfo);
- return TRUE;
- }
- }
-@@ -323,7 +327,6 @@
- {
- gsize i;
- int evt;
-- gboolean result = FALSE;
- GString *buffer;
- GError *gerror=NULL;
- buffer=g_string_new(NULL);
-@@ -333,21 +336,18 @@
- evt = parse_acpi_event(buffer);
- switch (evt) {
- case ACPI_EVENT_AC:
-- update_ac_info(acpiinfo);
-- result = TRUE;
-- break;
-+ return update_ac_info(acpiinfo);
- case ACPI_EVENT_BATTERY_INFO:
-- update_battery_info(acpiinfo);
-- /* Update AC info on battery info updates. This works around
-- * a bug in ACPI (as per bug #163013).
-- */
-- update_ac_info(acpiinfo);
-- result = TRUE;
-- break;
-+ if (update_battery_info(acpiinfo)) {
-+ /* Update AC info on battery info updates. This works around
-+ * a bug in ACPI (as per bug #163013).
-+ */
-+ return update_ac_info(acpiinfo);
-+ }
-+ /* fall-through */
-+ default:
-+ return FALSE;
- }
--
--
-- return result;
- }
-
- /*
+++ /dev/null
---- mixer.orig/Makefile.am 2007-09-29 11:03:19.000000000 +1000
-+++ mixer/Makefile.am 2007-09-29 13:41:49.000000000 +1000
-@@ -1,9 +1,6 @@
- SUBDIRS = docs
-
- INCLUDES = -I. -I$(srcdir) \
-- -DG_DISABLE_DEPRECATED \
-- -DGTK_DISABLE_DEPRECATED \
-- -DGDK_DISABLE_DEPRECATED \
- $(MIXER_CFLAGS) \
- $(GNOME_APPLETS_CFLAGS) \
- $(GNOMEDESKTOP_CFLAGS)
+++ /dev/null
-# Copyright 1999-2007 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.18.0-r3.ebuild,v 1.8 2007/11/23 17:42:19 jer Exp $
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Applets for the GNOME Desktop and Panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="acpi apm doc gnome gstreamer hal ipv6"
-
-RDEPEND=">=x11-libs/gtk+-2.6
- >=dev-libs/glib-2.6
- >=gnome-base/libgnome-2.8
- >=gnome-base/libgnomeui-2.8
- >=gnome-base/gconf-2.8
- >=gnome-base/gnome-panel-2.13.4
- >=gnome-base/libglade-2.4
- >=gnome-base/gail-1.1
- >=x11-libs/libxklavier-2.91
- >=x11-libs/libwnck-2.9.3
- >=app-admin/system-tools-backends-1.1.3
- >=gnome-base/gnome-desktop-2.11.1
- >=x11-libs/libnotify-0.3.2
- hal? ( >=sys-apps/hal-0.5.3 )
- >=dev-libs/dbus-glib-0.71
- >=x11-themes/gnome-icon-theme-2.15.91
- >=dev-libs/libxml2-2.5.0
- >=virtual/python-2.4
- apm? ( sys-apps/apmd )
- x11-apps/xrdb x11-libs/libX11
- gnome? (
- gnome-base/libgnomekbd
- gnome-base/control-center
-
- >=gnome-extra/gucharmap-1.4
- >=gnome-base/libgtop-2.11.92
- >=gnome-base/gnome-vfs-2.15.4
-
- >=dev-python/pygtk-2.6
- >=dev-python/gnome-python-2.10
- )
- gstreamer? (
- >=media-libs/gstreamer-0.10.2
- >=media-libs/gst-plugins-base-0.10.2
- )"
-
-DEPEND="${RDEPEND}
- >=app-text/scrollkeeper-0.1.4
- >=dev-util/pkgconfig-0.19
- >=dev-util/intltool-0.35
- dev-libs/libxslt
- doc? (
- app-text/docbook-sgml-utils
- >=app-text/gnome-doc-utils-0.3.2
- ~app-text/docbook-xml-dtd-4.3
- )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
- G2CONF="--disable-scrollkeeper --enable-flags \
- $(use_with hal)
- $(use_enable ipv6)
- $(use_enable doc gtk-doc)"
-
- if use gstreamer; then
- G2CONF="${G2CONF} --with-gstreamer=0.10"
- fi
-
- if ! use ppc && ! use apm && ! use acpi; then
- G2CONF="${G2CONF} --disable-battstat"
- fi
-
- if use ppc && ! use apm; then
- G2CONF="${G2CONF} --disable-battstat"
- fi
-}
-
-src_unpack() {
- gnome2_src_unpack
- epatch "${FILESDIR}/${P}-acpi-procfs.patch"
- epatch "${FILESDIR}/${P}-gtk+-2.12-compat.patch"
- AT_M4DIR="m4" eautoreconf
-}
-
-src_install() {
- gnome2_src_install
-
- APPLETS="accessx-status battstat charpick cpufreq drivemount geyes \
- gkb-new gswitchit gweather invest-applet mini-commander \
- mixer modemlights multiload null_applet stickynotes trashapplet"
-
- for applet in ${APPLETS} ; do
- docinto ${applet}
-
- for d in AUTHORS ChangeLog NEWS README README.themes TODO ; do
- [ -s ${applet}/${d} ] && dodoc ${applet}/${d}
- done
- done
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if use acpi && ! use hal ; then
- elog "It is highly recommended that you install acpid if you use the"
- elog "battstat applet to prevent any issues with other applications "
- elog "trying to read acpi information."
- fi
-}
+++ /dev/null
-# Copyright 1999-2007 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.20.0.ebuild,v 1.8 2007/11/29 06:02:30 jer Exp $
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Applets for the GNOME Desktop and Panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="acpi apm doc gnome gstreamer hal ipv6 test"
-
-RDEPEND=">=x11-libs/gtk+-2.11
- >=dev-libs/glib-2.13
- >=gnome-base/libgnome-2.8
- >=gnome-base/libgnomeui-2.8
- >=gnome-base/gconf-2.8
- >=gnome-base/gnome-panel-2.13.4
- >=gnome-base/libglade-2.4
- >=gnome-base/gail-1.1
- >=x11-libs/libxklavier-2.91
- >=x11-libs/libwnck-2.9.3
- >=app-admin/system-tools-backends-1.1.3
- >=gnome-base/gnome-desktop-2.11.1
- >=x11-libs/libnotify-0.3.2
- hal? ( >=sys-apps/hal-0.5.3 )
- >=dev-libs/dbus-glib-0.71
- >=x11-themes/gnome-icon-theme-2.15.91
- >=dev-libs/libxml2-2.5.0
- >=virtual/python-2.4
- apm? ( sys-apps/apmd )
- x11-apps/xrdb x11-libs/libX11
- gnome? (
- gnome-base/libgnomekbd
- gnome-base/control-center
-
- >=gnome-extra/gucharmap-1.4
- >=gnome-base/libgtop-2.11.92
- >=gnome-base/gnome-vfs-2.15.4
-
- >=dev-python/pygtk-2.6
- >=dev-python/gnome-python-2.10
- )
- gstreamer? (
- >=media-libs/gstreamer-0.10.2
- >=media-libs/gst-plugins-base-0.10.2
- )"
-
-DEPEND="${RDEPEND}
- >=app-text/scrollkeeper-0.1.4
- >=dev-util/pkgconfig-0.19
- >=dev-util/intltool-0.35
- dev-libs/libxslt
- doc? (
- app-text/docbook-sgml-utils
- >=app-text/gnome-doc-utils-0.3.2
- ~app-text/docbook-xml-dtd-4.3
- )
- test? ( ~app-text/docbook-xml-dtd-4.3 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
- G2CONF="--disable-scrollkeeper --enable-flags \
- $(use_with hal)
- $(use_enable ipv6)
- $(use_enable doc gtk-doc)"
-
- if use gstreamer; then
- G2CONF="${G2CONF} --with-gstreamer=0.10"
- fi
-
- if ! use ppc && ! use apm && ! use acpi; then
- G2CONF="${G2CONF} --disable-battstat"
- fi
-
- if use ppc && ! use apm; then
- G2CONF="${G2CONF} --disable-battstat"
- fi
-}
-
-src_install() {
- gnome2_src_install
-
- APPLETS="accessx-status battstat charpick cpufreq drivemount geyes \
- gkb-new gswitchit gweather invest-applet mini-commander \
- mixer modemlights multiload null_applet stickynotes trashapplet"
-
- for applet in ${APPLETS} ; do
- docinto ${applet}
-
- for d in AUTHORS ChangeLog NEWS README README.themes TODO ; do
- [ -s ${applet}/${d} ] && dodoc ${applet}/${d}
- done
- done
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if use acpi && ! use hal ; then
- elog "It is highly recommended that you install acpid if you use the"
- elog "battstat applet to prevent any issues with other applications "
- elog "trying to read acpi information."
- fi
-}
# ChangeLog for gnome-base/gnome-light
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.85 2008/02/04 04:55:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.86 2008/03/10 22:31:28 leio Exp $
+
+ 10 Mar 2008; Mart Raudsepp <leio@gentoo.org> ChangeLog:
+ Remove GNOME 2.18
04 Feb 2008; Jeroen Roovers <jer@gentoo.org> gnome-light-2.20.3.ebuild:
Stable for HPPA (bug #208366).
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.18.3.ebuild,v 1.8 2007/11/06 17:09:24 armin76 Exp $
-
-S=${WORKDIR}
-DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
-SLOT="2.0"
-IUSE=""
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-# Note to developers:
-# This is a wrapper for the 'light' Gnome2 desktop,
-# This should only consist of the bare minimum of libs/apps needed
-# It is basicly the gnome-base/gnome without all extra apps
-
-# This is currently in it's test phase, if you feel like some dep
-# should be added or removed from this pack file a bug to
-# gnome@gentoo.org on bugs.gentoo.org
-
-# >=media-gfx/eog-2.2.1
-
-RDEPEND="!gnome-base/gnome
-
- >=dev-libs/glib-2.12.12
- >=x11-libs/gtk+-2.10.13
- >=dev-libs/atk-1.18.0
- >=x11-libs/pango-1.16.4
-
- >=gnome-base/orbit-2.14.7
-
- >=x11-libs/libwnck-2.18.3
- >=x11-wm/metacity-2.18.5
-
- >=gnome-base/gnome-vfs-2.18.1
- >=gnome-base/gconf-2.18.0.1
-
- >=gnome-base/gnome-mime-data-2.4.3
-
- >=gnome-base/libbonobo-2.18.0
- >=gnome-base/libbonoboui-2.18.0
- >=gnome-base/libgnome-2.18.0
- >=gnome-base/libgnomeui-2.18.1
- >=gnome-base/libgnomecanvas-2.14.0
- >=gnome-base/libglade-2.6.1
-
- >=gnome-base/control-center-2.18.1
-
- >=gnome-base/eel-2.18.3
- >=gnome-base/nautilus-2.18.3
-
- >=gnome-base/gnome-desktop-2.18.3
- >=gnome-base/gnome-session-2.18.3
- >=gnome-base/gnome-panel-2.18.3
-
- >=x11-themes/gnome-icon-theme-2.18.0
- >=x11-themes/gnome-themes-2.18.1
-
- >=x11-terms/gnome-terminal-2.18.1
-
- >=gnome-base/librsvg-2.16.1
-
- >=gnome-extra/yelp-2.18.1"
-
-pkg_postinst () {
-
- elog "Note that to change windowmanager to metacity do: "
- elog " export WINDOW_MANAGER=\"/usr/bin/metacity\""
- elog "of course this works for all other window managers as well"
- elog
- elog "Use gnome-base/gnome for the full GNOME Desktop"
- elog "as released by the GNOME team."
-
-}
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.20.1.ebuild,v 1.8 2007/11/29 06:22:19 jer Exp $
-
-S=${WORKDIR}
-DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
-SLOT="2.0"
-IUSE=""
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-# Note to developers:
-# This is a wrapper for the 'light' Gnome2 desktop,
-# This should only consist of the bare minimum of libs/apps needed
-# It is basicly the gnome-base/gnome without all extra apps
-
-# This is currently in it's test phase, if you feel like some dep
-# should be added or removed from this pack file a bug to
-# gnome@gentoo.org on bugs.gentoo.org
-
-# >=media-gfx/eog-2.2.1
-
-RDEPEND="!gnome-base/gnome
-
- >=dev-libs/glib-2.14.2
- >=x11-libs/gtk+-2.12.1
- >=dev-libs/atk-1.20.0
- >=x11-libs/pango-1.18.3
-
- >=gnome-base/orbit-2.14.10
-
- >=x11-libs/libwnck-2.20.1
- >=x11-wm/metacity-2.20.0
-
- >=gnome-base/gnome-vfs-2.20.0
- >=gnome-base/gconf-2.20.1
-
- >=gnome-base/gnome-mime-data-2.18.0
-
- >=gnome-base/libbonobo-2.20.1
- >=gnome-base/libbonoboui-2.20.0
- >=gnome-base/libgnome-2.20.1.1
- >=gnome-base/libgnomeui-2.20.1
- >=gnome-base/libgnomecanvas-2.20.1
- >=gnome-base/libglade-2.6.2
-
- >=gnome-base/control-center-2.20.1
-
- >=gnome-base/eel-2.20.0
- >=gnome-base/nautilus-2.20.0
-
- >=gnome-base/gnome-desktop-2.20.1
- >=gnome-base/gnome-session-2.20.1
- >=gnome-base/gnome-panel-2.20.1
-
- >=x11-themes/gnome-icon-theme-2.20.0
- >=x11-themes/gnome-themes-2.20.1
-
- >=x11-terms/gnome-terminal-2.18.2
-
- >=gnome-base/librsvg-2.18.2
-
- >=gnome-extra/yelp-2.20.0"
-
-pkg_postinst () {
-
- elog "Note that to change windowmanager to metacity do: "
- elog " export WINDOW_MANAGER=\"/usr/bin/metacity\""
- elog "of course this works for all other window managers as well"
- elog
- elog "Use gnome-base/gnome for the full GNOME Desktop"
- elog "as released by the GNOME team."
-
-}
+++ /dev/null
---- gnome-session/main.c.orig 2007-01-22 20:15:57.000000000 -0600
-+++ gnome-session/main.c 2007-01-22 20:17:57.000000000 -0600
-@@ -322,7 +322,6 @@
- GError *err;
- int status;
- char *display_str;
-- char **versions;
- GConfClient *gconf_client;
- GOptionContext *goption_context;
- gboolean dbus_daemon_owner;
-@@ -330,20 +329,6 @@
- if (getenv ("GSM_VERBOSE_DEBUG"))
- gsm_set_verbose (TRUE);
-
-- /* Help eradicate the critical warnings in unstable releases of GNOME */
-- versions = g_strsplit (VERSION, ".", 3);
-- if (versions && versions [0] && versions [1])
-- {
-- int major;
-- major = atoi (versions [1]);
-- if ((major % 2) != 0)
-- {
-- putenv ("G_DEBUG=fatal_criticals");
-- g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
-- }
-- }
-- g_strfreev (versions);
--
- set_lang();
- set_gtk1_theme_rcfile ();
-
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.18.3.ebuild,v 1.11 2008/03/02 11:33:31 leio Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI}
- branding? ( mirror://gentoo/gentoo-splash.png )"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="branding esd ipv6 tcpd"
-
-RDEPEND=">=dev-libs/glib-2.6
- >=x11-libs/gtk+-2.3.1
- x11-libs/libXau
- x11-apps/xdpyinfo
- >=gnome-base/libgnomeui-2.2
- =gnome-base/gnome-desktop-2*
- >=gnome-base/control-center-2.15.4
- >=x11-libs/libnotify-0.2.1
- >=gnome-base/gconf-2
- >=gnome-base/gnome-keyring-0.5.1
- >=dev-libs/dbus-glib-0.71
- esd? ( >=media-sound/esound-0.2.26 )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-DEPEND="${RDEPEND}
- x11-apps/xrdb
- >=sys-devel/gettext-0.10.40
- >=dev-util/pkgconfig-0.17
- >=dev-util/intltool-0.35
- !gnome-base/gnome-core"
-
-# gnome-base/gnome-core overwrite /usr/bin/gnome-session
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
- # TODO: convert libnotify to a configure option
- G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable esd) $(use_enable tcpd tcp-wrappers)"
-}
-
-src_unpack() {
- gnome2_src_unpack
-
- # Patch for Gentoo Branding (bug #42687)
- use branding && epatch "${FILESDIR}/${PN}-2.17.90.1-gentoo-branding.patch"
-
- # Get rid of random asserts in tons of programs due to development versions
- epatch "${FILESDIR}/${PN}-2.17.90-no-asserts.patch"
-}
-
-src_install() {
- gnome2_src_install
-
- dodir /etc/X11/Sessions
- exeinto /etc/X11/Sessions
- doexe "${FILESDIR}/Gnome"
-
- # Our own splash for world domination
- if use branding ; then
- insinto /usr/share/pixmaps/splash/
- doins "${DISTDIR}"/gentoo-splash.png
- fi
-}
projects / gentoo.git / commitdiff