Version bump, remove old.

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

5 files changed, 24 insertions, 381 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 4ceab7827a0a..a838ce94815d 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.279 2015/07/24 09:37:10 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.280 2015/07/28 23:06:39 chutzpah Exp $
+
+*dnsmasq-2.74 (28 Jul 2015)
+
+  28 Jul 2015; Patrick McLean <chutzpah@gentoo.org> +dnsmasq-2.74.ebuild,
+  -dnsmasq-2.72-r1.ebuild, -dnsmasq-2.72.ebuild, -dnsmasq-2.73.ebuild:
+  Version bump, remove old.
 
   24 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> dnsmasq-2.72-r2.ebuild:
   ia64 stable wrt bug #547966
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 30a618eb471f..92ca0ed54368 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -12,20 +12,26 @@ AUX dnsmasq.service 278 SHA256 2cca1e7ec70aee80c9d1f59e7f17b515e5fa66b08835ed0fd
 AUX dnsmasq.service-r1 278 SHA256 2cca1e7ec70aee80c9d1f59e7f17b515e5fa66b08835ed0fddbe799d2b39db04 SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1 WHIRLPOOL efbb77d8a3ec69bd030f219ffb975ec0a5680f0d4da8b05bbb896db26c444c861fb47d96dfe8201f21acf5085fb465892ef33263de677390308b2328a8a7e33e
 DIST dnsmasq-2.66.tar.xz 401056 SHA256 5e143947527bcdc46a30f4b1bbdfbfa96333dd98bcecdac3b5b1d6cacfe06c75 SHA512 f0bde09f178ca15f4c28efb06901213af9a009b4476daa8a08bafc7682b9ffed13ac65c5c232acdf828382f321137de08b4a33108d22613b198fe30695b3362c WHIRLPOOL e749d24017c35fdbaaaf417decdf9316e235cf7f96f031caceee14d06b982c285b0e561f50597cd12b6a31ef554f7f2e22ca6234f44a6d8bb066dede99461166
 DIST dnsmasq-2.72.tar.xz 454048 SHA256 7d0bd23f5d74b3a6b26a75d5ffcf9db81d461b47cbe578cb65a83a98008600b1 SHA512 d84b89c987966a5f5880aa329833626b0a017628dd6aa667bdad880d1c5f101a386dddb439eb6983d58952a36f25670bf58df94281b89320f02895a3e6af4cec WHIRLPOOL 491eadb0060f372a0b7f5855fb57040c4baf37352732a2943fb4173aa28e875b91537f87085201f13e76ec5680e4ad681992829a5cef800833be0911298a793c
-DIST dnsmasq-2.73.tar.xz 470420 SHA256 0bff81103e53fcab3a3c4d0fd6df1882f9446dca4fa74ff8270e1d2ab872d8f6 SHA512 bb63538c90d5d83a22d9ef7acc6b6c0d1fc1e7dbb3c626bf06b873758f0ff267f871ca4d5fbd9ac512db523429f2b557a9550e9fd994b78a6705375b94ae1b41 WHIRLPOOL 6f396754a87ca8a0ec2125d05296aa17bf30d24098c86e8c82d10df0d05f41e1d74f92411a53b7342d99f34b89f9195d7faea2261ca649091cf7ba9f48eafb57
+DIST dnsmasq-2.74.tar.xz 472480 SHA256 9ed484b9879d63f7a0bc1010562f17d8aaadf4261e9a126299796cb9696d93ba SHA512 a7ba814b480d98334400c68f62f160dac13374a0c147c7783237152095a98a63585737496f808db224ccc614316d76cadbcc179b53ff583ce6af96999be37f3a WHIRLPOOL c26be01120b0af62c263d780c61afbe5be228f8793aa8071771c48032f7bbc69f7a575de963e68f20bfe5c1af36c0780a495cbe867a0b88a09f78e5a14f68dd8
 EBUILD dnsmasq-2.66.ebuild 3181 SHA256 2811d53903d109cc344c962bfa49e6c9f857242931663042a74e0778c145da9e SHA512 2efdee54d8dd70be76cbce1e6b729618c1e79170dca1f054cf0f12ca0eca5ab65a5a61471fe913f5851f4d97c36fb83203d5d23fb6512ea30e6d4ea9ab16c124 WHIRLPOOL 8c49095c02073fe3b56fcff2f2333b7724fff270ecf03908b351d902be95d9ad80b1b20dafd9f8739b2c93f38027a62a8bc1580dfba8000b5f1efe29e1f0cb15
