Clean out older versions.

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

6 files changed, 19 insertions, 235 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index b79104b6898a..84353c60cdc8 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,10 @@
 # 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.229 2012/10/07 14:20:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.230 2012/10/08 05:50:08 chutzpah Exp $
+
+  08 Oct 2012; Patrick McLean <chutzpah@gentoo.org> -dnsmasq-2.57.ebuild,
+  -dnsmasq-2.61.ebuild, -files/dnsmasq.confd, -files/dnsmasq-init:
+  Clean out older versions.
 
   07 Oct 2012; Raúl Porcel <armin76@gentoo.org> dnsmasq-2.63.ebuild:
   alpha/ia64/s390/sh/sparc/x86 stable wrt #436894
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 8e9a2bde09b7..346aeb4355c0 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -2,23 +2,27 @@
 Hash: SHA256
 
 AUX dnsmasq-2.47-fbsd-config.patch 505 SHA256 4e05e46b59254e718550cda505986b9b572a0716636fb6a5405a54df25cfa84a SHA512 9d2476c60b87f4515473e5b790ca3c6dd96105ecbda55fa385ce88290acbe8a16b6c48f9a6cbcc535662765aa4f07d182c0f5ebb4ffff1c98bb0cf6a8f4dd528 WHIRLPOOL e314020c11bc902f1dc29464785098ef0d10ebf14d8092fc1b8b673cea3d64e5212f82b85597ffe2d2bc150fbf51f27f560744a7ea12f2359c698e5ca80898cb
-AUX dnsmasq-init 853 SHA256 da777f7e0093503dc3e17d674c5d512bd0a4b009bb8a455ffaa587b19b454c91 SHA512 729fb9d2b11bec819efac46e1c48f1fe661500dd5f653812762d2039464a545a7a72e326bbd3ad4b24e44cd3671f28a834c1fec9e0eb5cc97e97781bc8bc068b WHIRLPOOL a6e0ee2291851166bc5e860aa47b0acfe6d35abac7959b890a022ecd0c4bd72a8ad3e2157c349dd9e3b140271fef0ce02bc92acef5ba657d7e2c04ecab9ee2fc
 AUX dnsmasq-init-r2 595 SHA256 bc80bcd171db123a6d02df9ebbfde3fb59078295ff24dea9b9777bc4ee86db14 SHA512 1ebd8f61a11b3d05f754ef30c4b9f83df80892335b49b5b949d3c17277dc0ccc1929e77459aa2fcd193f55c65c2c3431cd049e4e0e5bfb4a35750c4fa845146a WHIRLPOOL 7a6ce7def99d58d7a01556fa811ae6f2dba2a20af30c9e770bd30dec5e052729768c9113f10e21bb3bfe2c6a1e45efd0e1d18f72dab22ad9fceef201db4c1a16
-AUX dnsmasq.confd 140 SHA256 8bbc2634ab537ed3a17ee98be9c2667013a2b048f6981138017414e54fe90746 SHA512 053a327f075176d8c80561f348c6c23d158aa8642d582d79d3595addde40f03cbfa335b24d8bc56fc210604bf9c73ab484ea6129cf459552a7fc1b0773d24536 WHIRLPOOL 33dd0c3d97f2ca2c648c952216f2d7cd31217c17655f0d9dd2110a7949348e8bb1d202e53ecc1f6481edf2eff8c477910bb0075d10f3f83769c9833353a2f0ae
 AUX dnsmasq.confd-r1 170 SHA256 51c0672a70d5d6793d295d82db666d372fb081e8627318f67c88e48d08d254b5 SHA512 9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 WHIRLPOOL 86f364adcb5576bfb2cc84d13dd087bef987cae70eee1ae7816f0febc58ec637a97fea357c506456781eab116e257d06b1e45f7e2bbd81849251c15067a347ab
 AUX dnsmasq.service 226 SHA256 022df33a4f66c41ea477e59958ebf3d012d314df400acbfdc69c50dc241915cf SHA512 afe0beaff106afe17702a96eca6ff6e4264034ce52f84995b0c39a346af35724a10808ecb872ebc77310dfbeae8342b47c2a0f70753570095d77118517054102 WHIRLPOOL eab0cc195e89d5495713d197f3fbf154a448b2f841dbc6bdc4b7410e1a7a1e0a8ce7ac944703c4b582dd8761fbe19b3ef448739ae59ff76963dc59363101dfdc
