Version bump. Add REQUIRED_USE block so conntrack can't be enabled on s390 to all current versions.

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

5 files changed, 170 insertions, 26 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 5a5fa9a00acd..8916c00b76bf 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,13 @@
 # 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.231 2012/11/14 18:31:00 chutzpah Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.232 2013/01/15 01:05:50 chutzpah Exp $
+
+*dnsmasq-2.65 (15 Jan 2013)
+
+  15 Jan 2013; Patrick McLean <chutzpah@gentoo.org> +dnsmasq-2.65.ebuild,
+  dnsmasq-2.63-r1.ebuild, dnsmasq-2.63.ebuild:
+  Version bump. Add REQUIRED_USE block so conntrack can't be enabled on s390 to
+  all current versions.
 
 *dnsmasq-2.63-r1 (14 Nov 2012)
 
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index fdafbb486fd0..7048d734eda0 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -6,24 +6,26 @@ AUX dnsmasq-init-r2 595 SHA256 bc80bcd171db123a6d02df9ebbfde3fb59078295ff24dea9b
 AUX dnsmasq.confd-r1 170 SHA256 51c0672a70d5d6793d295d82db666d372fb081e8627318f67c88e48d08d254b5 SHA512 9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 WHIRLPOOL 86f364adcb5576bfb2cc84d13dd087bef987cae70eee1ae7816f0febc58ec637a97fea357c506456781eab116e257d06b1e45f7e2bbd81849251c15067a347ab
 AUX dnsmasq.service 226 SHA256 022df33a4f66c41ea477e59958ebf3d012d314df400acbfdc69c50dc241915cf SHA512 afe0beaff106afe17702a96eca6ff6e4264034ce52f84995b0c39a346af35724a10808ecb872ebc77310dfbeae8342b47c2a0f70753570095d77118517054102 WHIRLPOOL eab0cc195e89d5495713d197f3fbf154a448b2f841dbc6bdc4b7410e1a7a1e0a8ce7ac944703c4b582dd8761fbe19b3ef448739ae59ff76963dc59363101dfdc
 DIST dnsmasq-2.63.tar.xz 378148 SHA256 f5eb1c2dfd47a2c75b0d40a60f85dce2e84c6af6d1cd5318fbe8cd69845ed2d8 SHA512 be057e19062b2eed46fd4677f1419048d4546e0de93a9b0b889417c240a5f7930329d659de41105670c23ca612ce53285875ed64ac56a0cf94ff01d522194cb1 WHIRLPOOL 7e1279efa347c8d69d56c240477f6acc1664b90f05de6a7053f8264d74200afad16389e33ea710e371c0c19c0d7ea9bfdec8d0089ca0fba341bf5e265d4ea783
