Make sure we use a proper $CC.

3 files changed, 31 insertions, 18 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index ad7b050740d3..b51029a8e5a8 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.59 2004/11/22 16:34:37 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.60 2004/11/23 01:36:42 vapier Exp $
+
+  22 Nov 2004; Mike Frysinger <vapier@gentoo.org> dnsmasq-2.18.ebuild:
+  Make sure we use a proper $CC.
 
 *dnsmasq-2.18 (22 Nov 2004)
 
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index a23a114d5a5c..9a11f1592eb0 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,16 +1,26 @@
-MD5 5469f9742c17cee1bc73583e67773ca0 ChangeLog 7196
-MD5 17ced6f6c41f0105ab28e94b8a7bd4f5 dnsmasq-2.8-r1.ebuild 1024
-MD5 26b4f1cdd80b7aee01db99e5ecf2ec0f dnsmasq-2.5-r1.ebuild 1018
-MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9ddd27a261a96d4b1c47e737d7942bc4 ChangeLog 7302
+MD5 4b34b115109d9d854cf38541543950ae dnsmasq-2.18.ebuild 986
 MD5 15b7b0f4e0039895f6b58d7299a38ba0 dnsmasq-2.15.ebuild 939
+MD5 26b4f1cdd80b7aee01db99e5ecf2ec0f dnsmasq-2.5-r1.ebuild 1018
+MD5 17ced6f6c41f0105ab28e94b8a7bd4f5 dnsmasq-2.8-r1.ebuild 1024
 MD5 2afac01881b13d0907550170a81ccecc dnsmasq-2.9.ebuild 1048
+MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
 MD5 4975daac017af7475926e513d5845e5d dnsmasq-2.17.ebuild 960
-MD5 2c785e3b618df3b600d69954ed9eedc4 dnsmasq-2.18.ebuild 960
-MD5 39075dfeab4bbded5f0e8680df29e414 files/digest-dnsmasq-2.8-r1 63
-MD5 8aeaa6fcd017624c86ad1a090cd8598a files/digest-dnsmasq-2.15 64
 MD5 9740ffe29b6d012b66cd2e532b8915ce files/digest-dnsmasq-2.5-r1 62
 MD5 51224c4bafcccf490d6de12440f681e5 files/dnsmasq-init 504
 MD5 fc1326c5ef78a5ba4a73f6261806579f files/dnsmasq.confd 339
 MD5 d48a297550b42f81be10bd5fcf4e15a7 files/digest-dnsmasq-2.9 63
-MD5 0003eb8af2f7b8f64e1472822d1ff2ff files/digest-dnsmasq-2.17 64
+MD5 39075dfeab4bbded5f0e8680df29e414 files/digest-dnsmasq-2.8-r1 63
 MD5 fd57ba5d6351e2f53becbeaa223b8a34 files/digest-dnsmasq-2.18 64
+MD5 8aeaa6fcd017624c86ad1a090cd8598a files/digest-dnsmasq-2.15 64
+MD5 0003eb8af2f7b8f64e1472822d1ff2ff files/digest-dnsmasq-2.17 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBopRwHTu7gpaalycRAi/TAKDX/6pvREyHkwn4ujxV0zPqvDxhdACg72Bp
+366IQcqXE/AYVC5kVC+Mmbo=
+=9KQW
+-----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.18.ebuild b/net-dns/dnsmasq/dnsmasq-2.18.ebuild
index a74abdb591c5..a9d73bdf1847 100644
--- a/net-dns/dnsmasq/dnsmasq-2.18.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.18.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.18.ebuild,v 1.1 2004/11/22 16:34:37 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.18.ebuild,v 1.2 2004/11/23 01:36:42 vapier Exp $
 
-#inherit eutils
+inherit toolchain-funcs
 
 MY_P="${P/_/}"
 MY_PV="${PV/_rc*/}"
@@ -12,16 +12,18 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~arm ~amd64 ~ia64 ~s390"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND="virtual/libc"
-DEPEND=">=sys-apps/sed-4 ${RDEPEND}"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	>=sys-apps/portage-2.0.51"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_compile() {
-	emake || die
+	emake CC="$(tc-getCC)" || die
 }
 
 src_install() {
@@ -33,10 +35,8 @@ src_install() {
 	dodoc CHANGELOG FAQ
 	dohtml *.html
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/dnsmasq-init dnsmasq
-	insinto /etc/conf.d
-	newins ${FILESDIR}/dnsmasq.confd dnsmasq
+	newinitd ${FILESDIR}/dnsmasq-init dnsmasq
+	newconfd ${FILESDIR}/dnsmasq.confd dnsmasq
 	insinto /etc
 	newins dnsmasq.conf.example dnsmasq.conf
 }