Version bump (bug #210000), drop ancient version, add some missing variable quoting.

Package-Manager: portage-2.1.4.4

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 23abbc0b6c11eb1800d13739692c1aef496519ad..b64ae4d09883efdecac0bab34ea1b389246a5a48 100644 (file)
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,13 @@
 # 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.141 2008/01/30 11:06:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.142 2008/02/15 04:17:25 chutzpah Exp $
+
+*dnsmasq-2.41 (15 Feb 2008)
+
+  15 Feb 2008; Patrick McLean <chutzpah@gentoo.org> -dnsmasq-2.31.ebuild,
+  +dnsmasq-2.41.ebuild:
+  Version bump (bug #210000), drop ancient version, add some missing variable
+  quoting.
 
   30 Jan 2008; Raúl Porcel <armin76@gentoo.org> -dnsmasq-2.34.ebuild,
   -dnsmasq-2.38.ebuild, -dnsmasq-2.38-r1.ebuild:

diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index c98020dfdf6e8f1740526a9e276a38bc6bb52447..c036c481c29ef2a871f356a0969cf02b60bfa04d 100644 (file)
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -2,12 +2,12 @@ AUX dnsmasq-fbsd-config.patch 451 RMD160 c9103d329ff429cdadea346db59678815fe3317
 AUX dnsmasq-init 924 RMD160 feb28b270b5656834550e4dcfc1c87eeef88ab77 SHA1 119f112555a19236622637666758ef42d90ad74b SHA256 3803f1b7cb4c9f1c738537d5b5d91b37727572c81056e2fe6546a517ba992f55
 AUX dnsmasq.confd 140 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 SHA1 83461d2964dc3f0db777fc26141b07f6f3f5a762 SHA256 8bbc2634ab537ed3a17ee98be9c2667013a2b048f6981138017414e54fe90746
 AUX resolvconf.dnsmasq 4078 RMD160 8a290b908cf975e0cbb2b845c5c492d8a3f6e2aa SHA1 70f4ca6e6cbd91b700e7e82696d5508f3c1686dd SHA256 c3cf0b2249267aaf921f335ec10cf140db570b2aa4009be789a215c47323a1d5
-DIST dnsmasq-2.31.tar.gz 204338 RMD160 7f45c52a76a1edabb868c42069bc4e7710d414e5 SHA1 0dbd561f7e82f3a8a9892347c75d747e816b3b14 SHA256 bb2ec35de2392307587a213bca93fdade6b5d65168b529fc5a95b2edd134edee
 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
-EBUILD dnsmasq-2.31.ebuild 938 RMD160 0dd3943443611e33b7ed363ddf55b2c0d600e1b8 SHA1 d0d3da5c9fc88479a8404fe8f9c24ad0f8012552 SHA256 2e29e0ab17e0f672e5ad3626a5b9bce82cfe24f9c78419a8097703cac293f4c7
+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.40-r1.ebuild 1428 RMD160 3bdec0dc97b673023a17878dab9a09ee0cd1d91b SHA1 5ab62dab128673ff655d6d713d0b778779fb48fb SHA256 ca1e4e928859e6da1e1cc036fe961ace3ebfaae5f6e80368b6d76d1cb52572d2
+EBUILD dnsmasq-2.40-r1.ebuild 1434 RMD160 e2db24b42db190e0d4fb2194e2305d935d9fec9d SHA1 563202ad8f57bf7fb169a70b4d6bdd34ee080336 SHA256 7936b820e44e3acd3ad59d2f9df29ed3c00b8501288e2115fcb615d1d004cd27
 EBUILD dnsmasq-2.40.ebuild 1582 RMD160 c991606cf75accac55a81ece073939b239f0a5b0 SHA1 135a1f2019ddc63006c97eef7c2d8fe95106e2b3 SHA256 4786e948ed41b95aa2d1fad0aa8210ff3d937193bb094ad889c60f83726efa09
-MISC ChangeLog 17402 RMD160 2789ec5444a5fb46cc596ed8da155a9b5597c148 SHA1 3ce0b65d54be30b96e3b9b82bdb2207153c78b1d SHA256 89d5951c4ba7ee8fb246aca13a08d697a161a5f6bd77a8f418e552fd0773e30a
+EBUILD dnsmasq-2.41.ebuild 1426 RMD160 03b8c6e01e9b371516fd81b295cb1d7110e587c7 SHA1 4e2857694e0e112a34843fec618ec1f78c0253b6 SHA256 108081113a2faf573f6b80d95105316157d1282cda1684795e7f37eaef397f12
+MISC ChangeLog 17620 RMD160 09b5d886febdb577cbd9c06ee2cc7ccfeba79804 SHA1 949a3a73e0087e08881843dfb81758e205585264 SHA256 fd9bafa704b5b55a3d805d645d441c29e56a3d754c4473aa07d31aa31dd26b98
 MISC metadata.xml 251 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 SHA1 4f7b27e3a8043f87fea8d4bc308e4b947f0e8675 SHA256 fd85d2faaf1d0c0eab6a4d2ab9eaa493e087a6108aafd0a5db6436bfc181783b

diff --git a/net-dns/dnsmasq/dnsmasq-2.31.ebuild b/net-dns/dnsmasq/dnsmasq-2.31.ebuild
deleted file mode 100644 (file)
index 931efe4..0000000
--- a/net-dns/dnsmasq/dnsmasq-2.31.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.31.ebuild,v 1.10 2007/03/26 07:51:13 antarus Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P="${P/_/}"
-MY_PV="${PV/_rc*/}"
-DESCRIPTION="Small forwarding DNS server"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
-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 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_compile() {
-       emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-       make \
-               PREFIX=/usr \
-               MANDIR=/usr/share/man \
-               DESTDIR="${D}" \
-               install || die
-       dodoc CHANGELOG FAQ
-       dohtml *.html
-
-       newinitd "${FILESDIR}"/dnsmasq-init dnsmasq
-       newconfd "${FILESDIR}"/dnsmasq.confd dnsmasq
-       insinto /etc
-       newins dnsmasq.conf.example dnsmasq.conf
-}

diff --git a/net-dns/dnsmasq/dnsmasq-2.40-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.40-r1.ebuild
index b6af9278de9905df33f078468b32c7fed19ee900..e0ac5ee03d22978ac1af225c4e4c248d20242822 100644 (file)
--- a/net-dns/dnsmasq/dnsmasq-2.40-r1.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.40-r1.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.40-r1.ebuild,v 1.1 2007/12/31 13:16:21 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.40-r1.ebuild,v 1.2 2008/02/15 04:17:25 chutzpah Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -23,7 +23,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"

diff --git a/net-dns/dnsmasq/dnsmasq-2.41.ebuild b/net-dns/dnsmasq/dnsmasq-2.41.ebuild
new file mode 100644 (file)
index 0000000..3d5cd16
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.41.ebuild
@@ -0,0 +1,62 @@
+# 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.1 2008/02/15 04:17:25 chutzpah Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_P="${P/_/}"
+MY_PV="${PV/_rc*/}"
+DESCRIPTION="Small forwarding DNS server"
+HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
+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"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+       dbus? ( sys-apps/dbus )"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # dnsmasq on FreeBSD wants the config file in a silly location, this fixes
+       epatch "${FILESDIR}/${PN}-fbsd-config.patch"
+}
+
+src_compile() {
+       use tftp || append-flags -DNO_TFTP
+       use dbus && append-flags -DHAVE_DBUS
+       use isc && append-flags -DHAVE_ISC_READER
+
+       emake \
+               CC="$(tc-getCC)" \
+               CFLAGS="${CFLAGS}" \
+               || die
+}
+
+src_install() {
+       make \
+               PREFIX=/usr \
+               MANDIR=/usr/share/man \
+               DESTDIR="${D}" \
+               install || die
+
+       dodoc CHANGELOG FAQ
+       dohtml *.html
+
+       newinitd "${FILESDIR}"/dnsmasq-init dnsmasq
+       newconfd "${FILESDIR}"/dnsmasq.confd dnsmasq
+       insinto /etc
+       newins dnsmasq.conf.example dnsmasq.conf
+
+       if use dbus ; then
+               insinto /etc/dbus-1/system.d
+               doins dbus/dnsmasq.conf
+       fi
+}