Bump to 2.2.4. Remove old revisions.

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

6 files changed, 18 insertions, 140 deletions

diff --git a/gnome-extra/sensors-applet/ChangeLog b/gnome-extra/sensors-applet/ChangeLog
index 1705c99dba03..de30cc746ad7 100644
--- a/gnome-extra/sensors-applet/ChangeLog
+++ b/gnome-extra/sensors-applet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/sensors-applet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/ChangeLog,v 1.35 2009/03/15 11:22:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/ChangeLog,v 1.36 2009/04/26 21:21:27 eva Exp $
+
+*sensors-applet-2.2.4 (26 Apr 2009)
+
+  26 Apr 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -sensors-applet-1.6.ebuild, -sensors-applet-1.8.2.ebuild,
+  -sensors-applet-2.2.1.ebuild, -sensors-applet-2.2.2.ebuild,
+  +sensors-applet-2.2.4.ebuild:
+  Bump to 2.2.4. Remove old revisions.
 
 *sensors-applet-2.2.3 (15 Mar 2009)
 
diff --git a/gnome-extra/sensors-applet/Manifest b/gnome-extra/sensors-applet/Manifest
index 0622e6f0a1cb..873f3d604470 100644
--- a/gnome-extra/sensors-applet/Manifest
+++ b/gnome-extra/sensors-applet/Manifest
@@ -3,24 +3,18 @@ Hash: SHA1
 
 AUX sensors-applet-1.7.12-test-fix.patch 540 RMD160 70ef1df3979ee72bb4232698335492e99aaed4bc SHA1 fe26c932a3b40e812e7eac184418fc72804fc297 SHA256 8cb8cb3781d26fddc5c11bff869328d237460d617e240a84ceb08f21bb6328e6
 AUX sensors-applet-2.2.2-nvidia-check.patch 951 RMD160 c9699308b389c31d848d6d2a55004a7a753caf87 SHA1 a25b9dfd69388fe051a19ae3b3c087c72d2c04ed SHA256 bfc7ecae661ff492f13c646e30659524e130dd34cbca74fe2d14f4d7bf9991c7
-DIST sensors-applet-1.6.tar.gz 212215 RMD160 a9836b907bece45fdb7026ee75f27f7b8c2c8663 SHA1 d152f59e933961b3d8378563d71559fcd05f06c7 SHA256 3d076c4c4d9e321a06c36ba6a55ff5f41625abd3a0b6304ea5692c22ac824f28
 DIST sensors-applet-1.7.12.tar.gz 280611 RMD160 9d90ee667405a6dc09fe78ff7209f6aabc6f55d7 SHA1 56c8129a8bbfcada1bb43bb7aa3df7d50963335a SHA256 195df33c123484c37fda5c4153403943190b20b6895b3a84b420c1b63bf872cb
-DIST sensors-applet-1.8.2.tar.gz 281720 RMD160 78ee5b36978a14d004c7c1bdd873b1fa4f5eac32 SHA1 bd05380c89757fdebed1ad2e18e6da66a0aba1d9 SHA256 033c8e25a8cf0b216b63bc5b410802b74d4230ce4b608733aefa84bab0743273
-DIST sensors-applet-2.2.1.tar.gz 518257 RMD160 3b6c5ea65b68e694c0db5b2776a89847b8fd57a9 SHA1 445b658dcb3d462b85368bbbfa62a9facfc203bc SHA256 6be95f70458d299f28bfc81dee201b3e1c328bc55df00fc7f2c30d7f8f6faba0
-DIST sensors-applet-2.2.2.tar.gz 464462 RMD160 8383ac3f680ff9c79cc8e39d93d39db955de5ad5 SHA1 9e3a26607f51b77ceb9f3f4066b8c2496e7ab3aa SHA256 20059d2152baca147e9df8bdecdace34c1ce250512a5b8a0c4c864c9a6b9b059
 DIST sensors-applet-2.2.3.tar.gz 464586 RMD160 31fe52e11a5f93a77aa4dd443cc0e6e87746561e SHA1 e614a6c848baa73e4f0b0e43d25d582cc5130b9b SHA256 56bb803a8cf6d986d2ae77942cb338d4cf89ef602b4433f11fd5bd814aba2980
