Toggle configure option to install unit file (#517728 by Konstantin)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 179 insertions, 15 deletions

diff --git a/net-irc/znc/ChangeLog b/net-irc/znc/ChangeLog
index 606822d1dced..83cd26b4c673 100644
--- a/net-irc/znc/ChangeLog
+++ b/net-irc/znc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/znc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.76 2014/07/12 10:24:23 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.77 2014/07/25 10:52:42 pacho Exp $
+
+*znc-1.4-r1 (25 Jul 2014)
+
+  25 Jul 2014; Pacho Ramos <pacho@gentoo.org> +znc-1.4-r1.ebuild:
+  Toggle configure option to install unit file (#517728 by Konstantin)
 
   12 Jul 2014; Alex Alexander <wired@gentoo.org> znc-1.2-r1.ebuild,
   znc-1.4.ebuild, znc-9999.ebuild:
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 227e1143a628..1b41b88a087b 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -8,24 +8,15 @@ AUX znc.initd 910 SHA256 9df9e738efca0e6ace045bdb6a1419082408119ba92c032566c6d4a
 DIST znc-1.2.tar.gz 1235150 SHA256 d9a2cd2a484ff23e6fc9cbde8dd8a43efbcd8d288afca7b1268914ca0d18701d SHA512 dff24e56127e5599d64b4c62de967d5d48d8ebf23ca8597d33bf0b3622640512db7a462bfa7c2031cd8307f402bab8efa345f6d1fc813e78eb0dcae581de3cf7 WHIRLPOOL b0810eb66e63be762f74f04eb2289e3634b18d6ecbd36d55f6a6772697e0397637d59b9ea01eaf62ef1cbe5f6e65b06432a254f4ada35194aa06b65c4a2f7994
 DIST znc-1.4.tar.gz 1239648 SHA256 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52 SHA512 0c33b05e8232084999812cbaa467dc7d37b80cafc1001b82e89c702b4303d8db9a27b948fe653e7090404eb1c66f5492f02f3524bc39efabade4be8bdb476671 WHIRLPOOL 420e665fa193b3f0284a070e021c4c467e3d40a0812eedeef9b2f65a6626a050b7af8bf15a754ac571d12261705832cfa18a0f7a7817cce96d220028a86230cf
 EBUILD znc-1.2-r1.ebuild 4345 SHA256 20273af3b73b384990b5d80d330feb35f8eba60890522389f6ac60451beac579 SHA512 e93b74145292063f715596019e020b9b4b0b4c7f7419622491ce1bae2f9a399e599697df13c6b0d7b4354300ab30a1e28f1e311b83b52924b43e2ba12458f54a WHIRLPOOL b461ec739e49c083215a4a91b801371100b2793badee31533b932643c7e74e5993ae0c2796619666a9e73de77545e1b70d7c7dc7c9e39605808cc9539252415f
+EBUILD znc-1.4-r1.ebuild 4289 SHA256 1e312ad6836447586e38d1a413e0c14ad0d5f17ff1626f7c1bbcb1fa3594bbb6 SHA512 40bcf88030e0a352268828f132ee4808211daaab70b8bb6e50aeac5440ca5458425d4ae40c4bc1b8b67e5f195f6d91feeeee84356239ab8d4421dac459c97f52 WHIRLPOOL a852f4cb3ead0957dc70c156c6ab107536b0c582ce6fc1b1f5be28e9b1ed49c3db040fa8988bcbeb38eafa73327c476b701f86ea92135f7dec6816bdba021fae
 EBUILD znc-1.4.ebuild 4223 SHA256 6138bea75dac96d91902a3bfbf72afcd5e827bf7f75e1f33254374be72f69604 SHA512 13f24cf15675a08074ee3dfb4f7faca2cfd50e37a9da3d8c4f0d95eb9c9166c691ab67965111cb69be20f3bb614eaf7354bfe7abe79b04ea73dea3232ca0fc08 WHIRLPOOL 028ee4367608cdc69107679b81803fdbe0ba75ca098b2e993b795c89c802ed7ad23e3078e48802b714c3aa17174dcc8d46ec107a8340afc30b63b094fcfe2c62
 EBUILD znc-9999.ebuild 4225 SHA256 539c005e8ad713c820f4d08dcc4cbae462d9f50a40245a90ca4d0f36350cfa38 SHA512 be0f8a321898d5ddf661d05f999305afe6f3c46d2076c5df7cc85dc8dc5d1c13cb2fca053a465c95365fc2e348809290df0f9a0e2cefc39f5c42e6c50da3a75b WHIRLPOOL 50f0d673e297db07a7bb56919588f59d695ba94447a0b41f1b8ef220a3da25635ce588a6da57caecc2377bdc876281f088c0c7a85d9a296ba5f5097041d2bb1f
-MISC ChangeLog 11157 SHA256 bc7c9e4c660a9070d336d9aee2092e223311c75bc1c6fa93f8867355197c0ee1 SHA512 0ded59867ec2f557e2ddc1de1756632457e63f62b5171c6b2ec3e97279110335b4af00a0e0c7358cc59a5d5af3a4de2253cb788f3263609d8aba4f4ac6416ef1 WHIRLPOOL 4a191eb27fef49f12b6ccab98d89b00127f295383427029ad2e07466b82744732d8b03acbed321010bcb910b2454e442bf329b3a260f45bdb4e3ed05212b0d6f
+MISC ChangeLog 11322 SHA256 691b46164f0c533ea9a3ef0376d364e90e9966746c7fb60d6186663158003136 SHA512 85ad65cf7250ce2f7a9c09b05d24ccf8eee43e2b11fde4519e51243c79210e04a733c48b99ffeb45bf062c3eea88c2af393cf0e70dcd8d8a4a67aee3b77780d3 WHIRLPOOL f77a23a35db7f0b7357fc69266bcfcc2deb72ac081f3e3e5a6df59f68b5c22ebf81bd6c726a293520afd50702b743ae88a49b0b15a2794edbfcc60bbc96df475
 MISC metadata.xml 387 SHA256 864beefb6d435cf17de251ce82df948cb7af8181bd1ddbdf0d18106f0cb042ed SHA512 37de68d3d350980d0ced5ee9f46e6a6422a4341ca8aeba05fd6eb539081935c26feafabdb103e44470b5da76ef73fd08018662b9d85579b00395292a5bf77054 WHIRLPOOL c2ca27a67d989fc4b0b6f346409a5bd756400be9c4c3616ea548e4caff577c060508e3edc546c9b341d513ba9afa42e3dcec0bd4b40c416177c09e75fa8a3491
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTwQzeAAoJEDZF8K7rm0r6u5kQAIESQROjYtQ0CSO7l4yswx2G
-2TMVyXJw34WdO96eBBc3zbav/s2oBOhQLGBRFhiyqS7EUg8vQMiXjxRAEhw2FMwi
-TzutzwRZGpU/ahwB9kAD3rffwYEzYUvgZH8bkle/LvOKPM1LJraYc+F6hi3rg++3
-JttIADbW3v0wESM07zBqTINdBO6K/jQbyyulylLqevueoNHOWbsvqMsthHjyi0Q7
-pVOi7N9ztFtZgweDZmfVPgsRTpeSVEYYPWAoIKEV84vLPeiZGuH19Tb8JZYehFI+
-mo3ArQ6CkhRKpSMrzyfDOtgV2Qr9lwOzdas9vcGX14caE4bidT84b4tCkKiAEjwx
-3MG8ZfHeMLbdvlLvTE+clggL4S0nHW1IBKNGzNny8zV3C50Se2z+PKnQ6vuhn04H
-FBO8JMlAQqUdKAjlVyuk/gfMQH2Gca5QdkxA6KdSCMQWcrUNuNFS5+PuAs7fE/7G
-ei4z8tb5cOowS74/qk5PnUok58NpxUu4XwLjeMaUfcYehwQMxQk3aRDwke4gdvS/
-LYgSrkQ8IK2AIa2771KU7PE8VS/R8m86g3Z0N4uoXWurKpZf5OsxIDg0izRXM2J+
-hImGKLMaboXmBHzZpHcSynIxQH0XmemPM09WZTGmrNSPQ7CkYrJtHQgYgGL5+BSL
-p8xEwTowD2+R2OdQaLaQ
-=FK/z
+iEYEAREIAAYFAlPSNv0ACgkQCaWpQKGI+9SL5wCghnLmsuGlVy+hEH8DayNPS5GH
+ixYAn1gm8Hg4jm1BG9ACZYCs0DJQ7/+u
+=rOMY
 -----END PGP SIGNATURE-----
diff --git a/net-irc/znc/znc-1.4-r1.ebuild b/net-irc/znc/znc-1.4-r1.ebuild
new file mode 100644
index 000000000000..61deedcdab11
--- /dev/null
+++ b/net-irc/znc/znc-1.4-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/znc-1.4-r1.ebuild,v 1.1 2014/07/25 10:52:42 pacho Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_2,3_3} )
+inherit base python-single-r1 systemd user
+
+MY_PV=${PV/_/-}
+DESCRIPTION="An advanced IRC Bouncer"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/znc/znc.git"}
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+HOMEPAGE="http://znc.in"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="daemon debug ipv6 perl python ssl sasl tcl"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	perl? ( >=dev-lang/perl-5.10 )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	tcl? ( dev-lang/tcl )
+"
+DEPEND="
+	virtual/pkgconfig
+	perl? (
+		>=dev-lang/swig-2.0.12
+	)
+	python? (
+		>=dev-lang/swig-2.0.12
+	)
+	${RDEPEND}
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0-systemwideconfig.patch"
+)
+
+CONFDIR="/var/lib/znc"
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+	if use daemon; then
+		enewgroup ${PN}
+		enewuser ${PN} -1 -1 /dev/null ${PN}
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} == *9999* ]]; then
+		./autogen.sh
+	fi
+
+	base_src_prepare
+}
+
+src_configure() {
+	econf \
+		--with-systemdsystemunitdir=$(systemd_get_unitdir) \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable perl) \
+		$(use python && echo "--enable-python=python3") \
+		$(use_enable sasl cyrus) \
+		$(use_enable ssl openssl) \
+		$(use_enable tcl tcl)
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc NOTICE README.md
+	if use daemon; then
+		newinitd "${FILESDIR}"/znc.initd znc
+		newconfd "${FILESDIR}"/znc.confd znc
+	fi
+}
+
+pkg_postinst() {
+	if use !daemon; then
+		elog
+		elog "Run 'znc --makeconf' as the user you want to run ZNC as"
+		elog "to make a configuration file"
+		elog
+	else
+		elog
+		elog "An init-script was installed in /etc/init.d"
+		elog "A config file was installed in /etc/conf.d"
+		if [[ ! -d "${EROOT}${CONFDIR}" ]]; then
+			elog
+			elog "Run 'emerge --config znc' to configure ZNC"
+			elog "as a system-wide daemon."
+			elog
+			elog "To generate a new SSL certificate, run:"
+			elog "  znc --system-wide-config-as znc --makepem -d ${CONFDIR}"
+			elog "as root"
+			elog
+			elog "If migrating from a user-based install"
+			elog "you can use your existing config files:"
+			elog "  mkdir ${CONFDIR}"
+			elog "  mv /home/\$USER/.znc/* ${CONFDIR}"
+			elog "  rm -rf /home/\$USER/.znc"
+			elog "  chown -R znc:znc ${CONFDIR}"
+			elog
+			elog "If you already have znc set up and want take advantage of the"
+			elog "init script but skip of all the above, you can also edit"
+			elog "  /etc/conf.d/znc"
+			elog "and adjust the variables to your current znc user and config"
+			elog "location."
+			if [[ -d "${EROOT}"/etc/znc ]]; then
+				elog
+				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
+		else
+			elog "Existing config detected in ${CONFDIR}"
+			elog "You're good to go :)"
+		fi
+		elog
+	fi
+}
+
+pkg_config() {
+	if use daemon && ! [[ -d "${EROOT}${CONFDIR}" ]]; then
+		einfo "Press ENTER to interactively create a new configuration file for znc."
+		einfo "To abort, press Control-C"
+		read
+		mkdir -p "${EROOT}${CONFDIR}" || die
+		chown -R ${PN}:${PN} "${EROOT}${CONFDIR}" ||
+			die "Setting permissions failed"
+		"${EROOT}"/usr/bin/znc --system-wide-config-as znc -c -r -d "${EROOT}${CONFDIR}" ||
+			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"
+	else
+		if use daemon; then
+			ewarn "${CONFDIR} 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
+			ewarn "To configure znc as a system-wide daemon you have to"
+			ewarn "enable the 'daemon' use flag."
+		fi
+	fi
+}