diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-27 12:48:57 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-27 12:48:57 +0100 |
| commit | 70b82ae359a5538711e103b0e8dfb92654296644 (patch) | |
| tree | 8412b84ff9ce02a22be5251052b00feefe1d5b70 /app-admin/gkrellm | |
| parent | 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (diff) | |
gentoo resync : 27.10.2018
Diffstat (limited to 'app-admin/gkrellm')
| -rw-r--r-- | app-admin/gkrellm/Manifest | 2 | ||||
| -rw-r--r-- | app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild | 26 |
2 files changed, 13 insertions, 15 deletions
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest index 1dcca2a5129b..6b47cdfe0ece 100644 --- a/app-admin/gkrellm/Manifest +++ b/app-admin/gkrellm/Manifest @@ -7,5 +7,5 @@ AUX gkrellmd.conf 250 BLAKE2B 2b0cfcd1940cd695c67db32c13bbb7f372936b1f88938a2e43 AUX gkrellmd.initd 345 BLAKE2B 922967be33dcc733c55cfffa59addc01bbe2ba0298be14541925e88bac16f2310f226448545263527a96499454007baf04272fc5ce136628f03587bbc322f74b SHA512 197ad175f8e8afbc9bb81957d594ee2190c7fb3e251cfda5e987c140174a6a08e485ce2fa4e3d7a21b9bb19979c853e4c04f33021beb497f084f0ddfb2c725ba AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d DIST gkrellm-2.3.10.tar.bz2 782794 BLAKE2B c0aac7df866d40c79667551ca4b25346da4267a0aad8853776425a08097dcfe3a24082e7e5d17db6d3936b59d10c29afa11e8a425319c19696141c02f7d95f25 SHA512 3ae0baa0d51729e1bac7b8f10e008bd7ed9d93d48cd894630e3a027565266e6458df0dcb3171fb271ca7766f4030149e3e6aa234ec191e8e223ae4dee1feb295 -EBUILD gkrellm-2.3.10-r1.ebuild 3251 BLAKE2B 86226ac8f2db195390acfcd5813103b82ab97e1b54771dc413535554d24444549b1d31241e5861915fe58f7e0aefed2d4e259cdb785920b69c7e8924fffbe62c SHA512 e2195ee72694798f537cb04c5b71ec6600bbfca10a6ddbf2a72d4427dae9a3f5e46093e35caa764fc937ecffdcd51394508a4a726c431ea14f666c08f6b4a822 +EBUILD gkrellm-2.3.10-r1.ebuild 3341 BLAKE2B eca313f344bec7dba570d12cbe78b019c5683f6761de4f1b9eb3fe22e9deedddfca8dd6efeb7b0429a043bad10b7e64feaaa0d2b2041e19db439a14156d02426 SHA512 d7ab6f431cefcff47c709a4d3c4fba9dddb89df343b1931699484c511d5a152a91d23c66876908be57ee777c3e65dce87a1be40833a04f05572cdda7c37c010f MISC metadata.xml 917 BLAKE2B 34cca38c9abfdd920abe9bf75e8569d652f3575e3c9f81e40f90255464021cb9f1768f742f30a8e6469a9e74342231380b9bc465a95ee1963e03d87238725e86 SHA512 8896a7f487c9089202c78589eb62c47f1705d41000a562b40a08eea660d0fe4fec422026329dedb4a33bd0dd63da5249e8dfd03590cadcf7088c0b31d55a34af diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild index 0dea33e32b53..b921679f6f1b 100644 --- a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild +++ b/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,9 +20,9 @@ IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X" RDEPEND=" dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) - gnutls? ( net-libs/gnutls ) - !gnutls? ( - ssl? ( + ssl? ( + gnutls? ( net-libs/gnutls ) + !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) @@ -53,6 +53,13 @@ S="${WORKDIR}/${MY_P}" DOCS=( Changelog CREDITS README ) +pkg_pretend() { + if use gnutls && ! use ssl ; then + ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag." + ewarn "No ssl backend will be built!" + fi +} + pkg_setup() { enewgroup gkrellmd enewuser gkrellmd -1 -1 -1 gkrellmd @@ -75,15 +82,6 @@ src_prepare() { src_compile() { if use X ; then - local sslopt="" - if use gnutls; then - sslopt="without-ssl=yes" - elif use ssl; then - sslopt="without-gnutls=yes" - else - sslopt="without-ssl=yes without-gnutls=yes" - fi - emake \ ${TARGET} \ CC="$(tc-getCC)" \ @@ -94,7 +92,7 @@ src_compile() { $(usex nls "" "enable_nls=0") \ $(usex lm_sensors "" "without-libsensors=yes") \ $(usex ntlm "" "without-ntlm=yes") \ - ${sslopt} + $(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes') else cd server || die emake \ |