Misc fixes, bug 267538 - imported from Kai Krakow's overlay

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

15 files changed, 234 insertions, 173 deletions

diff --git a/sys-apps/preload/ChangeLog b/sys-apps/preload/ChangeLog
index 102b28e6f78f..960bce48245d 100644
--- a/sys-apps/preload/ChangeLog
+++ b/sys-apps/preload/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for sys-apps/preload
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/ChangeLog,v 1.9 2009/05/07 03:06:49 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/ChangeLog,v 1.10 2009/05/20 02:58:30 darkside Exp $
+
+*preload-0.6.4-r1 (20 May 2009)
+
+  20 May 2009; Jeremy Olexa <darkside@gentoo.org>
+  -files/preload-0.6.3-conf.patch, +files/00-patch-configure.diff,
+  -files/preload-0.6.3-forking-children.patch,
+  +files/0002-Create-short-overlapping-io-bursts.patch,
+  -files/preload-0.6.3-nice-segfault.patch,
+  -files/preload-0.6.3-overlapping-io-bursts.patch,
+  +files/0001-Early-restart-of-forking-readahead-children.patch,
+  +files/preload-0.6.4.init.in,
+  +files/0003-Fix-wait_for_children-loop.patch,
+  +files/02-patch-preload_conf.diff, +files/02-patch-preload_sysconfig.diff,
+  -files/conf.d-preload, -files/init.d-preload, -preload-0.6.3-r5.ebuild,
+  +preload-0.6.4-r1.ebuild:
+  Misc fixes, bug 267538 - imported from Kai Krakow's overlay
 
 *preload-0.6.4 (07 May 2009)
 
diff --git a/sys-apps/preload/Manifest b/sys-apps/preload/Manifest
index 82de468202c0..2c3a060b77ac 100644
--- a/sys-apps/preload/Manifest
+++ b/sys-apps/preload/Manifest
@@ -1,12 +1,12 @@
-AUX conf.d-preload 733 RMD160 46fc537c93d776fcd8a7e5c358cab92d00b316bd SHA1 a3afaaae4b77fc8797b54348b69cd0a40d9d6f71 SHA256 c71a2294cb2fb92d45ed3d35461f56a1a5cc0766c7db26b2763df2baa85701f2
-AUX init.d-preload 870 RMD160 ca4a9894964c8b5e43100ee0602534ca8b13383a SHA1 eeb7bd9c604e904d76dd3a4cb1e86055eda39a76 SHA256 ff3299ab68693178d4143f41328b6ea7f2b4b87cbd5ec978eb7094bd085f36b4
-AUX preload-0.6.3-conf.patch 565 RMD160 a179cc629466db6b4c8338572dcfedd5df8648fa SHA1 2edf461357da6b3e92a56917f35da8e8409849e8 SHA256 0830b5cd1df5ada7ccb33803cc2a5349200d1f2422ac1d1a2daf94a8a1e8fc56
-AUX preload-0.6.3-forking-children.patch 1899 RMD160 4a48b982ea2e384f15a37026c1960499fb0b9da7 SHA1 86e83c9a1f92587265742b3bcd6fb0ccd03a41ee SHA256 f68dff0aebc2cecc8f05a50ab4dc56e0832d8e966e783a1d0cb81e5914dc51fe
-AUX preload-0.6.3-nice-segfault.patch 1066 RMD160 f0c68a7b6748c58d98e2a949dfee9df336923e62 SHA1 e9c71344643e5b8659618277fb1afbd33a51fc22 SHA256 db110f6ba27205f216f112cfd5a0438dd722c81ad7406c74152520141e995b28
-AUX preload-0.6.3-overlapping-io-bursts.patch 856 RMD160 136c5d885e7b3d5e1923ea03d2ae6be5dd4af714 SHA1 f631f9ee467fa9a4a82c5a59d43e67b520ba4fe7 SHA256 1e92121abfa3549b18d4a7eefa26fa098e25539cc3948c3ffe492598d6ba9ae5
-DIST preload-0.6.3.tar.gz 139587 RMD160 ba0666ee67780961651a99ac60068265d29c288a SHA1 3733693e186ebc8965f164a3fd7afa2cf558fec5 SHA256 de6a79ca1426f8a2710135b78fd9edb34e3a152e9cdd7cfd68166399171f358b
+AUX 00-patch-configure.diff 480 RMD160 bf41dcde022487583698830d24d9374093df1c31 SHA1 3bcf4d714bdbb1be7c8a555039f3b476b7665d0e SHA256 bf8dfd517139bfa127fd7c8d4debe14a5c429654a7e5952ccb54dfd9ba7c49d3
+AUX 0001-Early-restart-of-forking-readahead-children.patch 1900 RMD160 35ec6dbdf312996adbc5e52dd1966599372cb262 SHA1 9b9f762d30a3508d4bc7436d0042d48d4c36d15b SHA256 13a2d3f91960f9ebddf4261aa9e53f64ce3111b5e1c5273f467f00d3ab0ac880
+AUX 0002-Create-short-overlapping-io-bursts.patch 856 RMD160 136c5d885e7b3d5e1923ea03d2ae6be5dd4af714 SHA1 f631f9ee467fa9a4a82c5a59d43e67b520ba4fe7 SHA256 1e92121abfa3549b18d4a7eefa26fa098e25539cc3948c3ffe492598d6ba9ae5
+AUX 0003-Fix-wait_for_children-loop.patch 745 RMD160 bb3b5bcfe8f5a52f81d79aff5c5cc88568eb5783 SHA1 87b7c59fd6bfc5696c6d1ba160e7d5476d0bde6f SHA256 1bbb777d7a92779cff1888bdb5b322ce3cd913c3a9dc38c3677774d98d0a4176
+AUX 02-patch-preload_conf.diff 684 RMD160 8aa065b5c802194f454eac290fc05bc01359503d SHA1 1b1b58139d8649aee9f5fe3949b29eb8b0297b77 SHA256 f71c689becee188f67288869be70dc6712059e2b54601cd27bce5975c703957c
+AUX 02-patch-preload_sysconfig.diff 1421 RMD160 750b3de3567d592b0a4b852d3c7d0fe891c65373 SHA1 26e95262a59fbc1202c0de6be7a3e69cf7a14ed4 SHA256 02cb2c124e28e59aa756bda640bf7e8fad85276e46a18025a98ea0352414f50e
+AUX preload-0.6.4.init.in 1144 RMD160 38353810156c7f6d632965b108bdda7866fc6b02 SHA1 4cc8ace8195dc774a30ba4bc543d25e45b12d8ad SHA256 ce0e5a71a56ec6a5100e5666587ee8fbe4a99d502fb058feb01bc11c91c1a79b
 DIST preload-0.6.4.tar.gz 140750 RMD160 93de2090e7d5c21cdb5e74531dab480117f95c36 SHA1 2313a7f9c8713fbc0efaf649b29dbe36ed0b3945 SHA256 d0a558e83cb29a51d9d96736ef39f4b4e55e43a589ad1aec594a048ca22f816b
