version bump, updated live ebuild

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

4 files changed, 197 insertions, 26 deletions

diff --git a/net-irc/znc/ChangeLog b/net-irc/znc/ChangeLog
index 5dd4c4ad7ceb..7c281cbef6d7 100644
--- a/net-irc/znc/ChangeLog
+++ b/net-irc/znc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/znc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.68 2013/06/04 12:31:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.69 2013/11/14 11:35:35 wired Exp $
+
+*znc-1.2 (14 Nov 2013)
+
+  14 Nov 2013; Alex Alexander <wired@gentoo.org> +znc-1.2.ebuild,
+  znc-9999.ebuild:
+  version bump, updated live ebuild
 
   04 Jun 2013; Agostino Sarubbo <ago@gentoo.org> znc-1.0-r2.ebuild:
   Stable for amd64, wrt bug #471738
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index f7bd1983b019..ff659819458e 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,30 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX znc-1.0-systemwideconfig.patch 4252 SHA256 1ddd5e95b299ef3c2293ce89829bae290a5c8fdc8e260ff09ae7f22264b8fbc9 SHA512 4527317f8b45c77e329167cedd792eb7886b85eeb9cb0b39f7bb117edff9bdde406d3fc4aa81410a3b1f9f7957e8ac312cdd168469fdaefd234ddbbae279341e WHIRLPOOL 3556fef6a5a840657ed50e5e283d913ab441c73b3becdfd5e05661dd312cf9670677407734ec5ba8d4254a1e22a6d3274563ab8ff81b04b16fadc9c16029e933
 AUX znc-1.0-webadmin-null-pointer-dereference-fix.patch 1620 SHA256 2684bed1046b5a1d46f7f8aaa5deb75d051ce7b79b9d8089502fc6726036252c SHA512 60a7b960781c5fd0a06f0da3ef69fce821cf001c75a6c646cf87c16a22493a73adfef2e5bdf9bc350481b34a650dc1e9264502db90dec75394e58e41ca480d8f WHIRLPOOL 7ed241a4575adbebc3d83b5b6e2ad4418eb2a1cccd35b4abfb8821d4f7370203a126bdab6c8023ea2a6eb3b3bf2f5335007f07ab724940558dfe43f3f779b8ed
 AUX znc.confd 123 SHA256 be3155e79e6ed13be88fbf9d99f6889b3ee8425837120c448c827b8302672063 SHA512 352f18d64cbfbd5970c859f2ae2290c0ddafcbd8f1bb5d74f33976bc8388f65a75f8a9a73a093fbac12f2d243d4bcf74380bbb3aaab8d68f7bf4eab7ce3bea46 WHIRLPOOL 24e8272f1d94ff39cb748c9c280761437e2f6527ffa26e4972d83c99cde62e2f70d0c99639f4a8aabb4464fd85ee4856eb8086d3196e12286e3989d8e19c544b
 AUX znc.initd 910 SHA256 9df9e738efca0e6ace045bdb6a1419082408119ba92c032566c6d4a61b1844b5 SHA512 0d1b9bf71cde1b803e9deddc64006528778dc628603bb4ba8cca17098dcb6b8fc34dcb43eca7de7dec61ce84832dd07d76c7ccb2d9175f859d5aee2a349e8045 WHIRLPOOL 0640b8c30c7ff64b772998c86f06fcaae06759a5af7e0384a5ffbd1a1c4c85923c9d87362720a2ae6fb5a164d1a298d12e4493617a1e66813f3dfee0b40d04ce
 DIST znc-1.0.tar.gz 1222361 SHA256 a85539da42697b26e4d46205def36bb799f83d6aeef401d53c49ee674142062a SHA512 4219cdd32296e5851f6cd99a8ac6e14d2579df10e8e111bb09d6c3789e400e2fcdc173968afd54808d286f0fb4945aa57d2d0f3b62a20e761de64500c8938e35 WHIRLPOOL 864c45762f8508c8d724246153345554b660336789a5340e9633b83aed249c901f976d2aa6207a82ce8e7836d680fc30fca03cafbc8942932745c6f1584e99cc
