From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1530E139BC8 for ; Tue, 15 Sep 2015 15:41:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9059221C04A; Tue, 15 Sep 2015 15:41:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EBDE421C04A for ; Tue, 15 Sep 2015 15:41:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CC6D0340B2B for ; Tue, 15 Sep 2015 15:41:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24BD21FF for ; Tue, 15 Sep 2015 15:41:04 +0000 (UTC) From: "Julian Ospald" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Julian Ospald" Message-ID: <1442331618.e1db5127c88145aacde996fde3db6a2443d23284.hasufell@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/znc/znc-9999.ebuild X-VCS-Directories: net-irc/znc/ X-VCS-Committer: hasufell X-VCS-Committer-Name: Julian Ospald X-VCS-Revision: e1db5127c88145aacde996fde3db6a2443d23284 X-VCS-Branch: master Date: Tue, 15 Sep 2015 15:41:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6ad7afd6-b0f7-405a-8fec-196990f698bc X-Archives-Hash: 050f03ed41d20582fc2c1d5a6377bac7 commit: e1db5127c88145aacde996fde3db6a2443d23284 Author: Julian Ospald gentoo org> AuthorDate: Tue Sep 15 15:06:39 2015 +0000 Commit: Julian Ospald gentoo org> CommitDate: Tue Sep 15 15:40:18 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1db5127 net-irc/znc: update/sync live-ebuild * drop use of deprecated base.eclass * add missing dependencies * remove code duplication/dead codepaths * improve formatting * improve pkg_postinst message * use git-r3 instead of deprecated git-2 * use new init/conf scripts * try to use proper eautoreconf instead of './autogen.sh' * rm patch which does not apply net-irc/znc/znc-9999.ebuild | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild index 57071fa..cff81dc 100644 --- a/net-irc/znc/znc-9999.ebuild +++ b/net-irc/znc/znc-9999.ebuild @@ -5,20 +5,15 @@ EAPI=5 PYTHON_COMPAT=( python{3_3,3_4} ) -inherit base python-single-r1 user +inherit autotools eutils 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 +inherit git-r3 +EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/znc/znc.git"} +SRC_URI="" +KEYWORDS="" HOMEPAGE="http://znc.in" LICENSE="GPL-2" @@ -28,13 +23,15 @@ IUSE="daemon debug ipv6 perl python ssl sasl tcl" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" + dev-libs/icu + sys-libs/zlib perl? ( >=dev-lang/perl-5.10 ) python? ( ${PYTHON_DEPS} ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( >=dev-libs/openssl-0.9.7d:0 ) tcl? ( dev-lang/tcl:0= ) " -DEPEND=" +DEPEND="${RDEPEND} virtual/pkgconfig perl? ( >=dev-lang/swig-2.0.12 @@ -42,15 +39,10 @@ DEPEND=" 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() { @@ -64,11 +56,12 @@ pkg_setup() { } src_prepare() { - if [[ ${PV} == *9999* ]]; then - ./autogen.sh - fi + AT_M4DIR="${S}/m4" \ + eautoreconf - base_src_prepare + # build system quirk, it does not define AM_INIT_AUTOMAKE, nor + # does it have Makefile.am in the root dir, but we need '--add-missing' + automake --add-missing } src_configure() { @@ -86,8 +79,8 @@ src_install() { emake install DESTDIR="${D}" dodoc NOTICE README.md if use daemon; then - newinitd "${FILESDIR}"/znc.initd znc - newconfd "${FILESDIR}"/znc.confd znc + newinitd "${FILESDIR}"/znc.initd-r1 znc + newconfd "${FILESDIR}"/znc.confd-r1 znc fi } @@ -103,7 +96,8 @@ pkg_postinst() { 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 "Run 'emerge --config znc' under portage" + elog "or 'cave config znc' under paludis to configure ZNC" elog "as a system-wide daemon." elog elog "To generate a new SSL certificate, run:"