version bump, bug 531448, 549104, thanks Karl-Johan Karlsson and Ondrej Sury

(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)

8 files changed, 256 insertions, 64 deletions

diff --git a/net-dns/knot/ChangeLog b/net-dns/knot/ChangeLog
index 87af4c375a58..08407c4c6a39 100644
--- a/net-dns/knot/ChangeLog
+++ b/net-dns/knot/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-dns/knot
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/ChangeLog,v 1.30 2014/09/15 15:48:37 scarabeus Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/ChangeLog,v 1.31 2015/05/15 09:52:40 dlan Exp $
+
+*knot-2.0.0_beta (15 May 2015)
+*knot-1.6.3 (15 May 2015)
+
+  15 May 2015; Yixun Lan <dlan@gentoo.org> +knot-1.6.3.ebuild,
+  +knot-2.0.0_beta.ebuild, -knot-9999.ebuild,
+  +files/1.6.3-dont-create-extra-directories.patch,
+  +files/2.0.0_beta-dont-create-extra-directories.patch,
+  +files/2.0.0_beta-spell-enable-vars-correctly.patch, metadata.xml:
+  version bump, bug 531448, 549104, thanks Karl-Johan Karlsson and Ondřej
+  Surý
 
 *knot-1.5.3 (15 Sep 2014)
 
