From 30c53e395853f5bfe805a1e429fcf26666eed8f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 17 May 2018 22:49:47 +0100 Subject: gentoo resync : 17.05.2018 --- net-irc/znc/Manifest | 11 ++- net-irc/znc/files/README.gentoo-r1 | 4 +- net-irc/znc/znc-1.6.5.ebuild | 4 +- net-irc/znc/znc-1.6.6.ebuild | 2 +- net-irc/znc/znc-1.7.0.ebuild | 152 +++++++++++++++++++++++++++++++++++++ net-irc/znc/znc-9999.ebuild | 19 ++--- 6 files changed, 172 insertions(+), 20 deletions(-) create mode 100644 net-irc/znc/znc-1.7.0.ebuild (limited to 'net-irc/znc') diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest index 5394bfee16a1..c34452aeb01a 100644 --- a/net-irc/znc/Manifest +++ b/net-irc/znc/Manifest @@ -1,5 +1,5 @@ AUX README.gentoo 768 BLAKE2B 83e7cdf538b89a8ef6ab242c9f1d5b01dd5a57aa4dc5b4f1b96998fbe0e01fb554c2d6de02fc552a1ac4ab26584a7fa14c19a96b4eda1ebd0367b68f965c2402 SHA512 627d3a8291e228fbeb783e61f46fe82f45ebc2a3647962c9bda150651d9bcadef699b6318083fc2396e6acc988ddf0ae1c01694e618d099591fa0db0258879d6 -AUX README.gentoo-r1 524 BLAKE2B b5910b0dddbaf94969ecd94d5e51f811320716577194df61b8bb2e8ba3152e7aeee9e2761deb768900af22264b9b37331b8fdce1d6e4d0a699e9eae92239d716 SHA512 522956f11a2579f163879e18aeea31b4f74a092e056cceed3526948f511c545d12a5411932cdb94b547f240522691a13fad89fe065d431c11922eeee232a09be +AUX README.gentoo-r1 530 BLAKE2B 5feab666142884c67c3c1a51322bb614bbdbaa453a4b6a4eb17b9fe774e4a4b188471a449f2cb5a1d07845a02a5eb15f2fad08958a839306d2029f56e8306543 SHA512 d5be4c0fc0069e6e8c6bf92f281034a603d6041f2b9a54d4fa97cae662225095d4473f54c4573141396ecccf369158f6c0986cafb9c39837edf9ab15200c8e18 AUX znc-1.0-systemwideconfig.patch 4252 BLAKE2B 432e232fdc8df1f13134a6e5f4d75bded260cc0b3beb1d611e93b98c840c59cf9800697c096dcb5d887ea017afbb693ea0c6fdf20afb317126eb8116043f1031 SHA512 4527317f8b45c77e329167cedd792eb7886b85eeb9cb0b39f7bb117edff9bdde406d3fc4aa81410a3b1f9f7957e8ac312cdd168469fdaefd234ddbbae279341e AUX znc-1.6.1-create-pidfile-per-default.patch 650 BLAKE2B 1316a818971396db3f2fea706afe57435a176db0f47e0e05fd5c53eeff9c5dfb2ffed201b75cd0bc9edbc521a962cb28ac1b8ac11d69729a41a1d01e3b7cd6ae SHA512 2e2342c8f87a58cd1703f19d3d76f58ac4c92a049de5b342dd46c2476a1344cbb9f85743fe387713a2465006f71f1379951d7f3770019f1867544b6705e0e8ec AUX znc-1.6.1-systemwideconfig.patch 8079 BLAKE2B f0ae13248ba1f49a8f4c7e49ea06c1107ebefdb916d09f8e45f21368f194daa33e0edd005595c9eb36014dab20e3a40e4fba13ec531fe40a3a18d71cc6183ebf SHA512 295a08dd5ce43b217e816148e272b722dff1a956ccdb5e58b0d337b7929a2bdae4e017ec686e820f89e53b310dd86ea8668095134d9618e5552ec323b83e624d @@ -9,9 +9,12 @@ AUX znc.initd 810 BLAKE2B 1d4ddc2b361e5391eafd4b8318b665e2427514f87c755839e167ca AUX znc.initd-r1 914 BLAKE2B df6854929c0dbddc2fa75dec0b5b4103ffc9c6a6d9de05c9f04c0d36a4ffff28e834e42b22c363e24be03435088b2fa4428486c08adedb12ff3b484445545b0c SHA512 01f44ab51f6fa29383b4a4bc6e5f19928ebac6b32f73fb96906113596a904324dd53ef9dbb895a8dd29028f3523e6f7285d2d5b2ee43058fc017f0b47ae788c1 AUX znc.initd-r2 952 BLAKE2B 81346bf0a1581543683eb5c125b29474c0bc01b8aee11c036a134c5a01042059564f2982aaec65715ac0a2c87b64fcd9746464148a81daeee549f4228d6ff55f SHA512 c3d676796aaa485dcaebee0fba58a8f86560cd192e0e2ccf06f58346c1368f58aa5be1c1e5160f8105e3dc5c684d3d1f82eff6a4d7b87c07f11450b72288727f DIST googletest-release-1.7.0.tar.gz 468653 BLAKE2B 8dfca8b79dcd7b64ce84bad11ee68c549f4fe3dff7638ed1d845af4a7f754ad5df782d2cbebdb9fecfda2499dae6585e07cda7a8c8c454f0b70723d5c9578aa4 SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc +DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d DIST znc-1.6.5.tar.gz 1470681 BLAKE2B 9de0b211280489423bc2894d0e76d7276aa42428d07d64516372a9ca6d1616db1f27c0142b54160c61cbee89d65ceadf941d001319254dbff9eb5b016988482e SHA512 d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626 DIST znc-1.6.6.tar.gz 1471612 BLAKE2B 8bd977a95417c4259e9f38759d838f55a146f376dc8bb6230ab6e1b698fb7c9e060cbc237efd4e836961314abab56cc02e7c6bc74e40bad17abaf06e47fbb516 SHA512 cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7 -EBUILD znc-1.6.5.ebuild 3473 BLAKE2B 621f5dee4eddcd369a6d99bbd8d26398e6464b2c377a7b9fe2d89db41e5fbf2fbd640c13a1292bc1e12b4119736ac6933643ea6d7be03cdb4dc32db4a4594997 SHA512 5360728c9eed15ecf686128fc9553627615dbb8b5db1662a39fc0d7da4587cb4980b617de2660efa5b0bdfe7cdbcd7e0defccc7359c4f27b4be0dd82d8cf3672 -EBUILD znc-1.6.6.ebuild 3472 BLAKE2B c84bd547203c288fa193680a08afdb62c4772d0c8197b00f8d911393e4eacc7d7f250ed006a3e16c6386cae74985c3e06137bf076fb75f762a38baa333b9e064 SHA512 9e2ca907c42708972362794e688d93397620eaed27d1a3f8d09c96a621210535bdba74bec4ed13af9087082c6458e69aea4567c4f09bf27f378cfcc900448e30 -EBUILD znc-9999.ebuild 4235 BLAKE2B 98a1f0d9b72b054fe0f45ebaa07260bc1e06498c2e12500ec1ddd460f7f81d781ca4f7171e23f91d199a6c4ab1932057132e294f54076b0d70f4c02a19d1f728 SHA512 6d777a2a8ad2ed5010a41e5095656795e293d9e112f5336f46fe744c6eb93e0ff8c5b55cb17c7bb28c5c17623389829e6eeff45691ad6f9452f8f253e5016249 +DIST znc-1.7.0.tar.gz 1853666 BLAKE2B 3e519d4005a10a9a5329f22ab6abbd19dfa2c7cecb949c138bc72909eae8883576fc0352e3ac46b852b8c58f038150419720aa48791a1339b004206f3afc20e9 SHA512 718dec65dfa2374c568b2694e4faef1f8cf313ae96d171e2263656e077e0fae5f8037c69a23ae33f4ea314ac6e15480c7dccef73ad3ac9324eb79caca622d54b +EBUILD znc-1.6.5.ebuild 3474 BLAKE2B fb127e5cb20f375da773dc5bf628ba6c4a4d45b408fe5f975768999c82a93844b2091511a90d694438743a0f165fb4afd1c774358fec09561be3fae64085715c SHA512 7a4c7f7d30eb63273fa75f6b925f11b2f426afea29de82dd1b33fdfcdaba911cf5172a564e230fc50d0a97c769389b963609c59169783f7a5354bf71ced2d0e4 +EBUILD znc-1.6.6.ebuild 3473 BLAKE2B 612f02114d9a058e109ee6f7185774bdc382e26abac72ff6b912997f1a8020ab67cbdd559739ffa5e7f121730d868ba54894fc333b63e41ae99706dca522d103 SHA512 06fc0f3897e7b2946f258cd48bc0a7ad689df339c2413cdddd7872a92774f17034d9d5f62e4d64222b62d07f1e321859428a05936f00775c63fa92805498456c +EBUILD znc-1.7.0.ebuild 4121 BLAKE2B 3a9610b2ba4ef4f74691ead7e156e66e74c7b0f8a30605dab3a9ef81ecba709aeb23631a415bc89a3373d44b04d3749f8591afa70c0415cb87590675abf8a8b3 SHA512 58cccf6867a76bf08a67bb724397d9b1c0be7c0522dfb2b170fef6156c63af5138eef90e2037b721c5cc6bccd9fcce7c85758b846c7a4acef44df814e5075875 +EBUILD znc-9999.ebuild 4121 BLAKE2B 3a9610b2ba4ef4f74691ead7e156e66e74c7b0f8a30605dab3a9ef81ecba709aeb23631a415bc89a3373d44b04d3749f8591afa70c0415cb87590675abf8a8b3 SHA512 58cccf6867a76bf08a67bb724397d9b1c0be7c0522dfb2b170fef6156c63af5138eef90e2037b721c5cc6bccd9fcce7c85758b846c7a4acef44df814e5075875 MISC metadata.xml 757 BLAKE2B bbc8339f0d871c55ce85cee29b4217ec41dc56c835d1d332feecb98ff08f9297a9290ee9f217715832454a041bd372277ee6b7659d43d2ada9f778a29c32737d SHA512 fd055b958ea544d901a15bdf9f8af9ab437896f97d7fa76f84cb6eebfdf7b1de2e8f13d85757d8d4c7098fd6f2102b505084a8beb58156258aaa73367c479eaf diff --git a/net-irc/znc/files/README.gentoo-r1 b/net-irc/znc/files/README.gentoo-r1 index cbd565d3d964..ca41e4dac26b 100644 --- a/net-irc/znc/files/README.gentoo-r1 +++ b/net-irc/znc/files/README.gentoo-r1 @@ -10,6 +10,6 @@ configuration files: # rm -rf /home/$USER/.znc # chown -R znc:znc /var/lib/znc -OpenRC user may also adjust the location of the files and the user running -znc in /etc/conf.d/znc instead. Systemd user may have to overwrite +OpenRC users may also adjust the location of the files and the user running +znc in /etc/conf.d/znc instead. Systemd users may have to overwrite the existing unit file. diff --git a/net-irc/znc/znc-1.6.5.ebuild b/net-irc/znc/znc-1.6.5.ebuild index 23d86965db2e..20fc31e09572 100644 --- a/net-irc/znc/znc-1.6.5.ebuild +++ b/net-irc/znc/znc-1.6.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ SRC_URI=" " KEYWORDS="amd64 arm x86" -HOMEPAGE="http://znc.in" +HOMEPAGE="https://znc.in" LICENSE="Apache-2.0" SLOT="0" IUSE="daemon debug +ipv6 +icu libressl perl python +ssl sasl tcl test +zlib" diff --git a/net-irc/znc/znc-1.6.6.ebuild b/net-irc/znc/znc-1.6.6.ebuild index 0e053e7e5951..76b253fef239 100644 --- a/net-irc/znc/znc-1.6.6.ebuild +++ b/net-irc/znc/znc-1.6.6.ebuild @@ -11,7 +11,7 @@ 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" -HOMEPAGE="http://znc.in" +HOMEPAGE="https://znc.in" SRC_URI=" http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz test? ( ${GTEST_URL} ) diff --git a/net-irc/znc/znc-1.7.0.ebuild b/net-irc/znc/znc-1.7.0.ebuild new file mode 100644 index 000000000000..b27016716af6 --- /dev/null +++ b/net-irc/znc/znc-1.7.0.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{4,5,6} ) + +inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user + +GTEST_VER="1.8.0" +GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz" +DESCRIPTION="An advanced IRC Bouncer" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"} + SRC_URI="" +else + SRC_URI=" + https://znc.in/releases/archive/${P}.tar.gz + test? ( ${GTEST_URL} ) + " + KEYWORDS="~amd64 ~arm ~x86" +fi + +HOMEPAGE="https://znc.in" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )" + +RDEPEND=" + icu? ( dev-libs/icu:= ) + nls? ( dev-libs/boost:=[nls] ) + 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:0= ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + perl? ( >=dev-lang/swig-3.0.0 ) + python? ( >=dev-lang/swig-3.0.0 ) +" + +pkg_setup() { + if use python; then + python-single-r1_pkg_setup + fi + + 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} +} + +src_prepare() { + # Let SWIG rebuild modperl/modpython to make user patching easier. + if [[ ${PV} != *9999* ]]; then + rm modules/modperl/generated.tar.gz || die + rm modules/modpython/generated.tar.gz || die + fi + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used. + -DSYSTEMD_DIR="$(systemd_get_systemunitdir)" + -DWANT_ICU="$(usex icu)" + -DWANT_IPV6="$(usex ipv6)" + -DWANT_I18N="$(usex nls)" + -DWANT_PERL="$(usex perl)" + -DWANT_PYTHON="$(usex python)" + -DWANT_CYRUS="$(usex sasl)" + -DWANT_OPENSSL="$(usex ssl)" + -DWANT_TCL="$(usex tcl)" + -DWANT_ZLIB="$(usex zlib)" + ) + + if [[ ${PV} != *9999* ]] && use test; then + export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest" + export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock" + fi + + cmake-utils_src_configure +} + +src_test() { + cmake-utils_src_make unittest +} + +src_install() { + cmake-utils_src_install + + dodoc NOTICE + newinitd "${FILESDIR}"/znc.initd-r2 znc + newconfd "${FILESDIR}"/znc.confd-r1 znc + + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die + DISABLE_AUTOFORMATTING=1 + readme.gentoo_create_doc +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + readme.gentoo_print_elog + fi + + if [[ -d "${EROOT%/}"/etc/znc ]]; then + ewarn "${EROOT%/}/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 " ${EROOT%/}/var/lib/znc" + ewarn "please move ${EROOT%/}/etc/znc to ${EROOT%/}/var/lib/znc" + ewarn "or adjust your service configuration." + fi +} + +pkg_config() { + 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 enter to interactively create a new configuration file 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" + start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \ + "${EROOT%/}"/usr/bin/znc -- --makeconf --datadir "${EROOT%/}/var/lib/znc" || + die "Config failed" + einfo + einfo "You can now start the znc service using the init system of your choice." + einfo "Don't forget to enable it if you want to use znc at boot." + fi +} diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild index de34be1322ea..b27016716af6 100644 --- a/net-irc/znc/znc-9999.ebuild +++ b/net-irc/znc/znc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,13 +17,13 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI=" - http://znc.in/releases/archive/${P}.tar.gz + https://znc.in/releases/archive/${P}.tar.gz test? ( ${GTEST_URL} ) " KEYWORDS="~amd64 ~arm ~x86" fi -HOMEPAGE="http://znc.in" +HOMEPAGE="https://znc.in" LICENSE="Apache-2.0" SLOT="0" IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib" @@ -45,8 +45,8 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - nls? ( sys-devel/gettext ) virtual/pkgconfig + nls? ( sys-devel/gettext ) perl? ( >=dev-lang/swig-3.0.0 ) python? ( >=dev-lang/swig-3.0.0 ) " @@ -98,9 +98,7 @@ src_configure() { } src_test() { - pushd "${BUILD_DIR}" > /dev/null || die - ${CMAKE_MAKEFILE_GENERATOR} unittest || die "Unit test failed" - popd > /dev/null || die + cmake-utils_src_make unittest } src_install() { @@ -138,8 +136,7 @@ pkg_config() { 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 "Press enter to interactively create a new configuration file for znc." einfo "To abort, press Control-C" read mkdir -p "${EROOT%/}/var/lib/znc" || die @@ -149,7 +146,7 @@ pkg_config() { "${EROOT%/}"/usr/bin/znc -- --makeconf --datadir "${EROOT%/}/var/lib/znc" || die "Config failed" einfo - einfo "Now you can start znc service using the init system of your choice." - einfo "Don't forget to enable znc service if you want to use znc on boot." + einfo "You can now start the znc service using the init system of your choice." + einfo "Don't forget to enable it if you want to use znc at boot." fi } -- cgit v1.2.3