Fix hddtemp sensors for Linux 3.x wrt #409343 by Balint SZENTE. Install to libdir instead of libexecdir.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 96 insertions, 12 deletions

diff --git a/xfce-extra/xfce4-sensors-plugin/ChangeLog b/xfce-extra/xfce4-sensors-plugin/ChangeLog
index 134c46a4cc13..5481ce79b766 100644
--- a/xfce-extra/xfce4-sensors-plugin/ChangeLog
+++ b/xfce-extra/xfce4-sensors-plugin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for xfce-extra/xfce4-sensors-plugin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors-plugin/ChangeLog,v 1.31 2012/01/06 11:08:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors-plugin/ChangeLog,v 1.32 2012/04/18 09:37:20 ssuominen Exp $
+
+*xfce4-sensors-plugin-1.2.3-r1 (18 Apr 2012)
+
+  18 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-sensors-plugin-1.2.3-r1.ebuild,
+  +files/xfce4-sensors-plugin-1.2.3-linux-3.x.patch:
+  Fix hddtemp sensors for Linux 3.x wrt #409343 by Balint SZENTE. Install to
+  libdir instead of libexecdir.
 
   06 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-sensors-plugin-1.2.3.ebuild, metadata.xml:
diff --git a/xfce-extra/xfce4-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index cc0d035077aa..419d25fc0c32 100644
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xfce4-sensors-plugin-1.2.3-linux-3.x.patch 510 RMD160 fb6c5c0fc9a800009d50790ef4fec606188d83b0 SHA1 dfae019c9f271e3d4ebc84c5ddb46e848e08089d SHA256 fb6d68c24753ca8f93fc903d9e1852cba205740124f2d77b33d92b3a2512fc9e
 DIST xfce4-sensors-plugin-1.2.3.tar.bz2 418517 RMD160 27ba953568b82a47f74392a42b3d79f089006cc1 SHA1 a6abc97407d697ddf320e6d559594206228f3c77 SHA256 3dd27348f7b38b55e53aa8d851cdb80e090b8830ca9e705bf32641679f08d326
