4 files changed, 17 insertions, 68 deletions
diff --git a/app-admin/mon/ChangeLog b/app-admin/mon/ChangeLog
index e0c0a65d77f7..20c3c548aee9 100644
--- a/app-admin/mon/ChangeLog
+++ b/app-admin/mon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/mon
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mon/ChangeLog,v 1.27 2009/10/11 23:36:13 halcy0n Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mon/ChangeLog,v 1.28 2010/10/08 00:06:41 cla Exp $
+
+  08 Oct 2010; Dawid Węgliński <cla@gentoo.org> mon-0.99.2-r2.ebuild,
+  -mon-0.99.2-r4.ebuild, mon-0.99.2-r5.ebuild:
+  QA fixes: respect LDFLAGS (#339584), use emake instead of make, assign
+  RDEPEND. Remove old
 
   11 Oct 2009; Mark Loeser <halcy0n@gentoo.org> mon-0.99.2-r2.ebuild:
   QA fixes; unquoted variables
diff --git a/app-admin/mon/mon-0.99.2-r2.ebuild b/app-admin/mon/mon-0.99.2-r2.ebuild
index 55dbbdc82363..976be540b3cd 100644
--- a/app-admin/mon/mon-0.99.2-r2.ebuild
+++ b/app-admin/mon/mon-0.99.2-r2.ebuild
@@ -1,6 +1,6 @@
-# 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/mon/mon-0.99.2-r2.ebuild,v 1.4 2009/10/11 23:36:13 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mon/mon-0.99.2-r2.ebuild,v 1.5 2010/10/08 00:06:41 cla Exp $
 
 inherit toolchain-funcs
 
@@ -17,6 +17,8 @@ DEPEND=">=dev-perl/Mon-0.9
 	>=virtual/perl-Time-HiRes-1.20
 	>=dev-perl/Period-1.20-r2"
 
+RDEPEND="${DEPEND}"
+
 src_compile() {
 	cd "${S}"/mon.d
 	make CC="$(tc-getCC) $CFLAGS" || die
diff --git a/app-admin/mon/mon-0.99.2-r4.ebuild b/app-admin/mon/mon-0.99.2-r4.ebuild
deleted file mode 100644
index 191335c1ca17..000000000000
--- a/app-admin/mon/mon-0.99.2-r4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mon/mon-0.99.2-r4.ebuild,v 1.2 2007/04/28 17:05:28 tove Exp $
-
-inherit toolchain-funcs eutils multilib
-
-DESCRIPTION="highly configurable service monitoring daemon"
-HOMEPAGE="http://www.kernel.org/software/mon/"
-SRC_URI="mirror://kernel/software/admin/mon/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="ldap mysql"
-
-DEPEND=">=dev-perl/Mon-0.9
-	>=virtual/perl-Time-HiRes-1.20
-	dev-perl/Convert-BER
-	dev-perl/Filesys-DiskSpace
-	dev-perl/Net-Telnet
-	ldap? ( dev-perl/perl-ldap )
-	dev-perl/Expect
-	dev-perl/Net-DNS
-	mysql? ( dev-perl/DBD-mysql )
-	>=dev-perl/Period-1.20-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" && epatch "${FILESDIR}"/alertafter.patch
-}
-
-src_compile() {
-	cd "${S}"/mon.d
-	make CC="$(tc-getCC) $CFLAGS" || die
-}
-
-src_install() {
-	dosbin mon clients/mon* || die "dosbin"
-
-	insinto /usr/$(get_libdir)/mon/utils
-	doins utils/* || die "doins"
-
-	exeinto /usr/$(get_libdir)/mon/alert.d ; doexe alert.d/*
-	exeinto /usr/$(get_libdir)/mon/mon.d ; doexe mon.d/*.monitor
-	insopts -g uucp -m 02555 ; doins mon.d/*.wrap
-
-	dodir /var/log/mon.d
-	dodir /var/lib/mon.d
-
-	doman doc/*.1
-	doman doc/*.8
-	dodoc CHANGES CREDITS KNOWN-PROBLEMS
-	dodoc mon.lsm README TODO VERSION
-	docinto txt ; dodoc doc/README*
-	docinto etc ; dodoc etc/*
-	newdoc "${FILESDIR}"/mon.cf mon.cf.sample
-
-	newinitd "${FILESDIR}"/mon.rc6 mon
-	insinto /etc/mon
-	newins "${FILESDIR}"/mon.cf mon.cf.sample
-}
diff --git a/app-admin/mon/mon-0.99.2-r5.ebuild b/app-admin/mon/mon-0.99.2-r5.ebuild
index 57ec11608361..5616258650ac 100644
--- a/app-admin/mon/mon-0.99.2-r5.ebuild
+++ b/app-admin/mon/mon-0.99.2-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 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/mon/mon-0.99.2-r5.ebuild,v 1.1 2007/07/09 22:47:42 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mon/mon-0.99.2-r5.ebuild,v 1.2 2010/10/08 00:06:41 cla Exp $
 
 inherit toolchain-funcs eutils multilib
 
@@ -24,14 +24,17 @@ DEPEND=">=dev-perl/Mon-0.9
 	mysql? ( dev-perl/DBD-mysql )
 	>=dev-perl/Period-1.20-r2"
 
+RDEPEND="${DEPEND}"
+
 src_unpack() {
 	unpack ${A}
+	sed -r '/^LDFLAGS/s:=:= $(LDFLAGS):' -i "${S}"/mon.d/Makefile
 	cd "${S}" && epatch "${FILESDIR}"/alertafter.patch
 }
 
 src_compile() {
 	cd "${S}"/mon.d
-	make CC="$(tc-getCC) $CFLAGS" || die
+	emake CC="$(tc-getCC) ${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
 }
 
 src_install() {