From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1400016-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 7B470158090
	for <garchives@archives.gentoo.org>; Mon, 23 May 2022 17:26:51 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id A951AE090F;
	Mon, 23 May 2022 17:26:50 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 8E526E090F
	for <gentoo-commits@lists.gentoo.org>; Mon, 23 May 2022 17:26:50 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 9D805341B24
	for <gentoo-commits@lists.gentoo.org>; Mon, 23 May 2022 17:26:49 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id CFD1E34E
	for <gentoo-commits@lists.gentoo.org>; Mon, 23 May 2022 17:26:47 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1653326788.bf92bccd8ffd7dc4ff4b32b465fa5e34ca04a564.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/, media-libs/openjpeg/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch media-libs/openjpeg/openjpeg-2.5.0-r1.ebuild media-libs/openjpeg/openjpeg-2.5.0.ebuild
X-VCS-Directories: media-libs/openjpeg/ media-libs/openjpeg/files/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: bf92bccd8ffd7dc4ff4b32b465fa5e34ca04a564
X-VCS-Branch: master
Date: Mon, 23 May 2022 17:26:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 51bae3fb-50a7-4331-a82d-acdfb9b464cb
X-Archives-Hash: e482b66795c3d8a0647eaf7a9480c7d1

commit:     bf92bccd8ffd7dc4ff4b32b465fa5e34ca04a564
Author:     Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz>
AuthorDate: Mon May 23 11:33:58 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 23 17:26:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf92bccd

media-libs/openjpeg: add 2.5.0-r1, fix includedir

Bug: https://bugs.gentoo.org/694776
Closes: https://bugs.gentoo.org/847058
Signed-off-by: Thomas Bracht Laumann Jespersen <t <AT> laumann.xyz>
Closes: https://github.com/gentoo/gentoo/pull/25607
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch         | 4 ++--
 .../openjpeg/{openjpeg-2.5.0.ebuild => openjpeg-2.5.0-r1.ebuild}      | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
index f82b64485979..f47f062b8939 100644
--- a/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
+++ b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
@@ -243,7 +243,7 @@ Raises minimum cmake version by a little.
 +mandir=@CMAKE_INSTALL_MANDIR@
 +docdir=@CMAKE_INSTALL_DOCDIR@
 +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
  
  Name: openjp2
  Description: JPEG2000 library (Part 1 and 2)
@@ -283,7 +283,7 @@ Raises minimum cmake version by a little.
 +mandir=@CMAKE_INSTALL_MANDIR@
 +docdir=@CMAKE_INSTALL_DOCDIR@
 +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
  
  Name: openjpip
  Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9)

diff --git a/media-libs/openjpeg/openjpeg-2.5.0.ebuild b/media-libs/openjpeg/openjpeg-2.5.0-r1.ebuild
similarity index 100%
rename from media-libs/openjpeg/openjpeg-2.5.0.ebuild
rename to media-libs/openjpeg/openjpeg-2.5.0-r1.ebuild