4 files changed, 10 insertions, 18 deletions
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 7e242e4f3842..f43b87bb5cb3 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index dbd2f3262554..5f1366174b25 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -4,6 +4,6 @@ AUX cupsd.init.d-r4 577 BLAKE2B 48508b10a13ee73e905b3d061275f5cb12ebdc2175ce46af
 DIST cups-2.4.6-source.tar.gz 8135135 BLAKE2B 4e61112ddaa46f20b1cfcb8f523dd07ba7d82604b9857754b288a2a9c5bc50ce242cfa119867347e4696818dc2eb505cf7fff1f9a0634e314edb2500395b83e4 SHA512 eb748680a748f599e4826c17054a24259d190e6c8e8339f6a7a37ee2a3f4c3fd1829e856b25a854cfdbee1b51279c70a0e847f6142225b8b68f1cd10c4ce4ce4
 DIST cups-2.4.7-source.tar.gz 8134809 BLAKE2B d81de62cff37c576ef8fb125b97568c2d86602cec6151d7030552fad421d7bc77a5df1e860d5ac5a241e739cc0d1fe5fcac44b8451ad2fc4dc675cf74fd41382 SHA512 914b574ff6d85de9f3471528b52d4a436c484c441f47651846e1bdfa00aec26774efd416ff466216d2bccf468f8a797b1e0d666b5c82abc87e77550ce8b00d39
 EBUILD cups-2.4.6.ebuild 9552 BLAKE2B 04227d32d232dabbf378d9dd4c254b04bf582e41c569295c50db2990b23f14824287c5158f792da2b9a64d146883b5c8b096f7fc55f88ffdc3b1288293def759 SHA512 4d8e8028a98f338d6775ee3ca07490efdfcd5f9ac9ca4a6fa59405045e25e2280598bab302b6d2cbc6c69878253cba035dbcee8a6f09c6c989ffc62d78408406
-EBUILD cups-2.4.7.ebuild 9553 BLAKE2B 976523e386d4b4f1231bdc0857bd9fdd6bf44008309f0b43b21266e05343fb0f9826f5ea94e427e4301c077739638b52e2b8a63f63cfde6c1a9c9f598fa8a5bd SHA512 5974d640daafcf55c7159f103af4c6bb0f89bb209743a0298725fe0a1e11538926b5e23dfffa1320340ab1fd440f797a44334677650fee7e1875f0ea2d046792
-EBUILD cups-9999.ebuild 9560 BLAKE2B 9f4c4868df8dd8dd31a8ec1c3adac3612e3fe01e5a0fd459d27c4a04121a6a2270563c7714187a3d81c3dadae531cf655b3d48f8a684dcbf0a4c52bbcea46833 SHA512 4082f0a7a857a96fd811460ccc660e9a6df370be4e72cde7fee82ea3964172753a5303e9daa32846c031a6baba409bf8e774868ab34b0897c1a85236ba2fa53b
+EBUILD cups-2.4.7-r1.ebuild 9468 BLAKE2B 13eeaba864bdb593e092db9db486587566b326211e4c7da61f4756d7bef5340c3ab681245cb450e2bf9a7f772b0a4370d8f39e428c771c98e4925c6c634fa702 SHA512 8a39e69a0db0993aecfc0df1d1523379b70b1efc71c69d4bbe39651bfc1bc16a1a5e805da62f44de084064fee739c2197942ad2b379010dd7a1527870ef2fd99
+EBUILD cups-9999.ebuild 9475 BLAKE2B 6a86ce8658096636175e5f324e4d19b6ab2023f002495e6bff79f18122ea1bb7332bfdc9c642d26022a50ec72e9dd3d1d0f7329b92fc49e3da7abf038835fc92 SHA512 e0ece558491f66bcbd78fa4c10a84ef58b58a17fac7ce1f6a5fd6c6a6e7c2163b671b178da22fe92883c90a79a391f2f0735cd1f920fcac0e6e12f4c9b6b6077
 MISC metadata.xml 527 BLAKE2B 04a32175e666165226eaa97785a6b9e4b779644e352c503a4653870631f28089dddbaaa3db3143f09a1d97c7f57952e4d760d64005eafacb379c23035fe9ad19 SHA512 136c81a99b501ffcedfd71f4425ba556292b79abc0ac819d336d2c845401775955b8cd72e6194f02f4c48d0cd26bc93ee7c94c7438228b49410daca80a159523
diff --git a/net-print/cups/cups-2.4.7.ebuild b/net-print/cups/cups-2.4.7-r1.ebuild
index fb26dd7c4f2a..ca1eb9e72744 100644
--- a/net-print/cups/cups-2.4.7.ebuild
+++ b/net-print/cups/cups-2.4.7-r1.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="acl dbus debug kerberos openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf"
+IUSE="acl dbus debug kerberos openssl pam selinux static-libs systemd test usb X xinetd zeroconf"
 
 # As of 2.4.2, they don't actually seem to be interactive (they pass some flags
 # by default to input for us), but they fail on some greyscale issue w/ poppler?
@@ -52,10 +52,8 @@ DEPEND="
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
 	!pam? ( virtual/libcrypt:= )
-	ssl? (
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
-		openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-	)
+	!openssl? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
+	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
 	systemd? ( sys-apps/systemd )
 	usb? ( virtual/libusb:1 )
 	X? ( x11-misc/xdg-utils )
@@ -166,9 +164,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable pam)
 		$(use_enable static-libs static)
 		$(use_enable test unit-tests)
-		# USE="ssl" => gnutls
-		# USE="ssl openssl" => openssl
-		$(use_with ssl tls $(usex openssl openssl gnutls))
+		--with-tls=$(usex openssl openssl gnutls)
 		$(use_with systemd ondemand systemd)
 		$(multilib_native_use_enable usb libusb)
 		$(use_with zeroconf dnssd avahi)
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index d1f511ef75b9..3d6b8b8cac30 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="acl dbus debug kerberos openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf"
+IUSE="acl dbus debug kerberos openssl pam selinux static-libs systemd test usb X xinetd zeroconf"
 
 # As of 2.4.2, they don't actually seem to be interactive (they pass some flags
 # by default to input for us), but they fail on some greyscale issue w/ poppler?
@@ -52,10 +52,8 @@ DEPEND="
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
 	!pam? ( virtual/libcrypt:= )
-	ssl? (
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
-		openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-	)
+	!openssl? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
+	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
 	systemd? ( sys-apps/systemd )
 	usb? ( virtual/libusb:1 )
 	X? ( x11-misc/xdg-utils )
@@ -166,9 +164,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable pam)
 		$(use_enable static-libs static)
 		$(use_enable test unit-tests)
-		# USE="ssl" => gnutls
-		# USE="ssl openssl" => openssl
-		$(use_with ssl tls $(usex openssl openssl gnutls))
+		--with-tls=$(usex openssl openssl gnutls)
 		$(use_with systemd ondemand systemd)
 		$(multilib_native_use_enable usb libusb)
 		$(use_with zeroconf dnssd avahi)