Require correct automake version. Get rid of the invalid aRts dependency. Proper desktop file fix. Wipe superfluous debian docs etc.. Address bug #254596 and #258437.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 98 insertions, 2 deletions

diff --git a/kde-misc/ksensors/ChangeLog b/kde-misc/ksensors/ChangeLog
index 544260fd55a8..2b82868528ca 100644
--- a/kde-misc/ksensors/ChangeLog
+++ b/kde-misc/ksensors/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-misc/ksensors
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksensors/ChangeLog,v 1.13 2009/01/11 08:01:40 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksensors/ChangeLog,v 1.14 2009/02/10 14:42:55 carlo Exp $
+
+*ksensors-0.7.3-r3 (10 Feb 2009)
+
+  10 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+  +files/ksensors-0.7.3-desktop-file.diff,
+  +files/ksensors-0.7.3-sound-dir.diff, +ksensors-0.7.3-r3.ebuild:
+  Require correct automake version. Get rid of the invalid aRts dependency.
+  Proper desktop file fix. Wipe superfluous debian docs etc.. Address bug
+  #254596 and #258437.
 
 *ksensors-0.7.3-r2 (11 Jan 2009)
 
diff --git a/kde-misc/ksensors/Manifest b/kde-misc/ksensors/Manifest
index cc02ab9b534e..671c42be5928 100644
--- a/kde-misc/ksensors/Manifest
+++ b/kde-misc/ksensors/Manifest
@@ -1,11 +1,14 @@
+AUX ksensors-0.7.3-desktop-file.diff 699 RMD160 05752a20c649dd751390ffda296d25da2a23b3fe SHA1 d0e44c4a76167b9df0c1cf2e1033582e86fcea92 SHA256 316b00b128bd47dad6e782d1f0c8d1ec28f1ad896525f0313159e1007a8af0d9
 AUX ksensors-0.7.3-hddtemp-path.patch 985 RMD160 81fb67dc03f35a0d6f2e75aeeb792928b5a60524 SHA1 ac94f09ea0a107214c888093e8487369f0dedca1 SHA256 63796036434a9b790bf9159b2129ab05f8ff598f36148061f0b18ec578095b84
 AUX ksensors-0.7.3-ibm-acpi.patch 7208 RMD160 24c621c0f92a9efb0866093995340c0732bac936 SHA1 3ae4701a0036ec5dfaf0358c800fc66489972027 SHA256 c02cbb90769ace5a76b6b8c049609325a9afec4dfa004c95d75a907f573afd46
+AUX ksensors-0.7.3-sound-dir.diff 411 RMD160 e15337da89132f3bbc15c07f0461b70920eb5982 SHA1 2868e2264f82811352b9b5f3ccba6e6b4b2986db SHA256 d584b08c6a8f31634d8e297dc8e93fb37d3523851a8c2fc2d15af8f3da46f139
 AUX ksensors.desktop 673 RMD160 223eb10929fce7fcbf0bf4e18310a99c786be666 SHA1 e35881b675d9182b2381378ed64d89c9e3311258 SHA256 f637d105f1cb4e4190bcd2ebeff7f0532120c22e0ecadc24376b26bff5b299ff
 DIST ksensors-0.7.3.tar.gz 864466 RMD160 e4f35ca5b17d326eaee0b718ce683118c4c71b11 SHA1 8d1c56c707aa4200e568f73d8fee0913a08e50cd SHA256 ca1f91cae6303a661fb7b08549cb4813ad43880aaba26297cab7f08904e96660
 DIST ksensors_0.7.3-13.diff.gz 18201 RMD160 bb7e3463ca0d9a834b5eb06afc95100de7c4263c SHA1 720d82370439a6ff61fc42a8bb28da5f534e439f SHA256 063819ac7e3f11afee022a3994684f942e35af2ee7e3f0c917d10093de09454b
 DIST ksensors_0.7.3-16.diff.gz 15949 RMD160 5086971425d8f57ef603f5672613e627a7b1c9bb SHA1 c93a55a47a1d6409c44a4fa63ee6ad2612537d08 SHA256 34e36103cb314694ebabe3f9807bf87512018a062b319782e0fb9e56f8137c8a
 EBUILD ksensors-0.7.3-r1.ebuild 1587 RMD160 8caf0d1174dc0d9febee8b104725083f26ee2976 SHA1 1b026adbac7d91c2240bccb810d7eab704efb17f SHA256 fe40c791a435acbd4cc5b05ce14cd1845bcee4ffeb8b30e108d7c3b51dd4d40a
 EBUILD ksensors-0.7.3-r2.ebuild 1591 RMD160 e06d04c1a75cc4bcef3144fe4242395b43171e3f SHA1 4ea9052ed45dc9e244be2daa1b162e49cb74dfbb SHA256 2d522f4d16c3c088e13f90154a8736d58af7dd0a46edbc1c6cf30c4fce2f432d
+EBUILD ksensors-0.7.3-r3.ebuild 1443 RMD160 8d2c3865acc1b5cc43ab842bed02ef2aafb8ab1c SHA1 b6cf6918b47d23b1b970f309111d1e268ee91876 SHA256 8ac29c0fb4ef74e9205fa506457e87f35dbd44095528df96b98db5cca125248b
 EBUILD ksensors-0.7.3.ebuild 585 RMD160 bd059334e7eacbbec579c3b1048580c8aa04a952 SHA1 9be2e8682cff4e45954702a03ea5accfc924c09a SHA256 aa7ef4f990557803f47ec2424790d5cfa99b53958a8cfea407516e4a8629b5f5
