version bump

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

4 files changed, 191 insertions, 19 deletions

diff --git a/net-irc/znc/ChangeLog b/net-irc/znc/ChangeLog
index 54612151aada..23e646e90ef8 100644
--- a/net-irc/znc/ChangeLog
+++ b/net-irc/znc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.74 2014/05/08 03:28:36 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.75 2014/05/09 05:17:38 wired Exp $
+
+*znc-1.4 (09 May 2014)
+
+  09 May 2014; Alex Alexander <wired@gentoo.org> +znc-1.4.ebuild,
+  znc-9999.ebuild:
+  version bump
 
   08 May 2014; Alex Alexander <wired@gentoo.org> znc-1.2-r1.ebuild,
   znc-9999.ebuild:
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 943fc7aa1ffb..f1822b1afca8 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -6,24 +6,26 @@ AUX znc-1.2-webadmin-correctly-handle-channel-names.patch 2702 SHA256 81fd252774
 AUX znc.confd 123 SHA256 be3155e79e6ed13be88fbf9d99f6889b3ee8425837120c448c827b8302672063 SHA512 352f18d64cbfbd5970c859f2ae2290c0ddafcbd8f1bb5d74f33976bc8388f65a75f8a9a73a093fbac12f2d243d4bcf74380bbb3aaab8d68f7bf4eab7ce3bea46 WHIRLPOOL 24e8272f1d94ff39cb748c9c280761437e2f6527ffa26e4972d83c99cde62e2f70d0c99639f4a8aabb4464fd85ee4856eb8086d3196e12286e3989d8e19c544b
 AUX znc.initd 910 SHA256 9df9e738efca0e6ace045bdb6a1419082408119ba92c032566c6d4a61b1844b5 SHA512 0d1b9bf71cde1b803e9deddc64006528778dc628603bb4ba8cca17098dcb6b8fc34dcb43eca7de7dec61ce84832dd07d76c7ccb2d9175f859d5aee2a349e8045 WHIRLPOOL 0640b8c30c7ff64b772998c86f06fcaae06759a5af7e0384a5ffbd1a1c4c85923c9d87362720a2ae6fb5a164d1a298d12e4493617a1e66813f3dfee0b40d04ce
 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 4340 SHA256 cf4cdded1d42ac4773a21a8da882d7a932d69d9dfb9c0ece286832f63a214c22 SHA512 e6372ce85c54d0ce66dfa6dbcfb0476d8f7759865d29036372985b4ef670e38adbc360c84b5601e0caf57712edf216e4eba834d03e71094dfcd27cd3d2b38b11 WHIRLPOOL c1513f2a84242610a588fee2cd643c77d40dcdabd13418cdf438ab19c949368ec961cf58af3e3b658bc6981113b7ecc2d881b907abb829b13c98279621677f3a