-EBUILD xfce4-sensors-plugin-1.2.3.ebuild 1791 RMD160 302499106b55191b89fbdb3e81cf0937d4519f71 SHA1 3096659f834e99eebb21a9db2cce89eaa0fe1960 SHA256 9537237b631bf1e52670584a2c43f9df5ecf70518014bcfef67af9002ab03cb1
-MISC ChangeLog 5002 RMD160 b0cb36fab2d0827c65d3b05f30d250f5920b42a5 SHA1 a95fd3b5a4c0df3a13a5113a2dcb12d39162d725 SHA256 bf4546f7b78defe943bd65eeb1d944510ce8c76e02dab172faef88c0377a1375
-MISC metadata.xml 256 RMD160 2201112aa03c06bccf7979cae0e102a6313ffca8 SHA1 8cc0f7639d84d3b139ae70888869d5ad53a24af0 SHA256 7c730898c382ced47bc84ef48051a563fd58027360987ff99f9fccb3ed29eb87
+EBUILD xfce4-sensors-plugin-1.2.3-r1.ebuild 2020 RMD160 b8f07f9abf916cae370bd41442efa86812bbfda0 SHA1 d8df71c4f124f4f9ac35eb721dd66075cdff90f9 SHA256 ca246cfc992f95a78840a9a2479c2f9e3218fdbae24d31b0b2f8292dfd817565
+EBUILD xfce4-sensors-plugin-1.2.3.ebuild 1827 RMD160 5c92db2e76bbec941916aa811370037171f541dc SHA1 fb3adfe2120572c45580ff73cff0c8bce4b67865 SHA256 81cab7becc1c7e523683531f79b7e587f196040b0ee8abdc334a3c093ed22ac5
+MISC ChangeLog 5458 RMD160 8be376a9abe591b69e8a516b646afa3ad5594949 SHA1 6421b3ee8626fca4e9ea9eafa48047ed738f6488 SHA256 087d02bb2ed45a3d11a88259b092bfdbd934015a3a5981685ee38862a3d7afcc
+MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPBtUoAAoJEEdUh39IaPFN4acH/1o0dreWx6mIWoEFoJcRQPBV
-w27pnwYF+3pcVM2AhxIooBasGNb1vwPbDLvpszVqp/Hk/kBcubjGIj/qrMzbvINR
-rvteVhJt5piLb8rVVu+RQAu6JctXFYoteJ9Pp3g2EeC66Ue2eDSL/0frWPLppomx
-kB/8+GZ6Op7nvWWnD/vLLelwGz5d/Mo3uFH87IPAzbyFcIHF9Gtln26ffunL10yN
-1AFe7ATX2yUaHiT6xO/kEn/lJvup3MhnzCpQT93Jn8K+x7tc3q3+fkc54NLAYfyW
-kGzhC6aitm+6xVMb2mtQfkLv4/oXPP2dd4vJlFh4t06v5n/B63pXsR1q5y0Vp+c=
-=bK40
+iQEcBAEBAgAGBQJPjor+AAoJEEdUh39IaPFNXf4H/01+uPm3Qffa7IkyCQR1h46H
+hW810uYjwo9CxZBwznI0vkvAPjNeW6z0LVBjpuy6HvbwJ1+n/wFvEEIObYxqjV02
+TmdR2hoRHnjdfKPuTMnsBGwaTB5fgGWf4+CfLhReoTYzuDN6Rqi30LdglLR6Sf0U
+UNnZCKahtc+7tRFkOv1RgZrB3O096B7bP+mNC1QL/KCgv/wSPKpu7CwP7vHsLs/e
+2Wd8VBwpBsNtOF8ZVVzuq2lxPrxzdqQ9EIIjuOaycd2xoGxFXHwaUBj70JAgPUJL
+0gcTIV3PRgPTtdhZJqbSLCDyeyd5UEkw0XgqhqcF8/1jOJDgiarGFectruFfo/I=
+=V9OE
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.2.3-linux-3.x.patch b/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.2.3-linux-3.x.patch
new file mode 100644
index 000000000000..c969b1d50ce8
--- /dev/null
+++ b/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.2.3-linux-3.x.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/409343
+http://bugzilla.xfce.org/show_bug.cgi?id=8266
+
+--- lib/hddtemp.c
++++ lib/hddtemp.c
+@@ -421,7 +421,7 @@ initialize_hddtemp (GPtrArray *chips, gb
+ #ifdef HAVE_NETCAT
+     read_disks_netcat (chip);
+ #else
+-    if (strcmp(p_uname->sysname, "Linux")==0 && major>=5)
++    if (strcmp(p_uname->sysname, "Linux")==0 && (generation>=3 || (generation==2 && major>=5)))
+         read_disks_linux26 (chip);
+     else
+         read_disks_fallback (chip); /* hopefully, that's a safe variant */
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.3-r1.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..79e5d8b7ce1f
--- /dev/null
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.3-r1.ebuild,v 1.1 2012/04/18 09:37:20 ssuominen Exp $
+
+EAPI=4
+EAUTORECONF=yes
+inherit multilib xfconf
+
+DESCRIPTION="A panel plug-in for different sensors using acpi, lm_sensors and hddtemp"
+HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+acpi debug hddtemp libnotify lm_sensors video_cards_nvidia"
+
+REQUIRED_USE="|| ( hddtemp lm_sensors acpi )"
+
+RDEPEND=">=x11-libs/gtk+-2.10:2
+	>=xfce-base/libxfce4ui-4.8
+	>=xfce-base/xfce4-panel-4.8
+	hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	lm_sensors? ( >=sys-apps/lm_sensors-3.1.0 )
+	video_cards_nvidia? ( media-video/nvidia-settings )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-linux-3.x.patch )
+
+	XFCONF=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		--disable-static
+		$(use_enable acpi procacpi)
+		$(use_enable acpi sysfsacpi)
+		$(use_enable hddtemp netcat)
+		$(use_enable hddtemp)
+		$(use_enable libnotify notification)
+		$(use_enable lm_sensors libsensors)
+		$(use_enable video_cards_nvidia xnvctrl)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS NOTES README TODO )
+}
+
+src_prepare() {
+	sed -i -e '/-no-undefined/d' src/Makefile.am || die
+	# Use flags from xfce4-dev-tools instead of defining them again in
+	# configure.in wrt #386979
+	sed -i -e '/PLATFORM_CFLAGS/s:-Werror::' configure.in || die
+	# http://bugzilla.xfce.org/show_bug.cgi?id=8057
+	# value "Monitor" in key "Categories" in group "Desktop Entry" requires
+	# another category to be present among the following categories: System
+	sed -i -e 's:Monitor:System;&:' src/xfce4-sensors.desktop.in || die
+	xfconf_src_prepare
+}