-EBUILD sensors-applet-1.6.ebuild 839 RMD160 54f3bb21bd4a9e408dc6257ba3e6ed7463445435 SHA1 b6f2927fccbcaf5b9fa0a7f15bfb28cd5e3dfb87 SHA256 280168fb066d32a271ed15521812bb9ac9554496b15c361924c38089e34b7a5e
+DIST sensors-applet-2.2.4.tar.gz 464585 RMD160 740c9b5f0c4aa59aac3c307073a96d87ee08fa7e SHA1 60d93637c1970037ec7ce324070536e2aa754316 SHA256 a52214f2cf2b23a49394804dc589be51eecd4b8674f141047a46a550882f28f6
 EBUILD sensors-applet-1.7.12.ebuild 1236 RMD160 4ae24726f0e32f86e2fbd72343eb0f4a1f74d629 SHA1 f5aa21f15a2d3185ad03197f64e98e43dda3ee43 SHA256 e30447a4004d28507a29ebc03cfb8fe67e706c7a565a2447820c6902d649c02a
-EBUILD sensors-applet-1.8.2.ebuild 1158 RMD160 cbec3b155bd6330cee1f6c53ea3606699a262e09 SHA1 a98f8c08c8d922176189b5eac00e098bb4d0baa4 SHA256 d1412b30f1416bfc8283d6fd0c64ff5d90d45033d8fe635428e0f36e3371f393
-EBUILD sensors-applet-2.2.1.ebuild 1267 RMD160 5579b34bc35584cc3357f014cfa94f6d24218942 SHA1 3dbde183ffdf5041bae1af5770ab49b856bce955 SHA256 fd2182425172714225da05636b4be1ac73f46f14f2dab2f8704492d51002eb3f
-EBUILD sensors-applet-2.2.2.ebuild 1446 RMD160 c2283b7e1b27e9176c2b49a46677637cc021bd74 SHA1 3eddcecc81372a650e25da701b91c0c9e9cc066a SHA256 8377244d3800cfd778ad5b99ed0e731a84bd3e50aae04f3d0f26726ef739fe3b
 EBUILD sensors-applet-2.2.3.ebuild 1211 RMD160 4d08f8638084bf24809bedb4d28f774765dee36c SHA1 10002a62623e8121ce2e8e000a336c1f2b565f5f SHA256 57742d877f3dea71d3226d739a131ac4fdc95e6dbc9fe5cb17f66df852013cc3
-MISC ChangeLog 7110 RMD160 a31cc4bc11504c8b950802ad04b29e985fe50ef1 SHA1 525b638913e7f77ad2d1f9900513d4dcf0c85cf8 SHA256 763065926686644839f3134ae2ce646084128a801ef30f69ff7c931ef4d73af1
+EBUILD sensors-applet-2.2.4.ebuild 1211 RMD160 614de3835870e013a5776d84b636ff3c6c6fcd91 SHA1 77b4c605121ea7075b234fcaffde2dda15817b8f SHA256 e76b0fd20fff8890a0d2c62c037ea5e5214a333d6363f1df5959540ad59e2c8a
+MISC ChangeLog 7395 RMD160 9d7dcf24eca6d184b31cf338fe788250e08b0480 SHA1 18b4e5803c0dfb2480b4a83c92056b4a7a724531 SHA256 d246f19ac5590abb2da361ef2ba7e4c315c6b6c69d039b0826eae5f44d70f460
 MISC metadata.xml 342 RMD160 e761b0d10437a107e4963ad475a49340cf830fc0 SHA1 518de70c94e013520807ee8606b03522f49c8d3a SHA256 8f31df57b084afbdabc6a63c0dba9d8f30d616bff61a7c49c1692a9cfc186fa0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkm85PYACgkQ1fmVwcYIWAbI1ACgzeVnvBidForWRN3J0UXqTDPp
