9 files changed, 31 insertions, 28 deletions
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild
index 6c64fa2c6a95..de26ee95d59a 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild
@@ -64,7 +64,7 @@ BIN_COMMON_DEPEND="
 	media-libs/libpng:0/16
 	>=sys-devel/gcc-7.3.0
 	>=sys-libs/glibc-2.27
-	virtual/jpeg:62
+	virtual/jpeg-compat:62
 "
 
 # PLEASE place any restrictions that are specific to the binary builds
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.10.0-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.10.0-r2.ebuild
index 9dc6568062cc..84c1107124c6 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.10.0-r1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.10.0-r2.ebuild
@@ -43,7 +43,7 @@ RDEPEND=">=dev-libs/glib-2.42:2%
 	>=media-libs/freetype-2.5.5:2%
 	>=media-libs/lcms-2.9:2%
 	>=sys-libs/zlib-1.2.8-r1%
-	virtual/jpeg:62%
+	virtual/jpeg-compat:62%
 	alsa? ( >=media-libs/alsa-lib-1.0% )
 	cups? ( >=net-print/cups-2.0% )
 	gtk? (
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.12.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild
index 00bb6c4eb2ee..524f4fe81db0 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.12.0.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND=">=dev-libs/glib-2.58:2%
 	>=media-libs/freetype-2.9.1:2%
 	>=media-libs/lcms-2.9:2%
 	>=sys-libs/zlib-1.2.11-r1%
-	virtual/jpeg:62%
+	virtual/jpeg-compat:62%
 	alsa? ( >=media-libs/alsa-lib-1.0% )
 	cups? ( >=net-print/cups-2.0% )
 	gtk? (
diff --git a/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild b/games-fps/etqw-bin/etqw-bin-1.5-r2.ebuild
index 8270e50c21ee..014fcff96bae 100644
--- a/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild
+++ b/games-fps/etqw-bin/etqw-bin-1.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ DEPEND="app-arch/unzip"
 RDEPEND="sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] )
 	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-	>=virtual/jpeg-62:62[abi_x86_32(-)]
+	virtual/jpeg-compat:62[abi_x86_32(-)]
 	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
 	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
 	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
diff --git a/games-fps/etqw-demo/etqw-demo-2.0_p1-r1.ebuild b/games-fps/etqw-demo/etqw-demo-2.0_p1-r2.ebuild
index 8915a443830f..57a181dc367f 100644
--- a/games-fps/etqw-demo/etqw-demo-2.0_p1-r1.ebuild
+++ b/games-fps/etqw-demo/etqw-demo-2.0_p1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ RESTRICT="strip mirror"
 
 DEPEND="app-arch/unzip"
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-	>=virtual/jpeg-62:62[abi_x86_32(-)]
+	virtual/jpeg-compat:62[abi_x86_32(-)]
 	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
 	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
 	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]"
diff --git a/virtual/jpeg-compat/jpeg-compat-62.ebuild b/virtual/jpeg-compat/jpeg-compat-62.ebuild
new file mode 100644
index 000000000000..cc4ce8125f6a
--- /dev/null
+++ b/virtual/jpeg-compat/jpeg-compat-62.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="A virtual for the libjpeg.so.62 ABI for binary-only programs"
+SLOT="62"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+RDEPEND="
+	|| (
+		>=media-libs/libjpeg-turbo-1.3.0-r3:0[${MULTILIB_USEDEP}]
+		>=media-libs/jpeg-6b-r12:62[${MULTILIB_USEDEP}]
+	)"
diff --git a/virtual/jpeg-compat/metadata.xml b/virtual/jpeg-compat/metadata.xml
new file mode 100644
index 000000000000..899a49093b0d
--- /dev/null
+++ b/virtual/jpeg-compat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/virtual/jpeg/jpeg-62.ebuild b/virtual/jpeg/jpeg-62.ebuild
deleted file mode 100644
index 3b40ab4281ee..000000000000
--- a/virtual/jpeg/jpeg-62.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="A virtual for the libjpeg.so.62 ABI for binary-only programs"
-SLOT="62"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="|| (
-		>=media-libs/libjpeg-turbo-1.3.0-r3:0[${MULTILIB_USEDEP}]
-		>=media-libs/jpeg-6b-r12:62[${MULTILIB_USEDEP}]
-		)"
diff --git a/virtual/jpeg/metadata.xml b/virtual/jpeg/metadata.xml
index d5a42ca38ba3..899a49093b0d 100644
--- a/virtual/jpeg/metadata.xml
+++ b/virtual/jpeg/metadata.xml
@@ -5,10 +5,4 @@
 		<email>graphics@gentoo.org</email>
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
-	<slots>
-		<slot name="0">For building against. This is the only slot
-			that provides headers and command line tools.</slot>
-		<slot name="62">For binary compatibility, provides
-			libjpeg.so.62 only.</slot>
-	</slots>
 </pkgmetadata>