Add ipv6 USE flag, fixes bugs #209913 and #210896. Fix some variable quoting problems...

Package-Manager: portage-2.1.4.4

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 4cfbb227f892d52ae37ee0c501002dbd116de92b..633ff153ba810d5fbba109193a0cf648f0ccb332 100644 (file)
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.144 2008/02/17 08:38:40 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.145 2008/02/21 15:54:02 chutzpah Exp $
+
+  21 Feb 2008; Patrick McLean <chutzpah@gentoo.org> dnsmasq-2.39.ebuild,
+  dnsmasq-2.40.ebuild, dnsmasq-2.41.ebuild:
+  Add ipv6 USE flag, fixes bugs #209913 and #210896. Fix some variable quoting
+  problems in older versions.
 
   17 Feb 2008; Christian Faulhammer <opfer@gentoo.org> dnsmasq-2.40.ebuild:
   stable amd64, bug 195615

diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index e41c7d463896ba30bfaa985650d818fc8d2ec8ae..95a37419d5956fea42b78d8cf9774266b83c59d6 100644 (file)
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dnsmasq-fbsd-config.patch 451 RMD160 c9103d329ff429cdadea346db59678815fe3317d SHA1 28f48fc050c3cc964e717a1c09edb47b4438597a SHA256 8973971c4a161f48815c41045cb350394f330276085e9b8f3c578077abc0f359
 AUX dnsmasq-init 924 RMD160 feb28b270b5656834550e4dcfc1c87eeef88ab77 SHA1 119f112555a19236622637666758ef42d90ad74b SHA256 3803f1b7cb4c9f1c738537d5b5d91b37727572c81056e2fe6546a517ba992f55
 AUX dnsmasq.confd 140 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 SHA1 83461d2964dc3f0db777fc26141b07f6f3f5a762 SHA256 8bbc2634ab537ed3a17ee98be9c2667013a2b048f6981138017414e54fe90746
@@ -8,16 +5,9 @@ AUX resolvconf.dnsmasq 4078 RMD160 8a290b908cf975e0cbb2b845c5c492d8a3f6e2aa SHA1
 DIST dnsmasq-2.39.tar.gz 288990 RMD160 7bd7e60b825d070eb588319bdb0f2f9a6dc95d23 SHA1 9c6e3b0739e7b3e55aab14acb2bed81c6fb47db9 SHA256 c290f6af5508ecefe83b50a5a063867b05ab024dd2f5ec5ee4d056b2509190c1
 DIST dnsmasq-2.40.tar.gz 307051 RMD160 f86ee3c5e398b3a8eac103c6598f8f3db60d6955 SHA1 4af93b18c262b83e5f6bd24004483aa2ec6f3d20 SHA256 16517856930074fa4bba739f40ca1dd4a11b80a0623a12f2ae7be701083564e0
 DIST dnsmasq-2.41.tar.gz 361517 RMD160 6f8af9934870d359b4155fca671c07c990c256ed SHA1 18ab4f28a3b9300a04f9a4db9cfc3a5d9bc46c55 SHA256 613d712d54ee38ec72d3effc9fe37e404fdbbad43e66f6689a8c509dc9a0d522
-EBUILD dnsmasq-2.39.ebuild 1588 RMD160 1b8b7395f62afb4792a50da3f3892433f4f13ce2 SHA1 5029559173e37ded656e0349bcdd694d2ea66e2f SHA256 14cdc9adf5706cab1ed57a362975b7a9d4578c8ad491883ae472eccf5e169ec9
+EBUILD dnsmasq-2.39.ebuild 1590 RMD160 d239156b97e657380313a03adb2d2e6f10a117ea SHA1 29488a9c7bbbf870eca43e646bc39a2e041a51ce SHA256 9a56eb4338f66c05018904bbf6db41b311bfe2b436a682bb6705bd11a7ae360e
 EBUILD dnsmasq-2.40-r1.ebuild 1434 RMD160 e2db24b42db190e0d4fb2194e2305d935d9fec9d SHA1 563202ad8f57bf7fb169a70b4d6bdd34ee080336 SHA256 7936b820e44e3acd3ad59d2f9df29ed3c00b8501288e2115fcb615d1d004cd27
