From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 877E31396D9 for ; Sat, 2 Dec 2017 14:16:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 803FDE0DAC; Sat, 2 Dec 2017 14:16:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 52045E0DAC for ; Sat, 2 Dec 2017 14:16:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE6AC33FE2A for ; Sat, 2 Dec 2017 14:16:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F04BAE73 for ; Sat, 2 Dec 2017 14:16:07 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1512224156.df0e4512f3ec5c66fff3425d07d3d4cdef9a8be4.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/watchdog/Manifest sys-apps/watchdog/watchdog-5.15.ebuild X-VCS-Directories: sys-apps/watchdog/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: df0e4512f3ec5c66fff3425d07d3d4cdef9a8be4 X-VCS-Branch: master Date: Sat, 2 Dec 2017 14:16:07 +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: 126759fa-848f-445f-9461-92dbf0c80973 X-Archives-Hash: eb6f6bd8217204db156ddeabbf0b76a4 commit: df0e4512f3ec5c66fff3425d07d3d4cdef9a8be4 Author: David Seifert gentoo org> AuthorDate: Sat Dec 2 14:14:36 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Dec 2 14:15:56 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df0e4512 sys-apps/watchdog: [QA] Add virtual/pkgconfig to DEPEND Package-Manager: Portage-2.3.16, Repoman-2.3.6 sys-apps/watchdog/Manifest | 2 +- sys-apps/watchdog/watchdog-5.15.ebuild | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest index b521b01b07f..8d7c98b5cbc 100644 --- a/sys-apps/watchdog/Manifest +++ b/sys-apps/watchdog/Manifest @@ -1,2 +1,2 @@ DIST watchdog-5.14.tar.gz 216384 SHA256 620b2f49e9879f2e85c73d4c1f422f9101e6b38e824fea2414befd8bb6866ad1 SHA512 ccfaca7a68a47cff42dbeae047dfa691e1cfc23851f9ca0634ea6315ff55a13cdbb0020bde7df38b702c82c0535ad41f520617dd639037e171701a6b0f8991aa WHIRLPOOL 5520e0a4970a20c25780d507260380acf2056828bad8702de98039876526c39a40f884eb1b684cf39386479e6d40c08f3134b138cc6caf51b4150289a364239c -DIST watchdog-5.15.tar.gz 228132 SHA256 ffdc865137ad5d8e53664bd22bad4de6ca136d1b4636720320cb52af0c18947c SHA512 a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75 WHIRLPOOL ebd7ee604ddbad856760949b16615693b1665289d57312f7dee10cea1d358dbd20f2beb2656e549a80c81ad08e5e6de8621cda3ad4eb696e9af7b63b8b4045b9 +DIST watchdog-5.15.tar.gz 228132 BLAKE2B 040badcf66f048e2873c335a4dd1b5dad6716c61534322c0c92dad2238049555af40e92612a260507fddd4c284d7ccb5d362dc1660084fd0a7db2c522b1ea323 SHA512 a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75 diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild b/sys-apps/watchdog/watchdog-5.15.ebuild index 887cff30080..1c38ff5e002 100644 --- a/sys-apps/watchdog/watchdog-5.15.ebuild +++ b/sys-apps/watchdog/watchdog-5.15.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit toolchain-funcs flag-o-matic systemd +inherit flag-o-matic systemd toolchain-funcs DESCRIPTION="A software watchdog and /dev/watchdog daemon" HOMEPAGE="https://sourceforge.net/projects/watchdog/" @@ -14,8 +14,9 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="nfs" -DEPEND="nfs? ( net-libs/libtirpc )" -RDEPEND="${DEPEND}" +RDEPEND="nfs? ( net-libs/libtirpc )" +DEPEND="${RDEPEND} + virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-musl.patch @@ -23,18 +24,16 @@ PATCHES=( ) src_configure() { - if use nfs ; then - tc-export PKG_CONFIG - append-cppflags $(${PKG_CONFIG} libtirpc --cflags) - export LIBS+=" $(${PKG_CONFIG} libtirpc --libs)" + if use nfs; then + append-cppflags "$($(tc-getPKG_CONFIG) libtirpc --cflags)" + append-libs "$($(tc-getPKG_CONFIG) libtirpc --libs)" fi econf $(use_enable nfs) } src_install() { default - docinto examples - dodoc examples/* + dodoc -r examples newconfd "${FILESDIR}"/${PN}-conf.d ${PN} newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}