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

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

5 files changed, 38 insertions, 57 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/Manifest b/net-dns/rbldnsd/Manifest
index f0b65dda64be..8514d35ab2df 100644
--- a/net-dns/rbldnsd/Manifest
+++ b/net-dns/rbldnsd/Manifest
@@ -4,16 +4,15 @@ Hash: SHA1
 AUX confd 635 RMD160 f553987798b9ad6ba28288d6608407be0956a17c SHA1 8765204aad28aee834e50cfa36722bfcf6959922 SHA256 24ec9e68e2f19e27048b37f5cb502e096de5757bb733807dfddac41ecc304eba
 AUX example 495 RMD160 61870074f98f0ccf69b5dae896b41790b18b82b3 SHA1 a97548ee443887685ff046a2fdc6598c1ba921e9 SHA256 716411e82cbfdcf93278f1b66578329ca5f7f91d2dcda51959fd047f1c0454b8
 AUX initd 475 RMD160 10fac5f89c6f49be4ef098852bd2e4c75dd61ed3 SHA1 2d891045ea2eef5687ffef9b06e562f799eaef5b SHA256 e1002cc31ba33061916cfe6caf26ed12b5cca6dd77149ad07304642db9218a62
-DIST rbldnsd_0.996a.tar.gz 112339 RMD160 b44a61ba9df55ff43df4283ac0632c8c61f930e4 SHA1 7630069156aeff4432a066bc9e292fa4fab6dd92 SHA256 fb251ce54cd9d0558a133294f3ae8087d0a5be4cb51fa655e48dbd4c0563f6e4
+AUX rbldnsd-0.996b-asneeded.patch 305 RMD160 2729bde79b3e77e687df407b70753afcd0a83996 SHA1 483e172c54995ff4a897fb2455079de68f49f59a SHA256 7eb48018e8d4a2784d3766a48a1ad88a3771ab161f90aa96d62f4b154a170817
 DIST rbldnsd_0.996b.tar.gz 113128 RMD160 15be588fb4051f0526084425b586ea7986b6493a SHA1 9cfe6cf01c54088cecc3a02902c721ee714f1c28 SHA256 475afe5be8729a76b7c23e2f3d5ce1c773775140406a58bfb7477fac5a528342
-EBUILD rbldnsd-0.996a.ebuild 1127 RMD160 b626bf5eed11215fc9211cd68468d7d9851f5a34 SHA1 ed70893c2f5336b4ef7f9fe5b5456828073b18e1 SHA256 06115ec54290848a8a5d4995d2eebeda4a53c48db94008736c5ae69ed90e64f9
-EBUILD rbldnsd-0.996b.ebuild 1133 RMD160 30313ee6aa328e0627d4f73e7ba1e6719a99f4ef SHA1 4d1ea8b82b5eb3a513f318592bb3341c2d120ced SHA256 3131a3a40277e84e57ca3bc97757ac9044ec34340f4e1a7ecbfed333818a0d36
-MISC ChangeLog 1997 RMD160 ba03cc67e98f82800b97cafa2ee852c8de121464 SHA1 fe19f293c214345f5aafeea6198db32414eba30c SHA256 e86c6689ee222ecf74c078336c137f58254906770161e499ab00372f241adfb1
+EBUILD rbldnsd-0.996b.ebuild 1323 RMD160 8550ce83d7ec3ab801b0878b64ceda34b086e4da SHA1 b7e45e14fd817f09f30dec7ccb489389d9fd70c0 SHA256 f6a095268f4a95f8ae947d7d4bca1699c62830c882b719d00abb7c8f1c390d5a
+MISC ChangeLog 2225 RMD160 aa27d242d3872f9a6bc1eededb01b8144dc14eea SHA1 cf424a4ac7cb4dcaedb72f9e9d86b0f3c95f9640 SHA256 d0d394ffeffe8608fff6b3b825e906fc08a59f793ef0b506c302a485946fb9d9
 MISC metadata.xml 1086 RMD160 40f01d91fbaa694a47664f0eb4aede8830f86973 SHA1 a703609629cd5ac5a1a2a696efe97057eb5a1678 SHA256 cb5deaad197ec12f2a6d73a3efcadd4197988e388cfa065275880486b2f651e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhnXdYACgkQV3J2n04Eauw1BwCg1N3I8rNLUBQwZdq/LQQcmZ+p
-YVMAn0ljJ2c3XBQOYuKu2E0dfyh2aesd
-=EaPd
+iEYEARECAAYFAklg3IAACgkQKhnDs22gwa9WCACfYOZs+v2n76UZlqAz6PtMuPE8
+glcAn1TJkejRmx/Jj4NZbylaYa4YJj7n
+=8Idw
 -----END PGP SIGNATURE-----
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