From 4208ec612369f9ec71083c749568cd7428f88c33 Mon Sep 17 00:00:00 2001 From: Bill Prendergast Date: Tue, 17 Oct 2023 07:34:30 +1100 Subject: [PATCH] www-misc/zoneminder update ssl USE flags - Removed ssl USE flags:- zoneminder REQUIRES one of gnutls or openssl, the build errors out if neither is found. *This means that the ssl USE flag is inappropriate because we ALWAYS enable some form of ssl* - Adjusted the -r1 builds to default to first webserver in IUSE_WEB_SERVER (currently +apache2 ). No need to keep two separate variables updated with the same information (IUSE and IUSE_WEB_SERVER) Signed-off-by: Bill Prendergast --- www-misc/zoneminder/Manifest | 16 ++++++++-------- www-misc/zoneminder/zoneminder-1.36.32-r1.ebuild | 9 +++------ www-misc/zoneminder/zoneminder-1.36.32.ebuild | 9 +++------ www-misc/zoneminder/zoneminder-1.36.33-r1.ebuild | 14 ++++++++------ www-misc/zoneminder/zoneminder-1.36.33.ebuild | 9 +++------ .../zoneminder/zoneminder-1.36.9999-r1.ebuild | 14 ++++++++------ www-misc/zoneminder/zoneminder-1.36.9999.ebuild | 9 +++------ www-misc/zoneminder/zoneminder-9999-r1.ebuild | 14 ++++++++------ www-misc/zoneminder/zoneminder-9999.ebuild | 9 +++------ 9 files changed, 47 insertions(+), 56 deletions(-) diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest index fed57dc..821a70a 100644 --- a/www-misc/zoneminder/Manifest +++ b/www-misc/zoneminder/Manifest @@ -22,12 +22,12 @@ DIST RtspServer-eab32851421ffe54fec0229c3efc44c642bc8d46.tar.gz 1396601 BLAKE2B DIST zoneminder-1.36.32.gh.tar.gz 11497953 BLAKE2B ba4ab069be2efbf5bf9d26e32ac7dc5cf693aba13b90a70c85f5abc402a9d3f80b205de1931c7acea330412a00d2b7653a24b2d7e1e2c4d44717c5f71fd14524 SHA512 820ddc4076237b0a2b7ecc605a267b4d28efe33a001bbc3005bece5e0c28b05e5570cd20889782c61bedca1f6ee8743153e3d856e1fb0ba36ced388a7e1bc682 DIST zoneminder-1.36.33.gh.tar.gz 11501221 BLAKE2B ee3e6c3fbef2aa45e391f548238ffdcbc7ca3dcdd6d5b7a9bb3ef465f28ac4c355059525351b6f62e3e3b7cd984212d85498aadb45fc723f4215e55b1fdd76ec SHA512 7afd25d3fa5dd170bad552332dab5425b664e41d430f1514f2b038ec7391dae6fab165050b541cad50a6904341f77605fde845cc02e4d7ee10f42650cb9e8707 DIST zoneminder-1.36.33.tar.gz 11501221 BLAKE2B ee3e6c3fbef2aa45e391f548238ffdcbc7ca3dcdd6d5b7a9bb3ef465f28ac4c355059525351b6f62e3e3b7cd984212d85498aadb45fc723f4215e55b1fdd76ec SHA512 7afd25d3fa5dd170bad552332dab5425b664e41d430f1514f2b038ec7391dae6fab165050b541cad50a6904341f77605fde845cc02e4d7ee10f42650cb9e8707 -EBUILD zoneminder-1.36.32-r1.ebuild 6743 BLAKE2B 45817e0a6756828dd2732f9240184c7857ff6df52a86b43d2619a9b2aa5f653b05aee1f49a9d83b8f95ffd0edb3d1fff21803b097e1df9e9bca6d4d060c13e98 SHA512 26551acbc0e6800f273c8ab0fd86d41ba422efd1235dcdfe099e2ee8a7731008ee861575c4101535d27ff26344c690c495ed0b94ef90e6fc6802546e9a8338f2 -EBUILD zoneminder-1.36.32.ebuild 6723 BLAKE2B c363bf98e5ff7b47a8197f780ded01fa8cc172eb46f63996479c1b7cdbb756e2b61e5577622e9c542fd712bb513640095831e58d9d80efb24cbbddabadb93083 SHA512 78b13420902f614adea716ba494f1f9c60e256479664e34d688ea09aabc3f592e38365b4ec7d722fcd87bd9cbeeba72551431038b451b87a3c55c5051e4a0073 -EBUILD zoneminder-1.36.33-r1.ebuild 10291 BLAKE2B 393cca251d1268c7073168a563d00098e417f8d099065e3784d450093e5de16b3657a10126bde721c723a99645eef9a4737f39cf4da8f81be807256f57160cbb SHA512 2fb1ac4e576a8929c7ebbaf5562ee35b9b58f880870640a0e0ea97c4b5170c4f5bb532e3d3341707f0cb6aeedacd8b2dc80f53aa5250efb7a0a7df7024624656 -EBUILD zoneminder-1.36.33.ebuild 6743 BLAKE2B 45817e0a6756828dd2732f9240184c7857ff6df52a86b43d2619a9b2aa5f653b05aee1f49a9d83b8f95ffd0edb3d1fff21803b097e1df9e9bca6d4d060c13e98 SHA512 26551acbc0e6800f273c8ab0fd86d41ba422efd1235dcdfe099e2ee8a7731008ee861575c4101535d27ff26344c690c495ed0b94ef90e6fc6802546e9a8338f2 -EBUILD zoneminder-1.36.9999-r1.ebuild 10186 BLAKE2B 8dfac6f40600a9c2a0b8d28034d4c2cac2e748a907174dcb7ad62304f97129576c9e167cd235061a1520ded948ed4e61d14388d11f45e6337f5e225f0376c470 SHA512 6448b3821be4a7c6857ec52c70ed4987cdbbc3a6ac4775482b6e2ff04cb4c64cf8e2d67fc464ed8934f38745c5ea3492da31a9702ae4bed1024d93622e648331 -EBUILD zoneminder-1.36.9999.ebuild 6638 BLAKE2B 31d327386c62a61c0b39a6833a27dcb28d1646980b28b84c14e3195953f4f1342d88242c381f6d487fe70f4894f91301247785f9436586bae8b292cfcf9ea549 SHA512 a2e203300e85cd4cdceafe9a0028cc09df5ef52e4731f08b35bd26ad8c04d650a13c692de0670e8e59d5b8b441a245c4c362e1d06c702988a7772982f3b30b20 -EBUILD zoneminder-9999-r1.ebuild 10182 BLAKE2B acf1c9365e7511be7b33289ce687aca4c72d0c14a2f65bef86bb6502a51ebacd1709ee6fd1548524ade32424e545811ff4faf2ba28b24197628e4b97eac1af88 SHA512 fee3b0b4b43448fc29751332743e9bcab2db2e89cafa3321a6d6be7eb43e3392c209a5860f96fc280b8ab8139f160ad3b45e6d1907518fa0c65f8f78d50bb2cf -EBUILD zoneminder-9999.ebuild 6562 BLAKE2B f9a139ad9e541adb14aebb8cb20a61e93380e7792499fbaffd3f2e623a56d43680cdb882cf49b7bfcdc39bd4c1be93168af7651b761e9093ba9d9c03a9ef9e9c SHA512 7cdf24767e490d1f00fc50c5967d41846e475824452c31a525fc507638b907f791560bcd9b4e3ceb4810074ec7f06d4d37365cf93868e9085839403e7f93d758 +EBUILD zoneminder-1.36.32-r1.ebuild 6709 BLAKE2B 0df43e7d0152853e560980aeb08f1632e7ad5be394ee8d88a68441f19a7db52156f842709398ef2817cae02576d20be26540df33f3743b4bbbbbae6a54305489 SHA512 b483930b7a2bc64a6d1213109a9e4198b0e10549a610234e8b5b695b87bddc5bac6ee2f39d46961e0e7f97febc68e33cb34ae142b8b780a5cbf733af80a30515 +EBUILD zoneminder-1.36.32.ebuild 6689 BLAKE2B f27ef0c9e82885d039895a21123d2073a1b3abf4f5ebf3ec916999a5cb3b97b4cf8bdb62c446cf988aef1cbdbd0e21650783476db5a23b7e0c28fb74aff50fbb SHA512 1de4a0e2c2f3265b4208106c11a8b9bf6f011f4ee40fe44983c906e58c8ac3d9577df383a68ba5df8b36a3f9d4d3fb4efedacd509ef957c967f28748d8db06da +EBUILD zoneminder-1.36.33-r1.ebuild 10362 BLAKE2B cfea77516f19e45659f50e600ccfe1f7041c831e0ffd8c69be5c36368ad53eff977d3ee33c4062270af497331496d57e2b714ddbb5e49d15e4ab6a14f289fbdb SHA512 9714109eac65a65e6e96dfac22da9f51b6db4dc26e9a8c941bacb1c24ee0c484f5106ae6fc7b2fc06a24edf10d91880795e31affe0ae24dfaeec189e406cc84f +EBUILD zoneminder-1.36.33.ebuild 6709 BLAKE2B 0df43e7d0152853e560980aeb08f1632e7ad5be394ee8d88a68441f19a7db52156f842709398ef2817cae02576d20be26540df33f3743b4bbbbbae6a54305489 SHA512 b483930b7a2bc64a6d1213109a9e4198b0e10549a610234e8b5b695b87bddc5bac6ee2f39d46961e0e7f97febc68e33cb34ae142b8b780a5cbf733af80a30515 +EBUILD zoneminder-1.36.9999-r1.ebuild 10257 BLAKE2B 099660fe3b4cdff47c8fbe1142c6d4223fae5910a7db9854cf9f24bec6287a88546be5e2bc98e922d11d0bafcc8f32f587b25275103ccec94ecedfee32958c85 SHA512 5ff6e5b15a938be8bef2f6b2f10d3db71cfd75d6cd738b828c22a259a40bc0c185c206586afd3392849e40c5bcd938b368b84de56b5bd2323de908487c450c34 +EBUILD zoneminder-1.36.9999.ebuild 6604 BLAKE2B 3c7b0c1ab4daf6d6a3d4741d01e58dad2b5e5ae9076f7549882fb5850ca74e2838a7c92e5a06bb9815e33ae35f14f97a73fb2cc3f5e8618f18e2e79b5838df71 SHA512 7d0fc4e0c6d832cc0377f8aa062c587cc11c642dc1d071e6f3d9da6b69fdfb1d1ac85478e1e683713fb1d28e97f74d14107ef4f06bb3570fbe1b5772225025a5 +EBUILD zoneminder-9999-r1.ebuild 10253 BLAKE2B bfa43357a1397f567abcc2f9f1e694878b8db009f7f4c7c336a748e9512ca1fc3fde0248116302d47b747847b197210006cbffd7d5e6bf39bc792157a6588fc7 SHA512 780873323e028e4f8584db6878dc62b598a6844d5aa91445c95bcb75f07dbf77e826558da80adf56a8a44572753df37702360e3244a9b1d977f95bb39ada49c9 +EBUILD zoneminder-9999.ebuild 6528 BLAKE2B a857ebda5b4791e9361582559a452e46b8fecce1b0ac77d46b681870f99e5e6e89a0e438a5fef23a623ad49679185497f2d03eb6516a25c1a45bbb1b5eb4f52d SHA512 b458765956a131583722cd1f844d881611f6158839a3f5f8f76f0c6562f085e339d8409353362d0a55fd5ab27ff9fd8da3e3b1b09ed67a104efa8ed82df905a2 MISC metadata.xml 779 BLAKE2B 5ef526f80cbd92fc5d57571fe7db881cb09166b29141f8bff825e4bf1ece44937fc48f68225f2e455c44aaf417a5153fefee106d02168b531a03bc7d46641aca SHA512 7aab2b0fc846861567440780f84f3a017edcf1cedafc8f511eab0fa11b26be58c81675833cea5aedff14a5095ba9471853eb736fe38aba2584c2fca19705f1a5 diff --git a/www-misc/zoneminder/zoneminder-1.36.32-r1.ebuild b/www-misc/zoneminder/zoneminder-1.36.32-r1.ebuild index 641331c..33bcbf0 100644 --- a/www-misc/zoneminder/zoneminder-1.36.32-r1.ebuild +++ b/www-misc/zoneminder/zoneminder-1.36.32-r1.ebuild @@ -29,11 +29,8 @@ else fi LICENSE="GPL-2" -IUSE="curl encode gcrypt gnutls +mmap +ssl vlc" +IUSE="curl encode gcrypt gnutls +mmap vlc" SLOT="0" -REQUIRED_USE=" - || ( ssl gnutls ) -" DEPEND=" app-eselect/eselect-php[apache2] @@ -78,8 +75,8 @@ www-servers/apache curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gnutls? ( net-libs/gnutls ) +!gnutls? ( dev-libs/openssl:0= ) mmap? ( dev-perl/Sys-Mmap ) -ssl? ( dev-libs/openssl:0= ) vlc? ( media-video/vlc[live] ) " RDEPEND="${DEPEND}" @@ -122,7 +119,7 @@ src_configure() { -DZM_NO_X10=OFF -DZM_NO_CURL="$(usex curl OFF ON)" -DZM_NO_LIBVLC="$(usex vlc OFF ON)" - -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex ssl OFF ON)" + -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex gnutls ON OFF)" -DHAVE_LIBGNUTLS="$(usex gnutls ON OFF)" -DHAVE_LIBGCRYPT="$(usex gcrypt ON OFF)" ) diff --git a/www-misc/zoneminder/zoneminder-1.36.32.ebuild b/www-misc/zoneminder/zoneminder-1.36.32.ebuild index b84ade9..2ce27ab 100644 --- a/www-misc/zoneminder/zoneminder-1.36.32.ebuild +++ b/www-misc/zoneminder/zoneminder-1.36.32.ebuild @@ -29,11 +29,8 @@ else fi LICENSE="GPL-2" -IUSE="curl encode gcrypt gnutls +mmap +ssl vlc" +IUSE="curl encode gcrypt gnutls +mmap vlc" SLOT="0" -REQUIRED_USE=" - || ( ssl gnutls ) -" DEPEND=" app-eselect/eselect-php[apache2] @@ -77,8 +74,8 @@ www-servers/apache curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gnutls? ( net-libs/gnutls ) +!gnutls? ( dev-libs/openssl:0= ) mmap? ( dev-perl/Sys-Mmap ) -ssl? ( dev-libs/openssl:0= ) vlc? ( media-video/vlc[live] ) " RDEPEND="${DEPEND}" @@ -121,7 +118,7 @@ src_configure() { -DZM_NO_X10=OFF -DZM_NO_CURL="$(usex curl OFF ON)" -DZM_NO_LIBVLC="$(usex vlc OFF ON)" - -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex ssl OFF ON)" + -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex gnutls ON OFF)" -DHAVE_LIBGNUTLS="$(usex gnutls ON OFF)" -DHAVE_LIBGCRYPT="$(usex gcrypt ON OFF)" ) diff --git a/www-misc/zoneminder/zoneminder-1.36.33-r1.ebuild b/www-misc/zoneminder/zoneminder-1.36.33-r1.ebuild index 556e6bf..800f1db 100644 --- a/www-misc/zoneminder/zoneminder-1.36.33-r1.ebuild +++ b/www-misc/zoneminder/zoneminder-1.36.33-r1.ebuild @@ -31,11 +31,11 @@ else fi LICENSE="GPL-2" +# first webserver in the list is the default, users will need to disable to select others IUSE_WEB_SERVER="apache2 nginx" -IUSE="curl gcrypt gnutls +mmap +ssl vlc +apache2 nginx" +IUSE="curl gcrypt gnutls +mmap vlc +${IUSE_WEB_SERVER}" SLOT="0" REQUIRED_USE=" - || ( ssl gnutls ) ^^ ( ${IUSE_WEB_SERVER} ) " @@ -90,11 +90,13 @@ virtual/perl-Time-HiRes curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gnutls? ( - net-libs/gnutls - dev-libs/libjwt[gnutls,ssl?] + net-libs/gnutls + dev-libs/libjwt[gnutls] +) +!gnutls? ( + dev-libs/openssl:= ) mmap? ( dev-perl/Sys-Mmap ) -ssl? ( dev-libs/openssl:0= ) vlc? ( media-video/vlc[live] ) ${DEPEND_WEB_SERVER} " @@ -174,8 +176,8 @@ src_configure() { -DZM_NO_X10=OFF -DZM_NO_CURL="$(usex curl OFF ON)" -DZM_NO_LIBVLC="$(usex vlc OFF ON)" + -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex gnutls ON OFF)" -DZM_NO_RTSPSERVER=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex ssl OFF ON)" ) cmake_src_configure diff --git a/www-misc/zoneminder/zoneminder-1.36.33.ebuild b/www-misc/zoneminder/zoneminder-1.36.33.ebuild index 641331c..33bcbf0 100644 --- a/www-misc/zoneminder/zoneminder-1.36.33.ebuild +++ b/www-misc/zoneminder/zoneminder-1.36.33.ebuild @@ -29,11 +29,8 @@ else fi LICENSE="GPL-2" -IUSE="curl encode gcrypt gnutls +mmap +ssl vlc" +IUSE="curl encode gcrypt gnutls +mmap vlc" SLOT="0" -REQUIRED_USE=" - || ( ssl gnutls ) -" DEPEND=" app-eselect/eselect-php[apache2] @@ -78,8 +75,8 @@ www-servers/apache curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gnutls? ( net-libs/gnutls ) +!gnutls? ( dev-libs/openssl:0= ) mmap? ( dev-perl/Sys-Mmap ) -ssl? ( dev-libs/openssl:0= ) vlc? ( media-video/vlc[live] ) " RDEPEND="${DEPEND}" @@ -122,7 +119,7 @@ src_configure() { -DZM_NO_X10=OFF -DZM_NO_CURL="$(usex curl OFF ON)" -DZM_NO_LIBVLC="$(usex vlc OFF ON)" - -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex ssl OFF ON)" + -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex gnutls ON OFF)" -DHAVE_LIBGNUTLS="$(usex gnutls ON OFF)" -DHAVE_LIBGCRYPT="$(usex gcrypt ON OFF)" ) diff --git a/www-misc/zoneminder/zoneminder-1.36.9999-r1.ebuild b/www-misc/zoneminder/zoneminder-1.36.9999-r1.ebuild index c5e8652..39649d2 100644 --- a/www-misc/zoneminder/zoneminder-1.36.9999-r1.ebuild +++ b/www-misc/zoneminder/zoneminder-1.36.9999-r1.ebuild @@ -31,11 +31,11 @@ else fi LICENSE="GPL-2" +# first webserver in the list is the default, users will need to disable to select others IUSE_WEB_SERVER="apache2 nginx" -IUSE="curl gcrypt gnutls +mmap +ssl vlc +apache2 nginx" +IUSE="curl gcrypt gnutls +mmap vlc +${IUSE_WEB_SERVER}" SLOT="0" REQUIRED_USE=" - || ( ssl gnutls ) ^^ ( ${IUSE_WEB_SERVER} ) " @@ -90,11 +90,13 @@ virtual/perl-Time-HiRes curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gnutls? ( - net-libs/gnutls - dev-libs/libjwt[gnutls,ssl?] + net-libs/gnutls + dev-libs/libjwt[gnutls] +) +!gnutls? ( + dev-libs/openssl:= ) mmap? ( dev-perl/Sys-Mmap ) -ssl? ( dev-libs/openssl:0= ) vlc? ( media-video/vlc[live] ) ${DEPEND_WEB_SERVER} " @@ -174,8 +176,8 @@ src_configure() { -DZM_NO_X10=OFF -DZM_NO_CURL="$(usex curl OFF ON)" -DZM_NO_LIBVLC="$(usex vlc OFF ON)" + -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex gnutls ON OFF)" -DZM_NO_RTSPSERVER=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex ssl OFF ON)" ) cmake_src_configure diff --git a/www-misc/zoneminder/zoneminder-1.36.9999.ebuild b/www-misc/zoneminder/zoneminder-1.36.9999.ebuild index 9ffc769..e590a08 100644 --- a/www-misc/zoneminder/zoneminder-1.36.9999.ebuild +++ b/www-misc/zoneminder/zoneminder-1.36.9999.ebuild @@ -29,11 +29,8 @@ else fi LICENSE="GPL-2" -IUSE="curl encode gcrypt gnutls +mmap +ssl vlc" +IUSE="curl encode gcrypt gnutls +mmap vlc" SLOT="0" -REQUIRED_USE=" - || ( ssl gnutls ) -" DEPEND=" app-eselect/eselect-php[apache2] @@ -78,8 +75,8 @@ www-servers/apache curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gnutls? ( net-libs/gnutls ) +!gnutls? ( dev-libs/openssl:0= ) mmap? ( dev-perl/Sys-Mmap ) -ssl? ( dev-libs/openssl:0= ) vlc? ( media-video/vlc[live] ) " RDEPEND="${DEPEND}" @@ -122,7 +119,7 @@ src_configure() { -DZM_NO_X10=OFF -DZM_NO_CURL="$(usex curl OFF ON)" -DZM_NO_LIBVLC="$(usex vlc OFF ON)" - -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex ssl OFF ON)" + -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex gnutls ON OFF)" -DHAVE_LIBGNUTLS="$(usex gnutls ON OFF)" -DHAVE_LIBGCRYPT="$(usex gcrypt ON OFF)" ) diff --git a/www-misc/zoneminder/zoneminder-9999-r1.ebuild b/www-misc/zoneminder/zoneminder-9999-r1.ebuild index 026cb30..327c18c 100644 --- a/www-misc/zoneminder/zoneminder-9999-r1.ebuild +++ b/www-misc/zoneminder/zoneminder-9999-r1.ebuild @@ -31,11 +31,11 @@ else fi LICENSE="GPL-2" +# first webserver in the list is the default, users will need to disable to select others IUSE_WEB_SERVER="apache2 nginx" -IUSE="curl gcrypt gnutls +mmap +ssl vlc +apache2 nginx" +IUSE="curl gcrypt gnutls +mmap vlc +${IUSE_WEB_SERVER}" SLOT="0" REQUIRED_USE=" - || ( ssl gnutls ) ^^ ( ${IUSE_WEB_SERVER} ) " @@ -90,11 +90,13 @@ virtual/perl-Time-HiRes curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gnutls? ( - net-libs/gnutls - dev-libs/libjwt[gnutls,ssl?] + net-libs/gnutls + dev-libs/libjwt[gnutls] +) +!gnutls? ( + dev-libs/openssl:= ) mmap? ( dev-perl/Sys-Mmap ) -ssl? ( dev-libs/openssl:0= ) vlc? ( media-video/vlc[live] ) ${DEPEND_WEB_SERVER} " @@ -174,8 +176,8 @@ src_configure() { -DZM_NO_X10=OFF -DZM_NO_CURL="$(usex curl OFF ON)" -DZM_NO_LIBVLC="$(usex vlc OFF ON)" + -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex gnutls ON OFF)" -DZM_NO_RTSPSERVER=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex ssl OFF ON)" ) cmake_src_configure diff --git a/www-misc/zoneminder/zoneminder-9999.ebuild b/www-misc/zoneminder/zoneminder-9999.ebuild index ebaa8bb..f0c2d9c 100644 --- a/www-misc/zoneminder/zoneminder-9999.ebuild +++ b/www-misc/zoneminder/zoneminder-9999.ebuild @@ -27,11 +27,8 @@ else fi LICENSE="GPL-2" -IUSE="curl encode gcrypt gnutls +mmap +ssl vlc" +IUSE="curl encode gcrypt gnutls +mmap vlc" SLOT="0" -REQUIRED_USE=" - || ( ssl gnutls ) -" DEPEND=" app-eselect/eselect-php[apache2] @@ -76,8 +73,8 @@ www-servers/apache curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gnutls? ( net-libs/gnutls ) +!gnutls? ( dev-libs/openssl:0= ) mmap? ( dev-perl/Sys-Mmap ) -ssl? ( dev-libs/openssl:0= ) vlc? ( media-video/vlc[live] ) " RDEPEND="${DEPEND}" @@ -118,7 +115,7 @@ src_configure() { -DZM_NO_X10=OFF -DZM_NO_CURL="$(usex curl OFF ON)" -DZM_NO_LIBVLC="$(usex vlc OFF ON)" - -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex ssl OFF ON)" + -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex gnutls ON OFF)" -DHAVE_LIBGNUTLS="$(usex gnutls ON OFF)" -DHAVE_LIBGCRYPT="$(usex gcrypt ON OFF)" )