Apply Flameeyes' patches to fix parallel compilation (bug #244966 by Jeremy Olexa). Also use 'elog' instead of 'einfo' and drop old 'eerror' message. Move to EAPI 2.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 69 insertions, 15 deletions

diff --git a/sys-apps/preload/ChangeLog b/sys-apps/preload/ChangeLog
index 82131f079c91..fe7902ec31f2 100644
--- a/sys-apps/preload/ChangeLog
+++ b/sys-apps/preload/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/preload
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/ChangeLog,v 1.14 2010/03/29 16:03:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/ChangeLog,v 1.15 2010/09/06 15:36:10 pacho Exp $
+
+  06 Sep 2010; Pacho Ramos <pacho@gentoo.org> preload-0.6.4-r1.ebuild,
+  +files/preload-0.6.4-use-help2man-as-usual.patch,
+  +files/preload-0.6.4-use-make-dependencies.patch:
+  Apply Flameeyes' patches to fix parallel compilation (bug #244966 by
+  Jeremy Olexa). Also use 'elog' instead of 'einfo' and drop old 'eerror'
+  message. Move to EAPI 2.
 
   29 Mar 2010; Pacho Ramos <pacho@gentoo.org> files/00-patch-configure.diff:
   00-patch-configure.diff modified to install docs under /usr/share/doc/,
diff --git a/sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch b/sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch
new file mode 100644
index 000000000000..d5d44e614edd
--- /dev/null
+++ b/sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch
@@ -0,0 +1,31 @@
+--- src/Makefile.am~	2009-04-15 23:46:04.000000000 +0200
++++ src/Makefile.am	2010-04-09 12:56:45.000000000 +0200
+@@ -54,23 +54,11 @@
+ 
+ dist_man_MANS = preload.8
+ 
+-$(srcdir)/preload.8: cmdline.c ../configure.ac preload.8.i
+-	$(MAKE) $(AM_MAKEFLAGS) preload
+-	@echo "Creating $@ using help2man(1)"
+-	@$(top_builddir)/missing --run \
+-	   help2man --no-info --section=8 --include=preload.8.i \
+-	   	    --help-option="-H" --output="$@.tmp" \
+-		    --name 'Adaptive readahead daemon' ./preload \
+-	 && mv "$@.tmp" "$@" \
+-	  || ($(RM) "$@"; \
+-	      echo Failed to update preload.8, the man page may be outdated >&2; \
+-	      (test -f "$@" || echo help2man is required to generate this file. >> "$@"));
+-
+-install-data-hook:
+-	@cd "$(DESTDIR)$(man8dir)" && gzip -c preload.8 > preload.8.gz.tmp && mv preload.8.gz.tmp preload.8.gz && $(RM) preload.8
+-
+-uninstall-hook:
+-	$(RM) "$(DESTDIR)$(man8dir)/preload.8.gz"
++preload.8: preload preload.8.i
++	-$(HELP2MAN) \
++		--no-info --section=8 --include=preload.8.i \
++		--help-option="-H" --output="$@" \
++		--name 'Adaptive readahead daemon' ./$^
+ 
+ ######################################################################
+ 
diff --git a/sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch b/sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch
new file mode 100644
index 000000000000..0f41780c31e4
--- /dev/null
+++ b/sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch
@@ -0,0 +1,21 @@
+--- src/Makefile.am~	2010-04-09 12:56:45.000000000 +0200
++++ src/Makefile.am	2010-04-09 12:58:36.000000000 +0200
+@@ -8,8 +8,6 @@
+ 		-DLOGDIR='"${logdir}"'	\
+ 		-DPKGLOCALSTATEDIR='"${pkglocalstatedir}"'
+ 
+-preload.o cmdline.o preload.8: Makefile
+-
+ sbin_PROGRAMS = preload
+ 
+ preload_SOURCES =	\
+@@ -64,8 +62,7 @@
+ 
+ MAINTAINERCLEANFILES += preload.conf.debug
+ 
+-preload.conf.debug:
+-	$(MAKE) $(AM_MAKEFLAGS) preload.conf
++preload.conf.debug: preload.conf
+ 	cp preload.conf preload.conf.debug
+ 
+ RUNPREQ = preload preload.conf.debug
diff --git a/sys-apps/preload/preload-0.6.4-r1.ebuild b/sys-apps/preload/preload-0.6.4-r1.ebuild
index 958088cdac13..806a2a1cab75 100644
--- a/sys-apps/preload/preload-0.6.4-r1.ebuild
+++ b/sys-apps/preload/preload-0.6.4-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 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.2 2010/03/29 15:40:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/preload-0.6.4-r1.ebuild,v 1.3 2010/09/06 15:36:10 pacho Exp $
+
+EAPI="2"
 
 inherit eutils autotools
 
@@ -18,22 +20,20 @@ WANT_AUTOCONF="2.56"
 RDEPEND=">=dev-libs/glib-2.6"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/00-patch-configure.diff
 	epatch "${FILESDIR}"/02-patch-preload_conf.diff
 	epatch "${FILESDIR}"/02-patch-preload_sysconfig.diff
+	epatch "${FILESDIR}"/${PN}-0.6.4-use-help2man-as-usual.patch
+	epatch "${FILESDIR}"/${PN}-0.6.4-use-make-dependencies.patch
 	use vanilla || epatch "${FILESDIR}"/000{1,2,3}-*.patch
 	cat "${FILESDIR}"/preload-0.6.4.init.in > preload.init.in || die
 
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf --localstatedir=/var
-	emake -j1 || die "emake failed"
 }
 
 src_install() {
@@ -47,11 +47,6 @@ src_install() {
 }
 
 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
+	elog "You probably want to add preload to the default runlevel like so:"
+	elog "# rc-update add preload default"
 }