-EBUILD znc-9999.ebuild 4274 SHA256 d8a0ce88f9441e80572b13f70e097b1645ff8c654b1db28127f4d9a97f7a8e2b SHA512 31007387c7bfa26c26fe2a6488ea39085a464f29420b1e3b99b000c1e3a53475f9f2650f506af67f020259f3c9bdb32aeceaa474bcbe1d804777f281aea0a7dc WHIRLPOOL 7450dba38033299907527fbc2fd3d2842498945419af899210ad0f006261c48e9903f5aab0beb46fc77c873f2989dd59847df57a5b91e0b96fb949f15e19bb94
-MISC ChangeLog 10883 SHA256 287b5e22c578813ad553247c0622f5db6aee69cccc213c633f17e04e6ec1b830 SHA512 6d8d2fdfd8c1d53d3a956f8ad362c61501b036d041f73f5ff8ee1fc06d79dee7bed30f1ba7d360af8295421b23736f4cce1573987ec183feb50274ecd7327618 WHIRLPOOL ac11dc3b7572735a92bcfd07b7c1a7766819457a9a4faed004ec7327bd614f2ccdf3fdd7bf79fe9547bad42c875467b587dd4cbbbf8859464c1d1e979c1fe3d0
+EBUILD znc-1.4.ebuild 4205 SHA256 d8941f374b0edae5bf71b32c16db0885a579b82c99ee77efa1016e6df1f685bc SHA512 df11cd8e1f7ee518067f954f572837e702aa2bacaed76d9205ab540b19ee8d5bf5659fe8cf1032f55cb51ed1b425038c3ecbaafb27b53ba98628a47c634bff1a WHIRLPOOL 1c0989bbd9d8f0011984c2671c7c1ad1325b8b8ad75e861350674b04a3dbe44a4c57c895caef1f25f2fbcd7a65fb5b8316cf6723a10e0da941829c7d50acbd4d
+EBUILD znc-9999.ebuild 4206 SHA256 607d75b17f2c2aaee2baf7320e45796becaf15a081151b583c830f7fef61ccf0 SHA512 fd473549d31b6ca7dd43efe1f0e960999d9b4ecd398e7d3e59e65804878004ff64311a3028cf69934a07983ea8f274e9c8d1ba9edc60218c42910ac73e04b394 WHIRLPOOL 67f85771f31913af0b7372c58369c34190865bd75877bd69385a29d8f938385ac6a91fc7bf56111734b130e69b4eb4c5b75a93068d99d67bf85cbff316257a5f
+MISC ChangeLog 11008 SHA256 3b9cb7fa611eee5f76aa1635fa14c70f47be86fa5e717c04d95383288bfee610 SHA512 fef1a8fd8c104afb51b71b913ee83e0d6ba44e9271e5824672cba89060d5a92ea4f86406655bd8f3bb669369ca7c7cfb7263647c7b797022d9ea294ae7614799 WHIRLPOOL 1cc4d8869ffda7a628b96937b1d26d9bde66bacc6c59441e6cc4ce7f8c8b29faa47b81efbf33fb212562c5f068ff1ac8d4b2acafaa0d56074382fcdad5568544
 MISC metadata.xml 387 SHA256 864beefb6d435cf17de251ce82df948cb7af8181bd1ddbdf0d18106f0cb042ed SHA512 37de68d3d350980d0ced5ee9f46e6a6422a4341ca8aeba05fd6eb539081935c26feafabdb103e44470b5da76ef73fd08018662b9d85579b00395292a5bf77054 WHIRLPOOL c2ca27a67d989fc4b0b6f346409a5bd756400be9c4c3616ea548e4caff577c060508e3edc546c9b341d513ba9afa42e3dcec0bd4b40c416177c09e75fa8a3491
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTavnmAAoJEDZF8K7rm0r6x+4P/1PxD309jji+w2Eu7NOwjxnk
-OMSqY54FLvutxx+gD11iN7qxN4lN/1/5NuywTOoTVMYXrXqTVDL9oqRdlyTB+EQh
-tYEBQdQMi3bo0HmpXFCBtxdv4YU9wwL/ra6yd9DtEt1uIdSX8HV4lc7Fo+BCOweC
-06fJtUkfTNWG9iJo99RhR8jEr8YpQhENnyJmMHx4O31V9DjTxhgKIRGlPJRCxpCe
-Yf9FCFbgaJQY++z/vMlR/iPHSwB8B99Vpv+sy/JIASidquRzIlxGO1NZfcBQVaHH
-SQKmfl0Zn2u7rPk2OuwhBNNWIxJwIaDvkiW3zQLWe5JaIx83/kHaL6JPmLVRD8ec
-TlyNNMyXSfvGszyWENundzac1Ei71AmePfn5/DwUlhUre0F87lsjh9WVg+VzQKmq
-hitFf/WSXPNVlXEf7sWxvl/hSwDF+8SSh+uXbV5apx9BqZ9sTDXuWolpMmu0/IaT
-ZiqaBPK/96ek/IKY+msGe5oCe39WwV/pueC1OKlq3doshcwAZat70zfQf4+21kad
-Z7+UKzs9YW441rKH2bbYM6VrXZ9SXOQvZrjkFNZgWDU5KbnaKOg90w9bZSCOddSa
-LfdlAGmV3bimG1r6fovjtnlQNKI3aswkq3PzjgMYQfTlJQo50WAZTjYgwOzkl60H
-E3Pj2CRQdaZCFV/uCyh9
-=b6fG
+iQIcBAEBCAAGBQJTbGT6AAoJEDZF8K7rm0r6Gn8P/RXV+o89UNI7T2du9UdeOLsD
+vEBhZCQ5ICJaRiK1P0XRQQ+9cK1d35feCW6UrJYAfFHVjIzGWofNwQzqayXkj/Hx
+IEWi0NpHeBTFedFd0oONlhBYXiy2vfri3F/jNYRl9eEwVwujhLN3zrfi40jjd8m0
+Rc5WoryoKG3iJHSIT85isd/WpQprxD42/V+Qhq06RRHr4ReEmS9uP7kzwOBi5YD+
+mfWaLE5/K724g7M7oFu1zXWb60vDrW+pfyS3BmVyrLmzCo5goQlwkk1MajV07++n
+eINYQBBRT/noNqfbmZfPcqJC5rb6cVdkr6IzXlXpxpIysaOmBdPZ5REDkfHHG2tp
+M0JML/EdXJ5Tj13aIgmrmGaU1OEP8y3rseM5W/Oxz1NTnFhkxnlop7YLoQYll6iQ
+hTcA0FAdc7D99KMr+XCWVTqst1AGsNbZYAa6Pni/MaO5OrVgP0SGxvQr5rgP5ULz
+TR4TUOo5fC9p3MHCor9XkaIAY+jxEBML8X53GCtjRR79cYZUDgv5sVe6gdGXCN3v
+qdEkFsw1cIHQPukB1QaLG1K4fibVki7YVntFZZbO6FOo7mldRAXOYtMKp24NTgvW
+go27UD0i5YdoosI8lTWHrTtBpYwSmLG6YvYX/XEqCHpAOWTwbNvCqRs8iU5Zu+az
+2nSOi+SGdH3ZS6mm7zqw
+=8byA
 -----END PGP SIGNATURE-----
