Take over maintainership. Version bump, add USE flag for DBUS support, and new internal TFTP server. Clean out some older versions that were never stabilized.

Package-Manager: portage-2.1.2-r4

8 files changed, 37 insertions, 94 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 043fa8e41145..01e2de1a54d5 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.107 2007/01/06 13:19:36 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.108 2007/01/25 03:27:41 chutzpah Exp $
+
+*dnsmasq-2.36 (25 Jan 2007)
+
+  25 Jan 2007; Patrick McLean <chutzpah@gentoo.org> metadata.xml,
+  -dnsmasq-2.32.ebuild, -dnsmasq-2.33.ebuild, +dnsmasq-2.36.ebuild:
+  Take over maintainership. Version bump, add USE flag for DBUS support, and
+  new internal TFTP server. Clean out some older versions that were never
+  stabilized.
 
   06 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> dnsmasq-2.34.ebuild:
   Stable on sparc
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 03542a697b6a..cf5fd770981d 100644
--- 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
 MD5 76c037c6372d10106bfaddc92bc6f898 files/dnsmasq-fbsd-config.patch 451
 RMD160 c9103d329ff429cdadea346db59678815fe3317d files/dnsmasq-fbsd-config.patch 451
@@ -26,49 +23,34 @@ MD5 5454b4f7e8df3dafa5fecb6d016b0fb2 files/resolvconf.dnsmasq 2693
 RMD160 ae2243cf5b68aa4fcb2f482115c6d4e49889de6a files/resolvconf.dnsmasq 2693
 SHA256 ff3518048270e1635126d630a27ec88873cc559327341d1f0b786f5c127f1575 files/resolvconf.dnsmasq 2693
 DIST dnsmasq-2.31.tar.gz 204338 RMD160 7f45c52a76a1edabb868c42069bc4e7710d414e5 SHA1 0dbd561f7e82f3a8a9892347c75d747e816b3b14 SHA256 bb2ec35de2392307587a213bca93fdade6b5d65168b529fc5a95b2edd134edee
-DIST dnsmasq-2.32.tar.gz 220656 RMD160 add05f013f952841c8bce1c7d92fc6d36a542b73 SHA1 f07c090922777f061fbe52aea464b1e43b3988d3 SHA256 ee6b71c2fb7237d3aec8a363266a9b62adaf880b52f1960298f915c863a39bdb
-DIST dnsmasq-2.33.tar.gz 227113 RMD160 ce50b7791546800537bcb4b1fddf41a185b2bda3 SHA1 a470a8ded17dee490302c53d04a5ad61b147b377 SHA256 8507e20ba9286463cc871785b3fbfba81819512b224193b21dbabfd661bc0d14
 DIST dnsmasq-2.34.tar.gz 255744 RMD160 36061107fa62c433df6a02a5fffdb30acc4bf893 SHA1 81c445433d95725c23a27ad06cd6a51665d14138 SHA256 8b9d6a277abecff19ae835c7f2e66e21cc9a4d37ceb35716aa655fd899287bc0
+DIST dnsmasq-2.36.tar.gz 268105 RMD160 14d1616cb0d57addf4afa3a9725a97cf5f479884 SHA1 eb8569ea35221f07b64060544e69dfaa9d4703c2 SHA256 0acc17cf059bb9b0ecde9a57ca5f09aadfebf99fe6b4ebcddf5800875aee3242
 EBUILD dnsmasq-2.31.ebuild 967 RMD160 1518ebea042712941b9d9b154e3fc52ca3731629 SHA1 19a85f22eb7faf2becf7f23e788e3509901c5340 SHA256 51f059ab78b780e34d538f911aff2283e53781780799a52fd8100da382309b0f
 MD5 2757ef66c4498cc17694439855a6f5bb dnsmasq-2.31.ebuild 967
 RMD160 1518ebea042712941b9d9b154e3fc52ca3731629 dnsmasq-2.31.ebuild 967
 SHA256 51f059ab78b780e34d538f911aff2283e53781780799a52fd8100da382309b0f dnsmasq-2.31.ebuild 967
