From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- virtual/jpeg/Manifest | 2 +- virtual/jpeg/jpeg-100-r1.ebuild | 15 +++++++++++++++ virtual/jpeg/jpeg-100.ebuild | 16 ---------------- 3 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 virtual/jpeg/jpeg-100-r1.ebuild delete mode 100644 virtual/jpeg/jpeg-100.ebuild (limited to 'virtual/jpeg') diff --git a/virtual/jpeg/Manifest b/virtual/jpeg/Manifest index 302adcb1f038..d6feb8058bf4 100644 --- a/virtual/jpeg/Manifest +++ b/virtual/jpeg/Manifest @@ -1,2 +1,2 @@ -EBUILD jpeg-100.ebuild 603 BLAKE2B 72449255edc3938b0f8935f0c03b0bc791584788b804913dbc71708c3c0af47d6c02015de5a0b69a3e8c014fe7a50f1dcc3576c308f24c93ca05c359a9e2dff8 SHA512 ca04e81d6380c9b917ed68b7dace21c7ff604505dde6958a49c324663b368d039b4edca725ad79ecd4c25ed625a34eb50edc062cdbfa90243eef8657ced04677 +EBUILD jpeg-100-r1.ebuild 537 BLAKE2B eec8f6912145cb43b29c3ecdb69a1038c7d1f441ecb6fa020fa093e6d398faff4c6dbf5fed16b647595a58fea6a27d4a63d35c59e1397193560b003c541bfd7a SHA512 60156eb939b2795b64605cc3ed5f80475bef21edd22416da114b7d24ca48ff92b60ffe74dc3ccd5f3e50fe98464ba3c237879b4b55e5338f0a57788a27e02a7f MISC metadata.xml 278 BLAKE2B dfec8ae3d98f446778a3eddc5382a412401a911fd7344f440c806cd0f64b1918a99fb67548a5fc2560ad917af337ee58a62833d821e80eeb45686568a5953c59 SHA512 b6e271c28fa50f7c0a882068a6f2048c288374d101421b6e1699dc7605164234749d700520a34498c4d0eb7dad938b09f3e71c4e34e951b8d6182b483787f650 diff --git a/virtual/jpeg/jpeg-100-r1.ebuild b/virtual/jpeg/jpeg-100-r1.ebuild new file mode 100644 index 000000000000..871f682b4bfb --- /dev/null +++ b/virtual/jpeg/jpeg-100-r1.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-build + +DESCRIPTION="Virtual to select between libjpeg-turbo and IJG jpeg for source-based packages" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs" + +RDEPEND=" + >=media-libs/libjpeg-turbo-1.5.3-r2:0[static-libs?,${MULTILIB_USEDEP}] +" diff --git a/virtual/jpeg/jpeg-100.ebuild b/virtual/jpeg/jpeg-100.ebuild deleted file mode 100644 index 9f8f55c5ff20..000000000000 --- a/virtual/jpeg/jpeg-100.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-build - -DESCRIPTION="Virtual to select between libjpeg-turbo and IJG jpeg for source-based packages" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs" - -RDEPEND="|| ( - >=media-libs/libjpeg-turbo-1.5.3-r2:0[static-libs?,${MULTILIB_USEDEP}] - >=media-libs/jpeg-9c:0[static-libs?,${MULTILIB_USEDEP}] - )" -- cgit v1.2.3