-EBUILD dnsmasq-2.63-r1.ebuild 2991 SHA256 7daf6ab73da29023627de15e45d4dc9819431641a7b1c11dcad8bf66d9b4815f SHA512 5c52fc4300781f7d780a15543e59ef9b020dda54721bc66a21acce3857418edbe27756f7d9cfbaaee00225bfe05f82b1311bc4122312e44661d86fe1791b9de6 WHIRLPOOL b06d7d1788cc0254529b878fad973c36e5dd91361a596ad2ce063edfa721bff8a57493118da3979871f760e056572a36b8889128731754c1b92e13df9e0402a7
-EBUILD dnsmasq-2.63.ebuild 2676 SHA256 d61e09f2db816dbe4e2c259e3b287ce0a921c81aaba8d0bdc8d53495bd6a7964 SHA512 fa7cc8b51588c4688a6fb7ae76e12858fe5e70429c866ed8448501aa794b38694e96cab7ddbb6288d7314fb7c767d87c46fa0af8f5fedb8ffd149d477b39e871 WHIRLPOOL d78cbef50982f789ff0afd5d214144eec028d5b9cae1c99b15ffb4f4320ff40a579af315f8422e2fd82d1ad7545a04313d42d9c7971787245f0842ec9a43d449
-MISC ChangeLog 30836 SHA256 7c81203bc0731a6ebbefc12ebc541d3acc74094f7176cf912112785107e8941b SHA512 f68d59654ad4761f2feb97887e7ef71774116b2bb22fa616fb777b4782638da5297392dd47a0f3c05273a0335d30317dc9b83c05c9cb60d9e672e968112e168a WHIRLPOOL 059f306912e610620bd58265277165987764b8a1245cf6c8f7358fd69afdab1d805f87a12a6ce559df8f8bf42806589c7ae641a9daa23c9ec53d20b973906721
+DIST dnsmasq-2.65.tar.xz 381900 SHA256 59d12adad6b7a11af6473797d156c69e54e9db5a2d10d837286404dbf421e6c2 SHA512 a13940fb52653ded5012750ce9b971d4d4e4f7a60cc5e5262e02076b982055dbd5458fdd4aaab82eda1e36551793088951af25659cad886406f62193cecdc920 WHIRLPOOL d1537b2e9de219e555ed8487747111c1ac9c0492e7212b0d0d33d0452c918d222fab9d2248092e9a6e118c35a19b679eb5efc6d4c4069dfb9b4e0b3d21d51276
+EBUILD dnsmasq-2.63-r1.ebuild 3033 SHA256 c41585554d03c9d51a4539728ef5184986d714a8bbcf1b7d4b056051f1b51551 SHA512 3c384dca0e2af032748f04994b3407be7677363a5c136070e1b72d5723530d2c7c8d60fb620fdf4336e1893cac5b000f9545e6c94ed0017e2510c44cd09121d4 WHIRLPOOL 654aab3a0df2a6ea2e6e8bbdd45b0a8ee8803fda08a126fddcbbc2e9a87e33cdc5651260405d08232eca058080c203ccf5259a4656da4f981fd9c4e27e79fff1
+EBUILD dnsmasq-2.63.ebuild 2714 SHA256 30fd5b5d033215893f82d9871a8262da64c408443d75a83e111dd2af7349e532 SHA512 8330af23cc476faefe45d1668465bb2f29e0ed0cac8b2ff52850908c709b717ee344fb4379c67fea2084e360676feea19b969da51a571cb5528b5295f94144dd WHIRLPOOL 9bc09d6132c0743781c75b7feb919131a641b4fcb8621a52717770b8386700e6aacec4160e9b2d61a74440a05f79f2b246762e15503db38cc19fbdc36814716e
+EBUILD dnsmasq-2.65.ebuild 3039 SHA256 b6934173aa17c5934e3f0498407215cf003c4fa4160e6c8923287e8d381085ee SHA512 dfd07a8988d223b62ae65323661798b4a1f4dc9c8a0f32c790bdd0c58a8e49c350c2b47d309bc8da1fe9e9226b453d35487c9152e6d26b14e54429a7bb2ecaa4 WHIRLPOOL 04fdf5d9a17cc7c37c5d7ce3cbfb9fda073303fefca13e15012270498b8ef4ce24c62846891f7cffae55537973bd7de4677ce30239b70f414fad8cd728b01a51
+MISC ChangeLog 31091 SHA256 cdfe942b19e1d261c6e2e5d0e649e6dc0f2468f2aaf85815e77eb1ebeb9ff88b SHA512 21dc6e89e3662200a5300c37bdee49e8e16704eac6f8b01c90fccc9e85031018ae05af2e2719dbb7b77f83d6a2047eaf7c97f0d9ee7c680d6956d89e3cb0a2d0 WHIRLPOOL 65daaabd500b256fb2c1f11f7261fbe2a13526509faf8422f05c4b87411051232f122aea756127f12c993c88abfddae9cec68c186785c8af1296fa9d2741a23e
 MISC metadata.xml 652 SHA256 f98126bcd65d4e0ad5c9030289ea09d7beb02430ef3520c206e931f41cb2a6f0 SHA512 3d33def0983aa0d789d2eee60d4719ffb811b2283cd089e5b58aab0473114ce88aca3d63877f5178803c4e05392f6a7e354f091de908385db0c149a89b687882 WHIRLPOOL 26d1b7e53f5c7f025d8784a0565bfcf688fd8c6050a54373397fd29f60b401679afa49191606c587f06882dfceedf7b4370e12650151a2750c13d5b55bdc6db7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQo+NvAAoJEHy/RO9cNQiDH7sP/0r+Ig31IcZwx9d0FGMftMbi
