Version bump.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

3 files changed, 155 insertions, 15 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index e3786c73510a..d1f47baa8a25 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.246 2013/10/25 18:23:51 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.247 2013/12/10 19:46:59 chutzpah Exp $
+
+*dnsmasq-2.68 (10 Dec 2013)
+
+  10 Dec 2013; Patrick McLean <chutzpah@gentoo.org> +dnsmasq-2.68.ebuild:
+  Version bump.
 
 *dnsmasq-2.67 (25 Oct 2013)
 
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 50a09b98ca76..150e60299208 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -8,24 +8,26 @@ AUX dnsmasq.confd-r1 170 SHA256 51c0672a70d5d6793d295d82db666d372fb081e8627318f6
 AUX dnsmasq.service 226 SHA256 022df33a4f66c41ea477e59958ebf3d012d314df400acbfdc69c50dc241915cf SHA512 afe0beaff106afe17702a96eca6ff6e4264034ce52f84995b0c39a346af35724a10808ecb872ebc77310dfbeae8342b47c2a0f70753570095d77118517054102 WHIRLPOOL eab0cc195e89d5495713d197f3fbf154a448b2f841dbc6bdc4b7410e1a7a1e0a8ce7ac944703c4b582dd8761fbe19b3ef448739ae59ff76963dc59363101dfdc
 DIST dnsmasq-2.66.tar.xz 401056 SHA256 5e143947527bcdc46a30f4b1bbdfbfa96333dd98bcecdac3b5b1d6cacfe06c75 SHA512 f0bde09f178ca15f4c28efb06901213af9a009b4476daa8a08bafc7682b9ffed13ac65c5c232acdf828382f321137de08b4a33108d22613b198fe30695b3362c WHIRLPOOL e749d24017c35fdbaaaf417decdf9316e235cf7f96f031caceee14d06b982c285b0e561f50597cd12b6a31ef554f7f2e22ca6234f44a6d8bb066dede99461166
 DIST dnsmasq-2.67.tar.xz 418484 SHA256 a8f1cec9d3f38d19c7c54e2879703d42748ace0f62c32e695b082051bdd2705d SHA512 32946fb01fca7f635b6164e0b06392d3377031c0f3fefbcd52bee74939ae527ba5abe494db7dd9d4afdd39faa044c0e82f0bec0b1137b7768013601bceb8a6b3 WHIRLPOOL d9d22e47a9e36962f87df3a76e38fd18415a00fdf60241861d8b29417c4d0f404cb6797e3a4688b95d4bc4cff86cb2cb3b3b0f405286c312300a54a0a61a2591
+DIST dnsmasq-2.68.tar.xz 420968 SHA256 055904f39a65bf651ccbe0f25922c88cf6e7e1b85e8b1905804253b6957ec7a0 SHA512 c67605f21fc5e64fe70ac4349c45a246575ebdb07ada14602c453b9a1152a12c3a7f3a01d5749db9f7a24a9f281a7fb9fd24bfaff1ec35e9ab0d213ae14cac07 WHIRLPOOL 9a69feedd8982dd70053df270fbd5523acc9a5b6e74d03e68363adb111d3ffe87f22dfb0f6f16f7159f717cb5d2de0bc142e585e26e2961068b0e3cc50734c03
 EBUILD dnsmasq-2.66.ebuild 3154 SHA256 62ffc1af6d4021fba25f7d9f6c36f71d291661c3988de2501b8a394b4bf6342e SHA512 049e94034f89e3a91c3b875a9e1c87ec014e5678c8c53708e17c8dcc858c418525ef550c4d4bc6201a235a0a66a3d9380b66dc8fc559d3a742d24666072ccd2d WHIRLPOOL d268b4ebaa126c73215b7cc6cf623a1eb085b4242ca04b08ce1cf89f9f5f60f078bc0f3dff5109053712048830c43793115d27cb6c144e5fc4e7d7a8f3b56654
 EBUILD dnsmasq-2.67.ebuild 3041 SHA256 22e5fca1aaac67e68e7f04de1eeff0547b46d682cd1ce0e629d404a158a782e2 SHA512 19a08db447e7cc58a6c4d3092b5e8e6bbc436683911bf819777d36697311fad4fbe38938261358f9a426e05caa68643aa287a3bfcb9e6630a3f2740c34f15836 WHIRLPOOL 547fbb5416e1ba8cf13c305d1ebceb43a8739431f63da30b393b4017a35c6c3ee220b2dae9b866850fa956f85960bf1a910102e99ca110213c08100bc42bfd43
