diff options
author | Patrick McLean <chutzpah@gentoo.org> | 2012-10-08 05:50:09 +0000 |
---|---|---|
committer | Patrick McLean <chutzpah@gentoo.org> | 2012-10-08 05:50:09 +0000 |
commit | 3cf2029199163a0ebd0fec30fc6ef9e1e7523ff4 (patch) | |
tree | be34eeb9cf28bce31fd66527816f8e940254d029 /net-dns | |
parent | sys-fs/aufs3: Fix compilation if USE=-nfs, #432392 (diff) | |
download | gentoo-2-3cf2029199163a0ebd0fec30fc6ef9e1e7523ff4.tar.gz gentoo-2-3cf2029199163a0ebd0fec30fc6ef9e1e7523ff4.tar.bz2 gentoo-2-3cf2029199163a0ebd0fec30fc6ef9e1e7523ff4.zip |
Clean out older versions.
(Portage version: 2.1.11.24/cvs/Linux x86_64)
Diffstat (limited to 'net-dns')
-rw-r--r-- | net-dns/dnsmasq/ChangeLog | 6 | ||||
-rw-r--r-- | net-dns/dnsmasq/dnsmasq-2.57.ebuild | 75 | ||||
-rw-r--r-- | net-dns/dnsmasq/dnsmasq-2.61.ebuild | 110 | ||||
-rw-r--r-- | net-dns/dnsmasq/files/dnsmasq-init | 35 | ||||
-rw-r--r-- | net-dns/dnsmasq/files/dnsmasq.confd | 4 |
5 files changed, 5 insertions, 225 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/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="" |