diff --git a/net-dns/knot/files/1.6.3-dont-create-extra-directories.patch b/net-dns/knot/files/1.6.3-dont-create-extra-directories.patch
new file mode 100644
index 000000000000..e8d84a188592
--- /dev/null
+++ b/net-dns/knot/files/1.6.3-dont-create-extra-directories.patch
@@ -0,0 +1,15 @@
+--- src/Makefile.in.orig	2015-05-03 16:34:53.177934984 +0200
++++ src/Makefile.in	2015-05-03 16:35:11.481325329 +0200
+@@ -2712,12 +2712,6 @@
+ 	uninstall-sbinPROGRAMS
+ 
+ 
+-# Create storage and run-time directories
+-install-data-hook:
+-	$(INSTALL) -d $(DESTDIR)/@config_dir@
+-	$(INSTALL) -d $(DESTDIR)/@run_dir@
+-	$(INSTALL) -d $(DESTDIR)/@storage_dir@
+-
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/net-dns/knot/files/2.0.0_beta-dont-create-extra-directories.patch b/net-dns/knot/files/2.0.0_beta-dont-create-extra-directories.patch
new file mode 100644
index 000000000000..538afecc5f62
--- /dev/null
+++ b/net-dns/knot/files/2.0.0_beta-dont-create-extra-directories.patch
@@ -0,0 +1,15 @@
+--- src/Makefile.in.orig	2015-05-10 20:59:26.854079700 +0200
++++ src/Makefile.in	2015-05-10 21:00:01.870857369 +0200
+@@ -3401,12 +3401,6 @@
+ 	uninstall-pkgconfigDATA uninstall-sbinPROGRAMS
+ 
+ 
+-# Create storage and run-time directories
+-@HAVE_DAEMON_TRUE@install-data-hook:
+-@HAVE_DAEMON_TRUE@	$(INSTALL) -d $(DESTDIR)/@config_dir@
+-@HAVE_DAEMON_TRUE@	$(INSTALL) -d $(DESTDIR)/@run_dir@
+-@HAVE_DAEMON_TRUE@	$(INSTALL) -d $(DESTDIR)/@storage_dir@
+-
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/net-dns/knot/files/2.0.0_beta-spell-enable-vars-correctly.patch b/net-dns/knot/files/2.0.0_beta-spell-enable-vars-correctly.patch
new file mode 100644
index 000000000000..5861ee5841c9
--- /dev/null
+++ b/net-dns/knot/files/2.0.0_beta-spell-enable-vars-correctly.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2015-05-10 19:25:43.365929384 +0200
++++ configure	2015-05-10 19:26:00.452648532 +0200
+@@ -12833,7 +12833,7 @@
+ if test "$enable_daemon" = "yes"; then :
+ 
+ 
+-if test "$enable_system" != "no"; then :
++if test "$enable_systemd" != "no"; then :
+ 
+   case $enable_systemd in #(
+   auto) :
diff --git a/net-dns/knot/knot-1.6.3.ebuild b/net-dns/knot/knot-1.6.3.ebuild
new file mode 100644
index 000000000000..008c8d4a2af6
--- /dev/null
+++ b/net-dns/knot/knot-1.6.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/knot-1.6.3.ebuild,v 1.1 2015/05/15 09:52:40 dlan Exp $
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="High-performance authoritative-only DNS server"
+HOMEPAGE="http://www.knot-dns.cz/"
+SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dnstap doc caps +fastparser idn lmdb systemd"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.1
+	>=dev-libs/userspace-rcu-0.5.4
+	caps? ( >=sys-libs/libcap-ng-0.6.4 )
+	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
+	idn? ( net-dns/libidn )
+	lmdb? ( dev-db/lmdb )
+	systemd? ( sys-apps/systemd )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex
+	sys-devel/bison
+	doc? ( dev-python/sphinx app-text/texlive-core sys-apps/texinfo )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-dont-create-extra-directories.patch"
+}
+
+src_configure() {
+	econf \
+		--with-storage="${EPREFIX}/var/lib/${PN}" \
+		--with-rundir="${EPREFIX}/var/run/${PN}" \
+		$(use_enable fastparser) \
+		$(use_enable debug debug server,zones,xfr,packet,rr,ns,loader,dnssec) \
+		$(use_enable debug debuglevel details) \
+		$(use_enable dnstap) \
+		$(use_enable lmdb) \
+		$(use_with idn libidn) \
+		$(usex systemd --enable-systemd=yes --enable-systemd=no)
+}
+
+src_compile() {
+	default
+	use doc && emake -C doc html-local singlehtml pdf-local info-local
+}
+
+# Portage's automatic test code runs "make -n check" to see if there
+# is a "check" target, but that fails here because the test
+# infrastructure hasn't been built yet. Just run "make check", which
+# will build it and then run the tests.
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+	keepdir /var/lib/${PN}
+
+	if use doc; then
+		dodoc doc/_build/latex/KnotDNS.pdf
+
+		docinto html
+		dodoc doc/_build/html/*.html doc/_build/html/*.js
+		docinto html/_sources
+		dodoc doc/_build/html/_sources/*
+		docinto html/_static
+		dodoc doc/_build/html/_static/*
+
+		docinto singlehtml
+		dodoc doc/_build/singlehtml/index.html
+		docinto singlehtml/_static/
+		dodoc doc/_build/singlehtml/_static/*
+
+		doinfo doc/_build/texinfo/KnotDNS.info
+	fi
+
+	newinitd "${FILESDIR}/knot.init" knot
+}
+
+pkg_postinst() {
+	enewgroup knot 53
+	enewuser knot 53 -1 /var/lib/knot knot
+}
diff --git a/net-dns/knot/knot-2.0.0_beta.ebuild b/net-dns/knot/knot-2.0.0_beta.ebuild
new file mode 100644
index 000000000000..1dd4a0922dec
--- /dev/null
+++ b/net-dns/knot/knot-2.0.0_beta.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/knot-2.0.0_beta.ebuild,v 1.1 2015/05/15 09:52:40 dlan Exp $
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="High-performance authoritative-only DNS server"
+HOMEPAGE="http://www.knot-dns.cz/"
+SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug dnstap doc caps +fastparser idn systemd"
+
+RDEPEND="
+	>=net-libs/gnutls-3.0
+	>=dev-libs/jansson-2.3
+	dev-db/lmdb
+	>=dev-libs/userspace-rcu-0.5.4
+	caps? ( >=sys-libs/libcap-ng-0.6.4 )
+	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
+	idn? ( net-dns/libidn )
+	systemd? ( sys-apps/systemd )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx app-text/texlive-core sys-apps/texinfo )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-spell-enable-vars-correctly.patch"
+	epatch "${FILESDIR}/${PV}-dont-create-extra-directories.patch"
+}
+
+src_configure() {
+	econf \
+		--with-storage="${EPREFIX}/var/lib/${PN}" \
+		--with-rundir="${EPREFIX}/var/run/${PN}" \
+		--with-lmdb \
+		$(use_enable fastparser) \
+		$(use_enable debug debug server,zones,ns,loader,dnssec) \
+		$(use_enable debug debuglevel details) \
+		$(use_enable dnstap) \
+		$(use_enable doc documentation) \
+		$(use_with idn libidn) \
+		$(usex systemd --enable-systemd=yes --enable-systemd=no)
+}
+
+src_compile() {
+	default
+	use doc && emake -C doc html-local singlehtml pdf-local info-local
+}
+
+# Portage's automatic test code runs "make -n check" to see if there
+# is a "check" target, but that fails here because the test
+# infrastructure hasn't been built yet. Just run "make check", which
+# will build it and then run the tests.
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+	keepdir /var/lib/${PN}
+
+	if use doc; then
+		dodoc doc/_build/latex/KnotDNS.pdf
+
+		docinto html
+		dodoc doc/_build/html/*.html doc/_build/html/*.js
+		docinto html/_sources
+		dodoc doc/_build/html/_sources/*
+		docinto html/_static
+		dodoc doc/_build/html/_static/*
+
+		docinto singlehtml
+		dodoc doc/_build/singlehtml/index.html
+		docinto singlehtml/_static/
+		dodoc doc/_build/singlehtml/_static/*
+
+		doinfo doc/_build/texinfo/KnotDNS.info
+	fi
+
+	newinitd "${FILESDIR}/knot.init" knot
+}
+
+pkg_postinst() {
+	enewgroup knot 53
+	enewuser knot 53 -1 /var/lib/knot knot
+}
diff --git a/net-dns/knot/knot-9999.ebuild b/net-dns/knot/knot-9999.ebuild
deleted file mode 100644
index d379d4fc8814..000000000000
--- a/net-dns/knot/knot-9999.ebuild
+++ /dev/null
@@ -1,61 +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/knot/knot-9999.ebuild,v 1.2 2014/05/27 13:28:32 scarabeus Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="https://gitlab.labs.nic.cz/labs/${PN}.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-inherit eutils user
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="http://www.knot-dns.cz/"
-[[ ${PV} == 9999 ]] || SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="debug caps +fastparser idn"
-
-RDEPEND="
-	dev-libs/openssl
-	dev-libs/userspace-rcu
-	caps? ( sys-libs/libcap-ng )
-	idn? ( net-dns/libidn )
-"
-#	sys-libs/glibc
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	virtual/yacc
-	fastparser? ( dev-util/ragel )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_prepare() {
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-storage="${EPREFIX}/var/lib/${PN}" \
-		--with-rundir="${EPREFIX}/var/run/${PN}" \
-		--disable-lto \
-		--enable-recvmmsg \
-		$(use_enable fastparser) \
-		$(use_enable debug debug server,zones,xfr,packet,dname,rr,ns,hash,compiler) \
-		$(use_enable debug debuglevel details) \
-		$(use_with idn libidn)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/knot.init" knot
-}
-
-pkg_postinst() {
-	enewgroup knot 53
-	enewuser knot 53 -1 /var/lib/knot knot
-}
diff --git a/net-dns/knot/metadata.xml b/net-dns/knot/metadata.xml
index 3b4307bbc3a7..29256af3d08f 100644
--- a/net-dns/knot/metadata.xml
+++ b/net-dns/knot/metadata.xml
@@ -10,6 +10,16 @@
 		<email>scarabeus@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="fastparser">Enables fast DNS zone parser.</flag>
+		<flag name="dnstap">Include support for the dnstap
+		binary log format (http://dnstap.info/).
+		</flag>
+	        <flag name="fastparser">Use a zone file parser that is
+		faster, but requires more memory and CPU time to
+		compile.
+		</flag>
+		<flag name="lmdb">Use the LMDB database to store
+		timers for slave zones on disk, making the timers
+		persist across server restarts.
+		</flag>
 	</use>
 </pkgmetadata>