-MISC ChangeLog 32942 SHA256 c565f2ea47163367150ad9df6e2d2bf45ac5df83d64ed0af03b06702a63eee44 SHA512 f630743ff3d9ffb947e94a0b92cf6d867dd5c1abb47a0b90837cbf6869cc525f19ef24e1424575b58a1d8938e1c971e6281fb3879187fb05c16f0114652e6a92 WHIRLPOOL a87078d3d1a664b74cc2cf1414234dee7488022b0c13a6d86ebdd60949fdf35bd3aa72ddc242c7eb48b42485d514210ea06305ef276955dc84cbf9df3d1d00f5
+EBUILD dnsmasq-2.68.ebuild 3041 SHA256 c1b4f7e41d453a85b2b277e16ab8f07c9dba8c0fc8021c517c1c68c0b7945627 SHA512 8efad9d17383102f910603e5c30a1c56459fe8f65c7198ccfccfa0a12a66fadee0e7421fb3c3a4be766b52519fe8cfd0bd3976b96a1afaaf897c56bb3efcfbed WHIRLPOOL 9d4106c152d5637bb94152977c61de889e45c3d6015bbccc54f3df702d457af77a85509aac20392f17c2ae1a1e7bf57e7e61f9915bb65074339e7375e4dc59b1
+MISC ChangeLog 33062 SHA256 a1a55f458d621e42469414b629f2357581d999f793aebe11d272d4c4d3b07b87 SHA512 a7ae5e230dc1f032bd11008465d707d5752e4ac530bf39738673b6ea97ec35908dc06163972f11ca9f9421c677bdfcb9365705f5d08779b0e02532beadee1193 WHIRLPOOL 0f379c42a5ed716fc52e0f1f723285e196d79e3c22a0a6ead7b97d1b2483fd63d650b872efdbd4a12fb0543c3f94758b2e885287192a4b675fda40a805cde1fc
 MISC metadata.xml 735 SHA256 ac74dd1039502a798c295934e7f94b42ea4576dec58b157a28f1406ced7cb00f SHA512 bb083c9077d9a4304e1d851c1c3e0eae827673ce81314f58542b3bb515691bab2ea5aedd35f93726d4f9225e4b51be10e73b67dc9d027985bcd7caeceb0e938f WHIRLPOOL 4cb58f7b294625a5f768124261f30a3e76094778b74b45e3cbbe3908309332ffbcd9382c5e5a0a160187d6e77ebe56162f275dae16e31285dfd99fb4cfbc0ce5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSarc4AAoJEHy/RO9cNQiD+nkP/j0o8fDKbTa7vcow2YyCiiRT
