[gentoo-commits] repo/gentoo:master commit in: media-gfx/xpaint/, media-gfx/xpaint/files/

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

commit:     ed46e83d672d110adada7533f90878ed9c25e195
Author:     Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Mon Mar 22 16:33:19 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 16:42:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed46e83d

media-gfx/xpaint: fix compilation with clang

Closes: https://bugs.gentoo.org/731010
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch | 13 +++++++++++++
 media-gfx/xpaint/xpaint-2.10.2-r1.ebuild                 | 10 +++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch b/media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch
new file mode 100644
index 00000000000..d6a3dab0783
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch
@@ -0,0 +1,13 @@
+libtool doesn't work if compiling with clang.  Need to add --tag=CC
+See bug https://bugs.gentoo.org/731010
+--- a/xpaintrw/Makefile.am
++++ b/xpaintrw/Makefile.am
+@@ -25,7 +25,7 @@
+ 
+ xpaint_DEFINES = $(ARCH_DEFINES) $(EXTRA_DEFINES) $(XAWLIB_DEFINES)
+ 
+-LIBTOOL = /usr/bin/libtool
++LIBTOOL = /usr/bin/libtool --tag=CC
+ AM_CFLAGS   = @X_CFLAGS@ @SPECIAL_CFLAGS@ $(xpaint_DEFINES)
+ AM_YFLAGS     = -d
+ CLEANFILES    = 

diff --git a/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild b/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
index dc92f046b92..86563f5c2ab 100644
--- a/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
+++ b/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
@@ -18,6 +18,7 @@ IUSE="pgf tiff"
 RDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype:2
+	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
 	x11-libs/libICE
 	x11-libs/libX11
@@ -28,7 +29,6 @@ RDEPEND="
 	x11-libs/libXpm
 	x11-libs/libXt
 	sys-libs/zlib
-	media-libs/libjpeg-turbo:=
 	pgf? ( media-libs/libpgf )
 	tiff? (
 		media-libs/jbigkit:0=
@@ -39,9 +39,14 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
+	sys-devel/libtool
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libtool-clang.patch
+)
+
 src_prepare() {
 	default
 	sed -i -e 's/-O3 -s//g' util/Makefile || die
@@ -78,6 +83,5 @@ src_install() {
 		-C util install
 	doicon icons/xpaint.svg
 	make_desktop_entry "${PN}"
-	find "${D}" -name '*.la' -type f -delete || die
-	find "${D}" -name '*.a' -type f -delete || die
+	find "${D}" \( -name '*.la' -o -name '*.a' \) -type f -delete || die
 }