-EBUILD dnsmasq-2.72-r1.ebuild 4438 SHA256 5c4f9c49e5153fbda1a40a13f2223e5dd74076e7d4074a2cd59cc0b11d226ad4 SHA512 f32ad3413bf929f6c42ad43972504cc871a07229220eac103a0c4adf4c817aba2120e6239813f0cc43ca39da3b7857c4913a616984a7845b03214e9edd323d26 WHIRLPOOL 3b1b356aea6f9ccc83de4dfb58673d57768a209a49762bdfd784185806140d1eb5a7ba740c6fd238c86fe305a1225c2639cccd58051bae6af3c8edc727798acf
 EBUILD dnsmasq-2.72-r2.ebuild 4439 SHA256 de12a1ae9cd08853564fdb41c635534faa00035731156fa0414f33ad69a5302e SHA512 9310d8dfef83d4df5028e0b4ed5e55b662e22858d7f85c4ef8a969ab076b0b768645d29ec5f09d13741353c19ae15f705f69f4fe161581a9143a413e0c758593 WHIRLPOOL e5124d1e8690d048034aeab17165dc07e996a4fe32d4dc8474adb5b623f7838a732cb929996d8150d435014dfa3411d041fd1505c59935d3b140070c90e5276e
-EBUILD dnsmasq-2.72.ebuild 4228 SHA256 8aaf3cbf173910c5adf0d25068289727d9c8eacbd1c5778883d252e6d1670c54 SHA512 31b9d191248ac827dabe6f02558051697f5d9d38a0591891045b87ec8e87062e14575bb95c1b21f88cf4374ed8ad68537c927deac977f2299fda27ba6d279aeb WHIRLPOOL a2a8fd6ffbd0e4da4250ac39a0f0ea1484eee1450c5b3e32d4a6ba702461be7cd1b8ec33efa86b97703c22523dab052da5079c7a1c304afb3dcf2c3990926e62
-EBUILD dnsmasq-2.73.ebuild 4368 SHA256 dc659698cf4fc08fa4b36045acc2fccb5631617b34c198fae0df7d4e51b6a4bb SHA512 ae61fab7ccb0142bb41e82b439797e8a3f5e02a26c9a90cf069ba4321ff0cd828540c274cc0e83e22e27883a9a64dd4919b41e127e4a64790e6b5121572b54ea WHIRLPOOL ca1cd4b4fe5e6fc6bcfe7a8af08239f2357b82ca982b38ff99826cc58ca624690026c31b5ee59ad91f560918828c1025e18a49e847076edb00a06219a1519c18
-MISC ChangeLog 37956 SHA256 b42a5f14491e93986a66c6f6f2608098a818920f9daa775d4fe83cd93e0bcaad SHA512 f79d5d41905f628afe4e29a1027878a6aa88a3adcf34c954434db345a68ae595a9cfd1ee5172639187e12580cb3d6ef1817967daa8c2ad9c5cbf88718a206e01 WHIRLPOOL 354284ddf809ffa6da9aafbe674d7842c4b7d6a5b1d850c40aed70180f277de62dfa088a4f22f1424fa0a3a5ca649dc5c5563597d2590d3de0bccd3d56b38d6c
+EBUILD dnsmasq-2.74.ebuild 4368 SHA256 0fcaba7a91a3cf077f497e8818c45b09bff7be697a868a775e2d2c321f58a18f SHA512 a09345d7c4797562ffc602a8fabad88449c12936b4a9cb5ba49592a07c11297e0b48f92db05232bf85d19f867b6b5de606e22e374114416b52ee1fb19893ec91 WHIRLPOOL 16c9c4c2d2a8b08a747fd0692ad2f0486fca339edff41e5e946e67c8b7ec552d387c56157db3a7a4b306e5a7b23b5b316b9e1df23681cb1ab934a2d6d4c7bda1
+MISC ChangeLog 38160 SHA256 388e93330036a24295080ef33a8f7e0417e84a9412500eedadc81f148423d949 SHA512 f430a9fadbc04aaa93232fb43c7cab19b7b457b1774ae0db57675e7444fba4dca55d35c5405bae240101ea067efae79cfc9c5881c47f3a9be2e4e6a8f7de096d WHIRLPOOL 4306e766d39d66d70378ed8e96ca4862fa35788f0b26494e94126139b0da66deab546c4283b7b2725ae34d4cc9e345fe4cb65e1d3c3f653f35c68581e69d3373
 MISC metadata.xml 890 SHA256 7952192e999afd4942b22e31dbaa1a8cb4972e5a8f7f8596476277c294dbc84d SHA512 7d3f3d84bc34eb57a241c2f6781561a3247ef24def3d22b64b603f490d0ca922223c2a8772b8d728f5ed3c063219ddbf6d03a5e891ca0a71d5497bb6068017b6 WHIRLPOOL f3bce03b7bf361f9456b1a342e8c40b71dce5ca0d5e0b9653859d5e4f08e2c44c8ad09e30bc51d1c9d3492fbe8ce42c0532bda3b8b8de1b693c1a8557cd75aad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlWyBrwACgkQG9wOWsQutdZ5/wP/bnFZoZriGo3o52BdpeO4n/xL