+DIST znc-1.2.tar.gz 1235150 SHA256 d9a2cd2a484ff23e6fc9cbde8dd8a43efbcd8d288afca7b1268914ca0d18701d SHA512 dff24e56127e5599d64b4c62de967d5d48d8ebf23ca8597d33bf0b3622640512db7a462bfa7c2031cd8307f402bab8efa345f6d1fc813e78eb0dcae581de3cf7 WHIRLPOOL b0810eb66e63be762f74f04eb2289e3634b18d6ecbd36d55f6a6772697e0397637d59b9ea01eaf62ef1cbe5f6e65b06432a254f4ada35194aa06b65c4a2f7994
 EBUILD znc-1.0-r1.ebuild 4005 SHA256 ac5a45427e1abadb896d54364a263bb7fab26b936b0b9215e123b1b0a91ddc39 SHA512 52b8c3e0dc73e7fc5b592443b43a279ca65f906dc49a4d3dc8c368465cfb16610c8c3d01f0806b7afe27d25561375379549d59a052adc13592fb1ea197219e47 WHIRLPOOL d876c45bdd8bab52f8cd6120fd7552cafcd9d711ad3bebef11ada750f43c0601ef913bb0def531d22aab491d751b067489e60b18a03d73f98a57a68218f3c7c2
 EBUILD znc-1.0-r2.ebuild 4069 SHA256 16b45848820b3015557ca71659ef9a3a4d7eeb05c8341c0add0c66e1def7dda1 SHA512 bc2553ec94e31c061fb2cf79b8ba1a1883ba617a9c3270bf77c5cb4e9677c386d3aa69bacb312626817bd0240473c2937e22ced2ebc464dc803b8cf09247bd7c WHIRLPOOL 134fce69e6bd20d25b225f978a7d754bad45bc39b6c59b14e58764f0dfc1f86de803a24d5567da7083169f0a41cc78b6ce03bf7a0449ab0c373bbd3966a41e8d
