EAPI2 - fix parallel build (bug #277586) - multilib ready - create user in pkg_setup

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

4 files changed, 42 insertions, 23 deletions

diff --git a/app-admin/syslogread/ChangeLog b/app-admin/syslogread/ChangeLog
index 05bf59370291..b8f09ba896a6 100644
--- a/app-admin/syslogread/ChangeLog
+++ b/app-admin/syslogread/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/syslogread
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslogread/ChangeLog,v 1.5 2009/07/13 00:22:46 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslogread/ChangeLog,v 1.6 2010/01/14 13:05:57 bangert Exp $
+
+  14 Jan 2010; Thilo Bangert <bangert@gentoo.org> syslogread-0.92.ebuild,
+  +files/syslogread-0.92-fix-parallel-build.patch:
+  EAPI2 - fix parallel build (bug #277586) - multilib ready - create user in
+  pkg_setup
 
   13 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   syslogread-0.92.ebuild:
diff --git a/app-admin/syslogread/Manifest b/app-admin/syslogread/Manifest
index 24015bc72f88..5c7193236436 100644
--- a/app-admin/syslogread/Manifest
+++ b/app-admin/syslogread/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.92/klogd.run 84 RMD160 0a67fbab20449468df169184af5bf0718e7b0d9f SHA1 1180048fc367f9de90b0bc9c568947e64f1bee67 SHA256 643ff8e40aa189bbf60ba4eb1f3143bb796fca34d98b1fda6ba38c6bdec3b389
 AUX 0.92/syslogread-log.run 129 RMD160 9de62ea16907d612f84526c18f67c24dc68917e5 SHA1 bb9b7afbaf835a9756b9285ac1d16929b5e5d89d SHA256 bdb69e01e1ce4bc84315db4852d81ccfaac3cb5ed97032552f84d52d61b0b1a2
 AUX 0.92/syslogread.init 473 RMD160 9e9b6fcd4b8c682cb339716045df7a4e4d9b7f9b SHA1 a01ceb8572d3221e397113af39d6c8010d0d7db8 SHA256 ae33a0b6caa3bc6b2b1b262454753e8f8d7c083cad26586eacabe56f15f5058e
 AUX 0.92/syslogread.run 56 RMD160 43e306cd53ed3e4e2fcb418d871200b0b2f1d85c SHA1 a8d3cbe0d5746b0b40c85e7e05f979fcabb6a762 SHA256 17706e9f1eebeede0555834b25497f15de6cecfe03d512ea1e2b473199838ac1
+AUX syslogread-0.92-fix-parallel-build.patch 516 RMD160 d678996f34e957f21948c4d6f3d533a26d78cd19 SHA1 8408afcbe8450790762016b63f2a55b9da375d1a SHA256 9a5fca50c488d23587fff7cde6076b70a1e9387f578b9c245e786bb951210a26
 DIST syslogread-0.92.tar.gz 21807 RMD160 df9f24b803423422781a2243034d118f75d39331 SHA1 78a63104ed2f1196c36448c55e9ec1b5c475bdc4 SHA256 eae464db3d9cc9826f65c8bd7ccbfe95795c39fda2876d4db2a4ee8d578bcd03
-EBUILD syslogread-0.92.ebuild 2183 RMD160 af47f88db5b9eaedca42748954d8368e54fb21af SHA1 0ecc9a50ddeb0b16bbb1220980f35349a3da2c50 SHA256 0411e24def0466f45cdf638a1e517925f2e051f355e3773ac0a43ed5f2d34178
-MISC ChangeLog 923 RMD160 54e146bbaccb29d1ac0c1f84946277860c6b2d9f SHA1 b1dee108c46bd63bdbd0a9078fa15f68daa157ba SHA256 e070a4b573b3b59a1cab555ae35a3076fd2ba3b1f2b2105e75fdae1e548d1e51
+EBUILD syslogread-0.92.ebuild 2252 RMD160 ad13fb1ab54320d1967670b31b6e4c466e39df14 SHA1 18da4ed4cf8fad3a7ca363c0599bb443ad01248c SHA256 c411870080e977a121b78275b044d354ea9e0d4da02fea5ef5f5fdac1ccac1fa
+MISC ChangeLog 1136 RMD160 71c9201084e74fb9838beeae7260393604416ba3 SHA1 93922144bd45a3d796908210c361a0d8d656baa5 SHA256 05bf6b82ed9667d3448858d86d558e06b31c176bf7b591d770916f87438fdb6d
 MISC metadata.xml 408 RMD160 7cd4677b7f99406ee5de7da9a64810aa3e1fedd4 SHA1 4001a89fd1f76333631d207d204524ac949b78ae SHA256 a0b75e3003b539b10ad2a463e79ee2dacb26961a58d3de6412912ccaf1bb1917
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpafmMACgkQAiZjviIA2XhfoACgwCbBASEmx49QhwhDs8jszdvu
-mpsAnj5BQoyLsRzhmaDpapmRld/JWlJ2
-=TjPu
------END PGP SIGNATURE-----
diff --git a/app-admin/syslogread/files/syslogread-0.92-fix-parallel-build.patch b/app-admin/syslogread/files/syslogread-0.92-fix-parallel-build.patch
new file mode 100644
index 000000000000..98e810fc70a9
--- /dev/null
+++ b/app-admin/syslogread/files/syslogread-0.92-fix-parallel-build.patch
@@ -0,0 +1,19 @@
+--- Makefile.orig	2010-01-14 13:47:59.000000000 +0100
++++ Makefile	2010-01-14 13:49:00.000000000 +0100
+@@ -45,14 +45,14 @@
+ 	./load insthier -lbg-installer
+ 	mv insthier installer
+ 
+-instcheck: load insthier.o
++instcheck: load insthier.o installer instshow
+ 	./load insthier -lbg-instcheck
+ 	mv insthier instcheck
+ 
+ insthier.o: compile insthier.c conf_bin.c conf_man.c
+ 	./compile insthier.c
+ 
+-instshow: load insthier.o
++instshow: load insthier.o installer
+ 	./load insthier -lbg-instshow
+ 	mv insthier instshow
+ 
diff --git a/app-admin/syslogread/syslogread-0.92.ebuild b/app-admin/syslogread/syslogread-0.92.ebuild
index f56ec09b62f0..a16a1eca59d5 100644
--- a/app-admin/syslogread/syslogread-0.92.ebuild
+++ b/app-admin/syslogread/syslogread-0.92.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslogread/syslogread-0.92.ebuild,v 1.6 2009/07/13 00:22:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslogread/syslogread-0.92.ebuild,v 1.7 2010/01/14 13:05:57 bangert Exp $
 
-inherit eutils toolchain-funcs
+EAPI="2"
+
+inherit eutils toolchain-funcs multilib
 
 DESCRIPTION="Syslog message handling tools"
 HOMEPAGE="http://untroubled.org/syslogread/"
@@ -13,24 +15,26 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND=">=dev-libs/bglibs-1.019-r1"
+DEPEND=">=dev-libs/bglibs-1.106"
 RDEPEND="sys-process/daemontools"
 PROVIDE="virtual/logger"
 
-pkg_preinst() {
+pkg_setup() {
 	enewgroup syslog
 	enewuser syslog -1 -1 /nonexistent syslog
 }
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}"/syslogread-0.92-fix-parallel-build.patch
+}
+
+src_configure() {
 	echo "/usr/include/bglibs/" > conf-bgincs
-	echo "/usr/lib/bglibs/" > conf-bglibs
+	echo "/usr/$(get_libdir)/bglibs/" > conf-bglibs
 	echo "${D}/usr/bin" > conf-bin
 	echo "${D}/usr/share/man" > conf-man
 	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
 	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	# See bug #277586
-	emake -j1 || die
 }
 
 src_install() {