-EBUILD dnsmasq-2.32.ebuild 1057 RMD160 539cf491c316881ac7dcef65812b574f570a4bde SHA1 eac73ad97855bd41286d2104c5862e384f7aefe1 SHA256 761eb96831a6607ab467ad69c657beb9f422a8e40929bb2e07cb6dfa2cdc94ab
-MD5 626fc40777fd6c429f94fda20eddca91 dnsmasq-2.32.ebuild 1057
-RMD160 539cf491c316881ac7dcef65812b574f570a4bde dnsmasq-2.32.ebuild 1057
-SHA256 761eb96831a6607ab467ad69c657beb9f422a8e40929bb2e07cb6dfa2cdc94ab dnsmasq-2.32.ebuild 1057
-EBUILD dnsmasq-2.33.ebuild 1322 RMD160 80eb010af547782d86813687e2c042bcdab1a72f SHA1 408453ab639d08b3de5cd5c50333715e3faa41e1 SHA256 dddaf3a54371bffb2a9ba2e0dfd7004df9293b3f9f58fe1f7c3f9dc8c44f46e5
-MD5 573bd866922c1ac33f67f906e4bf6779 dnsmasq-2.33.ebuild 1322
-RMD160 80eb010af547782d86813687e2c042bcdab1a72f dnsmasq-2.33.ebuild 1322
-SHA256 dddaf3a54371bffb2a9ba2e0dfd7004df9293b3f9f58fe1f7c3f9dc8c44f46e5 dnsmasq-2.33.ebuild 1322
 EBUILD dnsmasq-2.34.ebuild 1316 RMD160 7fa09ef99675319ee3d8f743e746bd2d69800f26 SHA1 9785b0cb6db0226fe3e3e4077251847bb7841f8e SHA256 7a6729383050e6b996276423af443886325606c9e0049ada972c1e92c30918d7
 MD5 4e8a18e62fba4e045e8c3be3b4f33f69 dnsmasq-2.34.ebuild 1316
 RMD160 7fa09ef99675319ee3d8f743e746bd2d69800f26 dnsmasq-2.34.ebuild 1316
 SHA256 7a6729383050e6b996276423af443886325606c9e0049ada972c1e92c30918d7 dnsmasq-2.34.ebuild 1316