-MISC ChangeLog 3768 RMD160 b0aaab940c9bc2f3fd4af61a83a5adfec7b5eb3b SHA1 07bd9eed04276a42dbff898d8c54d048694565d9 SHA256 cb381ce4aa3de1483d4d1b291cb266597be4099ccff2f7c0a0bd8c1ee6a930a9
+MISC ChangeLog 4134 RMD160 41f89aad52df34ee1a473ed5dc7514ee08bf5915 SHA1 8bd9c1b6516739b0c52839438b70fc83ca277704 SHA256 05d8b46de74015b0d82b54a5e3dccc22b7ff65637d71f4f8ce4f2b5b4a2b3c88
 MISC metadata.xml 264 RMD160 8e5f960ff721f7e343b53906ce859c9743682574 SHA1 66771788fd6677e0d7e4a4c802f35bde8dca74b3 SHA256 0bfb37f943cd2759265ace0fece857af77c99a30c1b37f3c7239ec78e0349f0f
diff --git a/kde-misc/ksensors/files/ksensors-0.7.3-desktop-file.diff b/kde-misc/ksensors/files/ksensors-0.7.3-desktop-file.diff
new file mode 100644
index 000000000000..228d17b4085b
--- /dev/null
+++ b/kde-misc/ksensors/files/ksensors-0.7.3-desktop-file.diff
@@ -0,0 +1,19 @@
+--- ksensors-0.7.3/src/Makefile.am.orig	2009-02-10 03:01:36.000000000 +0100
++++ ksensors-0.7.3/src/Makefile.am	2009-02-10 03:01:54.000000000 +0100
+@@ -46,7 +46,7 @@
+ ksensors_LDADD = $(LIB_KDEUI) $(LIB_KDECORE) -lsensors -lm
+ 
+ # this is where the desktop file will go 
+-shelldesktopdir   = $(kde_appsdir)/Utilities
++shelldesktopdir   = $(xdg_appsdir)
+ shelldesktop_DATA = ksensors.desktop
+ 
+ # this is where the shell's XML-GUI resource file goes
+--- ksensors-0.7.3/src/ksensors.desktop.orig	2009-02-10 03:02:15.000000000 +0100
++++ ksensors-0.7.3/src/ksensors.desktop	2009-02-10 03:03:16.000000000 +0100
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=KSensors
+ Exec=ksensors
+ Icon=ksensors
diff --git a/kde-misc/ksensors/files/ksensors-0.7.3-sound-dir.diff b/kde-misc/ksensors/files/ksensors-0.7.3-sound-dir.diff
new file mode 100644
index 000000000000..89f75c9bcd2f
--- /dev/null
+++ b/kde-misc/ksensors/files/ksensors-0.7.3-sound-dir.diff
@@ -0,0 +1,10 @@
+--- ksensors-0.7.3/src/sounds/Makefile.am.orig	2009-02-10 15:09:05.000000000 +0100
++++ ksensors-0.7.3/src/sounds/Makefile.am	2009-02-10 15:09:59.000000000 +0100
+@@ -5,6 +5,7 @@
+ EXTRA_DIST = ksensors_alert.wav
+ 
+ install-data-local:
++	$(mkinstalldirs) $(kde_sounddir)
+ 	$(INSTALL_DATA) $(srcdir)/ksensors_alert.wav $(kde_sounddir)/ksensors_alert.wav
+ uninstall-local:
+ 	rm -f $(kde_sounddir)/ksensors_alert.wav
diff --git a/kde-misc/ksensors/ksensors-0.7.3-r3.ebuild b/kde-misc/ksensors/ksensors-0.7.3-r3.ebuild
new file mode 100644
index 000000000000..27195072eb8b
--- /dev/null
+++ b/kde-misc/ksensors/ksensors-0.7.3-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksensors/ksensors-0.7.3-r3.ebuild,v 1.1 2009/02/10 14:42:55 carlo Exp $
+
+ARTS_REQUIRED="never"
+WANT_AUTOMAKE="1.6"
+
+inherit kde
+
+DESCRIPTION="KSensors - a nice lm_sensors frontend for KDE."
+SRC_URI="mirror://sourceforge/ksensors/${P}.tar.gz
+		mirror://debian/pool/main/k/ksensors/${PN}_${PV}-16.diff.gz"
+HOMEPAGE="http://ksensors.sourceforge.net/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hddtemp ibmacpi"
+
+DEPEND=">=sys-apps/lm_sensors-2.6.3"
+
+RDEPEND="${DEPEND}
+	hddtemp? ( >=app-admin/hddtemp-0.3_beta15-r1 )"
+
+need-kde 3.5
+
+src_unpack() {
+	kde_src_unpack
+
+	rm -f "${S}"/configure
+
+	cd ${WORKDIR}
+
+	# Debian patchset, fixes bugs 120350, 171208, 173821, 232782
+	epatch ${PN}_${PV}-16.diff
+
+        epatch "${FILESDIR}/ksensors-0.7.3-desktop-file.diff"
+	epatch "${FILESDIR}/ksensors-0.7.3-sound-dir.diff"
+
+	# On Gentoo hddtemp resides in /usr/sbin which is not in the user's
+	# path. Thus, call hddtemp with full path.
+	use hddtemp && epatch "${FILESDIR}/${P}-hddtemp-path.patch"
+
+	# User-contributed patch, fixes bug 116661
+	use ibmacpi && epatch "${FILESDIR}/${P}-ibm-acpi.patch"
+}
+
+pkg_postinst() {
+	kde_pkg_postinst
+
+	if use hddtemp; then
+		[[ -u "${ROOT}"/usr/sbin/hddtemp ]] || \
+			elog "You need to run \"chmod u+s /usr/sbin/hddtemp\" to show disk temperatures."
+	fi
+}