-EBUILD dnsmasq-2.40.ebuild 1583 RMD160 5838767d75c2bf128b7ce65473c1c788e30cb735 SHA1 d08b56290051534b2c3c1b20143b18b92d92d1f9 SHA256 2a93911565c969b42cb86192b1264a4760ab0ef60984ca4f963ac58e50b966e5
-EBUILD dnsmasq-2.41.ebuild 1445 RMD160 44edfd4fe42306266ea3e1c170d18719f70f374c SHA1 232ce18e8158bd03558c5af2c14adbc08e973c66 SHA256 b50745d0bb39886457c3343da9fcb706223729e00f2fc679c7fe8c836cd233fe
-MISC ChangeLog 17847 RMD160 b898045ab894e74a35d4f29ac108bb9958c64ddd SHA1 576056220239f971a920f06c44cc4775f9bad02a SHA256 f8c740f0b04fcc0c414abc2eca063b039841ad78b8b18534aeeb08a8279c2908
+EBUILD dnsmasq-2.40.ebuild 1590 RMD160 e9e377914d29d71cf0930b7cb1fdda1800709db5 SHA1 019dea9a370e83a56e1b347730f1e9b6d4c4e53c SHA256 583cc33f544a5eb81b5b4eee5cbce4e474385b237f6a29b8456860889fe9fcb2
+EBUILD dnsmasq-2.41.ebuild 1486 RMD160 f2498af2745cfeb185690063393062dac796aa77 SHA1 7a736e912f83166aabf5ba68f6c95229095812a4 SHA256 41756d726e87436e54f766ea28bfc182377e5ef22eb37cfc46b36f286a0b75ac
+MISC ChangeLog 18077 RMD160 0fc7f88d06dfdf49ece7c18cbb020191cc3616d2 SHA1 77bc516de6e72b9e4cc111e83ebd198232c9bc33 SHA256 d6aa28c81ef6a6cbd07046bb2b06d5d7e223c8b42248a6a20370c131ac9cfe99
 MISC metadata.xml 251 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 SHA1 4f7b27e3a8043f87fea8d4bc308e4b947f0e8675 SHA256 fd85d2faaf1d0c0eab6a4d2ab9eaa493e087a6108aafd0a5db6436bfc181783b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHt/LyNQqtfCuFneMRAuZRAJ4zzJkQhUqfhu8A3pvVUET12eHAXgCfTB1g
-9AoKvw/dylcBsCxVANFD89U=
-=8/S8
------END PGP SIGNATURE-----

diff --git a/net-dns/dnsmasq/dnsmasq-2.39.ebuild b/net-dns/dnsmasq/dnsmasq-2.39.ebuild
index 8589ee9c08e33fd7bc21b4d709db0bd6ecad21a8..b9ecc5b8ebb73e87f3cdfbc81c50aa21362770f1 100644 (file)
--- a/net-dns/dnsmasq/dnsmasq-2.39.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.39.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.39.ebuild,v 1.11 2007/08/04 11:25:19 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.39.ebuild,v 1.12 2008/02/21 15:54:02 chutzpah Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -24,7 +24,7 @@ S=${WORKDIR}/${PN}-${MY_PV}
 
 src_unpack() {
        unpack ${A}
-       cd ${S}
+       cd "${S}"
 
        # dnsmasq on FreeBSD wants the config file in a silly location, this fixes
        epatch "${FILESDIR}/${PN}-fbsd-config.patch"
@@ -58,6 +58,6 @@ src_install() {
 
        if use resolvconf ; then
                exeinto /etc/resolvconf/update.d
-               newexe ${FILESDIR}/resolvconf.dnsmasq dnsmasq
+               newexe "${FILESDIR}"/resolvconf.dnsmasq dnsmasq
        fi
 }

diff --git a/net-dns/dnsmasq/dnsmasq-2.40.ebuild b/net-dns/dnsmasq/dnsmasq-2.40.ebuild
index 5bcea98009956149b76f24b56f873303ca7908e2..da758472ce2baae63f732a9883380e1d10416145 100644 (file)
--- a/net-dns/dnsmasq/dnsmasq-2.40.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.40.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.40.ebuild,v 1.7 2008/02/17 08:38:40 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.40.ebuild,v 1.8 2008/02/21 15:54:02 chutzpah Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -24,7 +24,7 @@ S=${WORKDIR}/${PN}-${MY_PV}
 
 src_unpack() {
        unpack ${A}
-       cd ${S}
+       cd "${S}"
 
        # dnsmasq on FreeBSD wants the config file in a silly location, this fixes
        epatch "${FILESDIR}/${PN}-fbsd-config.patch"
@@ -58,6 +58,6 @@ src_install() {
 
        if use resolvconf ; then
                exeinto /etc/resolvconf/update.d
-               newexe ${FILESDIR}/resolvconf.dnsmasq dnsmasq
+               newexe "${FILESDIR}"/resolvconf.dnsmasq dnsmasq
        fi
 }

diff --git a/net-dns/dnsmasq/dnsmasq-2.41.ebuild b/net-dns/dnsmasq/dnsmasq-2.41.ebuild
index 070a4d0264709cb24756f78c73d005681f6923c5..4d6b12f5cba53640002d1669eedf50892b62e9be 100644 (file)
--- a/net-dns/dnsmasq/dnsmasq-2.41.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.41.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.41.ebuild,v 1.2 2008/02/15 15:17:15 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.41.ebuild,v 1.3 2008/02/21 15:54:02 chutzpah Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="dbus isc tftp"
+IUSE="dbus ipv6 isc tftp"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -31,6 +31,7 @@ src_unpack() {
 
 src_compile() {
        use tftp || append-flags -DNO_TFTP
+       use ipv6 || append-flags -DNO_IPV6
        use isc && append-flags -DHAVE_ISC_READER
        use dbus && sed -i '$ a #define HAVE_DBUS' src/config.h