-EBUILD preload-0.6.3-r5.ebuild 1615 RMD160 ce7d95cf87f8c8367264140cd31021d5617301b9 SHA1 cb69c07093baa101901e6ac334e33029aaed6820 SHA256 0f848c59ad1e9d70d52d62f85ae1c89bac50f6e4f412db42935aa94d684d5831
+EBUILD preload-0.6.4-r1.ebuild 1557 RMD160 b7d78fe09330faa5748f56ee6ce1543a3e64ccb8 SHA1 4e4d07106d3bc6c3eb048a0584e1bd140c8552ec SHA256 4efd8dff88616d3677eabf7abab980a95b8ffd737a7c16fc72dfd40a7c63e882
 EBUILD preload-0.6.4.ebuild 1447 RMD160 4e76692b638f1be9edc28b4be6387fa728986723 SHA1 d0f1c22773dfc117942a3400480cd52ad5deede4 SHA256 48232af286a2d9921e004cec17f7da25aa092df90be4fa99065fb0f7d542c26f
-MISC ChangeLog 3083 RMD160 d9268523236bb3850b5e5583139fda65fe17175c SHA1 b6cbc6ff6cca8b5d6229664b96947aef91efb5b8 SHA256 17409c19dac5fc2fd418d6b649bb3e2dabfebe80636c5575f9a814383104d58b
+MISC ChangeLog 3820 RMD160 9c6b9bb4bce70fdae5fb07c2890f7248a58cd97f SHA1 fb8c7abdd1a9b34b3927e9f1c9ff6fa24665577a SHA256 3ef14641bf0a7c25b65bab8ecc9c2d194a4d95677cfde8f88538a9146fd55baa
 MISC metadata.xml 503 RMD160 38ab96ae80e53c44b88512bec1409281cf06ef56 SHA1 4196948def119ac92327edf1307cc9a1bd0f4162 SHA256 0cbf6f727b2d3bc82e3a3d949dc9cb003029789718735e32cbc77e28eaa21b24