-DIST dnsmasq-2.57.tar.lzma 333348 SHA256 b35c5a31afce2b7c4bd62566d5dc87e1ce62d0d2ebd9c2baf15b5ea16bcc279d SHA512 866e9b54d884750edefa667db01dc5f4ce0338de19d2d8ace8ce62225afd82e72b1632c0316f1b27264de994c69ddd2bca76fbb14d2e32e5203950d2557aa5c8 WHIRLPOOL 1e51e8035e6c51dcbf49fe2dde2c30a6860de17a63473865d588e8defd1adaebf696c3c5066c5fbf3010d4f2e30928fe48d8598745a0ca6d2d0cfc1564b5d81d
-DIST dnsmasq-2.61.tar.lzma 374461 SHA256 c37fc14c3d0ee32d0418c125871665dd586cfe1a21f4b0307eb171bff41a2683 SHA512 0937d98264eba50801071a132b6b5ebee9b6e41ce3509f04027e648134031ba3144512abe1d689af70114f7fb7b030c0f8129a731f5cc345b94e6cde820f0b2e WHIRLPOOL 84488fca877735764172386e5dd639732aa725026feb94bf7dd3caf5d1a08a18e64247845cc9d88ca6e9a8b191235b2b50e28635b10ed59036f28b4d11b1e824
 DIST dnsmasq-2.63.tar.xz 378148 SHA256 f5eb1c2dfd47a2c75b0d40a60f85dce2e84c6af6d1cd5318fbe8cd69845ed2d8 SHA512 be057e19062b2eed46fd4677f1419048d4546e0de93a9b0b889417c240a5f7930329d659de41105670c23ca612ce53285875ed64ac56a0cf94ff01d522194cb1 WHIRLPOOL 7e1279efa347c8d69d56c240477f6acc1664b90f05de6a7053f8264d74200afad16389e33ea710e371c0c19c0d7ea9bfdec8d0089ca0fba341bf5e265d4ea783
-EBUILD dnsmasq-2.57.ebuild 1724 SHA256 ea37132601304a5148061fb603148c81e3a7d36df0341efb64486174067a03d4 SHA512 b04202cc8adf248913d953583e2952e3f9afb5762b43d24d9b465a815361d9b452f16f23e1350300b800e98f1f26c82fba97552641f89ec0ff0a2c113548aad4 WHIRLPOOL fc1a6f52f9c6f56fa641b4af786cbf3f482e8297e12f5bfb35df031d963c5b9523cb7ed6312834a675876e04fc06e6b09a7901184d66a28622189aa8227df54f
-EBUILD dnsmasq-2.61.ebuild 2413 SHA256 e8b5e69563351e11e45fcf06661fead93a7a2d4a164706b42e18849e7128a968 SHA512 38471b19d93154ac181266cb3848d52d561a7c8322bcaa1c6c34e4ed301a356f81e5b020baa9823478ff35f373508492f783fc96694609108082499c1a18aaed WHIRLPOOL ea42cbafd05648fdc7d223d1342a9096fc93884c4c87db535a0afb71d695e54f98afb16d2c1778a38cba886b44afc4074648888fd7254874dc7074c02f780c84
 EBUILD dnsmasq-2.63.ebuild 2676 SHA256 d61e09f2db816dbe4e2c259e3b287ce0a921c81aaba8d0bdc8d53495bd6a7964 SHA512 fa7cc8b51588c4688a6fb7ae76e12858fe5e70429c866ed8448501aa794b38694e96cab7ddbb6288d7314fb7c767d87c46fa0af8f5fedb8ffd149d477b39e871 WHIRLPOOL d78cbef50982f789ff0afd5d214144eec028d5b9cae1c99b15ffb4f4320ff40a579af315f8422e2fd82d1ad7545a04313d42d9c7971787245f0842ec9a43d449