-MISC ChangeLog 12841 RMD160 729b57ccd8a10eefa2ac79a0e4536c7aa17e8cd4 SHA1 c684bab6882694ca2bf9d47f727351c274743e92 SHA256 d269abe46c099a5a14eaeb40a6e282045c5b880180355e8d46a049a42143734b
-MD5 918ddefa8ff8a46ace365a8961d3fc00 ChangeLog 12841
-RMD160 729b57ccd8a10eefa2ac79a0e4536c7aa17e8cd4 ChangeLog 12841
-SHA256 d269abe46c099a5a14eaeb40a6e282045c5b880180355e8d46a049a42143734b ChangeLog 12841
-MISC metadata.xml 247 RMD160 a4da16fdd21a3881924fa4646ff17c365d38b9e4 SHA1 c75789dab817531b3534b695e0b1788202510542 SHA256 2aaecc1c578d9742784ab6724027daed89f6bdc3f21a21f27049469bc95e8510
-MD5 af297f893189af788d9c2473ea15495f metadata.xml 247
-RMD160 a4da16fdd21a3881924fa4646ff17c365d38b9e4 metadata.xml 247
-SHA256 2aaecc1c578d9742784ab6724027daed89f6bdc3f21a21f27049469bc95e8510 metadata.xml 247
+EBUILD dnsmasq-2.36.ebuild 1464 RMD160 4e8d45242e2206083d48ecc01ab8a39181c3d991 SHA1 caa452bee848ed9b7ea6929501068874fb9b7b3f SHA256 5a93904ee9c2233f8614817f5fab501e62e73089b351539486b11332882192ff
+MD5 b5fc3d4a550922c529cfeb0475d7a3c2 dnsmasq-2.36.ebuild 1464
+RMD160 4e8d45242e2206083d48ecc01ab8a39181c3d991 dnsmasq-2.36.ebuild 1464
+SHA256 5a93904ee9c2233f8614817f5fab501e62e73089b351539486b11332882192ff dnsmasq-2.36.ebuild 1464
+MISC ChangeLog 13170 RMD160 5c47cfd258591ace66a069a806e3a288609e224b SHA1 21180bb75c936070985165c5d1a6676deb481788 SHA256 f660f0af4d73888c469627d692a480ff1d0082fef3e222919ca4296e4ba6d9fe
+MD5 dd2a2a3dae3e58ecd42137649ece94af ChangeLog 13170
+RMD160 5c47cfd258591ace66a069a806e3a288609e224b ChangeLog 13170
+SHA256 f660f0af4d73888c469627d692a480ff1d0082fef3e222919ca4296e4ba6d9fe ChangeLog 13170
+MISC metadata.xml 251 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 SHA1 4f7b27e3a8043f87fea8d4bc308e4b947f0e8675 SHA256 fd85d2faaf1d0c0eab6a4d2ab9eaa493e087a6108aafd0a5db6436bfc181783b
+MD5 f115572f9475ea98b22ceeb627ba07f0 metadata.xml 251
+RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 metadata.xml 251
+SHA256 fd85d2faaf1d0c0eab6a4d2ab9eaa493e087a6108aafd0a5db6436bfc181783b metadata.xml 251
 MD5 c8208969c5beb7a58bae2666ab0e5133 files/digest-dnsmasq-2.31 238
 RMD160 e612b5108e9775d63ec132b107609b8c122ec371 files/digest-dnsmasq-2.31 238
 SHA256 5d32e1997e58a7d0bd61e63759b9f771a483d4f16bf89205a0f9be6be0e7ab17 files/digest-dnsmasq-2.31 238
-MD5 e8cfcc22ffb49252f17d4bb23ecceb5c files/digest-dnsmasq-2.32 238
-RMD160 e6ebc4491d6066d5ef010bbb10b403b9123c7096 files/digest-dnsmasq-2.32 238
-SHA256 d6c43c12ccd5357f31644704dd7916a8fb8dda84750ea416aed7fea2b64525af files/digest-dnsmasq-2.32 238
-MD5 03046b10656dd994d8811268ea386ec6 files/digest-dnsmasq-2.33 238
-RMD160 950ca1866e94e7ee1019720f0eb114c7bbb092fa files/digest-dnsmasq-2.33 238
-SHA256 e2fdfd6eebb06788755b8a4acd868a3389d6cc13223df614fe4a52efd64da72f files/digest-dnsmasq-2.33 238
 MD5 bad4050c298c5d809ee5f777d8e1062f files/digest-dnsmasq-2.34 238
 RMD160 8c4968a7ca3629cb18e1f241c7b3a9458c1546c5 files/digest-dnsmasq-2.34 238
 SHA256 b7556692de6def5af09946319cfd19d19de3348a1223875671b0bfeeacfe76ef files/digest-dnsmasq-2.34 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFqXKq8bi6rjpTunYRAt5/AKDYkoDYt0ah0RBeOTxxLogAfJjp5ACgpMjh
