Version bump.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

3 files changed, 132 insertions, 16 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 7a83027bea9a..f7a82b37dd31 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.212 2012/03/07 21:59:18 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.213 2012/04/30 18:46:12 chutzpah Exp $
+
+*dnsmasq-2.61 (30 Apr 2012)
+
+  30 Apr 2012; Patrick McLean <chutzpah@gentoo.org> +dnsmasq-2.61.ebuild:
+  Version bump.
 
 *dnsmasq-2.60 (07 Mar 2012)
 
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 46cd30f47b89..f65d31513ed3 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -11,26 +11,28 @@ AUX dnsmasq.confd-r1 170 RMD160 1863748117f626416a44b653110fb82dadb52352 SHA1 9b
 DIST dnsmasq-2.57.tar.lzma 333348 RMD160 e78d2f87804e88b2021da3c593191338d0deaed4 SHA1 cbf0c22a7b856746b23f2d894070c60d32c4a97e SHA256 b35c5a31afce2b7c4bd62566d5dc87e1ce62d0d2ebd9c2baf15b5ea16bcc279d
 DIST dnsmasq-2.59.tar.lzma 340720 RMD160 ca7b841d97e0ef7ab5a8c2c099ecb79de28633b3 SHA1 41de5a8187210d7473a084c27526d47853c2017f SHA256 3bba1f637d04145e756ffc31a5076961a0aaf4716d097fa0d4a9a24dc8869391
 DIST dnsmasq-2.60.tar.lzma 365513 RMD160 fb898487a4bac06e725b4182b04e196e3c5c92e0 SHA1 a6794d708a6fd530d046e4adaec41e7fd51e27a0 SHA256 aa5ada47e71a1fc83050d7e8569f03bc060c6a506ecc27a30832ef888e6d4c92
+DIST dnsmasq-2.61.tar.lzma 374461 RMD160 56d427fba2f39a8b428c94b636a2bde7c156faa6 SHA1 503d5ad6435e9d366fc6f53c1632e1f53d2e53fb SHA256 c37fc14c3d0ee32d0418c125871665dd586cfe1a21f4b0307eb171bff41a2683
 EBUILD dnsmasq-2.57-r1.ebuild 1808 RMD160 a3da887b372461bde5ac68a5470eb0b9f25e9ea7 SHA1 61640f3f85b3b85158d4d7f8df4b30d21b5bbc7a SHA256 5e8cd0c7eb5c9e35d5a309835816ced3e84956c08fa0dbf3b3d5e58f68d2f8b9
 EBUILD dnsmasq-2.57.ebuild 1727 RMD160 1e88b07ae8232fd32fea4bb12f7bb328192db262 SHA1 76b27384b19faf48f9375d355ab23ec8d671b03a SHA256 9de48e4a588c1dafbc76f40d7d2c81ecb04f3b1b5c3d8dd2baa9eb5489872689
 EBUILD dnsmasq-2.59.ebuild 1924 RMD160 847e38e6a362adadfc8af8a467116b6df6e26f3b SHA1 aa967d74511bf578f2adafc95f42cc4fc82b971d SHA256 caf88fe6e5fa3f490570c0e8b1954da5a9cde652093fd4721f1ffe641ba88160
 EBUILD dnsmasq-2.60.ebuild 2395 RMD160 4d124435da847fa0b5492302fbedaacdf5dc34ab SHA1 0c844c38eaaf157cead2b1b2f5fd367194a6f46b SHA256 bb1bb538c43a297adb80cff2c9588034b8cf59fc6deb1566757816e750286a7d
-MISC ChangeLog 28001 RMD160 a393a6b9b2d588a354949cbc724ca477b82a2c15 SHA1 ff1318b61b4b4f432332de511866e70822c74d53 SHA256 a3644ab5489e3c5a17367e8fac06e3bee235361f2f8b4806b361377350356ca8
+EBUILD dnsmasq-2.61.ebuild 2395 RMD160 f1ebb19c443bb4f6cedc8e4fe31973bffb259784 SHA1 e8bbca4d78c457d564865633d5cf25e1ad10493e SHA256 3b94d66d56f530f5c2b5a959d0f7164fdb370a7c6ba2aa6e5956f92d84fc8069
+MISC ChangeLog 28121 RMD160 2bc4d9794aea4a6b981a2bfd3dd61a68da657950 SHA1 1773dc74fade8fd26373ef3dbdbec23a522bc63a SHA256 a4c7ecbf125a40ebd73e50c9e0437b168e9904f6acac0a0a5e15c91e4439efde
 MISC metadata.xml 553 RMD160 3aeaf5b60c4bcbd87b42716a6645b229c1df6101 SHA1 bc2aaba4f287048cc9d8d9c0ea95449b17941d94 SHA256 56f56d4e1e01017bf60f2971c8da9c5e536d58fad955413e38ac3428831129ef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPV9o9AAoJEHy/RO9cNQiD7poP/AnRW1KwHzq70K143Alq7Z8W
