diff options
| author |   Thilo Bangert <bangert@gentoo.org> | 2010-01-14 13:05:58 +0000 |
|---|---|---|
| committer | Thilo Bangert <bangert@gentoo.org> | 2010-01-14 13:05:58 +0000 |
| commit | f473281772bdf0f792dfc56d99bfd136680e5101 (patch) | |
| tree | 0a5086d48e3d0849c0007551c1af49b5be63176a /app-admin | |
| parent | Bump of 3.3, remove old (diff) | |
| download | gentoo-2-f473281772bdf0f792dfc56d99bfd136680e5101.tar.gz gentoo-2-f473281772bdf0f792dfc56d99bfd136680e5101.tar.bz2 gentoo-2-f473281772bdf0f792dfc56d99bfd136680e5101.zip | |
EAPI2 - fix parallel build (bug #277586) - multilib ready - create user in pkg_setup
(Portage version: 2.2_rc61/cvs/Linux i686)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/syslogread/ChangeLog | 9 | ||||
| -rw-r--r-- | app-admin/syslogread/files/syslogread-0.92-fix-parallel-build.patch | 19 | ||||
| -rw-r--r-- | app-admin/syslogread/syslogread-0.92.ebuild | 22 |
3 files changed, 39 insertions, 11 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/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() { |