Version bump. Add nls support, suggested by Jan Psota.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 x86_64

3 files changed, 21 insertions, 13 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 03d1f72d6ed9..96a96fa70a7d 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.156 2008/07/10 14:52:07 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.157 2008/07/10 16:15:53 chutzpah Exp $
+
+*dnsmasq-2.43_rc6 (10 Jul 2008)
+
+  10 Jul 2008; Patrick McLean <chutzpah@gentoo.org>
+  -dnsmasq-2.43_rc5.ebuild, +dnsmasq-2.43_rc6.ebuild:
+  Version bump. Add nls support, suggested by Jan Psota.
 
 *dnsmasq-2.43_rc5 (10 Jul 2008)
 
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index f6f8ef9ef8e3..f6f921814cd1 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -5,10 +5,10 @@ AUX resolvconf.dnsmasq 4078 RMD160 8a290b908cf975e0cbb2b845c5c492d8a3f6e2aa SHA1
 DIST dnsmasq-2.39.tar.gz 288990 RMD160 7bd7e60b825d070eb588319bdb0f2f9a6dc95d23 SHA1 9c6e3b0739e7b3e55aab14acb2bed81c6fb47db9 SHA256 c290f6af5508ecefe83b50a5a063867b05ab024dd2f5ec5ee4d056b2509190c1
 DIST dnsmasq-2.41.tar.gz 361517 RMD160 6f8af9934870d359b4155fca671c07c990c256ed SHA1 18ab4f28a3b9300a04f9a4db9cfc3a5d9bc46c55 SHA256 613d712d54ee38ec72d3effc9fe37e404fdbbad43e66f6689a8c509dc9a0d522
 DIST dnsmasq-2.42.tar.gz 366503 RMD160 d3cbd534f1beb5981f9f12869667832cf6f1ee1b SHA1 85c371ab8951715fbdab01e337e5649705f0b221 SHA256 802699e0543e995ac4953dcef14a5ba39df8158f6c9010de888a90dfd20125c2
-DIST dnsmasq-2.43rc5.tar.gz 389479 RMD160 ad4f61f42d246fa2dd31f180d9ba5880781ac107 SHA1 b120f622fe912d58be4f4faef2c02a97cb581acc SHA256 b52ef298548762c171471c9dd5e38eb0ad7c88fbf0458ac8cd5d2a6734cfba23
+DIST dnsmasq-2.43rc6.tar.lzma 282325 RMD160 5bc9ffb9a13e1fe890eddec536493359361d9075 SHA1 8a347a6565d33b1d39b40411cf5908854fbbd94b SHA256 07f8cd1c5f11bbeaa52355202549a85fb42df24126bdc6285b8ffd1bd64783dd
 EBUILD dnsmasq-2.39.ebuild 1615 RMD160 bed33625fa785f07cc1f658ab76e43691259c93b SHA1 261e1dd3b263a14727b20ea717780be7e514e876 SHA256 57a6102b9e0d746528b9edd1d15d3f0190d2afcfb118c5d42124c14bc5065b60
 EBUILD dnsmasq-2.41.ebuild 1521 RMD160 0dfe63467317d3d7508e82e77894e993c8342727 SHA1 123a9ee5c825440970e6589c44d6a4b412aacb42 SHA256 34d5fb4d62abb4d21b7829033090da6087bc1f75cd873423d585e3991e6dbfcc
 EBUILD dnsmasq-2.42.ebuild 1528 RMD160 425d62552f25d6484b25c09e2e1230b88a52424d SHA1 20fd989cc9c5f19e7a967e0652ef1e9077263d08 SHA256 fb9fb8fdb823c70e474c4d7f8819d7642c43fb643418f789fda79864a70370eb
-EBUILD dnsmasq-2.43_rc5.ebuild 1618 RMD160 2708b6f868f91a50fe1de6787bdd7741b8e01aa9 SHA1 8f24e252633c38f107b823588ee470ff44d7103b SHA256 38973410d7cf46ded127a61d6bf6d86adeb003a8d74bed219ffeb02a2aded269
-MISC ChangeLog 19644 RMD160 f74956a23e74e26a3812e0663567d68d2490db5c SHA1 44c2c95674050b1524244509bfd7f3a9d3d69efc SHA256 ff09c9bc9459cd6d5b136d6420c0143fb3df8e370fe871dd7a9eefdd486b1731
+EBUILD dnsmasq-2.43_rc6.ebuild 1725 RMD160 069f21db46513d92c8e823702e67f47603fd85f2 SHA1 dcc4d496b67378354639c220ff32be42b095ecae SHA256 6d7533c3fba96b447cecd57a34bc213b753b8fd041a7fe1df2b601602b200e4b
+MISC ChangeLog 19841 RMD160 9b5c28a0003eacc76fe8f39371ca4bf7283ecae4 SHA1 f81a199951992c61797959f87aded60d8b55d476 SHA256 de297ded4d04109387fcccb865edf06fa84fa8cdf66315bc68e2891a7bff5a40
 MISC metadata.xml 251 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 SHA1 4f7b27e3a8043f87fea8d4bc308e4b947f0e8675 SHA256 fd85d2faaf1d0c0eab6a4d2ab9eaa493e087a6108aafd0a5db6436bfc181783b
diff --git a/net-dns/dnsmasq/dnsmasq-2.43_rc5.ebuild b/net-dns/dnsmasq/dnsmasq-2.43_rc6.ebuild
index 49357481d86f..d48ce156e713 100644
--- a/net-dns/dnsmasq/dnsmasq-2.43_rc5.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.43_rc6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.43_rc5.ebuild,v 1.1 2008/07/10 14:52:07 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.43_rc6.ebuild,v 1.1 2008/07/10 16:15:53 chutzpah Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -8,17 +8,18 @@ MY_P="${P/_/}"
 MY_PV="${PV/_/}"
 DESCRIPTION="Small forwarding DNS server"
 HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
-#SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.gz"
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/release-candidates/${MY_P}.tar.gz"
+#SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.lzma"
+SRC_URI="http://www.thekelleys.org.uk/dnsmasq/release-candidates/${MY_P}.tar.lzma"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="dbus ipv6 isc tftp"
+IUSE="dbus ipv6 isc nls tftp"
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dbus? ( sys-apps/dbus )"
+RDEPEND="dbus? ( sys-apps/dbus )
+	nls? ( sys-devel/gettext )"
+
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
@@ -38,9 +39,10 @@ src_compile() {
 	use dbus && sed -i '$ a #define HAVE_DBUS' src/config.h
 
 	emake \
+		PREFIX=/usr \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
-		|| die
+		all$(use nls && echo "-i18n") || die
 }
 
 src_install() {
@@ -48,7 +50,7 @@ src_install() {
 		PREFIX=/usr \
 		MANDIR=/usr/share/man \
 		DESTDIR="${D}" \
-		install || die
+		install$(use nls && echo "-i18n") || die
 
 	dodoc CHANGELOG FAQ
 	dohtml *.html