-EBUILD znc-9999.ebuild 4247 SHA256 908a281c271adb7f4ea0f0075ea62a256842f38d95e5d88d1e16d54daeb55e21 SHA512 572a8acbe2f370252ede90514de11cac4c945be1cde185914fc1697aff3ddbebcbfe302566c400e50af963dbf357e562bd9d05dd511e93e8d9fed8bf4781577f WHIRLPOOL 10239f774cb226092e32f4b82c2928befb30aecd1720f068217b539420810974f08f9c4ec4cae1d4b578941c8e04b1c0c294b54f3dbd69f8d47bc373ef2140c6
-MISC ChangeLog 9956 SHA256 e1bf1257ce00d794e449eca4f2fe32e490658e9190820efd819fcccc1822f288 SHA512 9416947ecf8e050af00d0d07f41265fc99baa279be84cea3d5798ba946e1753710f4eafc130a8226da3ba7aaf5cb60c3a413485121ea247f5b0795ccd55d82fa WHIRLPOOL 585bc2f96900a116d8060ef4db22e6e0a4b7add0244cafa8f86ff6a29712a3c10071d3bd0d10b1126db4a9b6f1164fac7c3445170f6ce0a9907e0a9d7206e06d
+EBUILD znc-1.2.ebuild 4222 SHA256 5253afc49362d9388ca6763aa910aca0875b94e63b382356b4bdcfa554138e7e SHA512 b9be656963356d9b881d57183fbcf84533f5eef81302f7f0043a7c0e522d9f97ea33a687e862bec84f478d7d2135173111dd89a7d93d45bbacfd4f75de5bc107 WHIRLPOOL 5fd08de9ebaf2fb1a05d594d155b7a5eef05a1aa33ca9df3a6aad4257a9d7df65bd29ec61389fa79b53075463811494004f0102ff03c5bfa30a0f9eb24336cab
+EBUILD znc-9999.ebuild 4223 SHA256 99bb226b0cbd24bfb41334acc50e42e7fac086c82f9867b7d1fc66c9148ea31f SHA512 1eb70d8a34093d4c16b2fe81d044d60555e0673785b2913d1f5fda874d395df4d2ac4ab206126802c0d778b05e3f323362a6f7347045acdcac30dd2b104a9501 WHIRLPOOL 3f802236a112e6ec986277e7ad1f9db6f75e00294043d394e9ea06259d4dd171bf3f2f98d7c0ef3a4c9ec025354742dd68cb8d3cf9ecd0b2afd6d0d15c65f3b4
+MISC ChangeLog 10104 SHA256 5132e36543f01ed88171cbbc37b7a6a7aeab7d523775e56804000e76332a2af2 SHA512 481d94387781c1859fda4e3fb36775a069ad0083229940b554d16934640ae56a6726c887367344bb26b3ed63bff45273efe4c561c737680fc3129a17ac8c959d WHIRLPOOL a31d25eee70e038c28688f24f0acff200ac2a917323781226c61bc79b0e9d03525bf674456c24fa39ff110bea9895e8d729cb8ae2c2a95b911629bb4bace0ee2
 MISC metadata.xml 387 SHA256 864beefb6d435cf17de251ce82df948cb7af8181bd1ddbdf0d18106f0cb042ed SHA512 37de68d3d350980d0ced5ee9f46e6a6422a4341ca8aeba05fd6eb539081935c26feafabdb103e44470b5da76ef73fd08018662b9d85579b00395292a5bf77054 WHIRLPOOL c2ca27a67d989fc4b0b6f346409a5bd756400be9c4c3616ea548e4caff577c060508e3edc546c9b341d513ba9afa42e3dcec0bd4b40c416177c09e75fa8a3491
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRrd4mAAoJELp701BxlEWfjvUP/1KgkWDmC0B2m5T49fBKqbGT
-eBKQ7esgYDyuwtGWbcXsDUeNDGopcpdT/S4Mv0a6DnKHz7k96Mkhk1GT2FZwK4/q
-wZ2L31/xu2kIuvZCbfmReTyuIZf8dSxeAzSYe8P+Xd87CHQ9DOdU5OlIE3TTMeKq
-qKPuzDfAEjrID52dgb5x1UMi5v/T25PPAlPgDCCfQ2CIqkiP/3r62QVhA8QJkraj
-UhTtp70wpAii8eTPlsv9MNNwnUA51kogNM3SbLVqaAKuu8OXQ+d5KVt7Am7POyDb
-dUl2AvdVbfeHN4K0Oa/qD26A8dDr8S0RIBX6L+NltUOUWno2fNfz/AE+yEzhSay4
-0cOWrzZ9decux3XG9Zj6sXqcp+PiwF2YREAoZoaqx8OwQ1ULRzHMeeDK31Unv5Oj
-0/TGcJBMk8MT7zP7Dmm3Vgp18uOZ874Ir+maCfo8sImbto1gA4Udl1QCWGqwjxQc
-lA5xU9Nru03RRi909yG97bndECCs6Wiv213KDL7a7k+KROQBnYhTtQqzQ9sKVf9W
-B/mMudPp4lnkesIUl4n+E4aBorFY5FQgq5smWpKdX9AHjELrw7KjnZsKWTv8OXwZ
-YO8Y9QFR9DVEReoWOqLHrqLs3EE0++DmzRywQcUM9JQOPaCp/Vxf44BB+OV0g3O2
-Gqahw58xONwNEo+KS9HQ
-=sG8Y
+iQIcBAEBCAAGBQJShLXzAAoJEDZF8K7rm0r62Q8P/A0Slx/meYlB+dxHly46is71
+o3REBkxh0r4tM2MK4ldW4bza/LADkSiyMD/nRncNBkTQM0Y8opoVx1dKOWKhj/bw
+H/+ze7pDGrpRSBAgB87S6ckUidnb9OSeDZUB7k65oDijbmVuQiV1o9gkSib+FZ5y
+pV5Er7n8ZbKyz/z4PmHaX8nFeclC2JrQwfG1QkXEWX6F1j9ND695cKJvCTxsGChI
+InLRsYSLO/PCjjVKFPuwi1ciB+61Z1yUFccuJsj4NUVLP6WrDJ9mvxRw1EWD+kDy
+BqO+mmqBigaAZkjSepsovGTeQIhP7irQmXft4K9w0rSZE0TPqy362WOoxpfEO4A+
+HMzrPnORoXgXD/mPDDfxYmcEobwapj0qCGdZiOho3nZ20C5C4nwA0J4VB5shvMwU
+fOqE67VSGq4r0QQM+eSXNsfd9xvpb1SXfAEXAtFvHUBpVgGw6CeCkrQE7IX9mxH0
+760jYRaPh/K05iGCV7Nok9nkStcO+rXvcOHo147iMIZxuYjsds1sm+RZWgmuj6k0
+3DP+jhGQ98mFbn4YbkVU6PYq//bVKBjeXfRULWx2lPUabKGBvYPG86hJ79ZyYTwf
+X1PK6fiecIlEgrYs8qttu+P/JC1FUHVyXfUsPwbyhSZSNtEiobLuWsOmTIZaEuQU
+9PewBRngZjBAM5wv7SKQ
+=asOE
 -----END PGP SIGNATURE-----
