Require gnutls be built w/USE=openssl #546116 by Patrick Lauer.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index 94f78e86ec58f6a8f98c9ce822629c7d774e0274..fbb7aa5bf91a9b596ecd51938582cf27d7df6d6c 100644 (file)
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/iputils
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.139 2015/04/25 00:09:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.140 2015/04/25 00:34:24 vapier Exp $
+
+  25 Apr 2015; Mike Frysinger <vapier@gentoo.org> iputils-20121221-r1.ebuild,
+  iputils-99999999.ebuild:
+  Require gnutls be built w/USE=openssl #546116 by Patrick Lauer.
 
   25 Apr 2015; Mike Frysinger <vapier@gentoo.org>
   +files/iputils-99999999-openssl.patch,

diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 0ed7c8b3df5c485e4a1cb65042571ed7591e70e9..681e15ef256309ad487063d9cfcb090659ecf4a4 100644 (file)
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -13,25 +13,25 @@ AUX iputils-99999999-openssl.patch 2532 SHA256 0ffcce81badea00e84bdaf49929bc657a
 AUX iputils-99999999-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df
 DIST iputils-s20121221-manpages.tar.bz2 23778 SHA256 6fc7ed7d281b7a2ee00e4f75e5465c90498c685bcc988afdff74db4eaa736d1c SHA512 006be62e61bf1555c99dbd5aac270cbd8d1074a3016fdde3aeed47e5c9b1acd326aa30a596c532d6688827f7f61966a6e3141eaa3b6f4f943eb21ac227282d8c WHIRLPOOL da0ccb577c4b2189553419df2c093404752fb2865eb3e0bfececfc242d930ceb44f96b32d945cfdd0c9ca060359651b2ec8479db5cc9220cda412dfeee5e910d
 DIST iputils-s20121221.tar.bz2 155344 SHA256 450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f SHA512 693d240becd766c345c3af2053fc0699b9358e54d667d40738c21d731b70e779112d81476a220d8300ca54250120385414a13610d445996f95a90571047389f4 WHIRLPOOL 64529180eb4b8e2f7a60c18df7cac49e10a4b7702514252d418b16dcdc10a85ccb0a7f8beb51274cc9d708be2026c4c136e720986795fd39d314e4f9d5590ec9
-EBUILD iputils-20121221-r1.ebuild 2899 SHA256 3b63b43641f6c4ff0b5c4cfc71739e977ca280abc24c745409cd28dc2b66acfb SHA512 1980bc2a4c7b1d944e96cc1d0d7dece2672ce866d920331d75f1b1111598a91056d693e73e8ad8e9a6ecec4c97caea6aa2db194cf78d80265665bfb557833530 WHIRLPOOL 659b2395b5bea25833ed865aa32c24b418b051b9f7f48eb6eb68e7b7210e09ce3dab4a10cc2050816c476f312e64b9cb17ba0cf03ac267a6cb91f351750dc7d5
+EBUILD iputils-20121221-r1.ebuild 2935 SHA256 b3a25f83df129f390654fd1db166fb00864871d018f421caa6a8ce6300d4a5dc SHA512 e11e33a1e4516005a4be9680546fb24967458ff3871ed968bbbdb8be73314cafe099f08d3a84dfe8e2ba9c2c26e4f69af276c1c798585a7cc4783de44f63c1b2 WHIRLPOOL 6ab24c3960aa2ec5d93734c3ec4fcf3f7712c74f676c57aaaacd1239e9f497a25945837bec21736665ce2ad5f2d48093c1efc9ba21e888f4d706ef3205230ae5
 EBUILD iputils-20121221.ebuild 2852 SHA256 6df665954e76448c80184e43f7ed3f1aea111ff3b2ac7a30114248db7211ecba SHA512 fd6c699a954802606e886739eb5b0e7d1df0d78256add26cb071d191fbb37ef5c122adfe34dd4e44c27852b05833caed734d23b9cd97c3c71980457e5bc0c6fc WHIRLPOOL 7f172afc263bdc1a16de208343a736ca2bf6a4d3b34500d66cbd93154c471b165d91f56252413a2b3b3f3279d2ddf299e0b5ad6c9da4cd224eab3d6b50c95a0b
