QA: Fixed compilation with --as-needed (bug 247960), respect CC, die on dosbin

(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)

4 files changed, 32 insertions, 50 deletions

diff --git a/net-dns/rbldnsd/ChangeLog b/net-dns/rbldnsd/ChangeLog
index 06f68e4aeb08..0fc99bd88450 100644
--- a/net-dns/rbldnsd/ChangeLog
+++ b/net-dns/rbldnsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/rbldnsd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/rbldnsd/ChangeLog,v 1.13 2008/06/29 10:02:55 tove Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/rbldnsd/ChangeLog,v 1.14 2009/01/04 15:57:44 angelos Exp $
+
+  04 Jan 2009; Christoph Mende <angelos@gentoo.org>
+  +files/rbldnsd-0.996b-asneeded.patch, -rbldnsd-0.996a.ebuild,
+  rbldnsd-0.996b.ebuild:
+  QA: Fixed compilation with --as-needed (bug 247960), respect CC, die on
+  dosbin
 
   29 Jun 2008; Torsten Veller <tove@gentoo.org> rbldnsd-0.996a.ebuild,
   rbldnsd-0.996b.ebuild:
diff --git a/net-dns/rbldnsd/files/rbldnsd-0.996b-asneeded.patch b/net-dns/rbldnsd/files/rbldnsd-0.996b-asneeded.patch
new file mode 100644
index 000000000000..77af1d915928
--- /dev/null
+++ b/net-dns/rbldnsd/files/rbldnsd-0.996b-asneeded.patch
@@ -0,0 +1,11 @@
+--- configure.lib.orig	2009-01-04 16:52:52.112984801 +0100
++++ configure.lib	2009-01-04 16:53:07.680980305 +0100
+@@ -105,7 +105,7 @@
+ # run a compiler
+ ac_run_compiler() {
+   rm -f conftest*; cat >conftest.c
+-  ac_run $CC $CFLAGS "$@" conftest.c
++  ac_run $CC $CFLAGS conftest.c "$@"
+ }
+ 
+ ac_compile() {
diff --git a/net-dns/rbldnsd/rbldnsd-0.996a.ebuild b/net-dns/rbldnsd/rbldnsd-0.996a.ebuild
deleted file mode 100644
index 211bce0be000..000000000000
--- a/net-dns/rbldnsd/rbldnsd-0.996a.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/rbldnsd/rbldnsd-0.996a.ebuild,v 1.2 2008/06/29 10:02:55 tove Exp $
-
-inherit eutils
-DESCRIPTION="a DNS daemon which is designed to serve DNSBL zones"
-HOMEPAGE="http://www.corpit.ru/mjt/rbldnsd.html"
-SRC_URI="http://www.corpit.ru/mjt/rbldnsd/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="ipv6 zlib"
-
-RDEPEND="zlib? ( sys-libs/zlib )"
-DEPEND=""
-
-src_compile() {
-	# econf doesn't work
-	./configure \
-		$(use_enable ipv6) \
-		$(use_enable zlib) || die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dosbin rbldnsd
-	doman rbldnsd.8
-	keepdir /var/db/rbldnsd
-	dodoc CHANGES* TODO NEWS README* "${FILESDIR}"/example
-	newinitd "${FILESDIR}"/initd rbldnsd
-	newconfd "${FILESDIR}"/confd rbldnsd
-}
-
-pkg_postinst() {
-	enewgroup rbldns
-	enewuser rbldns -1 -1 /var/db/rbldnsd rbldns
-	chown rbldns:rbldns /var/db/rbldnsd
-
-	elog "for testing purpose, example zone file has been installed"
-	elog "see /usr/share/doc/${PF}/example.gz"
-}
diff --git a/net-dns/rbldnsd/rbldnsd-0.996b.ebuild b/net-dns/rbldnsd/rbldnsd-0.996b.ebuild
index b580fae5ae0d..a7996e5d60ac 100644
--- a/net-dns/rbldnsd/rbldnsd-0.996b.ebuild
+++ b/net-dns/rbldnsd/rbldnsd-0.996b.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/rbldnsd/rbldnsd-0.996b.ebuild,v 1.3 2008/06/29 10:02:55 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/rbldnsd/rbldnsd-0.996b.ebuild,v 1.4 2009/01/04 15:57:44 angelos Exp $
+
+inherit eutils toolchain-funcs
 
-inherit eutils
 DESCRIPTION="a DNS daemon which is designed to serve DNSBL zones"
 HOMEPAGE="http://www.corpit.ru/mjt/rbldnsd.html"
 SRC_URI="http://www.corpit.ru/mjt/rbldnsd/${PN}_${PV}.tar.gz"
@@ -15,17 +16,24 @@ IUSE="ipv6 zlib"
 RDEPEND="zlib? ( sys-libs/zlib )"
 DEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
+
 src_compile() {
 	# econf doesn't work
 	./configure \
 		$(use_enable ipv6) \
 		$(use_enable zlib) || die "./configure failed"
 
-	emake || die "emake failed"
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
+		|| die "emake failed"
 }
 
 src_install() {
-	dosbin rbldnsd
+	dosbin rbldnsd || die "dosbin failed"
 	doman rbldnsd.8
 	keepdir /var/db/rbldnsd
 	dodoc CHANGES* TODO NEWS README* "${FILESDIR}"/example