| 1 |
commit: 15f8c32a171cca665574bbfbd936a4dea34317ed |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 27 17:39:42 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 27 17:39:42 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15f8c32a |
| 7 |
|
| 8 |
virtual/jpeg-compat: New binary compatibility virtual |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/12115 |
| 11 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
.../libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild | 2 +- |
| 15 |
...bin-3.10.0-r1.ebuild => icedtea-bin-3.10.0-r2.ebuild} | 2 +- |
| 16 |
...ea-bin-3.12.0.ebuild => icedtea-bin-3.12.0-r1.ebuild} | 2 +- |
| 17 |
.../{etqw-bin-1.5-r1.ebuild => etqw-bin-1.5-r2.ebuild} | 4 ++-- |
| 18 |
...-demo-2.0_p1-r1.ebuild => etqw-demo-2.0_p1-r2.ebuild} | 4 ++-- |
| 19 |
virtual/jpeg-compat/jpeg-compat-62.ebuild | 16 ++++++++++++++++ |
| 20 |
virtual/{jpeg => jpeg-compat}/metadata.xml | 6 ------ |
| 21 |
virtual/jpeg/jpeg-62.ebuild | 15 --------------- |
| 22 |
virtual/jpeg/metadata.xml | 6 ------ |
| 23 |
9 files changed, 23 insertions(+), 34 deletions(-) |
| 24 |
|
| 25 |
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 |
| 26 |
index 6c64fa2c6a9..de26ee95d59 100644 |
| 27 |
--- a/app-office/libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild |
| 28 |
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild |
| 29 |
@@ -64,7 +64,7 @@ BIN_COMMON_DEPEND=" |
| 30 |
media-libs/libpng:0/16 |
| 31 |
>=sys-devel/gcc-7.3.0 |
| 32 |
>=sys-libs/glibc-2.27 |
| 33 |
- virtual/jpeg:62 |
| 34 |
+ virtual/jpeg-compat:62 |
| 35 |
" |
| 36 |
|
| 37 |
# PLEASE place any restrictions that are specific to the binary builds |
| 38 |
|
| 39 |
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 |
| 40 |
similarity index 99% |
| 41 |
rename from dev-java/icedtea-bin/icedtea-bin-3.10.0-r1.ebuild |
| 42 |
rename to dev-java/icedtea-bin/icedtea-bin-3.10.0-r2.ebuild |
| 43 |
index 9dc6568062c..84c1107124c 100644 |
| 44 |
--- a/dev-java/icedtea-bin/icedtea-bin-3.10.0-r1.ebuild |
| 45 |
+++ b/dev-java/icedtea-bin/icedtea-bin-3.10.0-r2.ebuild |
| 46 |
@@ -43,7 +43,7 @@ RDEPEND=">=dev-libs/glib-2.42:2% |
| 47 |
>=media-libs/freetype-2.5.5:2% |
| 48 |
>=media-libs/lcms-2.9:2% |
| 49 |
>=sys-libs/zlib-1.2.8-r1% |
| 50 |
- virtual/jpeg:62% |
| 51 |
+ virtual/jpeg-compat:62% |
| 52 |
alsa? ( >=media-libs/alsa-lib-1.0% ) |
| 53 |
cups? ( >=net-print/cups-2.0% ) |
| 54 |
gtk? ( |
| 55 |
|
| 56 |
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 |
| 57 |
similarity index 99% |
| 58 |
rename from dev-java/icedtea-bin/icedtea-bin-3.12.0.ebuild |
| 59 |
rename to dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild |
| 60 |
index 00bb6c4eb2e..524f4fe81db 100644 |
| 61 |
--- a/dev-java/icedtea-bin/icedtea-bin-3.12.0.ebuild |
| 62 |
+++ b/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild |
| 63 |
@@ -41,7 +41,7 @@ RDEPEND=">=dev-libs/glib-2.58:2% |
| 64 |
>=media-libs/freetype-2.9.1:2% |
| 65 |
>=media-libs/lcms-2.9:2% |
| 66 |
>=sys-libs/zlib-1.2.11-r1% |
| 67 |
- virtual/jpeg:62% |
| 68 |
+ virtual/jpeg-compat:62% |
| 69 |
alsa? ( >=media-libs/alsa-lib-1.0% ) |
| 70 |
cups? ( >=net-print/cups-2.0% ) |
| 71 |
gtk? ( |
| 72 |
|
| 73 |
diff --git a/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild b/games-fps/etqw-bin/etqw-bin-1.5-r2.ebuild |
| 74 |
similarity index 96% |
| 75 |
rename from games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild |
| 76 |
rename to games-fps/etqw-bin/etqw-bin-1.5-r2.ebuild |
| 77 |
index 8270e50c21e..014fcff96ba 100644 |
| 78 |
--- a/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild |
| 79 |
+++ b/games-fps/etqw-bin/etqw-bin-1.5-r2.ebuild |
| 80 |
@@ -1,4 +1,4 @@ |
| 81 |
-# Copyright 1999-2015 Gentoo Foundation |
| 82 |
+# Copyright 1999-2019 Gentoo Authors |
| 83 |
# Distributed under the terms of the GNU General Public License v2 |
| 84 |
|
| 85 |
EAPI=5 |
| 86 |
@@ -18,7 +18,7 @@ DEPEND="app-arch/unzip" |
| 87 |
RDEPEND="sys-libs/glibc |
| 88 |
amd64? ( sys-libs/glibc[multilib] ) |
| 89 |
>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] |
| 90 |
- >=virtual/jpeg-62:62[abi_x86_32(-)] |
| 91 |
+ virtual/jpeg-compat:62[abi_x86_32(-)] |
| 92 |
>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] |
| 93 |
>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] |
| 94 |
>=x11-libs/libX11-1.6.2[abi_x86_32(-)] |
| 95 |
|
| 96 |
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 |
| 97 |
similarity index 95% |
| 98 |
rename from games-fps/etqw-demo/etqw-demo-2.0_p1-r1.ebuild |
| 99 |
rename to games-fps/etqw-demo/etqw-demo-2.0_p1-r2.ebuild |
| 100 |
index 8915a443830..57a181dc367 100644 |
| 101 |
--- a/games-fps/etqw-demo/etqw-demo-2.0_p1-r1.ebuild |
| 102 |
+++ b/games-fps/etqw-demo/etqw-demo-2.0_p1-r2.ebuild |
| 103 |
@@ -1,4 +1,4 @@ |
| 104 |
-# Copyright 1999-2015 Gentoo Foundation |
| 105 |
+# Copyright 1999-2019 Gentoo Authors |
| 106 |
# Distributed under the terms of the GNU General Public License v2 |
| 107 |
|
| 108 |
EAPI=5 |
| 109 |
@@ -21,7 +21,7 @@ RESTRICT="strip mirror" |
| 110 |
|
| 111 |
DEPEND="app-arch/unzip" |
| 112 |
RDEPEND=">=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] |
| 113 |
- >=virtual/jpeg-62:62[abi_x86_32(-)] |
| 114 |
+ virtual/jpeg-compat:62[abi_x86_32(-)] |
| 115 |
>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] |
| 116 |
>=x11-libs/libX11-1.6.2[abi_x86_32(-)] |
| 117 |
>=x11-libs/libXext-1.3.2[abi_x86_32(-)]" |
| 118 |
|
| 119 |
diff --git a/virtual/jpeg-compat/jpeg-compat-62.ebuild b/virtual/jpeg-compat/jpeg-compat-62.ebuild |
| 120 |
new file mode 100644 |
| 121 |
index 00000000000..cc4ce8125f6 |
| 122 |
--- /dev/null |
| 123 |
+++ b/virtual/jpeg-compat/jpeg-compat-62.ebuild |
| 124 |
@@ -0,0 +1,16 @@ |
| 125 |
+# Copyright 1999-2019 Gentoo Authors |
| 126 |
+# Distributed under the terms of the GNU General Public License v2 |
| 127 |
+ |
| 128 |
+EAPI=7 |
| 129 |
+ |
| 130 |
+inherit multilib-build |
| 131 |
+ |
| 132 |
+DESCRIPTION="A virtual for the libjpeg.so.62 ABI for binary-only programs" |
| 133 |
+SLOT="62" |
| 134 |
+KEYWORDS="amd64 ~arm arm64 ppc64 x86" |
| 135 |
+ |
| 136 |
+RDEPEND=" |
| 137 |
+ || ( |
| 138 |
+ >=media-libs/libjpeg-turbo-1.3.0-r3:0[${MULTILIB_USEDEP}] |
| 139 |
+ >=media-libs/jpeg-6b-r12:62[${MULTILIB_USEDEP}] |
| 140 |
+ )" |
| 141 |
|
| 142 |
diff --git a/virtual/jpeg/metadata.xml b/virtual/jpeg-compat/metadata.xml |
| 143 |
similarity index 54% |
| 144 |
copy from virtual/jpeg/metadata.xml |
| 145 |
copy to virtual/jpeg-compat/metadata.xml |
| 146 |
index d5a42ca38ba..899a49093b0 100644 |
| 147 |
--- a/virtual/jpeg/metadata.xml |
| 148 |
+++ b/virtual/jpeg-compat/metadata.xml |
| 149 |
@@ -5,10 +5,4 @@ |
| 150 |
<email>graphics@g.o</email> |
| 151 |
<name>Gentoo Graphics Project</name> |
| 152 |
</maintainer> |
| 153 |
- <slots> |
| 154 |
- <slot name="0">For building against. This is the only slot |
| 155 |
- that provides headers and command line tools.</slot> |
| 156 |
- <slot name="62">For binary compatibility, provides |
| 157 |
- libjpeg.so.62 only.</slot> |
| 158 |
- </slots> |
| 159 |
</pkgmetadata> |
| 160 |
|
| 161 |
diff --git a/virtual/jpeg/jpeg-62.ebuild b/virtual/jpeg/jpeg-62.ebuild |
| 162 |
deleted file mode 100644 |
| 163 |
index 3b40ab4281e..00000000000 |
| 164 |
--- a/virtual/jpeg/jpeg-62.ebuild |
| 165 |
+++ /dev/null |
| 166 |
@@ -1,15 +0,0 @@ |
| 167 |
-# Copyright 1999-2018 Gentoo Foundation |
| 168 |
-# Distributed under the terms of the GNU General Public License v2 |
| 169 |
- |
| 170 |
-EAPI=5 |
| 171 |
- |
| 172 |
-inherit multilib-build |
| 173 |
- |
| 174 |
-DESCRIPTION="A virtual for the libjpeg.so.62 ABI for binary-only programs" |
| 175 |
-SLOT="62" |
| 176 |
-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" |
| 177 |
- |
| 178 |
-RDEPEND="|| ( |
| 179 |
- >=media-libs/libjpeg-turbo-1.3.0-r3:0[${MULTILIB_USEDEP}] |
| 180 |
- >=media-libs/jpeg-6b-r12:62[${MULTILIB_USEDEP}] |
| 181 |
- )" |
| 182 |
|
| 183 |
diff --git a/virtual/jpeg/metadata.xml b/virtual/jpeg/metadata.xml |
| 184 |
index d5a42ca38ba..899a49093b0 100644 |
| 185 |
--- a/virtual/jpeg/metadata.xml |
| 186 |
+++ b/virtual/jpeg/metadata.xml |
| 187 |
@@ -5,10 +5,4 @@ |
| 188 |
<email>graphics@g.o</email> |
| 189 |
<name>Gentoo Graphics Project</name> |
| 190 |
</maintainer> |
| 191 |
- <slots> |
| 192 |
- <slot name="0">For building against. This is the only slot |
| 193 |
- that provides headers and command line tools.</slot> |
| 194 |
- <slot name="62">For binary compatibility, provides |
| 195 |
- libjpeg.so.62 only.</slot> |
| 196 |
- </slots> |
| 197 |
</pkgmetadata> |
Archives