From 38b7258d086dd5e263c3bbe3880c8c956676bc71 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 26 Jan 2018 15:48:02 +0000 Subject: gentoo resync : 25.01.2018 --- net-dns/dnsmasq/Manifest | 8 +- net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild | 190 -------------------------------- net-dns/dnsmasq/dnsmasq-2.76.ebuild | 186 ------------------------------- net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild | 195 --------------------------------- net-dns/dnsmasq/dnsmasq-2.77.ebuild | 193 -------------------------------- net-dns/dnsmasq/dnsmasq-2.78.ebuild | 2 +- 6 files changed, 2 insertions(+), 772 deletions(-) delete mode 100644 net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild delete mode 100644 net-dns/dnsmasq/dnsmasq-2.76.ebuild delete mode 100644 net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild delete mode 100644 net-dns/dnsmasq/dnsmasq-2.77.ebuild (limited to 'net-dns/dnsmasq') diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest index 6d7879328f39..22128565863f 100644 --- a/net-dns/dnsmasq/Manifest +++ b/net-dns/dnsmasq/Manifest @@ -4,12 +4,6 @@ AUX dnsmasq-init-r2 457 BLAKE2B 29b6844617774b6aa31c596839e4a29a85a24b322716385f AUX dnsmasq-init-r3 481 BLAKE2B 8ae305209c9005387da1e5a4b0f44370744e803a5a8ecc609c815998a63f9e586e361d1ac5159bb3701d3721d860ec0cbc8770e1971cefe808ffb18da6ab77a2 SHA512 23f292dbf479479ef9d23c0c23ccb2735995f97d37156df3a3818a69ce938ffc2ec7be636771f960038a2e876521f144cc2f2a6fd154de94ff309b50f0cbfa44 AUX dnsmasq.confd-r1 170 BLAKE2B 84d5cdb15236c9e1c83fa53d0e401df90e86c6687cc88f9ebba3e2a0987cad2ccf9bb82ac7b1fcd77a81fa6058a3cd3276fb8a8a76e13983628e92be95b39af1 SHA512 9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1 -DIST dnsmasq-2.76.tar.xz 480796 BLAKE2B 09dd0e97bcd70fa2beecd80ed157692a217a8a5b71f5d9491c419bedc909b1dcee043c5aeaab333a44d1775785182658ac999c5d3c4f4bd48f1683122697e326 SHA512 8a930f3e7cdc0c291ce89bea8128a4b8438b9aa9e660a2ac037e0baa4c5c74f4482a8f83b0410066a759444b3c4e1cf62a9beb625e38509690227996de10e06a -DIST dnsmasq-2.77.tar.xz 487244 BLAKE2B 4671dd47f87c4554b7d18413cff22cd5ed8338d2d97a8c2ecb57a92d0c7efa6a7fd9ff208b529f124cd8678e0d7f9328366a18039162647bed6076a05a882b1a SHA512 6ca98a71a8fdfd606e29c58b34dadfa63148c39f931570cca67a287e044d52c6ec2f8acbf5620ada3312e9db3a2fd63877188d829c070beaa730607e3309e768 DIST dnsmasq-2.78.tar.xz 489172 BLAKE2B 996b59181c4b582b74c91be073e62f0756d2e4c67ee36ff825b6973699f60e44959bb0451bbb8623f277e5a8378cda987a300eee6ec9398ae99284b302da2747 SHA512 9b79b84e5a768d52f90f6335ccef2c404ecd7a13e78e49f4cd0755fffc6cf34d0dc96ad4c72cad1dab3c5743a8d0d789b3e9b6e625b03c5675bb898ca61a698b -EBUILD dnsmasq-2.76-r1.ebuild 4381 BLAKE2B 944decd725b60468fd5e24dfd03306e3c02caa859e16213b820283532309e25110e764d55da800d8430309cbb776802384dca2c5abbebe356a7001210ffd16b3 SHA512 b5751ff008cf1e81c54f984e6f9fb69af8d1d6598af1efd22dfffe56ea9e257932a1cdc7abd920fd4fe106620aed15038ef255748f506e8d317ff8fcb510a338 -EBUILD dnsmasq-2.76.ebuild 4260 BLAKE2B 16b873db306175a8e222b97d2d5692fea52143d88a12e977f9f13a83d6e932c6d2bd8846aa380b5fbe75bbcd9f81f09ac8895233f576c1484863d2af2cac8f0d SHA512 8e87b85b3a49f51357110d35f27d71b3f8a803f702d54e7cc21e45f430a674c2100de632a8a01a2b2cf27391955ee7ac0ab39dd61a1efaff9482cc2a7527f59f -EBUILD dnsmasq-2.77-r1.ebuild 4527 BLAKE2B 427026b251afc91a374c6ebc836ec28e0889a3bd9aa913f1ce56885689b90000a7a66482cd1b859825b0233958ab5fecd0e464809e435e202d56f1db7f7ad447 SHA512 2a016687619f37c460737a2623d364d0a302ae7e3c062e6d6bc75c7ed130daeb4f8f02edf48c5c4cb626b8621c0404fde3c6ff2781c6fe9af88a6d49fa1e8b52 -EBUILD dnsmasq-2.77.ebuild 4495 BLAKE2B a767a8432ceb5232d70a368012d95729f7b154b98d86004ad1a0114ec8736fd0cdaac85fd52183ea9ef6df8d20c72d96976b0caf56dbd331a31ef9e9e5914169 SHA512 8bc8a3c2a222cb1715afbcb0d6ec38c8d61b2ff31c42351a39a4e0420605f1c7202850dde125cfaf47ccbd96d89440cb4afa99f6c60345ca1d67e77e358aa614 -EBUILD dnsmasq-2.78.ebuild 4519 BLAKE2B 5a77fab9bc9a9fa34bf725bbbf0ce3f762f092a203c43bdf24d86a01b98524dcbf97810cfb040d2f39c6651b670bc2114efe207e352a1b3f2177d07f69ed1a64 SHA512 e2b43fdf906f99765ef1503a724d31df154cb8d87e12aa17bb56b79e31e71874a0f0ee41ac1943b88f14d03dddd538f5c614b57afed73abf0c42fd788ba7b154 +EBUILD dnsmasq-2.78.ebuild 4507 BLAKE2B 15472be6911ec12f64e3f0ff322d15bde8c15857f1b01e1e9053ba476c832ae852049e558b05b54b74dde2fe60e34202835e90d68c7ec4381a5a4e268fd023d6 SHA512 b7db6c09a5a0febfa1bc0437e34b793cbd1c6f5aba8a96769e2c85fffa7aabd88eb3bb198ba5bf0263c3b113ac9f1ab608a36421ab64120e7f62fd6815ec1ca3 MISC metadata.xml 1149 BLAKE2B 9d9b9c87dd5bf6233d4656e0de77cd9e5d75ef631731c2e9d06917ade555422a5d4dbd846bc6bc7b5ff411a7d706f35ba68bb8d5ec8f793d878bba2de86a1b44 SHA512 7fad0bb400a664a67e82173015dcc2fc95644dd6c357e787b8257a193dc14adbee8f5a04cb4422fadefdeec0d3dc5bd986f4f5b44ee420b8a104cb5a8e1b58a6 diff --git a/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild deleted file mode 100644 index 95de5790dac2..000000000000 --- a/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils toolchain-funcs flag-o-matic user systemd - -DESCRIPTION="Small forwarding DNS server" -HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html" -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 +inotify ipv6 lua nls script selinux static tftp" -DM_LINGUAS="de es fi fr id it no pl pt_BR ro" - -CDEPEND="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="${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 )" - -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() { - default - - 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 inotify)" - 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 \ - MANDIR=/usr/share/man \ - CC="$(tc-getCC)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - COPTS="${COPTS}" \ - CONFFILE="/etc/${PN}.conf" \ - all$(use nls && echo "-i18n") - - use dhcp-tools && emake -C contrib/lease-tools \ - PREFIX=/usr \ - MANDIR=/usr/share/man \ - CC="$(tc-getCC)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - all -} - -src_install() { - local lingua puid - emake \ - PREFIX=/usr \ - MANDIR=/usr/share/man \ - COPTS="${COPTS}" \ - DESTDIR="${D}" \ - install$(use nls && echo "-i18n") - - for lingua in ${DM_LINGUAS}; do - has ${lingua} ${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 - - docinto html/ - dodoc *.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/lease-tools/{dhcp_release,dhcp_lease_time} - doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1 - if use ipv6; then - dosbin contrib/lease-tools/dhcp_release6 - doman contrib/lease-tools/dhcp_release6.1 - fi - 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.76.ebuild b/net-dns/dnsmasq/dnsmasq-2.76.ebuild deleted file mode 100644 index 77842fc8f919..000000000000 --- a/net-dns/dnsmasq/dnsmasq-2.76.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils toolchain-funcs flag-o-matic user systemd - -DESCRIPTION="Small forwarding DNS server" -HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html" -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 +inotify ipv6 lua nls script selinux static tftp" -DM_LINGUAS="de es fi fr id it no pl pt_BR ro" - -CDEPEND="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="${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 )" - -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() { - default - - 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 inotify)" - 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 \ - MANDIR=/usr/share/man \ - CC="$(tc-getCC)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - COPTS="${COPTS}" \ - CONFFILE="/etc/${PN}.conf" \ - all$(use nls && echo "-i18n") - - use dhcp-tools && emake -C contrib/lease-tools \ - PREFIX=/usr \ - MANDIR=/usr/share/man \ - CC="$(tc-getCC)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - all -} - -src_install() { - local lingua puid - emake \ - PREFIX=/usr \ - MANDIR=/usr/share/man \ - COPTS="${COPTS}" \ - DESTDIR="${D}" \ - install$(use nls && echo "-i18n") - - for lingua in ${DM_LINGUAS}; do - has ${lingua} ${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 - - docinto html/ - dodoc *.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/lease-tools/{dhcp_release,dhcp_lease_time} - doman contrib/lease-tools/{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.77-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild deleted file mode 100644 index 17fb4b4ab3a6..000000000000 --- a/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs flag-o-matic user systemd - -DESCRIPTION="Small forwarding DNS server" -HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html" -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 +id idn libidn2 +inotify" -IUSE+=" ipv6 lua nls script selinux static tftp" - -DM_LINGUAS=(de es fi fr id it no pl pt_BR ro) - -CDEPEND="dbus? ( sys-apps/dbus ) - idn? ( - !libidn2? ( net-dns/libidn ) - libidn2? ( >=net-dns/libidn2-2.0 ) - ) - lua? ( dev-lang/lua:* ) - conntrack? ( net-libs/libnetfilter_conntrack ) - nls? ( sys-devel/gettext ) -" - -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 ) - libidn2? ( idn )" - -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() { - default - - 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 libidn2 || use_have idn)" - COPTS+="$(use_have libidn2)" - COPTS+="$(use_have -n inotify)" - COPTS+="$(use_have -n dhcp dhcp dhcp6)" - COPTS+="$(use_have -n ipv6 ipv6 dhcp6)" - COPTS+="$(use_have -n id id)" - 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 \ - MANDIR=/usr/share/man \ - CC="$(tc-getCC)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - COPTS="${COPTS}" \ - CONFFILE="/etc/${PN}.conf" \ - all$(use nls && echo "-i18n") - - use dhcp-tools && emake -C contrib/lease-tools \ - PREFIX=/usr \ - MANDIR=/usr/share/man \ - CC="$(tc-getCC)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - all -} - -src_install() { - local lingua puid - emake \ - PREFIX=/usr \ - MANDIR=/usr/share/man \ - COPTS="${COPTS}" \ - DESTDIR="${D}" \ - install$(use nls && echo "-i18n") - - for lingua in "${DM_LINGUAS[@]}"; do - has ${lingua} ${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 - - docinto html/ - dodoc *.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/lease-tools/{dhcp_release,dhcp_lease_time} - doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1 - if use ipv6; then - dosbin contrib/lease-tools/dhcp_release6 - doman contrib/lease-tools/dhcp_release6.1 - fi - 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.77.ebuild b/net-dns/dnsmasq/dnsmasq-2.77.ebuild deleted file mode 100644 index 3c45c1db5b18..000000000000 --- a/net-dns/dnsmasq/dnsmasq-2.77.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs flag-o-matic user systemd - -DESCRIPTION="Small forwarding DNS server" -HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html" -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 +id idn libidn2 +inotify" -IUSE+=" ipv6 lua nls script selinux static tftp" - -DM_LINGUAS=(de es fi fr id it no pl pt_BR ro) - -CDEPEND="dbus? ( sys-apps/dbus ) - idn? ( net-dns/libidn ) - libidn2? ( >=net-dns/libidn2-2.0 ) - lua? ( dev-lang/lua:* ) - conntrack? ( net-libs/libnetfilter_conntrack ) - nls? ( sys-devel/gettext ) -" - -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 ) - libidn2? ( !idn )" - -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() { - default - - 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 libidn2)" - COPTS+="$(use_have -n inotify)" - COPTS+="$(use_have -n dhcp dhcp dhcp6)" - COPTS+="$(use_have -n ipv6 ipv6 dhcp6)" - COPTS+="$(use_have -n id id)" - 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 \ - MANDIR=/usr/share/man \ - CC="$(tc-getCC)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - COPTS="${COPTS}" \ - CONFFILE="/etc/${PN}.conf" \ - all$(use nls && echo "-i18n") - - use dhcp-tools && emake -C contrib/lease-tools \ - PREFIX=/usr \ - MANDIR=/usr/share/man \ - CC="$(tc-getCC)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - all -} - -src_install() { - local lingua puid - emake \ - PREFIX=/usr \ - MANDIR=/usr/share/man \ - COPTS="${COPTS}" \ - DESTDIR="${D}" \ - install$(use nls && echo "-i18n") - - for lingua in "${DM_LINGUAS[@]}"; do - has ${lingua} ${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 - - docinto html/ - dodoc *.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/lease-tools/{dhcp_release,dhcp_lease_time} - doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1 - if use ipv6; then - dosbin contrib/lease-tools/dhcp_release6 - doman contrib/lease-tools/dhcp_release6.1 - fi - 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.78.ebuild b/net-dns/dnsmasq/dnsmasq-2.78.ebuild index ee66cd35d3b7..8ffbd1829a6f 100644 --- a/net-dns/dnsmasq/dnsmasq-2.78.ebuild +++ b/net-dns/dnsmasq/dnsmasq-2.78.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify" IUSE+=" ipv6 lua nls script selinux static tftp" -- cgit v1.2.3