-EBUILD iputils-99999999.ebuild 2740 SHA256 c2cb8497d68e2e1fc7a2963f911fb18c5ec74feecb9c9bede07a9ab8a708c652 SHA512 01dd31afaef9e7b27a30dc668dce2dbd26ca935133db30553e6dd6c0bff1b2462dee183f37bad1684fc2c442b245ab018a796000935f5f50447532b8392f8701 WHIRLPOOL cdd98cba2ac59ed723cd89096c0afb7ae280490e5bb6f9abae76be143b0c186363fc39d24daf9e252623a5b3f86b7cf26d7496b99b2045422ac4ce7a491ac66b
-MISC ChangeLog 21004 SHA256 1dfe999e884186f811f17c3249636362d50024fe1a3ec39deb4a2e20ea830cea SHA512 77891511f3faf3d6eb5b2c3f7a69700ecc33a62d629d9969dd8a01d35538fff6cf757d87c18af155558d378494d0ef7950e155fd650c3c2bfdd39e5ba41f7fac WHIRLPOOL eb31308cf2bf909b2db09020c22a396d077b8126b7640d6a48e8acb0503d79bb78937ea59ef0be8436a88f297474c0ace8f0e904b8fad90e803d292dafc894cf
+EBUILD iputils-99999999.ebuild 2776 SHA256 d3aef77173c86c30e72760c26c6079fe2065c15421afa1a0afae409d72496a19 SHA512 5e08927b37a4423df9f0f7de83bc03767ca613879f40481f02a0105a63d822c843469ef7b5dcdfc7c699aeee67bcc07b244fbf20d6bfff362b6d5813c2ad6270 WHIRLPOOL 972e8e3759b5e9eb2ebfd7eac7b8205780137ebce3f0d9a2f465805c56d4035f3cabc2dbd25606b566b56b2ef47e456b0401085b0444424d804e9c2c77f39e39
+MISC ChangeLog 21176 SHA256 6bb896c13f349bafe815bf9fc50f3d6ea39e119d6cf8bf0431e6ed740af4632d SHA512 f8bdca08ad65864ff22761d2381f10f2da53b5883b18694a4e6e1231864064a19ec25fe8ab2e167f1f42702bbfb9a52d38a60600c14dd4c0c69b582b31eb36d7 WHIRLPOOL d98ec2905cf687a1c9ca58bb6edcd6e5736ede92492df5a2f9705c8db3eacdab4f6b767c7efe3f6cf0b4de7880993352af890b6d52dae53676bad674b6868a9b
 MISC metadata.xml 386 SHA256 36462bcda28f18d127af12e2c6fdf58a813f3a5018a9151695892c1b706da52d SHA512 d7529383e575fbdbae4c96123530672192198cf1c4fc3a22097c42ddb3d179b8c99c67e274fbade85c68fc742d5792fb5286f40993f1099dc4694b1cf9942224 WHIRLPOOL 24417ef5492727316830ab0f208138c8ba41ae3e51b46e398297b1ed823f7d801e1cb4bb2ca6d87035f37a4072919073bd99dd8677cb67f3263258cb72184764
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVOxOPAAoJEPGu1DbS6WIAYfIQAJjiLATVWUKZLRhq3yhythD4
-sWMiAk2CgGOOCB5QuZEvVR1fcRrJjWB99Shb20rPQCEe2IhygJXxSaUVIDoi2d5I
-JwHxHMIi24t7tduI8TvCFV8vxfH4D+2Is/Yipe2SFUrMPZOdR2A6N1Ealeeb8aI3
-8r0KG4G7fRc7xoHVja3t7ug101MXUPQ9U4TTiDK5MM9vUpPILIChbGIcCNaFHTch
-/my2HK1nLRlMVeWu3UZ+X0pqKL7saLHsvdh33B3gqc0MRnATECUDx/j9NZw2BYvA
-UH9UU9KEpdR9Lz58rTDL4H9lwFN3RLWdA81PZEf0EzOcaJ59U2Js/9DTeCIFHHOA
-jGcF0MXOJQVznJvZDZMFPfvjhr3r7Fu7NFtWo6QCjMuCiPf3G5gyFs/l0wRW7CP0
-dyGuTnDCQk+R/Ks+qKgVzZg8xEGUJui59XxtEaaQm1ThnAV/EkyEyzk+U+pCs00b
-s/3awoTJ2XZeU0etlvbsAg2iEIjvbFqskvugLOK8rffV4DnJ5NUJT4h4/s89adjN
-rEAbV4x7MdgMaXZvAKSJmaCtYOPr7hvq9pp3XcYx8DNJ0x0DoI/VQK6FHFv5pddL
-0wZVBjouzC095w5A/Yfw5kGILrHFovJlewKWK38GM/hNH261gqeUFRS2tgKvVSoC
-F0TJDMbMzERFcYUofJPu
-=Mr1O
+iQIcBAEBCAAGBQJVOuEQAAoJEPGu1DbS6WIA8nkP/i1V7wUsUwtVewOuyK9eGz+z
+X49wZC48Yjr/YZ3n6meqcO3QSSbD/ecWwSE09k7YK1uKmo5CJBUTRh9QY+aILIg1
+AHh3VDGm0mgkEeL6HQD9O2QXvmDv969xx1wDrmiBZhIlcZMNpY/RVyNRB0fRXdAf
+7dEtSGg2TlXHHA50IP52zcsE5Wjy4UWstPMw81UhYADviiMfydFFnzfTOw6eCuVI
+Q+hG0GHffNu7orzX66e9er+F/jWJhPejIGT9O6G9GAFKK0nDr2kaGjnu0pRtQGn4
+W+E7blLeVJ1mkcygBAja3oQh+vWkTX0gnHkz83fPGj/UhP/w/XltVXUo/y3ZHIOK
+c5EjgZfDIMB6DnIXZkcOdbGDg5ckZmPr1twmur4tTr8UKkgeLb7/v/BJZlkeLuHl
+eVljijsi0JzS6DNhaD5kQmQYlh03kOEaPQt50P8lDXhBhzOLK2iLlQma0ummKJUm
+SGcVIJTXBWDtUykmboB3es2MCy8SKL/O7q0MlRmwfJRC7mJ6PFproBuvv3n5FbUW
+jiKeuvtdVwKUha9PqA2FYpojNtknbxP4Q1rhKwk5PCMcCIlcy79UViEmEXhqF09V
++eaSMZirBAhea2joter2PJLs4y2/z2lc0NPkQabhrglQbHKunX+4NXBguf+AU+uu
+f+iakMDbHv0DFppVP0lJ
+=tZe4
 -----END PGP SIGNATURE-----