-MISC ChangeLog 30429 SHA256 165614fac134d3add6df0ae78adf9a39d973d3a667ba3970fb98386f2b13cd61 SHA512 c5177563d8bcc35d361b60629006d2ed07a07494cc8da00119ab94577b53a4028a01a64218df197e98d5fe293ab3e494d774d982336afd6f28c04387e518cef1 WHIRLPOOL 3d2bc6184ebaab8a5888d470dfc8c4807ba03b6343e89fc567b8523d20ed0cdcef9396ed5bd99454813323284f9598e0cd68e1b2b64394ecccad57dfc01d3397
+MISC ChangeLog 30600 SHA256 0ee3de5e687043a6169be2f749225b055c5c18693237a4945159a54aecc7b419 SHA512 0cdaddd7dae3184aef582efcbc23d04813ce9b912a31573b075440fb35d76184b05597a5c80d16ba92e059592a78f8e462206e50fa231277e439de12f448c7d7 WHIRLPOOL 2a3fb060c9336a02baffedfc445de1493b1036e412009c56cc470ec1bfc7b2830fe23c14eb85dbda3fbdcaa02b33617fbace3a287a80dcebe8eb6ff0ebbed8e8
 MISC metadata.xml 553 SHA256 56f56d4e1e01017bf60f2971c8da9c5e536d58fad955413e38ac3428831129ef SHA512 745bbee2cc2ac31c013306e23f616c7abf863d3d6ce00331c77d1c2526f56f0c54f82f95edd925f0793943c1f76ba7539a4396dac91761cbe3f4ea1f84536995 WHIRLPOOL 8d552fa85073ec9df8838a06ddf4d7a5e6a92fef856cbbd2c7c8d542cf593ce390be375f4a4bf3a7f3282b0ad5c2c68e9b80c052eb7ca7019a4fe096c975d629
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBxj5kACgkQuQc30/atMkDJ2ACdGcou4jQXij7QlFtbOrjdVP0y
-8D0AoKnU2kc0G+W7Tz9+LHCkUJAyWo0a
-=pXHo
+iQIcBAEBCAAGBQJQcmmhAAoJEHy/RO9cNQiDdcgQAKTQO5v8Z9a00HJTeTciGyqY
+u3XjAIwhTYnQT3698bZcg099yLiv3+VDjwL+wIWV/bdjQEn+NajY7vfEPAKKMUPS
+ZWGC9PkFgbq1MPrOKbYc1BJ8PlRXYGY5eNMxSK6iJtjKF2LMBGkV8YhULYiwHdHK
+91njj1FNitzxGA2nfKrXVKiikOkPidOnxtParoq8NBIuEEaW0BqhEbF9/cCqbR/4
+bH2qum7p3eyhwtaCa+xA8XPYafn1wRA4djv/18NyiUVDvBqY9LqhSAfevRWuL3ra
+K+RqpqLDJ3jSSwBDAN7iaThtQ2E1NMGJ4iIVKdu31UTcHe8YH/135VbB1rH1jdYB
+giUaUWm/ME04knVk8f1Bs3I5aDdCUCShDcs99Ay8hYDDJ9VQjXfqRXDLPY2B+W30
+ZHUm08L/FTE6c3MeqpC2CYEDjpaYpNJYtFPaReReygM7+m0bWVKuo+EL+y2Lewhh
+oLo9Ek3Vm9ydA2dLIiptHbVZ08Y+PjFnCj6Fd6KtlLyIeMH8MfxxoAWpn17/6Wd3
+fuoRMRl3iScKSS9b0wU7Xd4oRY9byM+b14WI1pxa6IZHVKORGqXdXOQDgU3sjVts
+qZHD38k80aPJyP8MVmfmZiXidmyOBLsJz3+6CWyG5vO/34ENC3+irVRCeM36Mt3T
+IkpTIgjNcrDUBcZU0sWg
+=j3vm
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.57.ebuild b/net-dns/dnsmasq/dnsmasq-2.57.ebuild
deleted file mode 100644
index 47b204abbb5b..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.57.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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.57.ebuild,v 1.9 2012/05/03 03:59:12 jdhore Exp $
-
-EAPI=2
-
-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"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="dbus +dhcp idn ipv6 nls tftp"
-
-RDEPEND="dbus? ( sys-apps/dbus )
-	idn? ( net-dns/libidn )
-	nls? (
-		sys-devel/gettext
-		net-dns/libidn
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	|| ( app-arch/xz-utils app-arch/lzma )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
-	epatch "${FILESDIR}/${PN}-2.47-fbsd-config.patch"
-}
-
-src_configure() {
-	COPTS=""
-	use tftp || COPTS+=" -DNO_TFTP"
-	use dhcp || COPTS+=" -DNO_DHCP"
-	use ipv6 || COPTS+=" -DNO_IPV6"
-	use dbus && COPTS+=" -DHAVE_DBUS"
-	use idn  && COPTS+=" -DHAVE_IDN"
-}
-
-src_compile() {
-	emake \
-		PREFIX=/usr \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		COPTS="${COPTS}" \
-		all$(use nls && echo "-i18n") || die
-}
-
-src_install() {
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		DESTDIR="${D}" \
-		install$(use nls && echo "-i18n") || die
-
-	dodoc CHANGELOG FAQ
-	dohtml *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init dnsmasq
-	newconfd "${FILESDIR}"/dnsmasq.confd dnsmasq
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	if use dbus ; then
-		insinto /etc/dbus-1/system.d
-		doins dbus/dnsmasq.conf
-	fi
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.61.ebuild b/net-dns/dnsmasq/dnsmasq-2.61.ebuild
deleted file mode 100644
index b41aad8af6a1..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.61.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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.10 2012/10/05 18:00:14 ranger Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs flag-o-matic user
-
-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}
-	virtual/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}" \
-		LDFLAGS="${LDFLAGS}" \
-		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
-}
diff --git a/net-dns/dnsmasq/files/dnsmasq-init b/net-dns/dnsmasq/files/dnsmasq-init
deleted file mode 100644
index 0ac8358cb74f..000000000000
--- a/net-dns/dnsmasq/files/dnsmasq-init
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/files/dnsmasq-init,v 1.15 2011/12/04 10:28:47 swegener Exp $
-
-extra_started_commands="reload"
-
-depend() {
-	provide dns
-	need localmount net
-	after bootmisc
-	use logger
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/sbin/dnsmasq \
-	    --pidfile /var/run/dnsmasq.pid \
-	    -- -x /var/run/dnsmasq.pid ${DNSMASQ_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/sbin/dnsmasq \
-	    --pidfile /var/run/dnsmasq.pid
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --stop --oknodo --signal HUP \
-	    --exec /usr/sbin/dnsmasq --pidfile /var/run/dnsmasq.pid
-	eend $?
-}
diff --git a/net-dns/dnsmasq/files/dnsmasq.confd b/net-dns/dnsmasq/files/dnsmasq.confd
deleted file mode 100644
index 47826dd50828..000000000000
--- a/net-dns/dnsmasq/files/dnsmasq.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/conf.d/dnsmasq: config file for /etc/init.d/dnsmasq
-
-# See the dnsmasq(8) man page for possible options to put here.
-DNSMASQ_OPTS=""