From 44e96f248bb93d265de2b2eab205972448b9b3de Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Wed, 2 May 2007 04:46:04 +0000 Subject: [PATCH] revbump for proc acpi fix Package-Manager: portage-2.1.2.5 --- gnome-base/gnome-applets/ChangeLog | 10 +- gnome-base/gnome-applets/Manifest | 19 ++- .../files/digest-gnome-applets-2.18.0-r1 | 3 + ...-applets-2.18.0-deprecated-acpi-info.patch | 38 ++++++ .../gnome-applets-2.18.0-r1.ebuild | 117 ++++++++++++++++++ 5 files changed, 182 insertions(+), 5 deletions(-) create mode 100644 gnome-base/gnome-applets/files/digest-gnome-applets-2.18.0-r1 create mode 100644 gnome-base/gnome-applets/files/gnome-applets-2.18.0-deprecated-acpi-info.patch create mode 100644 gnome-base/gnome-applets/gnome-applets-2.18.0-r1.ebuild diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog index d0f48ee958b6..054684215bca 100644 --- a/gnome-base/gnome-applets/ChangeLog +++ b/gnome-base/gnome-applets/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-base/gnome-applets # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.213 2007/04/07 22:46:32 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.214 2007/05/02 04:46:04 compnerd Exp $ + +*gnome-applets-2.18.0-r1 (02 May 2007) + + 02 May 2007; Saleem Abdulrasool + +files/gnome-applets-2.18.0-deprecated-acpi-info.patch, + +gnome-applets-2.18.0-r1.ebuild: + Revbump to allow the battstat applet to work with newer kernels (bug + #176757). Patch from Jeffrey Gardner 07 Apr 2007; Saleem Abdulrasool gnome-applets-2.18.0.ebuild: diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest index f86dbbf1f12f..54f4da137cf0 100644 --- a/gnome-base/gnome-applets/Manifest +++ b/gnome-base/gnome-applets/Manifest @@ -14,6 +14,10 @@ AUX gnome-applets-2.16.2-malloc.patch 402 RMD160 3ef843723f5da945aebef66a6860a2f MD5 8a32ffde190dbd0f381635fdac03310b files/gnome-applets-2.16.2-malloc.patch 402 RMD160 3ef843723f5da945aebef66a6860a2f5111a7f69 files/gnome-applets-2.16.2-malloc.patch 402 SHA256 b0e118b53942d12d4104ec8bc6434ea81d7178a5d6e8ccf6a8a71c6280a4d1fa files/gnome-applets-2.16.2-malloc.patch 402 +AUX gnome-applets-2.18.0-deprecated-acpi-info.patch 1225 RMD160 1fc01dc8e932647764b11b3ba50850f80e0aaa8e SHA1 b3f4e1019946c3b396650aa1e74c6cf0f6d193af SHA256 b5c732f49e5f89e4a76aa8c119808ddf19af7dfe4943070efd39da37d72718ef +MD5 fb5abc1ac52d447698ba3db1a89f8d02 files/gnome-applets-2.18.0-deprecated-acpi-info.patch 1225 +RMD160 1fc01dc8e932647764b11b3ba50850f80e0aaa8e files/gnome-applets-2.18.0-deprecated-acpi-info.patch 1225 +SHA256 b5c732f49e5f89e4a76aa8c119808ddf19af7dfe4943070efd39da37d72718ef files/gnome-applets-2.18.0-deprecated-acpi-info.patch 1225 DIST gnome-applets-2.14.2.tar.bz2 6601120 RMD160 34f263b64407514cb65f0ecb3654ee8fc294b219 SHA1 88f58242601b3762cb665e2f30b8459ae89f4ff1 SHA256 4bdd52b47649cfa6dc5d065201124ae02d3da593531cd0defa1a9cf7a761f1df DIST gnome-applets-2.16.2.tar.bz2 7127753 RMD160 b8706c57b37702b0bfc64cb549fc594b05da5e5b SHA1 8b912c21e7c390c9aae96bb81fe017fa1f9bf006 SHA256 de3c9d92c5da1597dbcdc5d4a7554235006d0bf6432f97ab7b0a6a5a47dbb67b DIST gnome-applets-2.18.0.tar.bz2 7133902 RMD160 c9a18c717fd01ede9476a70784a8522968e52211 SHA1 7bec1f642e827634f74859e81e1502799d3c05a2 SHA256 f8f23e0c5e156afb0811d7a7fcbfec8dc667b8e35fa8a1cfff0b4866014c2157 @@ -29,14 +33,18 @@ EBUILD gnome-applets-2.16.2.ebuild 2650 RMD160 13d80188e729200264073b63be4e4f15d MD5 82cea9099c32cd64f980f01cd1c3529e gnome-applets-2.16.2.ebuild 2650 RMD160 13d80188e729200264073b63be4e4f15d3ff8201 gnome-applets-2.16.2.ebuild 2650 SHA256 c7377a4cacde0f914c6a038b891e0c523ba22a363cef59d6a4b7589fcc566dfa gnome-applets-2.16.2.ebuild 2650 +EBUILD gnome-applets-2.18.0-r1.ebuild 2986 RMD160 8f315796586b30753349b53405408feb2e58803d SHA1 3f2eb8db0c8c2f414ef251f3509d1562a516b087 SHA256 e72a30f9a5dc5b5ced0a9d0ebf60b41f0c7a4563979304179e749f1f003076d2 +MD5 0922aed8f6f9420239732ee0b3117044 gnome-applets-2.18.0-r1.ebuild 2986 +RMD160 8f315796586b30753349b53405408feb2e58803d gnome-applets-2.18.0-r1.ebuild 2986 +SHA256 e72a30f9a5dc5b5ced0a9d0ebf60b41f0c7a4563979304179e749f1f003076d2 gnome-applets-2.18.0-r1.ebuild 2986 EBUILD gnome-applets-2.18.0.ebuild 2886 RMD160 80cdbf0a54974dceeb22033a0d777bafbddff705 SHA1 f5e296f37b042d448dd69636cf683e3aa106f5c8 SHA256 c4b42184a0b7bef65386c5c318ae2c6e99d67c1cc7c75320b65bc78205856a65 MD5 a65c269f6e551d5d6e8e1ad7116b97d3 gnome-applets-2.18.0.ebuild 2886 RMD160 80cdbf0a54974dceeb22033a0d777bafbddff705 gnome-applets-2.18.0.ebuild 2886 SHA256 c4b42184a0b7bef65386c5c318ae2c6e99d67c1cc7c75320b65bc78205856a65 gnome-applets-2.18.0.ebuild 2886 -MISC ChangeLog 29584 RMD160 e4f5085daba0b1fe050ea78eb841d391ee607494 SHA1 835bd2c34b40315172a825d55c571357b548f8ea SHA256 432e9c3305e9cb2c9d23c8045560aba6b655f19aea5e29812374be1a6b08a3cc -MD5 6cb64e1d4add02c058b7cde8d5fb520f ChangeLog 29584 -RMD160 e4f5085daba0b1fe050ea78eb841d391ee607494 ChangeLog 29584 -SHA256 432e9c3305e9cb2c9d23c8045560aba6b655f19aea5e29812374be1a6b08a3cc ChangeLog 29584 +MISC ChangeLog 29884 RMD160 38d0c7ac95b3a6e48042b7458ceb5513cdb7fced SHA1 7c26b5d9d85cf3bb990ab583ab78343ac92ca505 SHA256 76a3fcbf67b61cebc0772f3fc351fdcfe5dee5e2044819778f8b062a671e33c9 +MD5 e876218d01886fe8cc05122649cf2a94 ChangeLog 29884 +RMD160 38d0c7ac95b3a6e48042b7458ceb5513cdb7fced ChangeLog 29884 +SHA256 76a3fcbf67b61cebc0772f3fc351fdcfe5dee5e2044819778f8b062a671e33c9 ChangeLog 29884 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 @@ -53,3 +61,6 @@ SHA256 753267861fe4c73102dc09d66bcb41cdac6f39a26cd3c21a6ad95a7b5d100440 files/di MD5 520433101587db3701cc08eb46418763 files/digest-gnome-applets-2.18.0 268 RMD160 01a80c3ac08eb23693cd2adad2485c19722b518a files/digest-gnome-applets-2.18.0 268 SHA256 98fa05a12d0c192e46fdff101ebb142fc448aa808ee4cdc30866a81158f20c39 files/digest-gnome-applets-2.18.0 268 +MD5 520433101587db3701cc08eb46418763 files/digest-gnome-applets-2.18.0-r1 268 +RMD160 01a80c3ac08eb23693cd2adad2485c19722b518a files/digest-gnome-applets-2.18.0-r1 268 +SHA256 98fa05a12d0c192e46fdff101ebb142fc448aa808ee4cdc30866a81158f20c39 files/digest-gnome-applets-2.18.0-r1 268 diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.18.0-r1 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.18.0-r1 new file mode 100644 index 000000000000..b08b91a64e0c --- /dev/null +++ b/gnome-base/gnome-applets/files/digest-gnome-applets-2.18.0-r1 @@ -0,0 +1,3 @@ +MD5 db3ef99c00335798f30fc0a9162c0257 gnome-applets-2.18.0.tar.bz2 7133902 +RMD160 c9a18c717fd01ede9476a70784a8522968e52211 gnome-applets-2.18.0.tar.bz2 7133902 +SHA256 f8f23e0c5e156afb0811d7a7fcbfec8dc667b8e35fa8a1cfff0b4866014c2157 gnome-applets-2.18.0.tar.bz2 7133902 diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.18.0-deprecated-acpi-info.patch b/gnome-base/gnome-applets/files/gnome-applets-2.18.0-deprecated-acpi-info.patch new file mode 100644 index 000000000000..33104d7b54cf --- /dev/null +++ b/gnome-base/gnome-applets/files/gnome-applets-2.18.0-deprecated-acpi-info.patch @@ -0,0 +1,38 @@ +--- gnome-applets-2.16.2-orig/battstat/acpi-linux.c 2007-05-01 21:44:17.000000000 -0500 ++++ gnome-applets-2.16.2/battstat/acpi-linux.c 2007-05-01 21:45:50.000000000 -0500 +@@ -200,22 +200,21 @@ + acpiinfo->max_capacity = 0; + acpiinfo->low_capacity = 0; + acpiinfo->critical_capacity = 0; ++ acpiinfo->ac_state_state = "state"; ++ acpiinfo->batt_state_state = "state"; ++ acpiinfo->charging_state = "charging state"; + + 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"; ++ if (hash) ++ { ++ 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"; ++ } + } + + procdir=opendir("/proc/acpi/battery/"); diff --git a/gnome-base/gnome-applets/gnome-applets-2.18.0-r1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.18.0-r1.ebuild new file mode 100644 index 000000000000..0e0c608009ed --- /dev/null +++ b/gnome-base/gnome-applets/gnome-applets-2.18.0-r1.ebuild @@ -0,0 +1,117 @@ +# 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-r1.ebuild,v 1.1 2007/05/02 04:46:04 compnerd 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 + ( =sys-apps/dbus-0.34 ) + ) + >=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}/${PN}-2.18.0-deprecated-acpi-info.patch +} + +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 +} -- 2.26.2