diff --git a/sys-apps/preload/files/00-patch-configure.diff b/sys-apps/preload/files/00-patch-configure.diff
new file mode 100644
index 000000000000..6d7faab3c60c
--- /dev/null
+++ b/sys-apps/preload/files/00-patch-configure.diff
@@ -0,0 +1,13 @@
+--- a/configure.ac	2008-02-26 12:40:18.421567321 +0100
++++ b/configure.ac	2008-02-26 12:41:10.198008844 +0100
+@@ -54,8 +54,8 @@
+ 
+ # Directories we need.
+ pkgdocdir='${datadir}/doc/'${PACKAGE_NAME}-${PACKAGE_VERSION}
+-initddir='${sysconfdir}/rc.d/init.d'
+-sysconfigdir='${sysconfdir}/sysconfig'
++initddir='${sysconfdir}/init.d'
++sysconfigdir='${sysconfdir}/conf.d'
+ logrotatedir='${sysconfdir}/logrotate.d'
+ logdir='${localstatedir}/log'
+ subsysdir='${localstatedir}/lock/subsys'
diff --git a/sys-apps/preload/files/preload-0.6.3-forking-children.patch b/sys-apps/preload/files/0001-Early-restart-of-forking-readahead-children.patch
index 3f705237acbc..2143ba3cc15e 100644
--- a/sys-apps/preload/files/preload-0.6.3-forking-children.patch
+++ b/sys-apps/preload/files/0001-Early-restart-of-forking-readahead-children.patch
@@ -37,7 +37,7 @@ index c169e81..7617449 100644
  {
    /* wait for child processes to terminate */
 -  while (procs > 0)
-+  while (procs > maxprocs)
++  while (procs >= maxprocs)
      {
        int status;
        if (wait (&status) > 0)
diff --git a/sys-apps/preload/files/preload-0.6.3-overlapping-io-bursts.patch b/sys-apps/preload/files/0002-Create-short-overlapping-io-bursts.patch
index 20ba67a1bb4b..20ba67a1bb4b 100644
--- a/sys-apps/preload/files/preload-0.6.3-overlapping-io-bursts.patch
+++ b/sys-apps/preload/files/0002-Create-short-overlapping-io-bursts.patch
diff --git a/sys-apps/preload/files/0003-Fix-wait_for_children-loop.patch b/sys-apps/preload/files/0003-Fix-wait_for_children-loop.patch
new file mode 100644
index 000000000000..dc37548638a5
--- /dev/null
+++ b/sys-apps/preload/files/0003-Fix-wait_for_children-loop.patch
@@ -0,0 +1,27 @@
+From 536714622135e53db3f8a5673db32c5de9620aa8 Mon Sep 17 00:00:00 2001
+From: Kai Krakow <kai@kaishome.de>
+Date: Tue, 29 Jul 2008 08:15:55 +0200
+Subject: [PATCH] Fix wait_for_children() loop
+
+Brain damage repaired: One should not wait while zero or
+more children exist... That's always the case. :-(
+---
+ src/readahead.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/readahead.c b/src/readahead.c
+index 466961d..08d9f4f 100644
+--- a/src/readahead.c
++++ b/src/readahead.c
+@@ -106,7 +106,7 @@ static void
+ wait_for_children (int maxprocs)
+ {
+   /* wait for child processes to terminate */
+-  while (procs >= maxprocs)
++  while (procs > maxprocs)
+     {
+       int status;
+       if (wait (&status) > 0)
+-- 
+1.5.4.5
+
diff --git a/sys-apps/preload/files/02-patch-preload_conf.diff b/sys-apps/preload/files/02-patch-preload_conf.diff
new file mode 100644
index 000000000000..70055c3bbb0f
--- /dev/null
+++ b/sys-apps/preload/files/02-patch-preload_conf.diff
@@ -0,0 +1,21 @@
+diff -urN preload-0.6.orig/src/preload.conf.in preload-0.6/src/preload.conf.in
+--- preload-0.6.orig/src/preload.conf.in	2008-07-24 02:02:11.000000000 +0200
++++ preload-0.6/src/preload.conf.in	2008-07-24 16:32:28.565184094 +0200
+@@ -132,7 +132,7 @@
+ # preload doesn't special-handle device files internally.
+ #
+ # default: (empty list, accept all)
+-mapprefix = /usr/;/lib;/var/cache/;!/
++mapprefix = /usr/;/lib;/var/cache/;/opt/;/home/;!/
+ 
+ # exeprefix:
+ #
+@@ -141,7 +141,7 @@
+ # files instead of maps.
+ #
+ # default: (empty list, accept all)
+-exeprefix = !/usr/sbin/;!/usr/local/sbin/;/usr/;!/
++exeprefix = !/usr/sbin/;!/usr/local/sbin/;/usr/;/opt/;/usr/libexec/;!/
+ 
+ # maxprocs
+ #
diff --git a/sys-apps/preload/files/02-patch-preload_sysconfig.diff b/sys-apps/preload/files/02-patch-preload_sysconfig.diff
new file mode 100644
index 000000000000..2a8e14525b4e
--- /dev/null
+++ b/sys-apps/preload/files/02-patch-preload_sysconfig.diff
@@ -0,0 +1,39 @@
+diff -urN preload-0.6.4.orig/preload.sysconfig preload-0.6.4/preload.sysconfig
+--- preload-0.6.4.orig/preload.sysconfig	2008-10-23 03:08:20.000000000 +0200
++++ preload-0.6.4/preload.sysconfig	2009-05-01 13:51:03.493828659 +0200
+@@ -1,10 +1,30 @@
++# Copyright 1999-2008 Gentoo Foundation
++# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/files/02-patch-preload_sysconfig.diff,v 1.1 2009/05/20 02:58:30 darkside Exp $
++# preload configuration file
++
++PIDFILE="/var/run/preload.pid"
++
++# verbosity. 0-10, Default is 1.
++#PRELOAD_VERBOSITY="1"
++
++# set this for niceness. Default is 15. Valid ranges are from -20 to 19. See
++# nice(1) man page.
++#PRELOAD_NICE="15"
++
++# log file (default is /var/log/preload.log )
++#PRELOAD_LOGFILE="/var/log/preload.log"
++
++# preload state file (default location is /var/lib/preload/preload.state )
++# Empty (commented out) means no state is saved.
++PRELOAD_STATEFILE="/var/lib/preload/preload.state"
++
+ # Miminum memory that the system should have for preload to be launched.
+-# In megabytes.
+-MIN_MEMORY="256"
++# In megabytes. Currently unused.
++#MIN_MEMORY="256"
+ 
+ # Command-line arguments to pass to the daemon.  Read preload(8) man page
+ # for available options.
+-PRELOAD_OPTS="--verbose 1"
++#PRELOAD_OPTS="--verbose 1"
+ 
+-# Option to call ionice with.  Leave empty to skip ionice.
+-IONICE_OPTS="-c3"
++# Option to call ionice with.  Leave empty to use defaults.
++#IONICE_OPTS="-c3"
diff --git a/sys-apps/preload/files/conf.d-preload b/sys-apps/preload/files/conf.d-preload
deleted file mode 100644
index 400778d091a4..000000000000
--- a/sys-apps/preload/files/conf.d-preload
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/files/conf.d-preload,v 1.6 2008/10/28 02:02:14 darkside Exp $
-# preload configuration file
-
-PIDFILE="/var/run/preload.pid"
-
-# verbosity. 0-10, Default is 4.
-#PRELOAD_VERBOSITY="4"
-
-# set this for niceness. Default is 15. Valid ranges are from -20 to 19. See
-# nice(1) man page. 
-#PRELOAD_NICE="15"
-
-# log file (default is /var/log/preload.log )
-#PRELOAD_LOGFILE="/var/log/preload.log"
-
-# preload state file (default location is /var/lib/preload/preload.state ) 
-# Empty (commented out) means no state is saved.
-PRELOAD_STATEFILE="/var/lib/preload/preload.state"
-
-# Option to call ionice with.  Leave empty to skip ionice.
-#IONICE_OPTS="-c3"
diff --git a/sys-apps/preload/files/init.d-preload b/sys-apps/preload/files/init.d-preload
deleted file mode 100644
index 33890ae87cf8..000000000000
--- a/sys-apps/preload/files/init.d-preload
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/files/init.d-preload,v 1.6 2008/10/28 13:04:57 darkside Exp $
-
-depend() {
-	after localmount xdm
-}
-
-start() {
-	ebegin "Starting preload"
-	start-stop-daemon --start --quiet --background \
-	--make-pidfile --pidfile ${PIDFILE} --exec /usr/sbin/preload -- \
-	-l ${PRELOAD_LOGFILE:-/var/log/preload.log} -V ${PRELOAD_VERBOSITY:-4} \
-	-n ${PRELOAD_NICE:-15} -s ${PRELOAD_STATEFILE:-""} -f
-
-	IONICE="$(command -v ionice)"
-	if [ -x "${IONICE}" -a -n "${IONICE_OPTS}" ]; then
-		einfo "ionicing preload"
-		"${IONICE}" "${IONICE_OPTS}" -p $(cat ${PIDFILE})
-	fi
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping preload (may take awhile)"
-	start-stop-daemon --stop --retry 120 --quiet --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/sys-apps/preload/files/preload-0.6.3-conf.patch b/sys-apps/preload/files/preload-0.6.3-conf.patch
deleted file mode 100644
index e7e27367039d..000000000000
--- a/sys-apps/preload/files/preload-0.6.3-conf.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/preload.conf.in~	2008-10-18 17:12:39.000000000 +0200
-+++ src/preload.conf.in	2008-10-18 17:12:39.000000000 +0200
-@@ -132,7 +132,7 @@
- # preload doesn't special-handle device files internally.
- #
- # default: (empty list, accept all)
--mapprefix = /usr;/lib;/lib64;/var/cache;!/
-+mapprefix = /usr;/lib;/lib64;/lib32;/opt;/var/cache;!/
- 
- # exeprefix:
- #
-@@ -141,7 +141,7 @@
- # files instead of maps.
- #
- # default: (empty list, accept all)
--exeprefix = !/usr/sbin;!/usr/local/sbin;/usr;!/
-+exeprefix = !/usr/sbin;!/usr/local/sbin;/usr;/opt;!/
- 
- # maxprocs
- #
diff --git a/sys-apps/preload/files/preload-0.6.3-nice-segfault.patch b/sys-apps/preload/files/preload-0.6.3-nice-segfault.patch
deleted file mode 100644
index 058c5367770f..000000000000
--- a/sys-apps/preload/files/preload-0.6.3-nice-segfault.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6c0e605415f82509522597f8695be8797104ac4b Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <behdad@users.sourceforge.net>
-Date: Tue, 19 Aug 2008 16:38:54 +0000
-Subject: [PATCH] 2008-08-19  Behdad Esfahbod  <behdad@gnome.org>
-
-        * src/cmdline.c: --nice was segfaulting.  Fix it.
----
- ChangeLog     |    4 ++++
- src/cmdline.c |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 2d785af..87ac2a0 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,7 @@
-+2008-08-19  Behdad Esfahbod  <behdad@gnome.org>
-+
-+	* src/cmdline.c: --nice was segfaulting.  Fix it.
-+
- 2008-07-28  Behdad Esfahbod  <behdad@gnome.org>
- 
- 	* NEWS:
-diff --git a/src/cmdline.c b/src/cmdline.c
-index b175a21..e4e6797 100644
---- a/src/cmdline.c
-+++ b/src/cmdline.c
-@@ -38,7 +38,7 @@ static const struct option const opts[] = {
-   {"statefile", 1, 0, 's'},
-   {"logfile", 1, 0, 'l'},
-   {"foreground", 0, 0, 'f'},
--  {"nice", 0, 0, 'n'},
-+  {"nice", 1, 0, 'n'},
-   {"verbose", 1, 0, 'V'},
-   {"debug", 0, 0, 'd'},
-   {NULL, 0, 0, 0},
--- 
-1.5.6.4
-
diff --git a/sys-apps/preload/files/preload-0.6.4.init.in b/sys-apps/preload/files/preload-0.6.4.init.in
new file mode 100644
index 000000000000..664cc9b09983
--- /dev/null
+++ b/sys-apps/preload/files/preload-0.6.4.init.in
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+
+PIDFILE="/var/run/@PACKAGE@.pid"
+
+depend() {
+	after localmount
+	use netmount ntpd
+}
+
+dump() {
+	ebegin "Dumping config and state for @PACKAGE@"
+	kill -USR1 $(<${PIDFILE})
+	kill -USR2 $(<${PIDFILE})
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading @PACKAGE@"
+	kill -HUP $(<${PIDFILE})
+	eend $?
+}
+
+start() {
+	ebegin "Starting @PACKAGE@"
+
+	#MIN_MEMORY=${MIN_MEMORY:-256}
+	# Check for > MIN_MEMORY MB
+	#free -m | awk '/Mem:/ {exit ($2 >= ('"$MIN_MEMORY"'))?0:1}' || exit 0
+
+	# IMPORTANT: Let ssd do the backgrounding so we immediatly get a valid
+	# pid file in the next step (ionice)
+	start-stop-daemon --start --quiet --background \
+		--make-pidfile --pidfile ${PIDFILE} \
+		--exec @sbindir@/@PACKAGE@ -- \
+		-l ${PRELOAD_LOGFILE:-/var/log/preload.log} -V ${PRELOAD_VERBOSITY:-1} \
+		-n ${PRELOAD_NICE:-15} -s ${PRELOAD_STATEFILE:-""} ${PRELOAD_OPTS} -f
+
+	IONICE=$(which ionice)
+	if [ -x "$IONICE" ]; then
+		IONICE_OPTS=${IONICE_OPTS:--c3}
+		$IONICE ${IONICE_OPTS} -p$(<${PIDFILE})
+	fi
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping @PACKAGE@ (this may take while)"
+	start-stop-daemon --stop --retry 120 --quiet --pidfile ${PIDFILE}
+	eend $?
+}
diff --git a/sys-apps/preload/preload-0.6.3-r5.ebuild b/sys-apps/preload/preload-0.6.3-r5.ebuild
deleted file mode 100644
index b8ae5d576c4e..000000000000
--- a/sys-apps/preload/preload-0.6.3-r5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/preload-0.6.3-r5.ebuild,v 1.1 2008/10/28 02:02:14 darkside Exp $
-
-inherit eutils
-
-DESCRIPTION="Adaptive readahead daemon."
-HOMEPAGE="http://sourceforge.net/projects/preload"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="vanilla"
-
-RDEPEND="dev-libs/glib"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Patch to add /opt & /lib32 to allowed files to preload. Submitted
-	# upstream, bug #242580
-	epatch "${FILESDIR}/${P}-conf.patch"
-	epatch "${FILESDIR}/${P}-nice-segfault.patch"
-	use vanilla || epatch "${FILESDIR}/${P}-forking-children.patch"
-	use vanilla || epatch "${FILESDIR}/${P}-overlapping-io-bursts.patch"
-}
-
-src_compile() {
-	econf --localstatedir=/var
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	rm -rf "${D}/etc/rc.d/" || die "rm rc.d failed"
-	rm -rf "${D}/etc/sysconfig/" || die "rm sysconfig failed"
-	rm -f "${D}/var/lib/preload/preload.state" || die "cleanup1 failed"
-	rm -f "${D}/var/log/preload.log" || die "cleanup2 failed"
-	keepdir /var/lib/preload
-	keepdir /var/log
-	newinitd "${FILESDIR}/init.d-preload" preload || die "initd failed"
-	newconfd "${FILESDIR}/conf.d-preload" preload || die "confd failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}
-
-pkg_postinst() {
-	elog "To start preload at boot, remember to add it to a runlevel:"
-	elog "# rc-update add preload default"
-}
diff --git a/sys-apps/preload/preload-0.6.4-r1.ebuild b/sys-apps/preload/preload-0.6.4-r1.ebuild
new file mode 100644
index 000000000000..c199f96b31f0
--- /dev/null
+++ b/sys-apps/preload/preload-0.6.4-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/preload-0.6.4-r1.ebuild,v 1.1 2009/05/20 02:58:30 darkside Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Adaptive readahead daemon."
+HOMEPAGE="http://sourceforge.net/projects/preload/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vanilla"
+
+WANT_AUTOCONF="2.56"
+
+RDEPEND=">=dev-libs/glib-2.6"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/00-patch-configure.diff
+	epatch "${FILESDIR}"/02-patch-preload_conf.diff
+	epatch "${FILESDIR}"/02-patch-preload_sysconfig.diff
+	use vanilla || epatch "${FILESDIR}"/000{1,2,3}-*.patch
+	cat "${FILESDIR}"/preload-0.6.4.init.in > preload.init.in || die
+
+	eautoreconf
+}
+
+src_compile() {
+	econf --localstatedir=/var
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	# Remove log and state file from image or they will be
+	# truncated during merge
+	rm ${D}/var/lib/preload/preload.state || die "cleanup failed"
+	rm ${D}/var/log/preload.log || die "cleanup failed"
+	keepdir /var/lib/preload
+	keepdir /var/log
+}
+
+pkg_postinst() {
+	einfo "You probably want to add preload to the boot runlevel like so:"
+	einfo "# rc-update add preload boot"
+	echo
+	eerror "IMPORTANT: If you are upgrading from preload < 0.6 ensure to"
+	eerror "merge your config files (etc-update) or system performance"
+	eerror "may suffer."
+	echo
+}