Remove syslog stuff as it was invalid for scsi/sata systems.

  Detect patched kernel via /sys in pkg_postinst as kernel sources may not be
  installed and the warning may be in error.
Package-Manager: portage-2.1.1_pre1-r3

3 files changed, 24 insertions, 21 deletions

diff --git a/app-laptop/hdapsd/ChangeLog b/app-laptop/hdapsd/ChangeLog
index d8a05d8199d4..a9d418198f00 100644
--- a/app-laptop/hdapsd/ChangeLog
+++ b/app-laptop/hdapsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-laptop/hdapsd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/ChangeLog,v 1.2 2006/06/27 09:51:45 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/ChangeLog,v 1.3 2006/06/28 08:58:14 uberlord Exp $
+
+  28 Jun 2006; Roy Marples <uberlord@gentoo.org> hdapsd-20060409.ebuild:
+  Remove syslog stuff as it was invalid for scsi/sata systems.
+  Detect patched kernel via /sys in pkg_postinst as kernel sources may not be
+  installed and the warning may be in error.
 
   27 Jun 2006; Roy Marples <uberlord@gentoo.org> +files/hdaps-Z60m.patch,
   hdapsd-20060409.ebuild:
diff --git a/app-laptop/hdapsd/Manifest b/app-laptop/hdapsd/Manifest
index 84a38113d1a8..ba33cb33a5bf 100644
--- a/app-laptop/hdapsd/Manifest
+++ b/app-laptop/hdapsd/Manifest
@@ -12,14 +12,14 @@ RMD160 c3034ecda4674ed3b6143b6dd7a93affe5d7ee3c files/hdapsd.init 1201
 SHA256 1d14fe6d0ade3651c259d4e438d5aa031aa9444086d3fbb0187dbcb7b3ce337e files/hdapsd.init 1201
 DIST hdaps_protect-patches-1.tar.bz2 6179 RMD160 5b173034eebbbee598e01d45e5e76e2859c0a829 SHA1 7d79652ddc884b6619944a0d9ed70557e9c56779 SHA256 ab4192fa3a26497fe9fed63bfaedfebc74d288a85e7283b1bc338984be1133dd
 DIST hdapsd-20060409.c.bz2 5253 RMD160 0b8d07a2612bd4888014913bd8810de664352bfb SHA1 df6c5bf28d4539e97bb1800a455a36cf690d4779 SHA256 e8e1788d485814cd294c33744b60265423d8971abf5ab50b037f05de2c710a21