-U0wr2AkvQ9G+bnk2bauIrRhUADtPb21xGOcUgMJsGqWoZ+eaOTkkVyKvehOXircA
-mokqhZ3X7D5mYH1Y2JYBp8vVhHHsLUF57RESvJICnWoB6tyIWRBxtkEpUGk0B446
-fgeaaM6E3yqJjCR+JXI=
-=bpHf
+iQIcBAEBCAAGBQJVuAsIAAoJEHy/RO9cNQiDXUAQAI/782i4Nvl9grLo5PKeWfFK
+AVjoqm0/d/fo8Se/67Baks+gh2y+IvMGQOQcKFDxIetUm5KRbcsjhn8Rj8zRXM3R
+re3zB6IdYuV6wKCmq+z8XtP9NjatQjEDWbVATTpDByBiciOCMRy2VxMeKXQu1Rn7
+hO3MC3YjB86qI//EGwM+KVRibQclYLVgIqqU1w5NZPMjWLZdVY6nuf2cPuGo8ae1
+RNJPvFVheDLMtUsq/mlrPHZg5oP8OnUeoRMuQLM3aktRE5n1BG9s2eEtBS7tvHop
+W+qetAwc1Dm9JuXTl1VOC1J8JhXZK7wMBWxaJVVZjNXUFKvTgJ8jnVzpYNhEHW/Y
+xST2BhS8yspeC8nxu2jkS/nalyVilxMaUPQhz9XaY7XSrSDhcn1X/Eb9XXStVwzx
+ocRoiuQ8FU8uhF0cFWOKH85g+yJhGgeKzXcZAMtnQ1hfXZuM1waav3tb6PFqfX/l
+bC8hcqwRtDFaZQuGPpyw947zJcffd6lqVDUVaYOKltMv6bvTF589j+T1rWHzc3do
+bY+AOYIAgjS+SyZkHJUNq4BUU6Mkhqn5eVvzZFU4nThkXoiCc5ddr+E7lZBHBG4v
+eArexlHylxaCIVwI/7fnBGFMg6IjrVHreHKbkh9ugSc+AjH4OZs/lCJ5nXf3SMXO
+OXScpYIt67iIJjjMcWED
+=JK4V
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.72-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.72-r1.ebuild
deleted file mode 100644
index 15867cbbd1a7..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.72-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.72-r1.ebuild,v 1.1 2015/04/28 18:16:54 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn ipv6 lua nls script selinux static 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
-
-CDEPEND="dbus? ( sys-apps/dbus )
-	idn? ( net-dns/libidn )
-	lua? ( dev-lang/lua:0 )
-	conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) )
-	nls? (
-		sys-devel/gettext
-		net-dns/libidn
-	)
-"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	dnssec? (
-		dev-libs/nettle[gmp]
-		static? (
-			dev-libs/nettle[static-libs(+)]
-		)
-	)
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	dnssec? (
-		!static? (
-			dev-libs/nettle[gmp]
-		)
-	)
-	selinux? ( sec-policy/selinux-dnsmasq )
-"
-
-REQUIRED_USE="dhcp-tools? ( dhcp )
-	lua? ( script )
-	s390? ( !conntrack )"
-
-use_have() {
-	local useflag no_only uword
-	if [[ $1 == '-n' ]]; then
-		no_only=1
-		shift
-	fi
-	useflag="${1}"
-	shift
-
-	uword="${1:-${useflag}}"
-	shift
-
-	while [[ ${uword} ]]; do
-		uword=${uword^^*}
-
-		if ! use "${useflag}"; then
-			echo -n " -DNO_${uword}"
-		elif [[ -z "${no_only}" ]]; then
-			echo -n " -DHAVE_${uword}"
-		fi
-		uword="${1}"
-		shift
-	done
-}
-
-pkg_pretend() {
-	if use static; then
-		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
-		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored."
-	fi
-}
-
-pkg_setup() {
-	enewgroup dnsmasq
-	enewuser dnsmasq -1 -1 /dev/null dnsmasq
-}
-
-src_prepare() {
-	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
-	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
-
-	epatch "${FILESDIR}"/${P}-Fix-crash-on-receipt-of-certain-malformed-DNS-requests.patch
-	epatch "${FILESDIR}"/${P}-Fix-crash-caused-by-looking-up-servers.bind-when-many-servers-defined.patch
-}
-
-src_configure() {
-	COPTS="$(use_have -n auth-dns auth)"
-	COPTS+="$(use_have conntrack)"
-	COPTS+="$(use_have dbus)"
-	COPTS+="$(use_have idn)"
-	COPTS+="$(use_have -n dhcp dhcp dhcp6)"
-	COPTS+="$(use_have -n ipv6 ipv6 dhcp6)"
-	COPTS+="$(use_have lua luascript)"
-	COPTS+="$(use_have -n script)"
-	COPTS+="$(use_have -n tftp)"
-	COPTS+="$(use_have dnssec)"
-	COPTS+="$(use_have static dnssec_static)"
-}
-
-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() {
-	local lingua puid
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		DESTDIR="${D}" \
-		install$(use nls && echo "-i18n")
-
-	for lingua in ${DM_LINGUAS}; do
-		use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
-	done
-	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
-
-	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
-	dodoc -r logo
-
-	dodoc CHANGELOG FAQ
-	dohtml *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN}
-	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
-
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	insinto /usr/share/dnsmasq
-	doins trust-anchors.conf
-
-	if use dhcp; then
-		dodir /var/lib/misc
-		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r1 ${PN}
-	fi
-	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_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-
-}
-
-pkg_preinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}"
-}
-
-pkg_postinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.72.ebuild b/net-dns/dnsmasq/dnsmasq-2.72.ebuild
deleted file mode 100644
index f5867af7936b..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.72.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.72.ebuild,v 1.11 2014/12/04 08:32:02 ago 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 ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn ipv6 lua nls script selinux static 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
-
-CDEPEND="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="${CDEPEND}
-	app-arch/xz-utils
-	dnssec? (
-		dev-libs/nettle[gmp]
-		static? (
-			dev-libs/nettle[static-libs(+)]
-		)
-	)
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	dnssec? (
-		!static? (
-			dev-libs/nettle[gmp]
-		)
-	)
-	selinux? ( sec-policy/selinux-dnsmasq )
-"
-
-REQUIRED_USE="dhcp-tools? ( dhcp )
-	lua? ( script )
-	s390? ( !conntrack )"
-
-use_have() {
-	local useflag no_only uword
-	if [[ $1 == '-n' ]]; then
-		no_only=1
-		shift
-	fi
-	useflag="${1}"
-	shift
-
-	uword="${1:-${useflag}}"
-	shift
-
-	while [[ ${uword} ]]; do
-		uword=${uword^^*}
-
-		if ! use "${useflag}"; then
-			echo -n " -DNO_${uword}"
-		elif [[ -z "${no_only}" ]]; then
-			echo -n " -DHAVE_${uword}"
-		fi
-		uword="${1}"
-		shift
-	done
-}
-
-pkg_pretend() {
-	if use static; then
-		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
-		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored."
-	fi
-}
-
-pkg_setup() {
-	enewgroup dnsmasq
-	enewuser dnsmasq -1 -1 /dev/null dnsmasq
-}
-
-src_prepare() {
-	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
-	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
-}
-
-src_configure() {
-	COPTS="$(use_have -n auth-dns auth)"
-	COPTS+="$(use_have conntrack)"
-	COPTS+="$(use_have dbus)"
-	COPTS+="$(use_have idn)"
-	COPTS+="$(use_have -n dhcp dhcp dhcp6)"
-	COPTS+="$(use_have -n ipv6 ipv6 dhcp6)"
-	COPTS+="$(use_have lua luascript)"
-	COPTS+="$(use_have -n script)"
-	COPTS+="$(use_have -n tftp)"
-	COPTS+="$(use_have dnssec)"
-	COPTS+="$(use_have static dnssec_static)"
-}
-
-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() {
-	local lingua puid
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		DESTDIR="${D}" \
-		install$(use nls && echo "-i18n")
-
-	for lingua in ${DM_LINGUAS}; do
-		use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
-	done
-	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
-
-	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
-	dodoc -r logo
-
-	dodoc CHANGELOG FAQ
-	dohtml *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN}
-	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
-
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	insinto /usr/share/dnsmasq
-	doins trust-anchors.conf
-
-	if use dhcp; then
-		dodir /var/lib/misc
-		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r1 ${PN}
-	fi
-	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_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-
-}
-
-pkg_preinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}"
-}
-
-pkg_postinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.73.ebuild b/net-dns/dnsmasq/dnsmasq-2.74.ebuild
index f72b670ba655..63b38473aec4 100644
--- a/net-dns/dnsmasq/dnsmasq-2.73.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.74.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.73.ebuild,v 1.1 2015/06/15 22:05:42 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.74.ebuild,v 1.1 2015/07/28 23:06:39 chutzpah Exp $
 
 EAPI=5