-XP9JMqu7Eb98Z3pOsjG2N8oCcmNi26vZElFuaZONMcmTv0ooKGhTOAxUnslpMbr4
-6z986FBOypYpjxJCMpc5VeDGL/ckwVzNeZnwBM8ZfwgAOPSK+etE4mWwtip7/V4i
-dZx/bxTs3QGgoBjLdWEj/OvuYPBiHREy/pF24HFTuy0PRM9+Y/MVmljTC26iq3R+
-7T/USvRiqFQLJLaMcLUhKaP3HFQC3JIjtbdruD9MZLRxQgt+FtDOAeyRTsLf7TqO
-dL+LAXmdc37xoy3h2Ondy8Mep5Dn1Fdzye12qF+VYpJii4WBgeqAu2aEJFPUSiuz
-vnaB1WUWJ+tE0kS6KlsGxwIOJcazmqR/ZWY7+2TdLe2QEkeo5dSAdEiq9ObvuATV
-kQyCYwwesrJAgK566wNaxgb8dHhxb56ACJsZi5Ml1XDTq0TYfONP2QMtfh2Xg2cE
-sNppSx0Z/T2nNsLtTdTPMDm3FutjRWRpUDcdJSmobEieng6gu3hRVNqgsTQw97U2
-0MUJsQ6Zz16SaZ+hdzHeSGc692C8/61oujV4+JBBko8GBAtR/or4ypqT1m/ST0FS
-D/ts6CqNpK7lTaiGeRjv1PX10T/Xvt8LyIrTCQAVH5w2oD9JLCES/l0CWd5NL7SY
-paCOD0H4Two7pUFPq136
-=xQKV
+iQIcBAEBCAAGBQJSp2+0AAoJEHy/RO9cNQiD620P/jx1t14W3RSZ2BXRnnM16UG2
+PpRx8QRhIfs5+tXaJ/2L2BRqbQNBxbJKhXEhcpp0zUCkxZhKg9bXJlHitcpx9JFJ
+/Lf9hEeBp2hOkd3zrSnf0t4dmU1hcODRFGVVub5XYeu0PkMKmppZVx0hFFK4aXrp
+kkR/czCqf8F9qbGaguwUcjIljjU/CcfdxIQY/DaVQQEnCa1OKlJ9BVennNe/lm2t
+YxkdpBI4OOX3Ax1FrUBgmpWgxKEjaOh+ntx1yvGLwNSSDyWDYjT8pn0vXPPZ0MQC
+ZYo/xbz4lpSkt14j8Xo96bK70FbCAGyX0gmkgAaSP204Wl0LhwvW5z1zTkZzeufz
+lDxQb7r6CE/DjUPD8iQ8Hhb8MxW3//+ws79VXmRtAohdyoXiKvcUdaYdLPkjZ88A
+d0DhfoVic+paJ9+dl6g8bUQxJIjYCslxAWIG0ihKiAHzPouucVTzFasICjCMv1Rq
+I7BLNJBz2OseXNXC5tufvV1wTb0CvrvsOWUJ+cJYfSTTpInr4cGHjPhVGyfThmft
+hiX6t+ZGGS+xBhnD4pAxL73dPutR0SMOinn9Wtiyw8VvMI6NdiWg9scZYGkE+Srf
+3jvHqx2CqjUuUBTc3RzgcGTTf4omoyoeb+y3BMh8p5m5RiP2+sNOI77Q0WfTqvjy
+yjBvM/M9RzlJ1bwscXKG
+=xAoF
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.68.ebuild b/net-dns/dnsmasq/dnsmasq-2.68.ebuild
new file mode 100644
index 000000000000..e333ebf5ac21
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.68.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.68.ebuild,v 1.1 2013/12/10 19:46:59 chutzpah Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs flag-o-matic user systemd
+
+DESCRIPTION="Small forwarding DNS server"
+HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
+SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
+
+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="auth-dns conntrack dbus +dhcp dhcp-tools idn ipv6 lua nls script selinux tftp"
+DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
+for dm_lingua in ${DM_LINGUAS}; do
+	IUSE+=" linguas_${dm_lingua}"
+done
+
+RDEPEND="dbus? ( sys-apps/dbus )
+		idn? ( net-dns/libidn )
+		lua? ( dev-lang/lua )
+		conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) )
+		nls? (
+			sys-devel/gettext
+			net-dns/libidn
+		)
+		selinux? ( sec-policy/selinux-dnsmasq )"
+
+DEPEND="${RDEPEND}
+		virtual/pkgconfig
+		app-arch/xz-utils"
+
+REQUIRED_USE="dhcp-tools? ( dhcp )
+			  lua? ( script )
+			  s390? ( !conntrack )"
+
+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() {
+	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
+}
+
+src_configure() {
+	COPTS="$(use_have -n auth-dns auth)"
+	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}" \
+		LDFLAGS="${LDFLAGS}" \
+		COPTS="${COPTS}" \
+		CONFFILE="/etc/${PN}.conf" \
+		all$(use nls && echo "-i18n")
+
+	use dhcp-tools && emake -C contrib/wrt \
+		PREFIX=/usr \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		all
+}
+
+src_install() {
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		DESTDIR="${D}" \
+		install$(use nls && echo "-i18n")
+
+	local lingua
+	for lingua in ${DM_LINGUAS}; do
+		use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
+	done
+	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
+
+	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
+
+	if use dhcp-tools; then
+		dosbin contrib/wrt/{dhcp_release,dhcp_lease_time}
+		doman contrib/wrt/{dhcp_release,dhcp_lease_time}.1
+	fi
+
+	systemd_dounit "${FILESDIR}"/dnsmasq.service
+}