-aTBzMPL8Yq0kYD72d02LnTA=
-=Npym
------END PGP SIGNATURE-----
+MD5 a1946d200e2840ae9b50e2d7fdbbd5d8 files/digest-dnsmasq-2.36 238
+RMD160 643fcf0014a59fb1ceed56131c440230ff5d3399 files/digest-dnsmasq-2.36 238
+SHA256 ba08fbc405229631822f7e957812c5e814875a86e260e1fcd1c2ddba8be4ea80 files/digest-dnsmasq-2.36 238
diff --git a/net-dns/dnsmasq/dnsmasq-2.32.ebuild b/net-dns/dnsmasq/dnsmasq-2.32.ebuild
deleted file mode 100644
index a7c6d3aa1c3e..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.32.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.32.ebuild,v 1.1 2006/06/16 17:52:03 avenj 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}
-	>=sys-apps/portage-2.0.51"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/dnsmasq232-ldflags.diff
-}
-
-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.33.ebuild b/net-dns/dnsmasq/dnsmasq-2.36.ebuild
index 9fd3d0ff0486..fa17ec3edbe6 100644
--- a/net-dns/dnsmasq/dnsmasq-2.33.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.36.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.33.ebuild,v 1.5 2006/10/02 15:47:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.36.ebuild,v 1.1 2007/01/25 03:27:41 chutzpah Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs flag-o-matic
 
 MY_P="${P/_/}"
 MY_PV="${PV/_rc*/}"
@@ -13,11 +13,12 @@ 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 ~x86 ~x86-fbsd"
-IUSE="resolvconf"
+IUSE="resolvconf tftp dbus"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
 	>=sys-apps/portage-2.0.51
+	dbus? ( sys-apps/dbus )
 	resolvconf? ( net-dns/resolvconf-gentoo )"
 
 S=${WORKDIR}/${PN}-${MY_PV}
@@ -31,6 +32,8 @@ src_unpack() {
 }
 
 src_compile() {
+	use tftp || append-flags -DNO_TFTP
+	use dbus && sed -i '$ a #define HAVE_DBUS' src/config.h
 	emake CC="$(tc-getCC)" || die
 }
 
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.32 b/net-dns/dnsmasq/files/digest-dnsmasq-2.32
deleted file mode 100644
index baad38b454b7..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.32
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d1f593a8352db1d6ad3dccc9b775295d dnsmasq-2.32.tar.gz 220656
-RMD160 add05f013f952841c8bce1c7d92fc6d36a542b73 dnsmasq-2.32.tar.gz 220656
-SHA256 ee6b71c2fb7237d3aec8a363266a9b62adaf880b52f1960298f915c863a39bdb dnsmasq-2.32.tar.gz 220656
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.33 b/net-dns/dnsmasq/files/digest-dnsmasq-2.33
deleted file mode 100644
index 90e412d0b28e..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.33
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 45696461b6e6bc929273b1191ca50447 dnsmasq-2.33.tar.gz 227113
-RMD160 ce50b7791546800537bcb4b1fddf41a185b2bda3 dnsmasq-2.33.tar.gz 227113
-SHA256 8507e20ba9286463cc871785b3fbfba81819512b224193b21dbabfd661bc0d14 dnsmasq-2.33.tar.gz 227113
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.36 b/net-dns/dnsmasq/files/digest-dnsmasq-2.36
new file mode 100644
index 000000000000..f046a4c2cf28
--- /dev/null
+++ b/net-dns/dnsmasq/files/digest-dnsmasq-2.36
@@ -0,0 +1,3 @@
+MD5 392bf22dbff84eae010e149f15cd4136 dnsmasq-2.36.tar.gz 268105
+RMD160 14d1616cb0d57addf4afa3a9725a97cf5f479884 dnsmasq-2.36.tar.gz 268105
+SHA256 0acc17cf059bb9b0ecde9a57ca5f09aadfebf99fe6b4ebcddf5800875aee3242 dnsmasq-2.36.tar.gz 268105
diff --git a/net-dns/dnsmasq/metadata.xml b/net-dns/dnsmasq/metadata.xml
index a3423cb0ced7..a44072a3883b 100644
--- a/net-dns/dnsmasq/metadata.xml
+++ b/net-dns/dnsmasq/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-<email>beu@gentoo.org</email>
-<name>Elfyn McBratney</name>
+<email>chutzpah@gentoo.org</email>
+<name>Patrick McLean</name>
 </maintainer>
 </pkgmetadata>