net-irc/znc: bump to 1.6.5, add Python 3.6

Gentoo-Bug: 613286
Package-Manager: Portage-2.3.4, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4303

2 files changed, 131 insertions, 0 deletions

diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index b3b62aa6e3e3..db13f97d8180 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -2,3 +2,4 @@ DIST googletest-release-1.7.0.tar.gz 468653 SHA256 f73a6546fdf9fce9ff93a5015e033
 DIST znc-1.4.tar.gz 1239648 SHA256 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52 SHA512 0c33b05e8232084999812cbaa467dc7d37b80cafc1001b82e89c702b4303d8db9a27b948fe653e7090404eb1c66f5492f02f3524bc39efabade4be8bdb476671 WHIRLPOOL 420e665fa193b3f0284a070e021c4c467e3d40a0812eedeef9b2f65a6626a050b7af8bf15a754ac571d12261705832cfa18a0f7a7817cce96d220028a86230cf
 DIST znc-1.6.3.tar.gz 1464200 SHA256 631c46de76fe601a41ef7676bc974958e9a302b72b25fc92b4a603a25d89b827 SHA512 777279b6c973310b4e78a0472bd1e355c2adf3e4fbe9ebedde3dd4706e5c0b208d4330eb2318a8d9e0d7d7146bee0a4a428cbe5a3f230c8f6aa692a477e86e2b WHIRLPOOL 2a41e0ac90038a8cc8f289d4ffc0494d29eda75450f650b8870c076fb809eb9c5829720bb39eb43d38ee4ac7f9bea6000ad90fcdd8c0eea461bf04f88cc17b52
 DIST znc-1.6.4.tar.gz 1468049 SHA256 431097eb17860bfc980f3e68fdd75f98af4bdeecd793c84835c6cb11c3320d1c SHA512 d66069a7db4d85f8f132aed1ee4b0da8a04c61ab0e2df36426eb326e713401e824c9653b7edd0f7b317779b95b56965bc987c7099eb83b4950386462fd96cd8f WHIRLPOOL 42612a47f459f6e4ce5e64d836491366e3f10e50a7d6ee72ef50468e8e4a90a39cd708492b5b77d53ec8d8184164885dd7f3c79635b5d1e297ec8dc7ef313c34
+DIST znc-1.6.5.tar.gz 1470681 SHA256 2f0225d49c53a01f8d94feea4619a6fe92857792bb3401a4eb1edd65f0342aca SHA512 d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626 WHIRLPOOL b72585a2f11754bedb667ac078a617195aa718f9864e7e33b962d75387e7bc4c8c6c1465844f27b65a5af2d50cec7006ae325a43eb2ef930fc9c218bbaae60a1
diff --git a/net-irc/znc/znc-1.6.5.ebuild b/net-irc/znc/znc-1.6.5.ebuild
new file mode 100644
index 000000000000..ae97ab976e87
--- /dev/null
+++ b/net-irc/znc/znc-1.6.5.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit eutils python-single-r1 readme.gentoo-r1 systemd user
+
+MY_PV=${PV/_/-}
+GTEST_VER="1.7.0"
+GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> googletest-release-${GTEST_VER}.tar.gz"
+DESCRIPTION="An advanced IRC Bouncer"
+
+SRC_URI="
+	http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
+	test? ( ${GTEST_URL} )
+"
+KEYWORDS="~amd64 ~arm ~x86"
+
+HOMEPAGE="http://znc.in"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="daemon debug +ipv6 +icu libressl perl python +ssl sasl tcl test +zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	icu? ( dev-libs/icu:= )
+	perl? ( >=dev-lang/perl-5.10:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tcl? ( dev-lang/tcl:0= )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-systemwideconfig.patch
+	"${FILESDIR}"/${PN}-1.6.1-create-pidfile-per-default.patch
+)
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+	if use daemon; then
+		enewgroup ${PN}
+		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+		# The home directory was previously set to /dev/null
+		# This caused a bug with the systemd unit
+		# https://bugs.gentoo.org/521916
+		esethome ${PN} /var/lib/${PN}
+	fi
+}
+
+src_configure() {
+	econf \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$(use_enable debug) \
+		$(use_enable icu charset) \
+		$(use_enable ipv6) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable sasl cyrus) \
+		$(use_enable ssl openssl) \
+		$(use_enable tcl) \
+		$(use_enable zlib) \
+		$(use_with test gtest "${WORKDIR}/googletest-release-${GTEST_VER}")
+}
+
+src_install() {
+	default
+	dodoc NOTICE
+	if use daemon; then
+		newinitd "${FILESDIR}"/znc.initd-r1 znc
+		newconfd "${FILESDIR}"/znc.confd-r1 znc
+	fi
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo") || die
+	DISABLE_AUTOFORMATTING=1
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	if [[ -d "${EROOT%/}"/etc/znc ]]; then
+		ewarn "/etc/znc exists on your system."
+		ewarn "Due to the nature of the contents of that folder,"
+		ewarn "we have changed the default configuration to use"
+		ewarn "	/var/lib/znc"
+		ewarn "please move /etc/znc to /var/lib/znc"
+		ewarn "or adjust /etc/conf.d/znc"
+	fi
+}
+
+pkg_config() {
+	if use daemon; then
+		if [[ -e "${EROOT%/}/var/lib/znc" ]]; then
+			ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging"
+			ewarn "any existing configuration. If you are sure you want"
+			ewarn "to generate a new configuration, remove the folder"
+			ewarn "and try again."
+		else
+			einfo "Press any key to interactively create a new configuration file"
+			einfo "for znc."
+			einfo "To abort, press Control-C"
+			read
+			mkdir -p "${EROOT%/}/var/lib/znc" || die
+			chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" ||
+				die "Setting permissions failed"
+			"${EROOT%/}"/usr/bin/znc --system-wide-config-as ${PN} -c -r -d "${EROOT%/}/var/lib/znc" ||
+				die "Config failed"
+			echo
+			einfo "To start znc, run '/etc/init.d/znc start'"
+			einfo "or add znc to a runlevel:"
+			einfo "  rc-update add znc default"
+		fi
+	else
+		ewarn "To configure znc as a system-wide daemon you have to"
+		ewarn "enable the 'daemon' use flag."
+	fi
+}