pacho       14/07/25 10:52:42

  Modified:             ChangeLog
  Added:                znc-1.4-r1.ebuild
  Log:
  Toggle configure option to install unit file (#517728 by Konstantin)
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
A188FBD4)

Revision  Changes    Path
1.77                 net-irc/znc/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/znc/ChangeLog?rev=1.77&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/znc/ChangeLog?rev=1.77&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/znc/ChangeLog?r1=1.76&r2=1.77

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ChangeLog   12 Jul 2014 10:24:23 -0000      1.76
+++ ChangeLog   25 Jul 2014 10:52:42 -0000      1.77
@@ -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 <[email protected]> +znc-1.4-r1.ebuild:
+  Toggle configure option to install unit file (#517728 by Konstantin)
 
   12 Jul 2014; Alex Alexander <[email protected]> znc-1.2-r1.ebuild,
   znc-1.4.ebuild, znc-9999.ebuild:



1.1                  net-irc/znc/znc-1.4-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/znc/znc-1.4-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/znc/znc-1.4-r1.ebuild?rev=1.1&content-type=text/plain

Index: znc-1.4-r1.ebuild
===================================================================
# 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
}




Reply via email to