diff --git a/net-irc/znc/znc-1.2.ebuild b/net-irc/znc/znc-1.2.ebuild
new file mode 100644
index 000000000000..0d10a2c9bc37
--- /dev/null
+++ b/net-irc/znc/znc-1.2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/znc-1.2.ebuild,v 1.1 2013/11/14 11:35:35 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"
+
+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 "If you are using SSL you should also run 'znc --makepem'"
+		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 "If you are using SSL you should also 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 59dc71333cf7..d0fd78f488ce 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 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.6 2013/02/02 02:48:24 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/znc-9999.ebuild,v 1.7 2013/11/14 11:35:35 wired Exp $
 
 EAPI=5
 
-PYTHON_DEPEND="python? 3"
-inherit base python user
+PYTHON_COMPAT=( python{3_2,3_3} )
+inherit base python-single-r1 user
 
 MY_PV=${PV/_/-}
 DESCRIPTION="An advanced IRC Bouncer"
@@ -35,7 +35,7 @@ DEPEND="
 	virtual/pkgconfig
 	perl? ( dev-lang/swig )
 	python? (
-		>=dev-lang/swig-2.0.2
+		>=dev-lang/swig-2.0.8
 		>=dev-lang/perl-5.10
 	)
 	${RDEPEND}
@@ -51,8 +51,7 @@ CONFDIR="/var/lib/znc"
 
 pkg_setup() {
 	if use python; then
-		python_set_active_version 3
-		python_pkg_setup
+		python-single-r1_pkg_setup
 	fi
 	if use daemon; then
 		enewgroup ${PN}
@@ -73,7 +72,7 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable ipv6) \
 		$(use_enable perl) \
-		$(use python && echo "--enable-python=python-$(python_get_version)") \
+		$(use python && echo "--enable-python=python3") \
 		$(use_enable sasl cyrus) \
 		$(use_enable ssl openssl) \
 		$(use_enable tcl tcl)
@@ -81,7 +80,7 @@ src_configure() {
 
 src_install() {
 	emake install DESTDIR="${D}"
-	dodoc AUTHORS README.md
+	dodoc NOTICE README.md
 	if use daemon; then
 		newinitd "${FILESDIR}"/znc.initd znc
 		newconfd "${FILESDIR}"/znc.confd znc