-WT4dZ+xNrAKrSFfoAsDt07vHeKMTaGtVrs2iP/9e2V80gTGGANU/06jCZAewou5V
-NM8gf90wqzOGwqRvoO9KsstlHRawK/jY7Gb1CC5OwtXR9jKzLXuJ+pZtkepDIWWg
-vqGX+5TSPanBwhQzO6B1bxdy8QBjtnaYHi6oePyLjTllOIggvIDmpPBSh7JZ8CEo
-uh4hUArbmHYvYs7V+zsQxdnck8rqSaAzMT8jlYCsgmR/cMjR65USX5XgBT09biXs
-j/JpxAW2eWqrTNlQmIlHOA07EXylJjNlBzRUswZaTRrzirIwFI5o76bbQpB40PAO
-XOUr/v5lt/I/38QJLTzrbspy3nI+S9AEVNiEjbZsQtrAKswXTM7++LZPJ4tROoZE
-34vgnln2k+RSTX3KkCsG3s82MN1QOJx7OwFJ7ZHkfDpmUeL3HRgrViYwO737GAeM
-u1iwpAU2LxMMNhWJ7N9/n2KWenDNBiCUXSrtPSFk79xcAIB2fNErynRa9CrYD1TN
-BmwsbXXbKZg9NXYgTgmZard4Zu3EXqy1ZClAMlHyAcDIs5jUvZhczm2tL3ti0S4M
-XjD2+vCGLS49YsLDBKJsMCUItjPRWSv9BCNAEOUqMW3AUj+/mWN2scSyaatIffWC
-iAlZIfFdDA0mYzp8Ufdw
-=9xXJ
+iQIcBAEBCAAGBQJPnt4IAAoJEHy/RO9cNQiDVJIP/ikVR2Nt8/wBqtnWIR3c3cNR
+vtfdjf7FvP4uyJO2I5n1CD8sfmy8HT+PllT4GcHniZuv05+T5ucyDQac1C/ZOqUx
+cHLtBmX7bZtv3+fPhBPjl2LYqrXbDOcJvLOa0WvVybyRAsDAqKasjRVDBa9BuaqP
+XnsJMwb7wtHcbz4/cjWG1xO8N3JmeJw7Lz+CZ1g+VJPiCrT3vTBwZghx3ys0oXEH
+koyPqu+G11lrhqXuHN5bP+aQ5RfpGdLAAnyQTyYNRwYzRpBcjGUsDQMsKDlo+6NT
+uyzBuDYR6jz3PM3JFnqRFccb1Lu6VLHXBYTMC4mzilyTZjZLqirxb/++BAY05EHj
+nnpiokQHjYxi/jqcACofSmQwaaH6Dop2vbCpyQVcHqDmRXC3IAaC8+U5nIhjycRe
+EGKOFnxcYcmdBzhJ9JHiHF1V8h0pARxKvLl/smQH8nzRyuImow0ENuF/Vt3PVa6V
+RrzC5Goc/mssPpphI93lfw/1Zx70HjIyssxvQvmypiS17hv9eo6yb0mWwa+3HLLD
+jAxD3NHLLdhtiuBLMNCB1MGlXE9Bcp98L3d+e3acjtSoxyTiN9VPiZGsh3BdLrmg
+A3/sMTLBwDu2e/xsg5wdhZAA89yChbxkwNlwh19umVY9cyL3SiVd1nv9Yl1TPLSG
+eGaL4CrzlFHPW9SoSMhF
+=Ms6e
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.61.ebuild b/net-dns/dnsmasq/dnsmasq-2.61.ebuild
new file mode 100644
index 000000000000..fecad2026c6f
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.61.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.61.ebuild,v 1.1 2012/04/30 18:46:12 chutzpah Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs flag-o-matic
+
+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.lzma"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="conntrack dbus +dhcp idn ipv6 lua nls script tftp"
+
+RDEPEND="dbus? ( sys-apps/dbus )
+	idn? ( net-dns/libidn )
+	lua? ( dev-lang/lua )
+	conntrack? ( net-libs/libnetfilter_conntrack )
+	nls? (
+		sys-devel/gettext
+		net-dns/libidn
+	)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	|| ( app-arch/xz-utils app-arch/lzma )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+REQUIRED_USE="lua? ( script )"
+
+use_have() {
+	local NO_ONLY=""
+	if [ $1 == '-n' ]; then
+		NO_ONLY=1
+		shift
+	fi
+
+	local UWORD=${2:-$1}
+	UWORD=${UWORD^^*}
+
+	if ! use ${1}; then
+		echo " -DNO_${UWORD}"
+	elif [ -z "${NO_ONLY}" ]; then
+		echo " -DHAVE_${UWORD}"
+	fi
+}
+
+pkg_setup() {
+	enewgroup dnsmasq
+	enewuser dnsmasq -1 -1 /dev/null dnsmasq
+}
+
+src_prepare() {
+	# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
+	epatch "${FILESDIR}/${PN}-2.47-fbsd-config.patch"
+	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
+}
+
+src_configure() {
+	COPTS="$(use_have conntrack)"
+	COPTS+="$(use_have dbus)"
+	COPTS+="$(use_have -n dhcp)"
+	COPTS+="$(use_have idn)"
+	COPTS+="$(use_have -n ipv6)"
+	COPTS+="$(use_have lua luascript)"
+	COPTS+="$(use_have -n script)"
+	COPTS+="$(use_have -n tftp)"
+	COPTS+="$(use ipv6 && use dhcp || echo " -DNO_DHCP6")"
+}
+
+src_compile() {
+	emake \
+		PREFIX=/usr \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		COPTS="${COPTS}" \
+		all$(use nls && echo "-i18n")
+}
+
+src_install() {
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		DESTDIR="${D}" \
+		install$(use nls && echo "-i18n")
+
+	dodoc CHANGELOG CHANGELOG.archive FAQ
+	dodoc -r logo
+
+	dodoc CHANGELOG FAQ
+	dohtml *.html
+
+	newinitd "${FILESDIR}"/dnsmasq-init-r2 dnsmasq
+	newconfd "${FILESDIR}"/dnsmasq.confd-r1 dnsmasq
+
+	insinto /etc
+	newins dnsmasq.conf.example dnsmasq.conf
+
+	if use dbus ; then
+		insinto /etc/dbus-1/system.d
+		doins dbus/dnsmasq.conf
+	fi
+}