| 1 |
commit: df0e4512f3ec5c66fff3425d07d3d4cdef9a8be4 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 2 14:14:36 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 2 14:15:56 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df0e4512 |
| 7 |
|
| 8 |
sys-apps/watchdog: [QA] Add virtual/pkgconfig to DEPEND |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
| 11 |
|
| 12 |
sys-apps/watchdog/Manifest | 2 +- |
| 13 |
sys-apps/watchdog/watchdog-5.15.ebuild | 17 ++++++++--------- |
| 14 |
2 files changed, 9 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest |
| 17 |
index b521b01b07f..8d7c98b5cbc 100644 |
| 18 |
--- a/sys-apps/watchdog/Manifest |
| 19 |
+++ b/sys-apps/watchdog/Manifest |
| 20 |
@@ -1,2 +1,2 @@ |
| 21 |
DIST watchdog-5.14.tar.gz 216384 SHA256 620b2f49e9879f2e85c73d4c1f422f9101e6b38e824fea2414befd8bb6866ad1 SHA512 ccfaca7a68a47cff42dbeae047dfa691e1cfc23851f9ca0634ea6315ff55a13cdbb0020bde7df38b702c82c0535ad41f520617dd639037e171701a6b0f8991aa WHIRLPOOL 5520e0a4970a20c25780d507260380acf2056828bad8702de98039876526c39a40f884eb1b684cf39386479e6d40c08f3134b138cc6caf51b4150289a364239c |
| 22 |
-DIST watchdog-5.15.tar.gz 228132 SHA256 ffdc865137ad5d8e53664bd22bad4de6ca136d1b4636720320cb52af0c18947c SHA512 a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75 WHIRLPOOL ebd7ee604ddbad856760949b16615693b1665289d57312f7dee10cea1d358dbd20f2beb2656e549a80c81ad08e5e6de8621cda3ad4eb696e9af7b63b8b4045b9 |
| 23 |
+DIST watchdog-5.15.tar.gz 228132 BLAKE2B 040badcf66f048e2873c335a4dd1b5dad6716c61534322c0c92dad2238049555af40e92612a260507fddd4c284d7ccb5d362dc1660084fd0a7db2c522b1ea323 SHA512 a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75 |
| 24 |
|
| 25 |
diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild b/sys-apps/watchdog/watchdog-5.15.ebuild |
| 26 |
index 887cff30080..1c38ff5e002 100644 |
| 27 |
--- a/sys-apps/watchdog/watchdog-5.15.ebuild |
| 28 |
+++ b/sys-apps/watchdog/watchdog-5.15.ebuild |
| 29 |
@@ -3,7 +3,7 @@ |
| 30 |
|
| 31 |
EAPI=6 |
| 32 |
|
| 33 |
-inherit toolchain-funcs flag-o-matic systemd |
| 34 |
+inherit flag-o-matic systemd toolchain-funcs |
| 35 |
|
| 36 |
DESCRIPTION="A software watchdog and /dev/watchdog daemon" |
| 37 |
HOMEPAGE="https://sourceforge.net/projects/watchdog/" |
| 38 |
@@ -14,8 +14,9 @@ SLOT="0" |
| 39 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 40 |
IUSE="nfs" |
| 41 |
|
| 42 |
-DEPEND="nfs? ( net-libs/libtirpc )" |
| 43 |
-RDEPEND="${DEPEND}" |
| 44 |
+RDEPEND="nfs? ( net-libs/libtirpc )" |
| 45 |
+DEPEND="${RDEPEND} |
| 46 |
+ virtual/pkgconfig" |
| 47 |
|
| 48 |
PATCHES=( |
| 49 |
"${FILESDIR}"/${P}-musl.patch |
| 50 |
@@ -23,18 +24,16 @@ PATCHES=( |
| 51 |
) |
| 52 |
|
| 53 |
src_configure() { |
| 54 |
- if use nfs ; then |
| 55 |
- tc-export PKG_CONFIG |
| 56 |
- append-cppflags $(${PKG_CONFIG} libtirpc --cflags) |
| 57 |
- export LIBS+=" $(${PKG_CONFIG} libtirpc --libs)" |
| 58 |
+ if use nfs; then |
| 59 |
+ append-cppflags "$($(tc-getPKG_CONFIG) libtirpc --cflags)" |
| 60 |
+ append-libs "$($(tc-getPKG_CONFIG) libtirpc --libs)" |
| 61 |
fi |
| 62 |
econf $(use_enable nfs) |
| 63 |
} |
| 64 |
|
| 65 |
src_install() { |
| 66 |
default |
| 67 |
- docinto examples |
| 68 |
- dodoc examples/* |
| 69 |
+ dodoc -r examples |
| 70 |
|
| 71 |
newconfd "${FILESDIR}"/${PN}-conf.d ${PN} |
| 72 |
newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN} |
Archives