--- bind-9.9.3_p1.ebuild 2013-07-15 02:31:21.279134001 +0200 +++ bind-9.9.3_p1.ebuild 2013-07-29 23:28:45.494954447 +0200 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.3_p1.ebuild,v 1.2 2013/07/13 11:43:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.2_p2.ebuild,v 1.13 2013/04/14 11:46:42 ago Exp $ # Re dlz/mysql and threads, needs to be verified.. # MySQL uses thread local storage in its C api. Thus MySQL @@ -16,7 +16,7 @@ PYTHON_DEPEND="python? 2:2.7 3" SUPPORT_PYTHON_ABIS="1" -inherit python eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd +inherit python eutils autotools toolchain-funcs flag-o-matic multilib db-use user MY_PV="${PV/_p/-P}" MY_PV="${MY_PV/_rc/rc}" @@ -52,7 +52,7 @@ LICENSE="ISC BSD BSD-2 HPND JNIC openssl" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="berkdb caps dlz doc filter-aaaa geoip gost gssapi idn ipv6 ldap mysql odbc postgres python rpz rrl sdb-ldap selinux ssl static-libs threads urandom xml" # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 @@ -135,7 +135,7 @@ if use geoip; then cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \ - -e 's:RELEASEVER=:RELEASEVER=1:' \ + -e 's:RELEASEVER=:RELEASEVER=2:' \ ${GEOIP_PATCH_A} || die # sed -i -e 's:RELEASEVER=2:RELEASEVER=3:' ${GEOIP_PATCH_A} || die epatch ${GEOIP_PATCH_A} @@ -155,8 +155,7 @@ sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die # bug #220361 - rm aclocal.m4 - rm -rf libtool.m4/ + rm {aclocal,libtool}.m4 eautoreconf } @@ -192,11 +191,9 @@ $(use_with ldap dlz-ldap) \ $(use_with odbc dlz-odbc) \ $(use_with ssl openssl "${EPREFIX}"/usr) \ - $(use_with ssl ecdsa) \ $(use_with idn) \ $(use_enable ipv6) \ $(use_with xml libxml2) \ - $(use_enable xml newstats) \ $(use_with gssapi) \ $(use_enable rpz rpz-nsip) \ $(use_enable rpz rpz-nsdname) \ @@ -304,11 +301,6 @@ fperms 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf} fperms 0750 /etc/bind /var/bind/pri fperms 0770 /var/{run,log}/named /var/bind/{,sec,dyn} - - systemd_dounit "${FILESDIR}/named.service" - systemd_dotmpfilesd "${FILESDIR}/named.conf" - exeinto /usr/libexec - doexe "${FILESDIR}/generate-rndc-key.sh" } pkg_postinst() {