diff --git a/net-irc/znc/znc-1.4.ebuild b/net-irc/znc/znc-1.4.ebuild
new file mode 100644
index 000000000000..1907d5fe4b57
--- /dev/null
+++ b/net-irc/znc/znc-1.4.ebuild
@@ -0,0 +1,165 @@
+# 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.ebuild,v 1.1 2014/05/09 05:17:38 wired Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_2,3_3} )
+inherit base python-single-r1 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 )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	tcl? ( dev-lang/tcl )
+"
+DEPEND="
+	virtual/pkgconfig
+	perl? ( dev-lang/swig )
+	python? (
+		>=dev-lang/swig-2.0.8
+		>=dev-lang/perl-5.10
+	)
+	${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 \
+		$(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
+}
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index 2c4f618a5692..614e628e3ff8 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.8 2014/05/08 03:28:36 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/znc-9999.ebuild,v 1.9 2014/05/09 05:17:38 wired Exp $
 
 EAPI=5
 
@@ -94,7 +94,6 @@ pkg_postinst() {
 		elog
 		elog "Run 'znc --makeconf' as the user you want to run ZNC as"
 		elog "to make a configuration file"
-		elog "If you are using SSL you should also run 'znc --makepem'"
 		elog
 	else
 		elog
@@ -105,7 +104,7 @@ pkg_postinst() {
 			elog "Run 'emerge --config znc' to configure ZNC"
 			elog "as a system-wide daemon."
 			elog
-			elog "If you are using SSL you should also run:"
+			elog "To generate a new SSL certificate, run:"
 			elog "  znc --system-wide-config-as znc --makepem -d ${CONFDIR}"
 			elog "as root"
 			elog