-LJrxor/vt1fueTauxs2RK0H2BVASkh2VYyZCZNKTnnCfkkc4LTfGdttOFFhY99JD
-/UVBokdte7c7+SEjWOiRyJeiRTp6sde/DyHWPimtOZQGSKG5u96jBwnDvN5chimc
-nrvx4xhV6Z5nRNv1MTMbbTzmapWWznhNVO2e+nYduhbnpcJ8xPyE6UDKAoSU0Sa5
-HKVFQOUtuKPCMpqR+2nAe8D2c59pbtLnFBIs0iBGqcLycxngVz3YDshODtwfuC3Y
-q6qcuZM8QiMZvlFmLrv8AEzHa8qplEYgv1QErhYwZ/toN4sK2rZHweNJ+dYrKHax
-z3sEasynM+l5Skc4jO4sF+4gwxUTPibijV/+eHZi3kIYyP4uXu9s6o9iuIm13nQz
-Xq9G6mlAxKo3BgNqPk/wFtlxgtaA9VaXR4zfDF9mR/JZI1g1B6OIW7bm5n6Yypmz
-vodP4I9GEdvkqvpe1/WQSoLS0wUWwR8z/4HIKSO9szKWbQklQN0Iirb+KkkPZIhf
-g78MqTKWkI+upD8zKqrhvY3VC1OQY3OLLkXf8c/mcs3bAKmH1uOJBzMFMQAn7qVk
-4M7+REbWN74ph13jQr8zdAggsatrnxA3jjYrtxNycEzRPTuchZmW6rcqnIRg81e+
-HL6nNUu39cl9EFAPuu8e
-=XleB
+iQIcBAEBCAAGBQJQ9Kt3AAoJEHy/RO9cNQiDgiEP+gNWZplkQpRY70ZZQ90mXYd+
+LEOVIschw9QQa3Ue65haCVwWbvN3qrbazFyD46Ow8vopbgnHrGTZgwkXoHCWkst1
+Y0OxP1rTcAK1Peqa1kK7g212REEpI4OGY9HWMPjDzd1vnkMl9VFbGQr/Api1Kk9z
+aNz0ziWJZ+mTeWpSxMYywtdW3I7XMM8r9n0f0TDg3IBhS1MlCdR7i/48nq7P3N+X
+4nGV78dlewugB133HPZ81mReQmIaLLEomzW6tWDmJLN4JZ3XWLV9aZwy/ad2kxNf
+SuPmDznYt4r3WFmD5CVEABlECMCuB7Pn80pzRvAKd9D6grrlefj24wke9p+PDHK6
+7phQQE1nCHDqTU+IQjTY2FrQGFPiQgved1syIP0CM56gHSKfQpoiD4sMUoR/QgJd
+EsDfC85hB7qRqqycY9MRmbXNpu+G3EkDAg0wl6HeYVM1EXaqebzJT+taLfp4WCyk
+YZicggN/eptW365TVxloGyOcU2H6nDJPC/4d046IyRkw67yDUZON2PAoyWPepb/8
+7/O5Wg7I2pxnYiKOwMGmCY0XBoLvNw2C6K6our2jWfNNJDPXKT4HiP0zAzgDKaaZ
+v0J4kZGJvLl+nA8tgPyP+FdL2skwd1LXd94qWnanLA14Joak0aMRufnKaqewfCcQ
+MZxEAyURIGLl9W6XuKW3
+=Z1yT
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.63-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.63-r1.ebuild
index dbcc0de19558..9edac1932309 100644
--- a/net-dns/dnsmasq/dnsmasq-2.63-r1.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.63-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.63-r1.ebuild,v 1.1 2012/11/14 18:31:00 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.63-r1.ebuild,v 1.2 2013/01/15 01:05:50 chutzpah Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ done
 RDEPEND="dbus? ( sys-apps/dbus )
 	idn? ( net-dns/libidn )
 	lua? ( dev-lang/lua )
-	conntrack? ( net-libs/libnetfilter_conntrack )
+	conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) )
 	nls? (
 		sys-devel/gettext
 		net-dns/libidn
@@ -32,7 +32,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	app-arch/xz-utils"
 
-REQUIRED_USE="lua? ( script ) dhcp-tools? ( dhcp )"
+REQUIRED_USE="lua? ( script )
+			  dhcp-tools? ( dhcp )
+			  s390? ( !conntrack )"
 
 use_have() {
 	local NO_ONLY=""
diff --git a/net-dns/dnsmasq/dnsmasq-2.63.ebuild b/net-dns/dnsmasq/dnsmasq-2.63.ebuild
index 2a772bbbb9c8..0596f4c3b481 100644
--- a/net-dns/dnsmasq/dnsmasq-2.63.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.63.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.63.ebuild,v 1.7 2012/10/07 14:20:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.63.ebuild,v 1.8 2013/01/15 01:05:50 chutzpah Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ done
 RDEPEND="dbus? ( sys-apps/dbus )
 	idn? ( net-dns/libidn )
 	lua? ( dev-lang/lua )
-	conntrack? ( net-libs/libnetfilter_conntrack )
+	conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) )
 	nls? (
 		sys-devel/gettext
 		net-dns/libidn
@@ -32,7 +32,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	app-arch/xz-utils"
 
-REQUIRED_USE="lua? ( script )"
+REQUIRED_USE="lua? ( script )
+			  s390? ( !conntrack )"
 
 use_have() {
 	local NO_ONLY=""
diff --git a/net-dns/dnsmasq/dnsmasq-2.65.ebuild b/net-dns/dnsmasq/dnsmasq-2.65.ebuild
new file mode 100644
index 000000000000..491aa41876f4
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.65.ebuild
@@ -0,0 +1,132 @@
+# 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.65.ebuild,v 1.1 2013/01/15 01:05:50 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="conntrack dbus +dhcp dhcp-tools idn ipv6 lua nls script 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
+		)"
+
+DEPEND="${RDEPEND}
+		virtual/pkgconfig
+		app-arch/xz-utils"
+
+REQUIRED_USE="lua? ( script )
+			  dhcp-tools? ( dhcp )
+			  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() {
+	# 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}" \
+		LDFLAGS="${LDFLAGS}" \
+		COPTS="${COPTS}" \
+		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
+}