-EBUILD hdapsd-20060409.ebuild 2580 RMD160 066fcfe85272a021522affda7dcacf30ef4714d8 SHA1 fca506659733b4d68572d319258209fc7c9d6c13 SHA256 04fb2fab8e9577df428f2f50f8ddd05f59e3db5738b5166ea505c6a6750ac1e5
-MD5 7f00a58da59da0dbf4248b330cd41dea hdapsd-20060409.ebuild 2580
-RMD160 066fcfe85272a021522affda7dcacf30ef4714d8 hdapsd-20060409.ebuild 2580
-SHA256 04fb2fab8e9577df428f2f50f8ddd05f59e3db5738b5166ea505c6a6750ac1e5 hdapsd-20060409.ebuild 2580
-MISC ChangeLog 615 RMD160 4d8c7c1f31034518886c22621c0b0f7d7fa8e07d SHA1 875fe550ed74b3102ce244cce4ecb7c66debf37d SHA256 78e40afc63524490570d6d6eb05c9fef5c739aa8ae01172388a522c5f0f47e01
-MD5 c9e34f75dce9400b419d168f5c8d6cad ChangeLog 615
-RMD160 4d8c7c1f31034518886c22621c0b0f7d7fa8e07d ChangeLog 615
-SHA256 78e40afc63524490570d6d6eb05c9fef5c739aa8ae01172388a522c5f0f47e01 ChangeLog 615
+EBUILD hdapsd-20060409.ebuild 2330 RMD160 99ac1351d0106fe33ad23dd0f39be41e1730229f SHA1 dc27fab3a6c54bda1449f569723f3e300e6e90ea SHA256 a019f3bfbf9f5ae1e06061bede2ee9cb99ddef1dbbc3efe05f08484cfacea668
+MD5 5dbb372adc59a22fdb38f7eb48e15b8b hdapsd-20060409.ebuild 2330
+RMD160 99ac1351d0106fe33ad23dd0f39be41e1730229f hdapsd-20060409.ebuild 2330
+SHA256 a019f3bfbf9f5ae1e06061bede2ee9cb99ddef1dbbc3efe05f08484cfacea668 hdapsd-20060409.ebuild 2330
+MISC ChangeLog 875 RMD160 a2cb1a0cb0235ff7ba0d61f67019ead214c9223c SHA1 2b37bf0a8b1d4ea3bcbc63d7a68070c4670322eb SHA256 765adcde564b5ce59ff08819c1878077ad781abbf7f982dacc3dad6c33e528a0
+MD5 9c47e6a6072307563bfc28760a4da959 ChangeLog 875
+RMD160 a2cb1a0cb0235ff7ba0d61f67019ead214c9223c ChangeLog 875
+SHA256 765adcde564b5ce59ff08819c1878077ad781abbf7f982dacc3dad6c33e528a0 ChangeLog 875
 MISC metadata.xml 356 RMD160 140232e3535cb4f3eecb376611b3419519b4b260 SHA1 2563060180594d039fa175a73a8437bc13af5660 SHA256 29a57a39b3a1fdf3091c4012b4161c27b043da505743cf665860527545a9a1fa
 MD5 29203234d07d55e82b92c297ab988473 metadata.xml 356
 RMD160 140232e3535cb4f3eecb376611b3419519b4b260 metadata.xml 356
diff --git a/app-laptop/hdapsd/hdapsd-20060409.ebuild b/app-laptop/hdapsd/hdapsd-20060409.ebuild
index 67896d6a803b..dc391b8c76db 100644
--- a/app-laptop/hdapsd/hdapsd-20060409.ebuild
+++ b/app-laptop/hdapsd/hdapsd-20060409.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/hdapsd-20060409.ebuild,v 1.2 2006/06/27 09:51:45 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/hdapsd-20060409.ebuild,v 1.3 2006/06/28 08:58:14 uberlord Exp $
 
 inherit eutils linux-info
 
@@ -37,6 +37,8 @@ src_install() {
 	dodoc *.patch "${FILESDIR}"/hdaps-Z60m.patch
 }
 
+# Yes, this sucks as the source location may change, kernel sources may not be
+# installed, but we try our best anyway
 kernel_patched() {
 	get_version
 
@@ -56,7 +58,12 @@ pkg_config() {
 
 	# We need to find our FILESDIR as it's now lost
 	if [[ ! -e ${docdir}/${p} ]] ; then
-		ewarn "We don't have a patch for kernel ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} yet"
+		eerror "We don't have a patch for kernel ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} yet"
+		return 1
+	fi
+
+	if [[ ! -d ${KERNEL_DIR} ]] ; then
+		eerror "Kernel sources not found!"
 		return 1
 	fi
 
@@ -74,17 +81,8 @@ pkg_config() {
 }
 
 pkg_postinst(){
-	einfo "If you use syslog-ng you might want to add the following "
-	einfo "to /etc/syslog-ng/syslog-ng.conf to prevent your logfile"
-	einfo "getting flooded with the output of hdapsd:"
-	einfo "filter f_not_hdapsd { not match(queue_protect_store)"
-	einfo "                      and not match(idedisk_issue_protect_fn)"
-	einfo "                      and not match (ide_protect_queue);"
-	einfo "};"
-	einfo "log { source(src); filter(f_not_hdapsd); destination(messages); };"
-	einfo "log { source(src); destination(console_all); };"
+	[[ -n $(ls "${ROOT}"/sys/block/*/queue/protect 2>/dev/null) ]] && return 0
 
-	echo
 	if ! kernel_patched ; then
 		ewarn "Your kernel has NOT been patched for blk_freeze"
 		einfo "The ebuild can attempt to patch your kernel like so"