[gentoo-commits] repo/gentoo:master commit in: media-libs/libharu/

["Sam James" <sam@gentoo.org>]

commit:     19fb0caa1850b23a25c3e693d52ae178c9912d7d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 19:06:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 19:06:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19fb0caa

media-libs/libharu: drop multilib

No multilib reverse dependencies.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../libharu/{libharu-2.3.0-r2.ebuild => libharu-2.3.0-r3.ebuild} | 9 ++++-----
 .../libharu/{libharu-2.4.2.ebuild => libharu-2.4.2-r1.ebuild}    | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild b/media-libs/libharu/libharu-2.3.0-r3.ebuild
similarity index 86%
rename from media-libs/libharu/libharu-2.3.0-r2.ebuild
rename to media-libs/libharu/libharu-2.3.0-r3.ebuild
index 5e62094e2a17..60153140f9a5 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 MYP=RELEASE_${PV//./_}
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="C/C++ library for PDF generation"
 HOMEPAGE="http://www.libharu.org/"
@@ -13,11 +13,10 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MYP}.tar.gz -> ${P}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 DEPEND="
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:=
+	sys-libs/zlib:=
 "
 RDEPEND="${DEPEND}"
 
@@ -30,7 +29,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-4-Add-support-for-free-form-triangle-Shading-objects.patch
 )
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DLIBHPDF_EXAMPLES=NO # Doesn't work
 		-DLIBHPDF_STATIC=NO

diff --git a/media-libs/libharu/libharu-2.4.2.ebuild b/media-libs/libharu/libharu-2.4.2-r1.ebuild
similarity index 81%
rename from media-libs/libharu/libharu-2.4.2.ebuild
rename to media-libs/libharu/libharu-2.4.2-r1.ebuild
index 87d3e0fccb63..92b8e3624a99 100644
--- a/media-libs/libharu/libharu-2.4.2.ebuild
+++ b/media-libs/libharu/libharu-2.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="C/C++ library for PDF generation"
 HOMEPAGE="http://www.libharu.org/"
@@ -12,11 +12,10 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 DEPEND="
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:=
+	sys-libs/zlib:=
 "
 RDEPEND="${DEPEND}"
 
@@ -24,7 +23,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch
 )
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DLIBHPDF_EXAMPLES=NO # Doesn't work
 		-DLIBHPDF_STATIC=NO