diff --git a/net-misc/iputils/iputils-20121221-r1.ebuild b/net-misc/iputils/iputils-20121221-r1.ebuild
index 9f0bfcb392516e80055de853e9b4d511a5f0411b..04fc99b4c97f4441b17dffd07fe62b579bdae665 100644 (file)
--- a/net-misc/iputils/iputils-20121221-r1.ebuild
+++ b/net-misc/iputils/iputils-20121221-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild,v 1.16 2015/04/04 22:31:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild,v 1.17 2015/04/25 00:34:24 vapier Exp $
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
@@ -29,7 +29,10 @@ IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
        idn? ( net-dns/libidn[static-libs(+)] )
        ipv6? ( ssl? (
-               gnutls? ( net-libs/gnutls[static-libs(+)] )
+               gnutls? (
+                       net-libs/gnutls[openssl(+)]
+                       net-libs/gnutls[static-libs(+)]
+               )
                !gnutls? ( dev-libs/openssl:0[static-libs(+)] )
        ) )"
 RDEPEND="!net-misc/rarpd

diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index d1ad9aac938b9e9be03c1b20cad0b5623edd77a4..8d8a6ef4842556b7441ede1cf86e2027324e91fa 100644 (file)
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.14 2015/04/25 00:09:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.15 2015/04/25 00:34:24 vapier Exp $
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
@@ -29,7 +29,10 @@ IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
        idn? ( net-dns/libidn[static-libs(+)] )
        ipv6? ( ssl? (
-               gnutls? ( net-libs/gnutls[static-libs(+)] )
+               gnutls? (
+                       net-libs/gnutls[openssl(+)]
+                       net-libs/gnutls[static-libs(+)]
+               )
                !gnutls? ( dev-libs/openssl:0[static-libs(+)] )
        ) )"
 RDEPEND="!net-misc/rarpd