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.

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

5 files changed, 77 insertions, 21 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/Manifest b/sys-apps/preload/Manifest
index 14a0e2fd0ab8..354dee7f01eb 100644
--- a/sys-apps/preload/Manifest
+++ b/sys-apps/preload/Manifest
@@ -7,15 +7,17 @@ AUX 0002-Create-short-overlapping-io-bursts.patch 856 RMD160 136c5d885e7b3d5e192
 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-use-help2man-as-usual.patch 1169 RMD160 8fa932d749b0299b747c7f0376699bfb4e008aa4 SHA1 224228076f717e26728cb2aa22b73e4a1b802bc4 SHA256 8a224039789cb92e51be485e2c1e2ffb6381e1063b90efa56069f7a42395fba4
+AUX preload-0.6.4-use-make-dependencies.patch 533 RMD160 2741aa1b2231a36f03d8c6b31154c33f77de34d1 SHA1 e876b0d2fd98bb541770ca4cdb3a811954379513 SHA256 14370e962352510ed94bda04ddcd1882b5562fa1eaae93894ae485ec756591e7
 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.4-r1.ebuild 1558 RMD160 7f368b2b8960b2d696e1c059c35d5d387a443a5b SHA1 293e914087cbf7c30bd2126c9c80cedc30e2ea13 SHA256 fa1d7046022ed566e74ffcf2a685fed43b62a89675be512af3511a522168f999
-MISC ChangeLog 4386 RMD160 b8907a4120af20b755d2dd1218ffe1ebbac9661d SHA1 03c2005b236973508e5f3932cc85699bc074ab69 SHA256 a221b11535a0d74e58d51dc3238dc6acb0a55b5a209b1311b2da444fd6b20177
+EBUILD preload-0.6.4-r1.ebuild 1467 RMD160 6ab1c28ed1df7b337416fcd82690272266c47b81 SHA1 20148726603e729e6358705e1596f50a6b40bf73 SHA256 f336833351c93c7caeaf73fb0da0780cda77e32e19fa75c5f88c046eb9e2fdc9
+MISC ChangeLog 4734 RMD160 a4481b2fa8ef8dc7ef08740f6d318864a2f6aac1 SHA1 17ef0f6c7818be3a4db3b8116865d73326c23530 SHA256 ecd0683a16bf0fbfc99d7de15a755a0df5911b4c9522e78f7fe7f5c650ab57ec
 MISC metadata.xml 500 RMD160 585616977e3a6d9701943972204c04e5f67f0e44 SHA1 004400654ba3d6b8ebc21a604c9e2f3edb95168d SHA256 27849aba4dc94bab426082f0db8cd204bad4a1660d25867f43e2a45305e4da73
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkuwz2oACgkQCaWpQKGI+9RihQCdFpcVQaAI9QbB8HBFj67OlveK
-LJwAnAzO+wF3SmCnuFyNuwCTL/PaIeSm
-=s74r
+iEYEARECAAYFAkyFCnAACgkQCaWpQKGI+9TnWwCeIMn7UymFR2NeWiBPvPE6Z9v9
+AYMAn3HXa6GmHFIg8RGNhO7PTcHbq5wg
+=vJpG
 -----END PGP SIGNATURE-----
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"
 }