-R+EAoO2DaHEDHH9hsFGdMxJ+iazBGkkF
-=QM0T
+iEYEARECAAYFAkn07H8ACgkQ1fmVwcYIWAaBDQCeKvIIXc/QexpgZmGemKuXiGe1
+BocAniZDNjnarE4h3amSob42Y8shRW7e
+=hJni
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/sensors-applet/sensors-applet-1.6.ebuild b/gnome-extra/sensors-applet/sensors-applet-1.6.ebuild
deleted file mode 100644
index 19bc31bfc955..000000000000
--- a/gnome-extra/sensors-applet/sensors-applet-1.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-1.6.ebuild,v 1.6 2006/04/25 15:52:38 wolf31o2 Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="GNOME panel applet to display readings from hardware sensors"
-HOMEPAGE="http://sensors-applet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sensors-applet/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="hddtemp"
-
-RDEPEND=">=x11-libs/gtk+-2.4.0
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-panel-2
-	hddtemp? ( >=app-admin/hddtemp-0.3_beta13 )"
-
-DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12
-		>=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_compile() {
-	gnome2_omf_fix help/Makefile.in
-	gnome2_src_compile
-}
diff --git a/gnome-extra/sensors-applet/sensors-applet-1.8.2.ebuild b/gnome-extra/sensors-applet/sensors-applet-1.8.2.ebuild
deleted file mode 100644
index fad7d9c85a69..000000000000
--- a/gnome-extra/sensors-applet/sensors-applet-1.8.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-1.8.2.ebuild,v 1.1 2007/12/02 18:29:33 dang Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="GNOME panel applet to display readings from hardware sensors"
-HOMEPAGE="http://sensors-applet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sensors-applet/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="hddtemp libnotify lm_sensors nvidia"
-
-RDEPEND="
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.8.0
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/libgnome-2.8
-	>=gnome-base/libgnomeui-2.8
-	>=x11-libs/cairo-1.0.4
-	hddtemp? ( >=app-admin/hddtemp-0.3_beta13 )
-	libnotify? ( >=x11-libs/libnotify-0.4.0 )
-	lm_sensors? ( sys-apps/lm_sensors )
-	nvidia? ( || (
-		>=x11-drivers/nvidia-drivers-100.14.09
-		media-video/nvidia-settings
-	) )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12
-	>=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="$(use_with nvidia) \
-			$(use_with lm_sensors libsensors) \
-			$(use_enable libnotify)"
-}
diff --git a/gnome-extra/sensors-applet/sensors-applet-2.2.1.ebuild b/gnome-extra/sensors-applet/sensors-applet-2.2.1.ebuild
deleted file mode 100644
index c1fae1a8104b..000000000000
--- a/gnome-extra/sensors-applet/sensors-applet-2.2.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-2.2.1.ebuild,v 1.4 2008/11/16 16:36:55 flameeyes Exp $
-
-inherit gnome2 eutils flag-o-matic
-
-DESCRIPTION="GNOME panel applet to display readings from hardware sensors"
-HOMEPAGE="http://sensors-applet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sensors-applet/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="hddtemp libnotify lm_sensors nvidia"
-
-RDEPEND="
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.8.0
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/libgnome-2.8
-	>=gnome-base/libgnomeui-2.8
-	>=x11-libs/cairo-1.0.4
-	hddtemp? ( >=app-admin/hddtemp-0.3_beta13 )
-	libnotify? ( >=x11-libs/libnotify-0.4.0 )
-	lm_sensors? ( sys-apps/lm_sensors )
-	nvidia? ( || (
-		>=x11-drivers/nvidia-drivers-100.14.09
-		media-video/nvidia-settings
-	) )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12
-	>=app-text/gnome-doc-utils-0.3.2
-	dev-util/intltool"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="$(use_with nvidia) \
-			$(use_with lm_sensors libsensors) \
-			$(use_enable libnotify)"
-
-	# Bug #221817
-	use nvidia && append-ldflags -Wl,--no-as-needed
-}
diff --git a/gnome-extra/sensors-applet/sensors-applet-2.2.2.ebuild b/gnome-extra/sensors-applet/sensors-applet-2.2.4.ebuild
index 053c3ee4e477..4c7f7541dd12 100644
--- a/gnome-extra/sensors-applet/sensors-applet-2.2.2.ebuild
+++ b/gnome-extra/sensors-applet/sensors-applet-2.2.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-2.2.2.ebuild,v 1.1 2009/03/08 11:32:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-2.2.4.ebuild,v 1.1 2009/04/26 21:21:27 eva Exp $
 
 EAPI="2"
 
-inherit autotools gnome2 eutils
+inherit gnome2
 
 DESCRIPTION="GNOME panel applet to display readings from hardware sensors"
 HOMEPAGE="http://sensors-applet.sourceforge.net/"
@@ -44,12 +44,3 @@ pkg_setup() {
 		$(use_enable libnotify)
 		--disable-static"
 }
-
-src_prepare() {
-	# Fix nvidia library detection, bug #221817
-	if use nvidia; then
-		epatch "${FILESDIR}/${P}-nvidia-check.patch"
-		intltoolize --force --copy --automake || die "intltoolize failed"
-		eautoreconf
-	fi
-}