From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 May 2021 20:59:14 +0100 Subject: gentoo resync : 31.05.2021 --- media-gfx/xpaint/Manifest | 6 +- .../xpaint/files/xpaint-2.10.2-libtool-clang.patch | 13 ---- .../files/xpaint-2.10.2-respect-ldflags.patch | 18 ----- media-gfx/xpaint/xpaint-2.10.2-r1.ebuild | 88 ---------------------- media-gfx/xpaint/xpaint-3.1.3.ebuild | 4 +- 5 files changed, 4 insertions(+), 125 deletions(-) delete mode 100644 media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch delete mode 100644 media-gfx/xpaint/files/xpaint-2.10.2-respect-ldflags.patch delete mode 100644 media-gfx/xpaint/xpaint-2.10.2-r1.ebuild (limited to 'media-gfx/xpaint') diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest index fb8671fddc59..983242583388 100644 --- a/media-gfx/xpaint/Manifest +++ b/media-gfx/xpaint/Manifest @@ -1,10 +1,6 @@ -AUX xpaint-2.10.2-libtool-clang.patch 416 BLAKE2B 021018cc53dd726cc943cf316a69c3e9717f08e3f15de2c3acac0343a1ef1ee519d497cb8e497d432c4dfe9d68b06f67dade7c5992ba6fae318025759255aad5 SHA512 79eaa418eaab3253149d9ddfc7214af03a222ab406f85711600bba2d2b79f56c13c7c35abfeabba172b073896558a6445f5cfc26f97b8f501b2a0e08043c50b5 -AUX xpaint-2.10.2-respect-ldflags.patch 936 BLAKE2B d91ad744ec49ba4226255050a38bd6441f2087868e1f3f542c997736663a822f26c1f5ff4fdd8ae7b1c39581a3627bad28ec8743611f4366879b77397e0b5922 SHA512 9a2de804b7b940fd8a58bb1d0780cb05ad206560c224fbb007cf23f628a5ebeb37cc9cca39b1be4e33aaa5611bd7a7f5aab6267e07d2e11b667007d505f8debf AUX xpaint-3.1.3-gentoo-prefix.patch 3605 BLAKE2B c513a72991ec83b99fc12d90c112c743a0fec456ae09ad77ecee887e67d2891efd200d8d08bad594472060515b56b02b9097951c5ad285ddfebd3d46acc4265a SHA512 d231237fa1512637c5448b1c8c7a1dcffa1383a0dd24f6606215643ce51932ef58e994bfbc3f24d3376acdd9cc06d713d453c643d4d00e9d00af0e011e55762d AUX xpaint-3.1.3-gentoo-qa.patch 1480 BLAKE2B 43b80854e8d0bb68566f86116444507852bf61807846ec97238a90fefc8a86f9be3978858c12af3278b787b14f805edb628327ae411b8b6fbdcd7530ee72cbd5 SHA512 cfa7057625f3086b573f9109a89f29e1cf17c15d253a0c903bd0f315e4aac3d8111df899ef98d0a3416486d81305f0a041f061985d31d435ccbd24b0fc5a57b3 AUX xpaint-3.1.3-libtool-clang.patch 1434 BLAKE2B d89978f8c925a64fa62ff2a0788ed81ca5faee6a71afda069930a7381e2bb095bbad3c1236c3594532afc5441ef789bf6ea0571b4bb25065e2cbef7fdc52ebe3 SHA512 f4027619c4eda686953fc33c62518a7ef12db09e6160f5e038179aa06f64629d2ad28b373ec332fe3266fd7e15af77577b6a60cfdffb165afe1358519201c399 -DIST xpaint-2.10.2.tar.bz2 1891925 BLAKE2B 056ef057357a2441c8a286adf326a98650e5e0905ee07c5ef24b0689dbb57247711c44b63211494e4ca9e44429d6237c017f53e2690f99790fa6100e4ce4d118 SHA512 a25aa940931c686e86cbc2bd8d6fd3c80d2c793a20d7a2dd90fb5cba1cd360b5e1c8433bf0d639e2b86cb2a74040be373f732c4617909aaf8c5ada2624ab5614 DIST xpaint-3.1.3.tar.bz2 1656489 BLAKE2B c6f5ed4a6c990dccacc572c834fabf68a16cacfde477915e5c3598a96335a899344d4375a48e6bf06fb601e9b260a11cc2b43afb404a83b9fb7b3044288ce1fa SHA512 8ef15d6af4b65d9da18d3e5eb9eacc0b42e718d069e20de91f2e0352b642d0a4b7626a2008fdd6217c0668ed1ecdc7a09c4a993a6074c77b7899b4613c1c4bda -EBUILD xpaint-2.10.2-r1.ebuild 1627 BLAKE2B bcc7cc7bf254149c0a86633644700b4b2c109913f9c5c1587bff6d83a4a16db876975910b8e61c55a6fe6b79790eb709ddbb13aea7fa61da9e5b1ace2608aacd SHA512 869b6bcf1cf93fa0a64663bdaf38cb18aa0258005767bfc2087440f2acc9b506e824526d1684fb151a6220bc30d33cf545188aed0b52e40217078e952d7cd716 -EBUILD xpaint-3.1.3.ebuild 1897 BLAKE2B bcb42a0d09a8bbca4579966ab89e9abb101140e54944600fe7f6fa7e718fce557a13b3a212179fe880e8357a83e1c9ce08a600d391296fe67e139581f252ae3f SHA512 150c481b08f0348d9055dd9063648483b843616b69d2debef5cd4347fe1569708768c43791fa2243e9e9c5ae11aecbe958010983e1a1bdf6a005268dceb9ab31 +EBUILD xpaint-3.1.3.ebuild 1941 BLAKE2B 5e739c74c5341e48c973cb0786b96f56724ea602cf463855d2e587ce67a5437620585bfa84b8b6de2707c882453c43e3f1181e3f76fae69ad6ca73725d60caf4 SHA512 3b073c54cc13783430d34d6777eab200953dff07d01c529fc6ba1a5ff21de390a98758b588388fcc217c06783f335033f2de71275961b5563d68aa231fdc7dbf MISC metadata.xml 1439 BLAKE2B ca0b1f7ca10f9329bd535358cd6d683bdcbb793277a3c494c50b86d6e5a85691f2ebaefcdac49b5fa5dd610ebca07d30c16f9045db0cbb079dde142fadca4dae SHA512 74c75e26fa1ba697c15dee5c76048c99e104fff2492194ef71ebbe472c15790a5ca2a28f1ee2697b8c0dea1ff7b2e36947e52b03a9d885a338687353d6c555d3 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 deleted file mode 100644 index d6a3dab07830..000000000000 --- a/media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/files/xpaint-2.10.2-respect-ldflags.patch b/media-gfx/xpaint/files/xpaint-2.10.2-respect-ldflags.patch deleted file mode 100644 index 11a0b0e9a84e..000000000000 --- a/media-gfx/xpaint/files/xpaint-2.10.2-respect-ldflags.patch +++ /dev/null @@ -1,18 +0,0 @@ -The original Makefile did not pass CFLAGS and LDFLAGS -See bug https://bugs.gentoo.org/727632 -Also remove -O3 and stripping, leave portage control that ---- a/util/Makefile -+++ b/util/Makefile -@@ -10,10 +10,10 @@ - endif - - pdfconcat: -- $(CC) $(CFLAGS) -O3 -s -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat - - ppmtops: -- $(CC) $(CFLAGS) ppmtops.c -o ppmtops -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ppmtops.c -o ppmtops - - ifneq ($(WITH_PGF),no) - pgf2pnm: main.cpp pnm.cpp diff --git a/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild b/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild deleted file mode 100644 index 425586764ea2..000000000000 --- a/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop toolchain-funcs - -DESCRIPTION="Image editor with tiff, jpeg and png support" -HOMEPAGE="http://sf-xpaint.sourceforge.net/" -SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="pgf tiff" -# jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592 - -RDEPEND=" - media-libs/fontconfig - media-libs/freetype:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - x11-libs/libICE - x11-libs/libX11 - >=x11-libs/libXaw3dXft-1.6.2c[unicode] - x11-libs/libXext - x11-libs/libXft - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - sys-libs/zlib - pgf? ( media-libs/libpgf ) - tiff? ( - media-libs/jbigkit:0= - media-libs/tiff:0 - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/bison - sys-devel/flex - sys-devel/libtool - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-libtool-clang.patch - "${FILESDIR}"/${P}-respect-ldflags.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable tiff) \ - --disable-libopenjpeg -} - -src_compile() { - # clean up - emake clean - emake -C util clean - - # parallel make still fails sometimes - emake substads - emake xpaint.1 - - default - emake \ - WITH_PGF="$(usex pgf "yes" "no")" \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - -C util -} - -src_install() { - default - emake \ - WITH_PGF="$(usex pgf "yes" "no")" \ - DESTDIR="${ED}" \ - -C util install - doicon icons/xpaint.svg - make_desktop_entry "${PN}" - find "${ED}" \( -name '*.la' -o -name '*.a' \) -type f -delete || die -} diff --git a/media-gfx/xpaint/xpaint-3.1.3.ebuild b/media-gfx/xpaint/xpaint-3.1.3.ebuild index 6c62608de446..1c03f7e9b5fb 100644 --- a/media-gfx/xpaint/xpaint-3.1.3.ebuild +++ b/media-gfx/xpaint/xpaint-3.1.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="pgf tiff" # jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592 @@ -95,8 +95,10 @@ src_install() { pkg_postinst() { xdg_desktop_database_update + xdg_icon_cache_update } pkg_postrm() { xdg_desktop_database_update + xdg_icon_cache_update } -- cgit v1.2.3