diff options
Diffstat (limited to 'media-gfx')
107 files changed, 1669 insertions, 3239 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 20eaca292f3e..be373195e7f1 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/album/Manifest b/media-gfx/album/Manifest index 675e0a7fec1e..57c0b3e98213 100644 --- a/media-gfx/album/Manifest +++ b/media-gfx/album/Manifest @@ -1,6 +1,6 @@ DIST album-4.13.tar.gz 667760 BLAKE2B fa4bd75147d708c18f183787fb62d55a068956204dab249ca2652583421fd444ff6fbbce54e16f02072534050c52c67dabe3c4e6fc977c6aff7317a0df9357d4 SHA512 c22bbc5ad154f35d50d28e5331911d0fd32c5e7f25b659e48274baa1ccc9e3e8b9f771a1bfdf39078c9e959c3fd84b3ccd8528f20f7a80baa7c59bc579579756 DIST album-4.15.tar.gz 651380 BLAKE2B da6728f65586b242297bb7c8d8ae676de636177539e5c1337e05cdb3f60e39b4135294c5709a92ae670821b1e5cb39f22567e2188c18671681db52f667789c6d SHA512 3e075efd81c829817f42fbe2163269581aa6ac972ec8f14e04237598e08722cdda78cc702e8628a6f77e6c2181ab7bc438f56975f5ed883f5ed9c53ca13edf9a DIST data-4.05.tar.gz 6468036 BLAKE2B 3e11911dabcf024934653f5fb5c3c3b65bd2ad5e6607c67ee1dade392540bb0b7c90de521effa5d72d2f40dc6c02016e23d373f714a3b62c15af53ebb4d438d3 SHA512 a7c577df6d10dc2db53fa6d469d2cf9c5115de99df47e79f31ecc0b009bd12e654e4ca7b9e6e78abe90a8a87d5f52ca9946a2d632e3f219d9bcb5ab7838ce42e -EBUILD album-4.13-r1.ebuild 899 BLAKE2B ec2ec1d85335f477a07fdb0b5d5c69cea71593db8515e9d28d41514601c4accc23fc9719b018d03ff313390109824413517d491337a3d9facd99ef22e935b6e1 SHA512 459d5f73f0229da36a2ad154acbb4afc6c7b93e7a0691672c07a9bff297a50ee926c7e641bdd7219bdf541243fcf60777e6f81ad58892d8384bc567cd5025fea -EBUILD album-4.15.ebuild 942 BLAKE2B d451d96c4591a0a66d42e2e62149bb0d58cb546911956318daee089a16fdfb820778096c4484a4e0d4488e16aa43f3aa1e0349c39586c6cbc95b0bafae42c0cd SHA512 da75dcbd607886d54837c915997d4fb63b4d628eb37fbaed2e81aa221b49a0627fd42539737ee012d7078f83c12dab15563d22a567e12fcf3016b2481f83fefa +EBUILD album-4.13-r2.ebuild 903 BLAKE2B 22e870b231280d06e24bc6912df99a6d752b55f787d7f15e7574a8a2714057a8ba024f4babc7ffd854e6e8585080964599e3e7907980ca421a7ccef383c108aa SHA512 d98825eb26e99da51b43405a9886595c71aa1a6f2ff9701782a931b75ab914127aa2736a17e61d0206b1f3ab9c06154a54fc2eee6b2556d7f6e6482ad13c9e02 +EBUILD album-4.15-r1.ebuild 946 BLAKE2B ef25e0ec0a61d44d3b28a4831bbf45d9dac260020468dabfed2ae24395ea8dac570d4203c9abab48a2145069a4d3e22ee06a7d0b3020c630fd3a3d0317696ea7 SHA512 4975be05ca1d2ca7bda75acd05a4150910eeb8c99f8499019a5fe0e24c4f30dfb1d9a67c1a9e6ca1dd9e2820f4463a0d5efb1eab3122a3c2d356a2041d43d8c0 MISC metadata.xml 374 BLAKE2B 05c713b2922350914356e8a0073f22c635b6c1b84bd6d0dd8031b0515fba8580da54636e1e75dd4bfd903fd10b3f465cfbda325e4e826bffee3a40badd9cf8e8 SHA512 b0e38d10966a2d98b1f8d8235e9f8c96c294037e503179531e795ffedcf8517ddcab991d692fc7dae7d64e354510a36e07671fb216b94a62b3d78c938667d530 diff --git a/media-gfx/album/album-4.13-r1.ebuild b/media-gfx/album/album-4.13-r2.ebuild index 8b5500e20dd0..a590351eb9fa 100644 --- a/media-gfx/album/album-4.13-r1.ebuild +++ b/media-gfx/album/album-4.13-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -17,7 +17,7 @@ DEPEND="" RDEPEND="dev-lang/perl media-gfx/jhead virtual/imagemagick-tools - ffmpeg? ( virtual/ffmpeg )" + ffmpeg? ( media-video/ffmpeg )" src_install() { dobin album diff --git a/media-gfx/album/album-4.15.ebuild b/media-gfx/album/album-4.15-r1.ebuild index ce30184d4956..283dda684e5f 100644 --- a/media-gfx/album/album-4.15.ebuild +++ b/media-gfx/album/album-4.15-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -17,7 +17,7 @@ DEPEND="" RDEPEND="dev-lang/perl media-gfx/jhead virtual/imagemagick-tools - ffmpeg? ( virtual/ffmpeg )" + ffmpeg? ( media-video/ffmpeg )" src_install() { dobin album diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest index 8a4bd95c3b37..5f45da5eb0dc 100644 --- a/media-gfx/argyllcms/Manifest +++ b/media-gfx/argyllcms/Manifest @@ -1,6 +1,5 @@ -DIST Argyll_V2.1.1_src.zip 13825860 BLAKE2B c1a748cf8ecd8e04164b0281e5cfb708386b196ea75bef6be02945d1a0cd1d191d069420628612ce0bd24028e40221a988becc3eba16293555376d20ab3a4bf5 SHA512 551b90c245d15e401c96c76ec0be66053bd75ca4d8b668a41841d72197820ed27d4d0186f903c126f7bacd667170e8e45e42ad31fcd44ec3276558b87b520565 +AUX argyllcms-2.1.2-fno-common.patch 5132 BLAKE2B 5398d60a364a36ea24d6cce682330db177aaaec874a39e4f2a9c754a8862504938471851a14ce0871bb7863a9fd9a794f7ede2144090e1f44718f001344032e8 SHA512 d60f0eb9bd6d32b85d8ac88aa32558d1446357c6643fbdb393e90eba08f8f701ba8185741879b2320bda73e08ed14989cc1a16ffd4d2996d5e9afb05774e4e76 DIST Argyll_V2.1.2_src.zip 13837056 BLAKE2B cf6181549e37b1deda11bdd4a63b27e101180a1e82b132ea8dca5af6830a74d5e2f940633f5aecf9a8d62fe8c2b0cdce8f2af44124ce7432b33d2a1bdbaa2c21 SHA512 f49b588c5f0a39edcc30a068a8bde8c7b74611d3feb15d07d4a61b205ed1231c288629f65e1a5a60a3921d552a28e075667ada555401a0d9694fd882bddd4b06 -EBUILD argyllcms-2.1.1-r1.ebuild 2113 BLAKE2B 7491a7a5fccb9ca0675dced451e2d8c88b804f279e19eb53c0e6afe8a64c415ae0d9b954428f490d1050e86ff01ad8ff74bbc133b6a189951336c65a6c44cbb3 SHA512 f4180c02dcc2997607ffea5e174626609809a08346b6c65c7f51cb79c2e57eff5de83909855a35712b9d5f055d2ece7cfdafc6af2b9ed0c63ab9570f3cd7bd44 -EBUILD argyllcms-2.1.1.ebuild 2049 BLAKE2B 366bead11308fb50f97eb8a443eee23677463e8b249300b3544ea9157fbcf19e603fd1bd506c14e3470965717d84916a1456a70282b68b2b970c1885cbae1193 SHA512 a1b1a16d0f1bd9a8ccfa149de5978aeddc5c189a28869c3836dd35c009d016f8dedbf292b6fc73702869e265635a82cf3e44599333130f60ceeb16be23852f1c -EBUILD argyllcms-2.1.2.ebuild 2110 BLAKE2B 40f4737e8c444258b3d348d1b314adcf91df265cc706e317503016a5629e64beeb8b4f3d1677f3b4e4eb5870a5c852ad53cee71530c14c4adcb8f793b9216b35 SHA512 389d01f24370996c5677bae880c36f628717b7821f40410ce28645dbf8b07a8dab5eaee750b413897b273aeb900aaa17589ba561ce036c0508ef02563a0c7107 +EBUILD argyllcms-2.1.2-r1.ebuild 2171 BLAKE2B fc3fc692cf31bbbf4e37bac3b1cdc46b9645c7ffe800b5171414f95b576b429dfb1a51987941f9ef1d3f3b4bc69b033eaf8821e4fb7fe5979b1eb7d94c7a10c5 SHA512 39b5fe40c05827a85bfdfa0b466abc8a90a4311926b50fb8ff933a84f762aa7dd1d7e30580d185706913c9dea859eded7044d3d64a4fcc196e8192c0f6053e02 +EBUILD argyllcms-2.1.2.ebuild 2109 BLAKE2B d6877c236e18b35ea0305d61ae11942cc87a79c8c1adb37e86d941532d0f46a6983101d45c7d375fd33637f249215d06fab56fb756d9fceeaa6d5d1eb965e24d SHA512 047b0fc549fa038b0ad6584a36ff160ff31b608abdb7d95a905a9a7ec30f42492bbba2544080db7b9496e8dc8530e79de6d1463fd86c00145b69c41d8f0d3a02 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724 diff --git a/media-gfx/argyllcms/argyllcms-2.1.1.ebuild b/media-gfx/argyllcms/argyllcms-2.1.1.ebuild deleted file mode 100644 index 0e6708716ccf..000000000000 --- a/media-gfx/argyllcms/argyllcms-2.1.1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic multiprocessing toolchain-funcs udev - -MY_P="Argyll_V${PV}" - -DESCRIPTION="Open source, ICC compatible color management system" -HOMEPAGE="http://www.argyllcms.com/" -SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="amd64 arm64 hppa x86" -IUSE="doc" - -RDEPEND=" - dev-libs/openssl:0= - media-libs/tiff:0 - sys-libs/zlib - virtual/jpeg:0 - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libXScrnSaver" -DEPEND="${RDEPEND} - app-arch/unzip - dev-util/ftjam" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - # Make it respect LDFLAGS - echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop - - # Evil hack to get --as-needed working. The build system unfortunately lists all - # the shared libraries by default on the command line _before_ the object to be built... - echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop - - append-cflags -DUNIX -D_THREAD_SAFE - - sed \ - -e 's:CCFLAGS:CFLAGS:g' \ - -e "s:ar rusc:$(tc-getAR) rusc:g" \ - -i Jambase || die - - tc-export CC RANLIB - - jam -dx -fJambase "-j$(makeopts_jobs)" || die -} - -src_install() { - jam -dx -fJambase install || die - - rm bin/License.txt || die - - pushd bin > /dev/null - local binname - for binname in * ; do - newbin ${binname} argyll-${binname} - done - popd > /dev/null - - dodoc log.txt Readme.txt ttbd.txt notes.txt - if use doc; then - docinto html - dodoc doc/*html doc/*jpg doc/*gif - fi - - insinto /usr/share/${PN} - doins -r ref - - udev_dorules usb/55-Argyll.rules -} - -pkg_postinst() { - elog "If you have a Spyder2 you need to extract the firmware" - elog "from the CVSpyder.dll of the windows driver package" - elog "and store it as /usr/share/color/spyd2PLD.bin" - echo - elog "For further info on setting up instrument access read" - elog "http://www.argyllcms.com/doc/Installing_Linux.html" - echo -} diff --git a/media-gfx/argyllcms/argyllcms-2.1.1-r1.ebuild b/media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild index 276ade085560..25461f6d1758 100644 --- a/media-gfx/argyllcms/argyllcms-2.1.1-r1.ebuild +++ b/media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,10 +30,12 @@ RDEPEND=" x11-libs/libXScrnSaver !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )" -DEPEND="${RDEPEND} - app-arch/unzip +DEPEND="${RDEPEND}" +BDEPEND="app-arch/unzip dev-util/ftjam" +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + S="${WORKDIR}/${MY_P}" src_compile() { diff --git a/media-gfx/argyllcms/argyllcms-2.1.2.ebuild b/media-gfx/argyllcms/argyllcms-2.1.2.ebuild index 74bfefe93386..4eae0ce5c410 100644 --- a/media-gfx/argyllcms/argyllcms-2.1.2.ebuild +++ b/media-gfx/argyllcms/argyllcms-2.1.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="amd64 arm64 ~hppa x86" +KEYWORDS="amd64 arm64 hppa x86" IUSE="doc libressl" RDEPEND=" diff --git a/media-gfx/argyllcms/files/argyllcms-2.1.2-fno-common.patch b/media-gfx/argyllcms/files/argyllcms-2.1.2-fno-common.patch new file mode 100644 index 000000000000..36bf87d12550 --- /dev/null +++ b/media-gfx/argyllcms/files/argyllcms-2.1.2-fno-common.patch @@ -0,0 +1,134 @@ +argyllcms: Fix compilation with GCC 10 + +A common mistake in C is omitting extern when declaring a global variable +in a header file. If the header is included by several files it results +in multiple definitions of the same variable. In previous GCC versions +this error is ignored. GCC 10 defaults to -fno-common, which means a +linker error will now be reported. To fix this, use extern in header +files when declaring global variables, and ensure each global is defined +in exactly one C file. As a workaround, legacy C code can be compiled +with -fcommon. + + int x; // tentative definition - avoid in header files + extern int y; // correct declaration in a header file + +References: +https://bugzilla.opensuse.org/show_bug.cgi?id=1160244 +https://bugzilla.opensuse.org/show_bug.cgi?id=1160256 + +In case of vinflate.c and inflate.c, both files define local variables +with the same name as global. It is no more possible with GCC 10. To +prevent sharing variables across files, add "static" to all local +variables. + +Index: Argyll_V2.1.2/gamut/gamut.h +=================================================================== +--- Argyll_V2.1.2.orig/gamut/gamut.h ++++ Argyll_V2.1.2/gamut/gamut.h +@@ -36,7 +36,7 @@ + #define MAXGAMN 10 /* Maximum gamut point neighbors returned */ + #define NSLOTS 6 /* Number of maximum direction slots */ + +-struct _vrml *wrl; /* Declared in vrml.h, which may be #included after this */ ++struct _vrml; /* Declared in vrml.h, which may be #included after this */ + + /* ------------------------------------ */ + #define NODE_STRUCT \ +Index: Argyll_V2.1.2/spectro/vinflate.c +=================================================================== +--- Argyll_V2.1.2.orig/spectro/vinflate.c ++++ Argyll_V2.1.2/spectro/vinflate.c +@@ -92,7 +92,7 @@ int vinflate(void); + */ + + #define WSIZE 0x8000 +-unsigned int wp; /* current position in slide */ ++static unsigned int wp; /* current position in slide */ + uch slide[32768]; + + static int vflush_output(unsigned int w) { +@@ -160,8 +160,8 @@ static ush cpdext[] = { /* Extra + the stream. + */ + +-ulg bb; /* bit buffer */ +-unsigned bk; /* bits in bit buffer */ ++static ulg bb; /* bit buffer */ ++static unsigned bk; /* bits in bit buffer */ + + ush vmask_bits[] = { + 0x0000, +@@ -230,8 +230,8 @@ ush vmask_bits[] = { + */ + + +-int vlbits = 9; /* bits in base literal/length lookup table */ +-int vdbits = 6; /* bits in base distance lookup table */ ++static int vlbits = 9; /* bits in base literal/length lookup table */ ++static int vdbits = 6; /* bits in base distance lookup table */ + + + /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */ +@@ -239,7 +239,7 @@ int vdbits = 6; /* bits in base + #define N_MAX 288 /* maximum number of codes in any set */ + + +-unsigned hufts; /* track memory usage */ ++static unsigned hufts; /* track memory usage */ + + /* Given a list of code lengths and a maximum table size, make a set of + tables to decode that set of codes. Return zero on success, one if +Index: Argyll_V2.1.2/spectro/inflate.c +=================================================================== +--- Argyll_V2.1.2.orig/spectro/inflate.c ++++ Argyll_V2.1.2/spectro/inflate.c +@@ -49,7 +49,7 @@ typedef unsigned int ulg; + the next table, which codes e - 16 bits, and lastly e == 99 indicates + an unused code. If a code with e == 99 is looked up, this implies an + error in the data. */ +-struct huft { ++static struct huft { + uch e; /* number of extra bits or operation */ + uch b; /* number of bits in this code or subcode */ + union { +@@ -87,7 +87,7 @@ int inflate(void); + /* unsigned wp; current position in slide */ + + #define WSIZE 0x8000 +-unsigned int wp; /* current position in slide */ ++static unsigned int wp; /* current position in slide */ + uch slide[32768]; + + static int flush_output(unsigned int w) { +@@ -155,8 +155,8 @@ static ush cpdext[] = { /* Extra + the stream. + */ + +-ulg bb; /* bit buffer */ +-unsigned bk; /* bits in bit buffer */ ++static ulg bb; /* bit buffer */ ++static unsigned bk; /* bits in bit buffer */ + + ush mask_bits[] = { + 0x0000, +@@ -201,8 +201,8 @@ ush mask_bits[] = { + */ + + +-int lbits = 9; /* bits in base literal/length lookup table */ +-int dbits = 6; /* bits in base distance lookup table */ ++static int lbits = 9; /* bits in base literal/length lookup table */ ++static int dbits = 6; /* bits in base distance lookup table */ + + + /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */ +@@ -210,7 +210,7 @@ int dbits = 6; /* bits in base + #define N_MAX 288 /* maximum number of codes in any set */ + + +-unsigned hufts; /* track memory usage */ ++static unsigned hufts; /* track memory usage */ + + + static int huft_build(b, n, s, d, e, t, m) + diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest index b67b2de37c30..e41f18c5e31a 100644 --- a/media-gfx/asymptote/Manifest +++ b/media-gfx/asymptote/Manifest @@ -4,8 +4,12 @@ AUX asymptote-2.61-info.patch 436 BLAKE2B 34787bb4afb276074a16bbf36bf31ed71a1fd2 AUX asymptote-2.61-xdg-utils.patch 752 BLAKE2B e73ad1bdda49fe95f494815571b21c7987e256450885077b89bb1dc6e192fb0cb5389dcbc1864750f6a3b6bb2762056df3c3ccea01edc42ca8f5cb435d1fc4f8 SHA512 a967c529c9e487fea3fedc46cfde81347aca98e470f7bae17879f4ca7c661ea658e764dfb352c73dc0860e152d5a0969e4ced034e1bbbd59f78d495365ce5f70 AUX asymptote-2.62-info.patch 436 BLAKE2B f4994502868851fc175d05bdd83b3a099d67a2aa4d188656c24860ac167bb54b61a68497233536854656964b7fd7b71f050ec4b9c7c797a0e852936d3a2c7ce6 SHA512 77dea1306a90df1030b0789a0a6bf2c95c03805c13664d1b4599fc4a00fac7218425b33e506d1fb52b8e9da67d468b64de990a2ed3fb3853185ebc16ce74033b AUX asymptote-2.62-xdg-utils.patch 752 BLAKE2B 887e0ad34c0b24e20b50556eb070da9c4bcc00af60873b9da84445125f1129eef41050002fd8aa04ea796c14916041692c335a6d04833bf5c374e6c9aec5bad9 SHA512 cee63bbaf975ccb9fdece0728f62026b7e59e945790c6ffa1c182db814c87b0acdf38b9f1939532edf36e8f248d09f8f540c4223f7f6933c3d8a5f2a1ad0602e +AUX asymptote-2.65-info.patch 436 BLAKE2B 0ddf2454a1ad2370c153d74d8fe4b8f36c2f702d6f732608097865885cb71681e1564e2a25b107bb0d3ff5bc0db746a86f58be49179d6b825459fce02b51b88e SHA512 77e47570629ba0370e43f0e872feb58739958ba939d29edb8411681cf638a00866a892a3dcb9a41de82f463c8e4e21fa1a7e76003075f7d78d938ab38ca636e9 +AUX asymptote-2.65-xdg-utils.patch 754 BLAKE2B 6697eabd3cded5ac11c4802805e1c55a05d41ad35fa46d57ea0534d85a2d34d6fabf1b119d94b83ad8387e9de4537d933f25c24fbe2e376eba4bc02925f2a2fc SHA512 85d85f15d8ebeb3d272d1e619ec7a97cac71b673c03a9811c1e051ef6c49ba41399409eb26b24523145eb758c353233dc50d8b105979723d903c9da3bcbc4d52 DIST asymptote-2.61.src.tgz 4623504 BLAKE2B 8432f07ce21f630c5bdae609650c0bb2bcd237a121df68030dc19d1cae986f0bfa56dd0e241570809f9fcb202440e8b9b3c6d47a22eeaabe3eb9523360a166ca SHA512 34bb610360b4536da70ca9edf1e069ebbf0c9225948b92b3d59ea25e8684587364fa7bbb03909ba02617e6ee81d41a2e530c9ed639141e4cda42096143cab5f7 DIST asymptote-2.62.src.tgz 4625853 BLAKE2B 49a5c75f936149139576cc224b005e76d2465a6c813bcb152f2534e98e042685c1500eafb0954b9e53ac0e667b47ab88a8b3387f1627d58828008d0e4d4cc0c8 SHA512 f7e817cdbb3c079a10c5f6f56a1eb47b1aaf8230902c06870bc8feacfed5f7af3d8ed22e4c60cc7130828ced8d36ec035533de1074cb049d3de9006ee542ac2e +DIST asymptote-2.65.src.tgz 4640419 BLAKE2B a508532b9697a0744d48f8109d5b04ca71eb1ee7a08f15eccd2b95d63c16c980621ef03d01a03917a767c774f14a239a13f8fe50ad98b154b092f710917af1ad SHA512 c6879689192c1646a318b389de222accc55c8d5e9df17fab3c88c37f627d2cff8133cdefe9e6dec2784cf72edf261e557ad83f7fac6e67fd49c483e9d8971026 EBUILD asymptote-2.61.ebuild 4627 BLAKE2B e96e10d46b053e2f4e77a7ff95d4462ada1d67c46ada65d5c5f2cf7904c8470ca08a9801a09ea51f3a59e0a2e7371a1a86735b544e25c63ead28ea6f5a9a6879 SHA512 5ad08eabea089f9e96d0f79eb50c1c428a2e3bdb002b0d34417a58af5ed59d4e24eb41adb45241890cbadadc6cb745c00811a0fcd2d5d878e091a210cfcfc095 EBUILD asymptote-2.62.ebuild 4629 BLAKE2B 325473944f50c21e9b7f1336cb406569a1b85c902ff14e37aca970a5586c45adadda1fdeed9c9e9d5858aa2f0ef1d7fd45e8bc4a145d57cda7da4398fb82483f SHA512 31f06d0ca6e5ed329ee76e69ea26fe4868806aecc047a552efa7a1e6cfb06b9f9c2d9fa9f0db16098185342820a997716479361c4ac68b41ad496315283e0bf9 +EBUILD asymptote-2.65.ebuild 4631 BLAKE2B 83cdf968e58cf57afcb3860670771ace003b0b1f159da7d34d5df33d6c8d3e29f50438577d1d0b7f88d291de0662282ec3b9b9b0228b3b1269cff7ee0196f592 SHA512 fcd6ad9bd8b4dce2e75ce3ab5606b28fd0cf8bba116176a355f6cd86e5874ad70044f27d30b5b2a9348ec10efadaf7f33685622153a9fa2e6c646f917ccbb4c2 MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee diff --git a/media-gfx/asymptote/asymptote-2.65.ebuild b/media-gfx/asymptote/asymptote-2.65.ebuild new file mode 100644 index 000000000000..4c2242fc1988 --- /dev/null +++ b/media-gfx/asymptote/asymptote-2.65.ebuild @@ -0,0 +1,211 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit autotools elisp-common latex-package python-r1 + +DESCRIPTION="A vector graphics language that provides a framework for technical drawing" +HOMEPAGE="http://asymptote.sourceforge.net/" +SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + offscreen? ( opengl ) + doc? ( boehm-gc )" + +RDEPEND=" + >=sys-libs/ncurses-5.4-r5:0= + >=sys-libs/readline-4.3-r5:0= + imagemagick? ( media-gfx/imagemagick[png] ) + opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) + offscreen? ( media-libs/mesa[osmesa] ) + svg? ( app-text/dvisvgm ) + sigsegv? ( dev-libs/libsigsegv ) + boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) + fftw? ( >=sci-libs/fftw-3.0.1 ) + gsl? ( sci-libs/gsl ) + python? ( ${PYTHON_DEPS} ) + X? ( + ${PYTHON_DEPS} + dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg] + dev-python/numpy + dev-python/pycson + >=gnome-base/librsvg-2.40 + ) + latex? ( + virtual/latex-base + >=dev-texlive/texlive-latexextra-2013 + ) + emacs? ( >=app-editors/emacs-23.1:* ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" +DEPEND="${RDEPEND} + doc? ( + dev-lang/perl + media-gfx/imagemagick[png] + virtual/texi2dvi + virtual/latex-base + app-text/ghostscript-gpl ) + test? ( app-text/ghostscript-gpl )" + +TEXMF=/usr/share/texmf-site + +PATCHES=( + # Changing pdf, ps, image viewers to xdg-open + "${FILESDIR}/${P}-xdg-utils.patch" + + # Bug #322473 + "${FILESDIR}/${P}-info.patch" +) + +src_prepare() { + sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \ + -i configure.ac \ + || die "sed configure.ac failed" + + default + eautoreconf +} + +src_configure() { + # for the CPPFLAGS see + # https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349 + econf \ + CPPFLAGS=-DHAVE_SYS_TYPES_H \ + CFLAGS="${CXXFLAGS}" \ + --disable-gc-debug \ + $(use_enable boehm-gc gc system) \ + $(use_enable fftw) \ + $(use_enable gsl) \ + $(use_enable opengl gl) \ + $(use_enable offscreen) \ + $(use_enable sigsegv) +} + +src_compile() { + default + + cd doc || die + emake asy.1 + if use doc; then + # info + einfo "Making info" + emake ${PN}.info + cd FAQ || die + emake + cd .. || die + # pdf + einfo "Making pdf docs" + export VARTEXFONTS="${T}"/fonts + # see bug #260606 + emake -j1 asymptote.pdf + emake CAD.pdf + fi + cd .. || die + + if use emacs; then + einfo "Compiling emacs lisp files" + elisp-compile base/*.el + fi +} + +src_install() { + # the program + dobin asy + + # .asy files + insinto /usr/share/${PN} + doins base/*.asy + + # documentation + dodoc BUGS ChangeLog README ReleaseNotes TODO + doman doc/asy.1 + + # X GUI + if use X; then + insinto /usr/share/${PN} + doins -r GUI + chmod +x "${D}"/usr/share/${PN}/GUI/xasy.py + dosym ../share/${PN}/GUI/xasy.py /usr/bin/xasy + doman doc/xasy.1x + fi + + # examples + if use examples; then + insinto /usr/share/${PN}/examples + doins \ + examples/*.asy \ + doc/*.asy \ + doc/*.csv \ + doc/*.dat \ + doc/extra/*.asy + insinto /usr/share/${PN}/examples/animations + doins examples/animations/*.asy + fi + + # LaTeX style + if use latex; then + cd doc || die + insinto "${TEXMF}"/tex/latex/${PN} + doins ${PN}.sty asycolors.sty + if use examples; then + insinto /usr/share/${PN}/examples + doins latexusage.tex + insinto /usr/share/${PN}/examples/animations + doins ../examples/animations/*.tex + fi + cd .. || die + fi + + # asymptote.py + if use python; then + python_foreach_impl python_domodule base/${PN}.py + fi + + # emacs mode + if use emacs; then + elisp-install ${PN} base/*.el base/*.elc + elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el + fi + + # vim syntax + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins base/asy.vim + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}"/asy-ftd.vim + fi + + # extra documentation + if use doc; then + cd doc || die + doinfo ${PN}.info* + dodoc ${PN}.pdf CAD.pdf + cd FAQ || die + dodoc asy-faq.ascii + doinfo asy-faq.info + docinto html/FAQ + dodoc asy-faq.html/* + fi +} + +pkg_postinst() { + use latex && latex-package_rehash + use emacs && elisp-site-regen + + elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer' + elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer' +} + +pkg_postrm() { + use latex && latex-package_rehash + use emacs && elisp-site-regen +} diff --git a/media-gfx/asymptote/files/asymptote-2.65-info.patch b/media-gfx/asymptote/files/asymptote-2.65-info.patch new file mode 100644 index 000000000000..27d0e5ce868d --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-2.65-info.patch @@ -0,0 +1,13 @@ +Index: asymptote-2.65/doc/asymptote.texi +=================================================================== +--- asymptote-2.65.orig/doc/asymptote.texi ++++ asymptote-2.65/doc/asymptote.texi +@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir + + @dircategory Languages + @direntry +-* asymptote: (asymptote/asymptote). Vector graphics language. ++* asymptote: (asymptote). Vector graphics language. + @end direntry + + @titlepage diff --git a/media-gfx/asymptote/files/asymptote-2.65-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.65-xdg-utils.patch new file mode 100644 index 000000000000..6f4fb6cbcf4f --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-2.65-xdg-utils.patch @@ -0,0 +1,22 @@ +Index: asymptote-2.65/settings.cc +=================================================================== +--- asymptote-2.65.orig/settings.cc ++++ asymptote-2.65/settings.cc +@@ -100,13 +100,13 @@ string defaultPSViewer="open"; + string defaultPDFViewer="open"; + string defaultHTMLViewer="open"; + #else +-string defaultPSViewer="gv"; +-string defaultPDFViewer="acroread"; +-string defaultHTMLViewer="google-chrome"; ++string defaultPSViewer="xdg-open"; ++string defaultPDFViewer="xdg-open"; ++string defaultHTMLViewer="xdg-open"; + #endif + string defaultGhostscript="gs"; + string defaultGhostscriptLibrary=""; +-string defaultDisplay="display"; ++string defaultDisplay="xdg-open"; + string defaultAnimate="animate"; + void queryRegistry() {} + const string dirsep="/"; diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index ef89e342ec69..a0cfbe68154d 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -3,5 +3,5 @@ AUX blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch 1265 BLAKE2B bff3ae AUX blender-2.79b-gcc-8.patch 1259 BLAKE2B 7d204a953c71e656fb309e0560e2de03a9316a95e67a76ecdeb303fadeeca14338ba823d6780a50b62bf4686477a962030b42b15ceae12d48ab21034b0358cc1 SHA512 df0a6a0543a7feac22e6082652792e59ce675dcea99a821c480d5c13e42e9df4d7ab43c71d296a22dd195771714e630757b1e220177d3713f409ea21e9251504 AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af8c2c42fe0d3e9730833272b4fe8387075ce592ee65668cc9862a1ad10c9857a31b3f1c0614c9e69f937998ccb5c86a17 SHA512 5343f0e9e6bba2d15a38cb5db95a1aeff0a704c0762e558b9b74d88dd58e2fb5077289f0d8f25a61fa092d083f7db916d27c4642dfd7cf84d4c989258c3253ec DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f -EBUILD blender-2.79b-r2.ebuild 8415 BLAKE2B 97a7cc9743a1b004ad89452fe61a19a3739a83e117edda573ce39b9e5de49d80a2d5b85cf0948589b1b84b1331fab877b7f485b6350075072a5b430406dee4dd SHA512 951ef26bde571bd24af905784a1bfdf45f00bdc4c7a6c9e4b8f55ccb9c875faa38db56db4695d11a310865975a7f07d6eeb87df9816314d8a9ec391708e5f936 +EBUILD blender-2.79b-r2.ebuild 8338 BLAKE2B 3511f43b0a51ccb8be44a498baf17b6ea57a7db401bfb5ba356be06f952c3e9ee79ba663df90f56c7a10968818003b6fb5300c40665dae85baf33d304924ca91 SHA512 718fc4cc414961a0dd934e4060a415dd0a55dc06d52f4db3b69a2e777a1c6f4c93cec0ebdb8d8638d443ae409d4f9be86d6f012a4740f31d92dc2e3618e19d41 MISC metadata.xml 2628 BLAKE2B b6ac04e033bd54bf3b6918737289e0a12ece3f87543b033ff85748934b6cecdb0cf8084a3c0e7fd766965b6defa4a402980244bec1a0ed2772ffbd12bfe96a8f SHA512 a47e7a85cc98bf0befad9b5ef5ad75276a6649bb5949367294177f19ae763a3dd0eae1ce8d179463c18c33533c37c283c7beabe08fe27d861bd54eb761675e35 diff --git a/media-gfx/blender/blender-2.79b-r2.ebuild b/media-gfx/blender/blender-2.79b-r2.ebuild index 00b4f20254a2..1c922ac27481 100644 --- a/media-gfx/blender/blender-2.79b-r2.ebuild +++ b/media-gfx/blender/blender-2.79b-r2.ebuild @@ -21,7 +21,7 @@ SLOT="0" LICENSE="|| ( GPL-2 BL )" KEYWORDS="amd64 ~x86" IUSE="+bullet +dds +elbeem +game-engine +openexr collada color-management \ - cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \ + cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k \ llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \ osl player sdl sndfile test tiff valgrind" RESTRICT="!test? ( test )" @@ -53,7 +53,6 @@ RDEPEND="${PYTHON_DEPS} color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) - libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest index 62262b72b30e..f47ed26892eb 100644 --- a/media-gfx/cairosvg/Manifest +++ b/media-gfx/cairosvg/Manifest @@ -1,7 +1,5 @@ DIST CairoSVG-1.0.22.tar.gz 30896 BLAKE2B b1a4950a67159663bbc72189e57ce36bf2506733b4ff63319178540d242aafd29eb7f5c3993119a5034d3eb77df1dfdd8fed9c53966df13510fe910cbcbb8c43 SHA512 5f4ea7b80947092620827e454182af7332082a8c84fddc035f75ed19c09b4a9027d6bfd5c96e5f388150833788a71ab8fb77a1ffdd963b8106f07b1908a0c8f6 -DIST CairoSVG-2.0.3.tar.gz 39371 BLAKE2B a04e3e3d311167cef84063fd3eabc4ffa7c206c5c6fc8016283874411c344c686c441a3149631eccb38b610bb86a2ec3c193eec869b8802ddba1dac92c612215 SHA512 b7ad7be9bd06059392f2004e7cd5c1df1667dbae78482c68d681990a8b3a4141a9c4b72aa4af5075a87ac6a1a4ddf8311d991512be98128b21b87d4355c1bd3d DIST CairoSVG-2.4.2.tar.gz 38715 BLAKE2B 3c8f77561e13e0fdec371a601f09f0d107f972955c8e8fbc34f5092a7ff5f65b24338c20ae8e21b428eea083925a36b3e5635a9b0010c569d013169d919b7a35 SHA512 0d6dd22d9569fd3849cf7f6594c86bed719169dac1f0f3219e88d82f9d245bf29d51715159085cb26c0340c8f0dcb88412d141ec0ee3710b1477626f5a578441 EBUILD cairosvg-1.0.22.ebuild 708 BLAKE2B 0c4ae60144019c0dcb7230ca9e9c864fce160bc173a9af147329888d0c1b719e5e8b55ca6a6881b35e96063266903c0f280da85572cdf72c481e0a8d613904e5 SHA512 deb1c685e2c91a284ab591bb5ac4f4a00265564cb945d060273c9b8bddcff7d454b0557d33976119465798352ded1996bcdb6fbeb0338d328d46a82a63db26c4 -EBUILD cairosvg-2.0.3.ebuild 704 BLAKE2B 0479aad627b2da3bdc0b844d33b16bb809b96c8951b781925e68e35c9963a169a42436cebb0ec7e65479a64502c80b78365d888edff92244f6796e3ea9b8b957 SHA512 5f246219d9e86b2125f72db028904c0d92648fd5b20dc144f500418c78d789cf9ee7a8369af2908d251e37c3795b1b398155b4aeb55d9409cbb1aa2e8ff59ae9 -EBUILD cairosvg-2.4.2.ebuild 874 BLAKE2B 3f8bcf0a879209c30961a5cabb89fb0b00de69c42ae6ff800b13d56c963b2fdeb2f64d3e018152174dec0f5c95d1477be0df0d9eb05ddc48c2099d2c2066c833 SHA512 aeba0b58d589545240c6e059ee5d9abaa17af866427efe6d6194278967e0ec22bfab8b21e7ab9d7664fa7b4e98c02cb057777a9d945d6dab2dc2e3994dd7540d +EBUILD cairosvg-2.4.2.ebuild 872 BLAKE2B 4f326bdcaa5571e152cd438654fa0ffe4f9aa9465f0e88dce89f00c683506e932fd58fcd075d75f94f634e33d152c8b14a8dbdd8b467e087a6eb2c38d654a0fd SHA512 8bb35201de54b9f633516fa768925ac9b77245a8f8a89ddfea5ed12f01cf0ce57bb39deb24d3b3c11d8c0a59ace7fee30292b2ea175c29f88476e777b43935cf MISC metadata.xml 328 BLAKE2B 168e60e4dbd12e2b99ba4ad8a6f8f42ef5a4de12f8f1edc68ba4d1d4252b24995da5d0e4ef9e1db09b3934ba42b042685db625439425a6e98cde2f52050c4af1 SHA512 ebb7d9d27e014fd083d0abe9508040730f980ba8a0bc89670ee5418af2c3af036d0ec16b5607a8805944d3b7eeb835e8806ab059fed68c52268df1cd10d7bbb0 diff --git a/media-gfx/cairosvg/cairosvg-2.0.3.ebuild b/media-gfx/cairosvg/cairosvg-2.0.3.ebuild deleted file mode 100644 index a65f0571ab2c..000000000000 --- a/media-gfx/cairosvg/cairosvg-2.0.3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -MY_PN="CairoSVG" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="CLI and library to export SVG to PDF, PostScript, and PNG" -HOMEPAGE="https://cairosvg.org/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - dev-python/cairocffi[${PYTHON_USEDEP}] - dev-python/cssselect[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/tinycss[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -DOCS=( NEWS.rst README.rst TODO.rst ) diff --git a/media-gfx/cairosvg/cairosvg-2.4.2.ebuild b/media-gfx/cairosvg/cairosvg-2.4.2.ebuild index bd671f1a2cb2..2341e26567f1 100644 --- a/media-gfx/cairosvg/cairosvg-2.4.2.ebuild +++ b/media-gfx/cairosvg/cairosvg-2.4.2.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" dev-python/cairocffi[${PYTHON_USEDEP}] diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index c9062d327557..b4631300760c 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,4 +1,4 @@ AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42 -EBUILD digikam-6.4.0-r1.ebuild 4361 BLAKE2B 2c1c4bb2a47d433b4230a597a1a8bd275c242d0ae069809e3f933a9076d4ba58b00b41bbca196faad98aaf25d344689ffba23613d4027a4196113ef5d2ca0081 SHA512 a586fa2ba60d7227bf49cb5a94571a0d36916c0d64da9e3aad8f63d33cc4bf12c45772fff9262cfe9a364d07a018139a079f5515e262aa3e4189d9995fd5be9b +EBUILD digikam-6.4.0-r1.ebuild 4310 BLAKE2B 9c69ad526cedaac830105b620f2ee096504ca4e78c4ee4a6db60ac1398602be51bf1fe38a5b5dc338af2ae87ea041c93f3d1861352303c709121673034962133 SHA512 02d6beb8875c218acfe8f42d7c08715b53282b6d9a57949c8eb70176be6680a5b752719087f26b4cfa6bcae47e055c37db62d55cbec80ee6ddb4539ef2423b98 MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8 diff --git a/media-gfx/digikam/digikam-6.4.0-r1.ebuild b/media-gfx/digikam/digikam-6.4.0-r1.ebuild index 99983ca35b3b..f89120250bc7 100644 --- a/media-gfx/digikam/digikam-6.4.0-r1.ebuild +++ b/media-gfx/digikam/digikam-6.4.0-r1.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="https://www.digikam.org/" LICENSE="GPL-2" SLOT="5" -IUSE="addressbook calendar dnn heif +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" +IUSE="addressbook calendar dnn heif +imagemagick gphoto2 +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" BDEPEND=" >=dev-util/cmake-3.14.3 @@ -80,8 +80,7 @@ COMMON_DEPEND=" ) mediaplayer? ( media-libs/qtav[opengl] - !libav? ( media-video/ffmpeg:= ) - libav? ( media-video/libav:= ) + media-video/ffmpeg:= ) opengl? ( >=dev-qt/qtopengl-${QTMIN}:5 diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest index 17985e7cf3e2..d2dc07a4b110 100644 --- a/media-gfx/eom/Manifest +++ b/media-gfx/eom/Manifest @@ -1,9 +1,5 @@ -DIST eom-1.22.0.tar.xz 2171992 BLAKE2B 5fc1dc872dabd6c7e06c3df778ed1616ecd66487a7ffae94744b299d54df840623759fb559727db1e4e6089021f26a21568bf4682c33fdd434bc2e0924c9a698 SHA512 1e086d1e2a0adc02978ffb45a4636e9b614a52d53a7a821af4050029f3fa3a774c29c2d43b5f2e0c58a100311eccc34e9424caf44e7e2139b4fa8d695b77cea0 -DIST eom-1.22.1.tar.xz 2142132 BLAKE2B c68f6d6ee4284de7dea3f3d9761f4b67a2edc0a169b3c3ac04ac6efd13e9f1044cf0be023e36891672b31ff73815d7ce765d8db656bbeb69f324e0ee412eb231 SHA512 f510de62b9b6f11d02df067128042d6905484e0509a939b7919405d0c1dd03fe4b6735dcd8ccf780d36c5713f4585b50b2727645a454da148307a74cf542be87 DIST eom-1.22.2.tar.xz 2158376 BLAKE2B 88d8b635af5b37f1ee4a36c08eb6f4a50cada86f605ab5927b031458f7f36191fa76457263ce38a9f8a02b7ba59308655b5df7039a73083192bf89c15fbee32f SHA512 1045c6bb98056ad707b0acf509c12e0400c21238482bf801abc6b69252f2ffe9687f7fda8b7e09c6338bc80794b104cbb42c1ea89ff1f169c45fdc1fcbdbeabe DIST eom-1.24.0.tar.xz 2433420 BLAKE2B 58f99ba3cf0df3594c459af691cc6ab281657facb49bc3b6101bec1718b165b72b882aabd9abac3c4981b547157aa64d2f24f174fccae06cdaa685728e49740c SHA512 17d26a9341cde0a86f8d8b65008f554398111d80f5d131441654bd9e907df9c9d696038e678aca8d7f4bd2923ff593f626735a3cc30451118818cdbebceb87ab -EBUILD eom-1.22.0.ebuild 1390 BLAKE2B 06ef43f493912fb2de7881e22458845a8a1d56862155a32fea3c409eefada91ea7ffaa97bb14baa91be6091276885b00d6ee1abc7b6c0bb6ec02dff182f1918d SHA512 ab19d51c490b8a3259243d3a2f602bfc912fdc78ab84d4af4f9825f75f1874f2fbcc093b35127d724ca9b22e2648de258a7f76f90caa7c1cfb441440eeb1e2dd -EBUILD eom-1.22.1.ebuild 1392 BLAKE2B 8df9a098bd938c89497822854e017a8d5b5a1a8b0dbccd5070e26986fd3e34f5fc73a056ac1aaf5aa5ad7241cb1944094d2073f8195f37d016c80b012ac435df SHA512 6eca16a5e3601ceeeb9c59a489f2698f995864b8a570e8e4c072eefd9711fb5e7a9a97d21570d82b52956b49ee5322547ef9bcf4ed205fe69c3de35c91f37a3b -EBUILD eom-1.22.2.ebuild 1392 BLAKE2B f663cf36a2a12cfcc5f6c8865bf64665854f40e5037ae26311a1ef049cbc6a9cb1bbf865bd37fe67870067d75990eb32c99e9c19dea08ebce8cc662f9417ae09 SHA512 22aacfe12a4dc4b04d6db573b36ede53e6f9fe633b52c7c263bab30baacc60b6d606546fb851ba1e25a64dfcb31eec8fa81dcceff574368a0d57669200446283 +EBUILD eom-1.22.2.ebuild 1390 BLAKE2B f9feb1b56216987a705e5b39eecb886bd5cace7ef66b00540a66d06c65a4d9d93e4dc0b013db05b04826835c310ab2c71023757a74f14d7ef10f29763d025125 SHA512 e93fae7450900205833fcfc45b046d536fc119684f992503b99e08709d54a04b81074ff373c49ce00ef7645c7f81edf69a6f82c10f4f7d1cae120f85e9735f14 EBUILD eom-1.24.0.ebuild 1605 BLAKE2B d3b052ef8c91f55a20a087b5c233b30891c6637e1c9000f3c0a168ed192370dc55f921b553186c3b03d1993dffdde145a9395593529e2b3e66ca3499ce4c79cc SHA512 00860a79f7a18c077306e72534d7f290a902e6c9ad60b96de8b990b0811c6e9dc21e00c87c41d62f31034250a623e593ef592115fcf5d83618cc7bee4b68a0f9 MISC metadata.xml 467 BLAKE2B 5314ab156ff29533e419e8d6b82d634bd3ffd7898e8125525d2d45460dfa464c8c9a7311f3fb69e33172b523e85816d6ecaba0487087dacafd42e31cb261e3d7 SHA512 d21cd9729f0f8bde3caec98e3a7f75de8075b129651b7c25d386cbd1cf9f4a41972f48a6addb7180ae40a0c2a626a5508dab5736ed71d60b56bdd2132d479854 diff --git a/media-gfx/eom/eom-1.22.0.ebuild b/media-gfx/eom/eom-1.22.0.ebuild deleted file mode 100644 index 9e84c4ed3c3d..000000000000 --- a/media-gfx/eom/eom-1.22.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -DESCRIPTION="The MATE image viewer" -LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+" -SLOT="0" - -IUSE="X debug exif +introspection jpeg lcms svg tiff xmp" - -RDEPEND=" - dev-libs/atk - >=dev-libs/glib-2.50:2 - >=dev-libs/libpeas-1.8.0[gtk] - >=dev-libs/libxml2-2:2 - gnome-base/dconf - >=mate-base/mate-desktop-1.17.0 - sys-libs/zlib - x11-libs/cairo - >=x11-libs/gdk-pixbuf-2.30:2[introspection?,jpeg?,tiff?] - >=x11-libs/gtk+-3.22:3[introspection?] - x11-libs/libX11 - >=x11-misc/shared-mime-info-0.20 - virtual/libintl - exif? ( - >=media-libs/libexif-0.6.14 - virtual/jpeg:0 - ) - introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - svg? ( >=gnome-base/librsvg-2.36.2:2 ) - xmp? ( >=media-libs/exempi-1.99.5:2 ) - !!media-gfx/mate-image-viewer" - -DEPEND="${RDEPEND} - app-text/yelp-tools - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=dev-util/intltool-0.50.1 - sys-devel/gettext - virtual/pkgconfig" - -src_configure() { - mate_src_configure \ - $(use_enable debug) \ - $(use_enable introspection) \ - $(use_with X x) \ - $(use_with exif libexif) \ - $(use_with jpeg libjpeg) \ - $(use_with lcms cms) \ - $(use_with svg librsvg) \ - $(use_with xmp) -} diff --git a/media-gfx/eom/eom-1.22.1.ebuild b/media-gfx/eom/eom-1.22.1.ebuild deleted file mode 100644 index 9732879b8464..000000000000 --- a/media-gfx/eom/eom-1.22.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="The MATE image viewer" -LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+" -SLOT="0" - -IUSE="X debug exif +introspection jpeg lcms svg tiff xmp" - -RDEPEND=" - dev-libs/atk - >=dev-libs/glib-2.50:2 - >=dev-libs/libpeas-1.8.0[gtk] - >=dev-libs/libxml2-2:2 - gnome-base/dconf - >=mate-base/mate-desktop-1.17.0 - sys-libs/zlib - x11-libs/cairo - >=x11-libs/gdk-pixbuf-2.30:2[introspection?,jpeg?,tiff?] - >=x11-libs/gtk+-3.22:3[introspection?] - x11-libs/libX11 - >=x11-misc/shared-mime-info-0.20 - virtual/libintl - exif? ( - >=media-libs/libexif-0.6.14 - virtual/jpeg:0 - ) - introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - svg? ( >=gnome-base/librsvg-2.36.2:2 ) - xmp? ( >=media-libs/exempi-1.99.5:2 ) - !!media-gfx/mate-image-viewer" - -DEPEND="${RDEPEND} - app-text/yelp-tools - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=dev-util/intltool-0.50.1 - sys-devel/gettext - virtual/pkgconfig" - -src_configure() { - mate_src_configure \ - $(use_enable debug) \ - $(use_enable introspection) \ - $(use_with X x) \ - $(use_with exif libexif) \ - $(use_with jpeg libjpeg) \ - $(use_with lcms cms) \ - $(use_with svg librsvg) \ - $(use_with xmp) -} diff --git a/media-gfx/eom/eom-1.22.2.ebuild b/media-gfx/eom/eom-1.22.2.ebuild index cd0a1d6937c3..42ba95e06f2c 100644 --- a/media-gfx/eom/eom-1.22.2.ebuild +++ b/media-gfx/eom/eom-1.22.2.ebuild @@ -6,7 +6,7 @@ EAPI=6 inherit mate if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi DESCRIPTION="The MATE image viewer" diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest index deeb2265be5c..5b1c101cbbd5 100644 --- a/media-gfx/fbida/Manifest +++ b/media-gfx/fbida/Manifest @@ -11,5 +11,5 @@ DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc8 EBUILD fbida-2.12.ebuild 2413 BLAKE2B 2fde21f65df975032f3638e2f22ff4aef0ccd81b408e571fe88cc180ae9cc7d11c00f296158abac0c0b891dd46d3bc9c9bbd0a4e4e332e9c53cb074c74e256da SHA512 e2b31fb9cee9204d38060a2269996c8142a981e0179e67ab86bfebb7967bcfae59a45794106e9e741a5a5269b307290885bdfa1b009919550a034d7302390200 EBUILD fbida-2.13-r1.ebuild 2395 BLAKE2B b3f42d22b78ce8a0fe9158fad16daef4cf0fea76585c0f83035604b48664dd9f8a98adcbe2cb6e47fdd4c2fde8f33ec03087796c656dcc92682954864a54333b SHA512 e1809154631d9a298007bd02fca72914ffe9244fd904bbd6fa322831e944f02887cca4ac8e7dc50411efd0cd9356cb4ae663677cfd2a50eda5357132c082c30d EBUILD fbida-2.14.ebuild 2391 BLAKE2B d43531e71d419ade0e6c06bb2fe92bb72523e466af372a94d6291eeb9dbf3ec36ffbb61ea293e7c590c844f846685c96ee7fd7de78009bfb877dc879891f5b5c SHA512 29ea58a36af771231ea4d7cef4004681662440495ae98893bb143bd0e9ec26fb653688eddaa65f667241a868103e2216394b3685f3543f3848c9594d4cf73209 -EBUILD fbida-9999.ebuild 1239 BLAKE2B 78ae23ef4d8f11b72f9c426a35bbcb8d10cc4f2b566c7e13855e631c07d3cf05746c33cac3bd5c48028b1710b10f51f3af3db96fe09978906b460bc40ae2be29 SHA512 2c8aaa0ff740002b3b2b8c4f6de05f9e356d9848fbaf03b30cffa1a492580676494ef9aa2f67410d8f6982180b20c69ba9d96a847f4a8229a3a4a00458400db4 +EBUILD fbida-9999.ebuild 1261 BLAKE2B 13ca3dd7089feb7104c38febddacd22f3d856543d418d08897ca53b82b1e112660cc2db58c5904cf7a52fd2ed0b81a072c606168c7f5e19d5ebcfeb9aa2922a3 SHA512 fa8c7e06f7ee7ee7e4acc6c926558497de046bd5a895c8027fe715d8b83d4c803cd4971ff307b16685a1f87f37d3c043fc417fb89ca19431018501086bb58f29 MISC metadata.xml 439 BLAKE2B 66a897b749b63e389153a97d84be2d4cf7e9c06c0b967ae715bd8202e038005ee724110d7d62ff99ef6ba21c8a365634f9350fc43e7dce44c81717cdeee85c54 SHA512 078e39413b3d63c3324c1f98e83b1b9747f2653108e34986dfc869cc3b65452d1b85ecefdaab17c0c53bd50cdb879f68c8b55a9da7d0cdee47ca329af10eec58 diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild index 417d2d86c1b6..1da490349569 100644 --- a/media-gfx/fbida/fbida-9999.ebuild +++ b/media-gfx/fbida/fbida-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -64,7 +64,7 @@ src_prepare() { src_install() { meson_src_install - dodoc README + dodoc Changes README.{ida,md} TODO doicon "${WORKDIR}"/ida.png domenu desktop/ida.desktop diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest index 24fd1ccae3c8..3b87787dc45e 100644 --- a/media-gfx/fontforge/Manifest +++ b/media-gfx/fontforge/Manifest @@ -1,14 +1,9 @@ -AUX 20170731-PyMem_Free.patch 5579 BLAKE2B ffb048f9790ea237f37bedf17ec50087002c621d9b47f087397d417d854f593576229fac3d0ec17c5ba95bd4d44b75b270ceb754d50bd5388c96f542af7d21fb SHA512 fff7b217002d4f270ba20bdce9dcec44b4d1a68f4ea5df45880f5766b897ae8dcf051612416aac28e80d6063c9a461acbac998bd51eef1878bf590a8d75d0963 -AUX 20170731-gethex-unaligned.patch 510 BLAKE2B ed943be0d150c8de7c99decf898cc4cfccf4c3990045a92af79b60c7e018a118996aa4f4b7146408b713b4eaf2b867110dc41d6c99ba302cdc522f62d035572a SHA512 ef4df9ac6589615f4ce619d073cb78dc9fcc281f24a01941567a09a9e536d105672856fa3fded436bddefac4de094d017ed51ace9d5bb0454f44dc373c95927b -AUX 20170731-startnoui-FindOrMakeEncoding.patch 751 BLAKE2B c4a0248affa9117c5150aacb40a54bcb6f29d84866e1d193898f49a4fe58735eda2319856b6cfdbce450492871a5fe2255443849dd0f98ee70285614f7e44bb1 SHA512 0135717d9760a0bbf6d35ce21c19fb9019d3da01859882918a5643bbe6011a55eaf57ad07c8063c2c5c20cd6c6907420f8015abf54210ccdd75b2ba473e6b366 -AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6456bd8ed47b12ca8681e8970e65e3b69cd06880794832f761c6de801d9e7c51e1edfff5abf434aa7f7dcc7c2 SHA512 026f6765b2db7549f72cd6ccff8d23bdf357ab24035c89cd792fa933f6033445f6cbaf7fa20f1372bdeda2caa242b9f8237f3019292cba0cc551c6de9e5c8341 +AUX 20200314-MacServiceReadFDs.patch 1053 BLAKE2B 733c1e217681b7f5f6cf776835f142d93224bc240928c2b37101f71a19f31f240ac6c1f28931e544b5e277b82e6f0baceb0634fb92a74009b0c3b93d49262824 SHA512 cd8bf4bdf1e792ec4a9c7177cfd2e0cae42d0fa4ad016bb5372826e776170c6d4c53cdd2013784410fac9e4fd674afe3030b64577b2ac9f4b019d84510425614 +AUX 20200314-big-endian.patch 11856 BLAKE2B ae107bec5156a60605d19588b61ce9b7869a41ce148f3da16b7f69a3c298667c224d0cd22796aa447ef71118ee0b6c0cb8682f71d483de4806cd4640cefcb86f SHA512 d15dd1dcc5d3ca6d798954b31ce2dbc943536bbbcd158eb3ac95c9643fa0dee4c0357aa954298ef8d270be13c0f012d424d9c5f34d865dd9dd33ff7f189d257f AUX 20200314-stylemap.patch 869 BLAKE2B a5907efaa1357f5b445eadfa951d9558de78eb1f8eb271cac15318a6d1e7d95c4d56918ca41307c9ff74ab05bf3cc373a5189ccaa5c76282b2c0c5d6834bfaba SHA512 1f0e363d42606fb506dd6f747ac250cce6ab4b5bf49400095cab9fd48b68232a8d58325147d2e1f7ca223093d36edf020f70f383bb0bf24f3a2f2fc3b35fb747 AUX 20200314-tilepath.patch 1142 BLAKE2B 61aa804682a5e486c2f131fd9d81fc5d29ca946f18d9d11a323d4c49cfa8c9404b846e2afb6ac4dbf00af78133f27819f72f678298c3abfaeecd576877ac1ed4 SHA512 2cbd0ac47c211ceda2e2e4d6b62a69432e084ec664d58ff5e259f2d1eee9b70b64610d4a428d5f86305c8427c21dd6a00944a86a995c8cc5f9aed63df4aa5a31 AUX CVE-2020-5395.patch 3073 BLAKE2B 15fa97a633e2c218f512a7d1202555e2465bad9adf0661bcc314a940d691520ba897ed6d76ff2b80111f3c016d71717ec4170196ce2177f3e6478b26f63e76ca SHA512 7dcdd6c4e8eb433de32fe76c2a1832ba9b318c5889ce03325516fa8d3ce63043a89e740758cf75b10626bac43352292e11ba0fdf31725ecff5b9d3065265ac3b -DIST fontforge-20190801.tar.gz 20766334 BLAKE2B c3206e77da4a966b9e513c41c90e19522f3d1aad990cd3035d7c8a8cc009239811743c12c02df3b02fd91fa5a7738913dba43df14523a738a2232cd2d1a91700 SHA512 78f3e1e94e38e26dcf52c6a0e038753033dc47052b7492f0ac0aaf1b8962e4e4bbf07c2550ef6014ea7290a6429bf669acb0691735efe0aee368480b4b7e6236 +AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52b37e2f37bbac91d5df709d23e144ae33ec02907606348185eac7030f5151719e0023c0d9fda5395334a15c56f7174151c4 SHA512 6055f1696f1910e81ab1b84b48d336c1a097b53618a3a960e8ce2aeb57e05ad364848d48082b792cd4d5cc85fc95947cddd2e04e7a98c5ceb6f9ced14bd4e674 DIST fontforge-20200314.tar.xz 13850076 BLAKE2B 5e6ae3b7940a5b3b08811abdfc9d151f231e6d457b219eb0c666e1b831db815b696f345eda0d4d423b7e340f56fca67205734ae19903b3815381080d34b5e95c SHA512 09f5dc93f87ca63668d72d108690604489d6b3cec7eedff1c07ad6d1ce5eae442ab60e79e71ae8b99e9808f3551011788025a86ffc3a9738518d99761d849975 -DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11 -EBUILD fontforge-20170731-r5.ebuild 2823 BLAKE2B 496e75f46e8ef562476c1d6a72d76e2068cd797a29f86dd32dabfd4338a594a04b3aa7e94c06b3c02402c21b61ca71a46a2c7f9d2bb803f63f5c35a6709889ee SHA512 6a05758d6d57e2c838a7aa520bb721c112dcdafd2305566e2dc7e8769ce91def379df759db8415c44387afce2ad7496b4e3a868c4b16786a311a2ded15b47234 -EBUILD fontforge-20190801.ebuild 2470 BLAKE2B 316185d2a92b3a9e508ffc5c4fb699d297c90940f1fd3d973fd88f47610e45547276c54abb89f105f1f2dd98c1f4854ae5137acce3871a315ca3f55b5e6efdc3 SHA512 3e98601babb0991fbab2c36292f8cef069b976cbcc82fccff1b01170b77fecb4ccfc09448409f071f7611222f3e2d65f7a60ee35f2cc1cd4be821d6c981a2e78 -EBUILD fontforge-20200314.ebuild 2889 BLAKE2B 571ba654bf7b988b986412a756a0f239575cefc28351dd98c52640cd9ea3c4bee2f508c1e83bef7d0b9117de2e679f530b86d1c003435cc7fba774c4ebe96b5b SHA512 f0d28db34a7392f318bdaf39dc83115ea113158ad0b544b9dd7cd0904777fb77c4585f627c43a19410474aab64c8d2e766254d66e0b46501f47a711fbb85e73c +EBUILD fontforge-20200314.ebuild 3027 BLAKE2B 6279419e6cc43c67c7089acf6585563c3be3bbe67447129cc6e480d76ace2091f7430c6ae2353bc17df3e8ad70a6dfc0a26c2757fddbfa463c21e4eb2055852a SHA512 f86153004126af75d1c752139caa0cd0a9af482dcc032d28844cba7d038fced7e7cab7c3964a8583daa94ce5ccb2eca12444e9aa539563587caa4149b600d522 MISC metadata.xml 968 BLAKE2B 25c959d8983e879ee629f097471240a284877f9b3881c1530b91ecfee2c1207c57811a9498f92701fabafee2d8756bf75885ffe55021ab8f6194d5ea2b4c52d2 SHA512 1fb9e55e26f8974a5cc3dd421fd644ec55761c2a6767c7c8d32f8f514720e4dfc3509645bce2acc082cfca6f4b4ed4fe633d1bc9d3074cfe8ba53ae5b1b16004 diff --git a/media-gfx/fontforge/files/20170731-PyMem_Free.patch b/media-gfx/fontforge/files/20170731-PyMem_Free.patch deleted file mode 100644 index 48301dabb2f1..000000000000 --- a/media-gfx/fontforge/files/20170731-PyMem_Free.patch +++ /dev/null @@ -1,197 +0,0 @@ -From b6089f11bd7534c9aa38b875ef1e830fc3b898b4 Mon Sep 17 00:00:00 2001 -From: Jeremy Tan <jtanx@outlook.com> -Date: Wed, 13 Sep 2017 17:22:18 +0800 -Subject: [PATCH] python: Use PyMem_Free wherever PyArg_ParseTuple+es is used - -https://docs.python.org/2.0/ext/parseTuple.html - -diff --git a/fontforge/python.c b/fontforge/python.c -index 5d6820c40..c6d7aca2b 100644 ---- a/fontforge/python.c -+++ b/fontforge/python.c -@@ -607,7 +607,13 @@ return( NULL ); - } - } - -- if ( !SetPrefs((char *) prefname,&val,NULL)) { -+ bool succeeded = SetPrefs((char *) prefname,&val,NULL); -+ if (val.type == v_str && val.u.sval) { -+ PyMem_Free(val.u.sval); -+ val.u.sval = NULL; -+ } -+ -+ if (!succeeded) { - PyErr_Format(PyExc_NameError, "Unknown preference item in SetPrefs: %s", prefname ); - return( NULL ); - } -@@ -728,7 +734,7 @@ static PyObject *PyFF_UnicodeFromName(PyObject *UNUSED(self), PyObject *args) { - return( NULL ); - - ret = Py_BuildValue("i", UniFromName((char *) name, ui_none,&custom)); -- free(name); -+ PyMem_Free(name); - return( ret ); - } - -@@ -1361,12 +1367,14 @@ Py_RETURN_NONE; /* Well, that was pointless */ - if ( import==Py_None ) - import=NULL; - else if ( !PyCallable_Check(import) ) { -+ PyMem_Free(name); - PyErr_Format(PyExc_TypeError, "First argument is not callable" ); - return( NULL ); - } - if ( export==Py_None ) - export=NULL; - else if ( !PyCallable_Check(export) ) { -+ PyMem_Free(name); - PyErr_Format(PyExc_TypeError, "Second argument is not callable" ); - return( NULL ); - } -@@ -1472,7 +1480,7 @@ static PyObject *PyFF_logError(PyObject *UNUSED(self), PyObject *args) { - if ( !PyArg_ParseTuple(args,"es","UTF-8", &msg) ) - return( NULL ); - LogError(msg); -- free(msg); -+ PyMem_Free(msg); - Py_RETURN_NONE; - } - -@@ -1486,6 +1494,8 @@ static PyObject *PyFF_postError(PyObject *UNUSED(self), PyObject *args) { - return( NULL ); - if( showPythonErrors ) - ff_post_error(title,msg); /* Prints to stderr if no ui */ -+ PyMem_Free(title); -+ PyMem_Free(msg); - Py_RETURN_NONE; - } - -@@ -1494,6 +1504,8 @@ static PyObject *PyFF_postNotice(PyObject *UNUSED(self), PyObject *args) { - if ( !PyArg_ParseTuple(args,"eses","UTF-8", &title, "UTF-8", &msg) ) - return( NULL ); - ff_post_notice(title,msg); /* Prints to stderr if no ui */ -+ PyMem_Free(title); -+ PyMem_Free(msg); - Py_RETURN_NONE; - } - -@@ -1511,8 +1523,8 @@ return( NULL ); - return( NULL ); - - ret = ff_open_filename(title,def,filter); -- free(title); -- free(def); -+ PyMem_Free(title); -+ PyMem_Free(def); - if ( ret==NULL ) - Py_RETURN_NONE; - reto = DECODE_UTF8(ret,strlen(ret),NULL); -@@ -1534,8 +1546,8 @@ return( NULL ); - return( NULL ); - - ret = ff_save_filename(title,def,filter); -- free(title); -- free(def); -+ PyMem_Free(title); -+ PyMem_Free(def); - if ( ret==NULL ) - Py_RETURN_NONE; - reto = DECODE_UTF8(ret,strlen(ret),NULL); -@@ -1558,8 +1570,8 @@ return( NULL ); - return( NULL ); - if ( !PySequence_Check(answero) || STRING_CHECK(answero)) { - PyErr_Format(PyExc_TypeError, "Expected a tuple of strings for the third argument"); -- free(title); -- free(quest); -+ PyMem_Free(title); -+ PyMem_Free(quest); - return( NULL ); - } - cnt = PySequence_Size(answero); -@@ -1568,16 +1580,16 @@ return( NULL ); - cancel = cnt-1; - if ( cancel<0 || cancel>=cnt || def<0 || def>=cnt ) { - PyErr_Format(PyExc_ValueError, "Value out of bounds for 4th or 5th argument"); -- free(title); -- free(quest); -+ PyMem_Free(title); -+ PyMem_Free(quest); - free(answers); - return( NULL ); - } - for ( i=0; i<cnt; ++i ) { - PyObject *utf8_name = PYBYTES_UTF8(PySequence_GetItem(answero,i)); - if ( utf8_name==NULL ) { -- free(title); -- free(quest); -+ PyMem_Free(title); -+ PyMem_Free(quest); - FreeStringArray( i, answers ); - return( NULL ); - } -@@ -1587,8 +1599,8 @@ return( NULL ); - answers[cnt] = NULL; - - ret = ff_ask(title,(const char **) answers,def,cancel,quest); -- free(title); -- free(quest); -+ PyMem_Free(title); -+ PyMem_Free(quest); - FreeStringArray( cnt, answers ); - return( Py_BuildValue("i",ret)); - } -@@ -1608,23 +1620,23 @@ return( NULL ); - return( NULL ); - if ( !PySequence_Check(answero) || STRING_CHECK(answero)) { - PyErr_Format(PyExc_TypeError, "Expected a tuple of strings for the third argument"); -- free(title); -- free(quest); -+ PyMem_Free(title); -+ PyMem_Free(quest); - return( NULL ); - } - cnt = PySequence_Size(answero); - answers = calloc(cnt+1, sizeof(char *)); - if ( def<0 || def>=cnt ) { - PyErr_Format(PyExc_ValueError, "Value out of bounds for 4th argument"); -- free(title); -- free(quest); -+ PyMem_Free(title); -+ PyMem_Free(quest); - return( NULL ); - } - for ( i=0; i<cnt; ++i ) { - PyObject *utf8_name = PYBYTES_UTF8(PySequence_GetItem(answero,i)); - if ( utf8_name==NULL ) { -- free(title); -- free(quest); -+ PyMem_Free(title); -+ PyMem_Free(quest); - FreeStringArray( i, answers ); - return( NULL ); - } -@@ -1634,8 +1646,8 @@ return( NULL ); - answers[cnt] = NULL; - - ret = ff_choose(title,(const char **) answers,cnt,def,quest); -- free(title); -- free(quest); -+ PyMem_Free(title); -+ PyMem_Free(quest); - FreeStringArray( cnt, answers ); - return( Py_BuildValue("i",ret)); - } -@@ -1654,8 +1666,8 @@ return( NULL ); - return( NULL ); - - ret = ff_ask_string(title,def,quest); -- free(title); -- free(quest); -+ PyMem_Free(title); -+ PyMem_Free(quest); - free(def); - if ( ret==NULL ) - Py_RETURN_NONE; --- -2.17.0 - diff --git a/media-gfx/fontforge/files/20170731-gethex-unaligned.patch b/media-gfx/fontforge/files/20170731-gethex-unaligned.patch deleted file mode 100644 index 812f7a444721..000000000000 --- a/media-gfx/fontforge/files/20170731-gethex-unaligned.patch +++ /dev/null @@ -1,22 +0,0 @@ -fix unaligned access in gethex() - ---- a/fontforge/sfd.c -+++ b/fontforge/sfd.c -@@ -3393,6 +3393,7 @@ - static int gethex(FILE *sfd, uint32 *val) { - char tokbuf[100]; int ch; - char *pt=tokbuf, *end = tokbuf+100-2; -+ uint32 u; - - while ( isspace(ch = nlgetc(sfd))); - if ( ch=='#' ) -@@ -3416,7 +3417,8 @@ - } - *pt='\0'; - ungetc(ch,sfd); -- *val = strtoul(tokbuf,NULL,16); -+ u = strtoul(tokbuf,NULL,16); -+ memcpy(val, &u, sizeof(u)); - return( pt!=tokbuf?1:ch==EOF?-1: 0 ); - } - diff --git a/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch b/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch deleted file mode 100644 index 30731b904f25..000000000000 --- a/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 72572a68d306712c040ca741f0655b190326a509 Mon Sep 17 00:00:00 2001 -From: Jeremy Tan <jtanx@outlook.com> -Date: Sat, 9 Sep 2017 08:03:57 +0800 -Subject: [PATCH] startnoui.c: Include header that defines FindOrMakeEncoding - -Failure to include this was causing an implicit pointer to int conversion -which results in an invalid pointer address on 64-bit builds. - -Fixes #3145. - -diff --git a/fontforgeexe/startnoui.c b/fontforgeexe/startnoui.c -index ab8388539..7a188b7a2 100644 ---- a/fontforgeexe/startnoui.c -+++ b/fontforgeexe/startnoui.c -@@ -27,6 +27,7 @@ - #include "fontforgevw.h" - #include "scripting.h" - #include "start.h" -+#include "encoding.h" - - #ifndef _NO_LIBUNICODENAMES - #include <libunicodenames.h> /* need to open a database when we start */ diff --git a/media-gfx/fontforge/files/20170731-tilepath.patch b/media-gfx/fontforge/files/20170731-tilepath.patch deleted file mode 100644 index c14d81dc430c..000000000000 --- a/media-gfx/fontforge/files/20170731-tilepath.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix implicit declarations - -Fixed upstream in a larger refactor. - ---- a/fontforgeexe/tilepath.c -+++ b/fontforgeexe/tilepath.c -@@ -24,7 +24,9 @@ - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -+#include "cvundoes.h" - #include "fontforgeui.h" -+#include "fvfonts.h" - #include "splineutil.h" - #include "splineutil2.h" - #include <math.h> diff --git a/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch b/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch new file mode 100644 index 000000000000..d6beff7984c9 --- /dev/null +++ b/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch @@ -0,0 +1,38 @@ +From 5a3d2ce60aeefd706c36a8325721b0c8c818c742 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Fri, 1 May 2020 05:06:07 -0400 +Subject: [PATCH] Stub-out MacServiceReadFDs() on non-Mac platforms (#4246) + +This should fix a build failure on Linux with musl libc due to the +missing sys/select.h include. + +MacServiceReadFDs seems to only be called in startui.c, also behind the +__Mac macro. + +Bug: https://bugs.gentoo.org/706792 +--- + gdraw/gdraw.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdraw/gdraw.c b/gdraw/gdraw.c +index 1fb3354b1d..6bac57b92a 100644 +--- a/gdraw/gdraw.c ++++ b/gdraw/gdraw.c +@@ -32,7 +32,7 @@ + #include "gkeysym.h" + #include "ustring.h" + +-#if __Mac || __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ ++#if __Mac + # include <sys/select.h> + #endif + +@@ -1076,7 +1076,7 @@ GDrawRemoveReadFD( GDisplay *gdisp, + + void MacServiceReadFDs() + { +-#if (!defined(__MINGW32__))&&(!defined(__CYGWIN__)) ++#if __Mac + int ret = 0; + + GDisplay *gdisp = GDrawGetDisplayOfWindow(0); diff --git a/media-gfx/fontforge/files/20200314-big-endian.patch b/media-gfx/fontforge/files/20200314-big-endian.patch new file mode 100644 index 000000000000..f9581ad35f42 --- /dev/null +++ b/media-gfx/fontforge/files/20200314-big-endian.patch @@ -0,0 +1,298 @@ +From 65619185a42bd52bb4a4894c1714d78d96ed4175 Mon Sep 17 00:00:00 2001 +From: Jeremy Tan <jtanx@outlook.com> +Date: Sun, 26 Apr 2020 18:57:58 +1000 +Subject: [PATCH 1/2] tottfgpos.c: fix incorrect sizing of the scripts array + +latn contains 58 entries (29 pairs), meaning the size was too small +to fit the 0 marker at the end of the array +--- + fontforge/tottfgpos.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fontforge/tottfgpos.c b/fontforge/tottfgpos.c +index 5de5164ed1..e12a0b8a79 100644 +--- a/fontforge/tottfgpos.c ++++ b/fontforge/tottfgpos.c +@@ -60,7 +60,7 @@ int use_second_indic_scripts = false; + /* scripts (for opentype) that I understand */ + /* see also list in lookups.c mapping script tags to friendly names */ + +-static uint32 scripts[][59] = { ++static uint32 scripts[][61] = { + /* Adlam */ { CHR('a','d','l','m'), 0x1e900, 0x1e95f }, + /* Ahom */ { CHR('a','h','o','m'), 0x11700, 0x1173f }, + /* Anatolian */ { CHR('h','l','u','w'), 0x14400, 0x1467f }, + +From fde85b13382595cb3ab889e38570b4944edad808 Mon Sep 17 00:00:00 2001 +From: Jeremy Tan <jtanx@outlook.com> +Date: Sun, 26 Apr 2020 19:00:04 +1000 +Subject: [PATCH 2/2] python.c: fix type specifier on long input/return values + +int is guaranteed to be at least 16 bits, while long is at least +32 bits. So for uint32/int32 values, parse longs with the "l"/"k" +specifier and cast return values to long. + +The cast is necessary as on amd64 a long is 64 bits +--- + fontforge/python.c | 68 +++++++++++++++++++++++----------------------- + 1 file changed, 34 insertions(+), 34 deletions(-) + +diff --git a/fontforge/python.c b/fontforge/python.c +index 5344b0f60f..6c9675fa4e 100644 +--- a/fontforge/python.c ++++ b/fontforge/python.c +@@ -760,7 +760,7 @@ static PyObject *PyFF_UnicodeAnnotationFromLib(PyObject *UNUSED(self), PyObject + char *temp; + long val; + +- if ( !PyArg_ParseTuple(args,"|i",&val) ) ++ if ( !PyArg_ParseTuple(args,"|l",&val) ) + return( NULL ); + + if ( (temp=unicode_annot(val))==NULL ) { +@@ -777,7 +777,7 @@ static PyObject *PyFF_UnicodeNameFromLib(PyObject *UNUSED(self), PyObject *args) + char *temp; + long val; + +- if ( !PyArg_ParseTuple(args,"|i",&val) ) ++ if ( !PyArg_ParseTuple(args,"|l",&val) ) + return( NULL ); + + if ( (temp=unicode_name(val))==NULL ) { +@@ -798,10 +798,10 @@ static PyObject *PyFF_UnicodeBlockStartFromLib(PyObject *UNUSED(self), PyObject + /* Use this function with UnicodeBlockNameFromLib(n) & UnicodeBlockEndFromLib(n). */ + long val; + +- if ( !PyArg_ParseTuple(args,"|i",&val) ) ++ if ( !PyArg_ParseTuple(args,"|l",&val) ) + return( NULL ); + +- return( Py_BuildValue("i", unicode_block_start(val)) ); ++ return( Py_BuildValue("l", (long)unicode_block_start(val)) ); + } + + static PyObject *PyFF_UnicodeBlockEndFromLib(PyObject *UNUSED(self), PyObject *args) { +@@ -809,10 +809,10 @@ static PyObject *PyFF_UnicodeBlockEndFromLib(PyObject *UNUSED(self), PyObject *a + /* Use this function with UnicodeBlockStartFromLib(n), UnicodeBlockNameFromLib(n) */ + long val; + +- if ( !PyArg_ParseTuple(args,"|i",&val) ) ++ if ( !PyArg_ParseTuple(args,"|l",&val) ) + return( NULL ); + +- return( Py_BuildValue("i", unicode_block_end(val)) ); ++ return( Py_BuildValue("l", (long)unicode_block_end(val)) ); + } + + static PyObject *PyFF_UnicodeBlockNameFromLib(PyObject *UNUSED(self), PyObject *args) { +@@ -822,7 +822,7 @@ static PyObject *PyFF_UnicodeBlockNameFromLib(PyObject *UNUSED(self), PyObject * + char *temp; + long val; + +- if ( !PyArg_ParseTuple(args,"|i",&val) ) ++ if ( !PyArg_ParseTuple(args,"|l",&val) ) + return( NULL ); + + if ( (temp=unicode_block_name(val))==NULL ) { +@@ -853,24 +853,24 @@ static PyObject *PyFF_UnicodeNames2GetCntFromLib(PyObject *UNUSED(self), PyObjec + static PyObject *PyFF_UnicodeNames2GetNxtFromLib(PyObject *UNUSED(self), PyObject *args) { + long val; + +- if ( !PyArg_ParseTuple(args,"|i",&val) ) ++ if ( !PyArg_ParseTuple(args,"|l",&val) ) + return( NULL ); +- return( Py_BuildValue("i", unicode_names2getUtabLoc(val)) ); ++ return( Py_BuildValue("l", (long)unicode_names2getUtabLoc(val)) ); + } + + static PyObject *PyFF_UnicodeNames2NxtUniFromLib(PyObject *UNUSED(self), PyObject *args) { + long val; + +- if ( !PyArg_ParseTuple(args,"|i",&val) ) ++ if ( !PyArg_ParseTuple(args,"|l",&val) ) + return( NULL ); +- return( Py_BuildValue("i", unicode_names2valFrmTab(val)) ); ++ return( Py_BuildValue("l", (long)unicode_names2valFrmTab(val)) ); + } + + static PyObject *PyFF_UnicodeNames2FrmTabFromLib(PyObject *UNUSED(self), PyObject *args) { + long val; + char *temp; + +- if ( !PyArg_ParseTuple(args,"|i",&val) ) ++ if ( !PyArg_ParseTuple(args,"|l",&val) ) + return( NULL ); + if ( (temp=unicode_name2FrmTab(val))==NULL ) { + return Py_BuildValue("s", ""); +@@ -883,7 +883,7 @@ static PyObject *PyFF_UnicodeNames2FromLib(PyObject *UNUSED(self), PyObject *arg + long val; + char *temp; + +- if ( !PyArg_ParseTuple(args,"|i",&val) ) ++ if ( !PyArg_ParseTuple(args,"|l",&val) ) + return( NULL ); + if ( (temp=unicode_name2(val))==NULL ) { + return Py_BuildValue("s", ""); +@@ -899,7 +899,7 @@ static PyObject *PyFF_UnicodeNames2FromLib(PyObject *UNUSED(self), PyObject *arg + static PyObject *PyFF_isligature(PyObject *UNUSED(self), PyObject *args) { + long codepoint; + +- if ( !PyArg_ParseTuple(args,"|i",&codepoint) ) ++ if ( !PyArg_ParseTuple(args,"|l",&codepoint) ) + return( NULL ); + + return( Py_BuildValue("i", is_LIGATURE(codepoint)==0?1:0) ); +@@ -908,7 +908,7 @@ static PyObject *PyFF_isligature(PyObject *UNUSED(self), PyObject *args) { + static PyObject *PyFF_isvulgarfraction(PyObject *UNUSED(self), PyObject *args) { + long codepoint; + +- if ( !PyArg_ParseTuple(args,"|i",&codepoint) ) ++ if ( !PyArg_ParseTuple(args,"|l",&codepoint) ) + return( NULL ); + + return( Py_BuildValue("i", is_VULGAR_FRACTION(codepoint)==0?1:0) ); +@@ -917,7 +917,7 @@ static PyObject *PyFF_isvulgarfraction(PyObject *UNUSED(self), PyObject *args) { + static PyObject *PyFF_isotherfraction(PyObject *UNUSED(self), PyObject *args) { + long codepoint; + +- if ( !PyArg_ParseTuple(args,"|i",&codepoint) ) ++ if ( !PyArg_ParseTuple(args,"|l",&codepoint) ) + return( NULL ); + + return( Py_BuildValue("i", is_OTHER_FRACTION(codepoint)==0?1:0) ); +@@ -926,7 +926,7 @@ static PyObject *PyFF_isotherfraction(PyObject *UNUSED(self), PyObject *args) { + static PyObject *PyFF_isfraction(PyObject *UNUSED(self), PyObject *args) { + long codepoint; + +- if ( !PyArg_ParseTuple(args,"|i",&codepoint) ) ++ if ( !PyArg_ParseTuple(args,"|l",&codepoint) ) + return( NULL ); + + return( Py_BuildValue("i", (is_VULGAR_FRACTION(codepoint)==0 || \ +@@ -957,28 +957,28 @@ static PyObject *PyFF_FracChartGetCnt(PyObject *UNUSED(self), PyObject *UNUSED(a + static PyObject *PyFF_LigChartGetNxt(PyObject *UNUSED(self), PyObject *args) { + long val; + +- if ( !PyArg_ParseTuple(args,"|i",&val) ) ++ if ( !PyArg_ParseTuple(args,"|l",&val) ) + return( NULL ); + +- return( Py_BuildValue("i", Ligature_get_U(val)) ); ++ return( Py_BuildValue("l", (long)Ligature_get_U(val)) ); + } + + static PyObject *PyFF_VulChartGetNxt(PyObject *UNUSED(self), PyObject *args) { + long val; + +- if ( !PyArg_ParseTuple(args,"|i",&val) ) ++ if ( !PyArg_ParseTuple(args,"|l",&val) ) + return( NULL ); + +- return( Py_BuildValue("i", VulgFrac_get_U(val)) ); ++ return( Py_BuildValue("l", (long)VulgFrac_get_U(val)) ); + } + + static PyObject *PyFF_OFracChartGetNxt(PyObject *UNUSED(self), PyObject *args) { + long val; + +- if ( !PyArg_ParseTuple(args,"|i",&val) ) ++ if ( !PyArg_ParseTuple(args,"|l",&val) ) + return( NULL ); + +- return( Py_BuildValue("i", Fraction_get_U(val)) ); ++ return( Py_BuildValue("l", (long)Fraction_get_U(val)) ); + } + + /* If you have a unicode ligature, or fraction, these routines return loc n. */ +@@ -987,7 +987,7 @@ static PyObject *PyFF_OFracChartGetNxt(PyObject *UNUSED(self), PyObject *args) { + static PyObject *PyFF_LigChartGetLoc(PyObject *UNUSED(self), PyObject *args) { + long codepoint; + +- if ( !PyArg_ParseTuple(args,"|i",&codepoint) ) ++ if ( !PyArg_ParseTuple(args,"|l",&codepoint) ) + return( NULL ); + + return( Py_BuildValue("i", Ligature_find_N(codepoint)) ); +@@ -996,7 +996,7 @@ static PyObject *PyFF_LigChartGetLoc(PyObject *UNUSED(self), PyObject *args) { + static PyObject *PyFF_VulChartGetLoc(PyObject *UNUSED(self), PyObject *args) { + long codepoint; + +- if ( !PyArg_ParseTuple(args,"|i",&codepoint) ) ++ if ( !PyArg_ParseTuple(args,"|l",&codepoint) ) + return( NULL ); + + return( Py_BuildValue("i", VulgFrac_find_N(codepoint)) ); +@@ -1005,7 +1005,7 @@ static PyObject *PyFF_VulChartGetLoc(PyObject *UNUSED(self), PyObject *args) { + static PyObject *PyFF_OFracChartGetLoc(PyObject *UNUSED(self), PyObject *args) { + long codepoint; + +- if ( !PyArg_ParseTuple(args,"|i",&codepoint) ) ++ if ( !PyArg_ParseTuple(args,"|l",&codepoint) ) + return( NULL ); + + return( Py_BuildValue("i", Fraction_find_N(codepoint)) ); +@@ -1066,7 +1066,7 @@ static PyObject *PyFF_LigChartGetAltVal(PyObject *UNUSED(self), PyObject *args) + + if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) ) + return( NULL ); +- return( Py_BuildValue("i", Ligature_alt_getV(nthCode,altN)) ); ++ return( Py_BuildValue("l", (long)Ligature_alt_getV(nthCode,altN)) ); + } + + static PyObject *PyFF_LigChartUGetAltVal(PyObject *UNUSED(self), PyObject *args) { +@@ -1074,7 +1074,7 @@ static PyObject *PyFF_LigChartUGetAltVal(PyObject *UNUSED(self), PyObject *args) + + if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) ) + return( NULL ); +- return( Py_BuildValue("i", LigatureU_alt_getV(nthCode,altN)) ); ++ return( Py_BuildValue("l", (long)LigatureU_alt_getV(nthCode,altN)) ); + } + + static PyObject *PyFF_VulChartGetAltVal(PyObject *UNUSED(self), PyObject *args) { +@@ -1082,7 +1082,7 @@ static PyObject *PyFF_VulChartGetAltVal(PyObject *UNUSED(self), PyObject *args) + + if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) ) + return( NULL ); +- return( Py_BuildValue("i", VulgFrac_alt_getV(nthCode,altN)) ); ++ return( Py_BuildValue("l", (long)VulgFrac_alt_getV(nthCode,altN)) ); + } + + static PyObject *PyFF_VulChartUGetAltVal(PyObject *UNUSED(self), PyObject *args) { +@@ -1090,7 +1090,7 @@ static PyObject *PyFF_VulChartUGetAltVal(PyObject *UNUSED(self), PyObject *args) + + if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) ) + return( NULL ); +- return( Py_BuildValue("i", VulgFracU_alt_getV(nthCode,altN)) ); ++ return( Py_BuildValue("l", (long)VulgFracU_alt_getV(nthCode,altN)) ); + } + + static PyObject *PyFF_OFracChartGetAltVal(PyObject *UNUSED(self), PyObject *args) { +@@ -1098,7 +1098,7 @@ static PyObject *PyFF_OFracChartGetAltVal(PyObject *UNUSED(self), PyObject *args + + if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) ) + return( NULL ); +- return( Py_BuildValue("i", Fraction_alt_getV(nthCode,altN)) ); ++ return( Py_BuildValue("l", (long)Fraction_alt_getV(nthCode,altN)) ); + } + + static PyObject *PyFF_OFracChartUGetAltVal(PyObject *UNUSED(self), PyObject *args) { +@@ -1106,7 +1106,7 @@ static PyObject *PyFF_OFracChartUGetAltVal(PyObject *UNUSED(self), PyObject *arg + + if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) ) + return( NULL ); +- return( Py_BuildValue("i", FractionU_alt_getV(nthCode,altN)) ); ++ return( Py_BuildValue("l", (long)FractionU_alt_getV(nthCode,altN)) ); + } + + static PyObject *PyFF_Version(PyObject *UNUSED(self), PyObject *UNUSED(args)) { +@@ -1542,8 +1542,8 @@ return( ret ); + } + + static PyObject *PyFF_scriptFromUnicode(PyObject *UNUSED(self), PyObject *args) { +- long u; +- if ( !PyArg_ParseTuple(args,"i",&u) ) ++ unsigned long u; ++ if ( !PyArg_ParseTuple(args,"k",&u) ) + return( NULL ); + + uint32 script = ScriptFromUnicode(u, NULL); diff --git a/media-gfx/fontforge/files/fontforge-doc-no-warn-error.patch b/media-gfx/fontforge/files/fontforge-doc-no-warn-error.patch new file mode 100644 index 000000000000..ed1526b62e25 --- /dev/null +++ b/media-gfx/fontforge/files/fontforge-doc-no-warn-error.patch @@ -0,0 +1,25 @@ +From e8164ed0fa747bfc8e7e80e6ff6b9a34b7c1a33f Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Mon, 27 Apr 2020 20:00:54 -0400 +Subject: [PATCH] doc: do not treat warnings as errors + +--- + doc/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index 6c4601a05..e5aeaed4f 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -21,7 +21,7 @@ file(STRINGS manifest.txt _manifest) + configure_file(manifest.txt manifest.txt COPYONLY) + + add_custom_command(OUTPUT sphinx-docs +- COMMAND "${Sphinx_BUILD_BINARY}" -q -n -W -b html -d doctrees "${CMAKE_CURRENT_SOURCE_DIR}/sphinx" sphinx-docs ++ COMMAND "${Sphinx_BUILD_BINARY}" -q -n -b html -d doctrees "${CMAKE_CURRENT_SOURCE_DIR}/sphinx" sphinx-docs + DEPENDS ${_manifest} + ) + +-- +2.26.2 + diff --git a/media-gfx/fontforge/fontforge-20170731-r5.ebuild b/media-gfx/fontforge/fontforge-20170731-r5.ebuild deleted file mode 100644 index 3717888256a5..000000000000 --- a/media-gfx/fontforge/fontforge-20170731-r5.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit gnome2-utils python-single-r1 xdg-utils - -DESCRIPTION="postscript font editor and converter" -HOMEPAGE="http://fontforge.github.io/" -SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-dist-${PV}.tar.xz" - -LICENSE="BSD GPL-3+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - cairo? ( png ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( png python ) -" - -RDEPEND=" - dev-libs/glib - dev-libs/libltdl:0 - dev-libs/libxml2:2= - >=media-libs/freetype-2.3.7:2= - cairo? ( - >=x11-libs/cairo-1.6:0= - x11-libs/pango:0= - ) - gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0 ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0= ) - truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) - gtk? ( x11-libs/gtk+:2= ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - unicode? ( media-libs/libuninameslist:0= ) - X? ( - x11-libs/libX11:0= - x11-libs/libXi:0= - >=x11-libs/pango-1.10:0=[X] - ) -" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig - X? ( x11-base/xorg-proto ) -" - -# Needs keywording on many arches. -# zeromq? ( -# >=net-libs/czmq-2.2.0:0= -# >=net-libs/zeromq-4.0.4:0= -# ) - -S="${WORKDIR}/fontforge-2.0.${PV}" - -PATCHES=( - "${FILESDIR}"/20170731-startnoui-FindOrMakeEncoding.patch - "${FILESDIR}"/20170731-tilepath.patch - "${FILESDIR}"/20170731-gethex-unaligned.patch - "${FILESDIR}"/20170731-PyMem_Free.patch - "${FILESDIR}"/CVE-2020-5395.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local myeconfargs=( - --disable-static - $(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge") - $(use_enable gtk gtk2-use) - $(use_enable python python-extension) - $(use_enable python python-scripting) - --enable-tile-path - --enable-gb12345 - $(use_with cairo) - $(use_with gif giflib) - $(use_with jpeg libjpeg) - $(use_with png libpng) - $(use_with readline libreadline) - --without-libspiro - $(use_with tiff libtiff) - $(use_with unicode libuninameslist) - #$(use_with zeromq libzmq) - --without-libzmq - $(use_with X x) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - # Build system deps are broken - emake -C plugins - emake -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/media-gfx/fontforge/fontforge-20190801.ebuild b/media-gfx/fontforge/fontforge-20190801.ebuild deleted file mode 100644 index 74590785e86e..000000000000 --- a/media-gfx/fontforge/fontforge-20190801.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 2004-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit python-single-r1 xdg - -DESCRIPTION="postscript font editor and converter" -HOMEPAGE="http://fontforge.github.io/" -SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-${PV}.tar.gz" - -LICENSE="BSD GPL-3+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - cairo? ( png ) - gtk? ( cairo ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -RDEPEND=" - dev-libs/glib - dev-libs/libltdl:0 - dev-libs/libxml2:2= - >=media-libs/freetype-2.3.7:2= - cairo? ( - >=x11-libs/cairo-1.6:0= - x11-libs/pango:0= - ) - gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0 ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0= ) - truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) - gtk? ( >=x11-libs/gtk+-3.10:3 ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - unicode? ( media-libs/libuninameslist:0= ) - X? ( - x11-libs/libX11:0= - x11-libs/libXi:0= - >=x11-libs/pango-1.10:0=[X] - ) -" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -# Needs keywording on many arches. -# zeromq? ( -# >=net-libs/czmq-2.2.0:0= -# >=net-libs/zeromq-4.0.4:0= -# ) - -PATCHES=( - "${FILESDIR}"/20170731-gethex-unaligned.patch - "${FILESDIR}"/CVE-2020-5395.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local myeconfargs=( - --disable-static - $(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge") - $(use_enable python python-extension) - $(use_enable python python-scripting) - --enable-tile-path - $(use_with cairo) - $(use_with gif giflib) - $(use_with jpeg libjpeg) - $(use_with png libpng) - $(use_with readline libreadline) - --without-libspiro - $(use_with tiff libtiff) - $(use_with unicode libuninameslist) - $(use_with X x) - ) - if use gtk; then - # broken AC_ARG_ENABLE usage - # https://bugs.gentoo.org/681550 - myeconfargs+=( --enable-gdk=gdk3 ) - fi - econf "${myeconfargs[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - docompress -x /usr/share/doc/${PF}/html - einstalldocs - find "${ED}" -name '*.la' -type f -delete || die -} diff --git a/media-gfx/fontforge/fontforge-20200314.ebuild b/media-gfx/fontforge/fontforge-20200314.ebuild index 595c9336afa0..3379e2f1b634 100644 --- a/media-gfx/fontforge/fontforge-20200314.ebuild +++ b/media-gfx/fontforge/fontforge-20200314.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg LICENSE="BSD GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X" RESTRICT="!test? ( test )" @@ -47,7 +47,7 @@ DEPEND="${RDEPEND} " BDEPEND=" sys-devel/gettext - doc? ( dev-python/sphinx ) + doc? ( >=dev-python/sphinx-2 ) python? ( ${PYTHON_DEPS} ) test? ( ${RDEPEND} ) " @@ -55,6 +55,9 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/20200314-stylemap.patch "${FILESDIR}"/20200314-tilepath.patch + "${FILESDIR}"/20200314-big-endian.patch + "${FILESDIR}"/fontforge-doc-no-warn-error.patch + "${FILESDIR}"/20200314-MacServiceReadFDs.patch ) pkg_setup() { diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 7b7410714385..d046674c61be 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -12,13 +12,10 @@ AUX gimp-2.8.22-cve-2017-17789.patch 1245 BLAKE2B 14d519b8b024e51b452806b4acb6f0 AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a51038aeb146779268f78fb2f0a24ef912468510de2a0f640c5f905fe9959581686f55bccc022633b6f2a3a93ab3f12848 SHA512 5bc928860b2f2b53cc72c9c3caf6a532cf7e61b02e0716ee99a5166a07b01bdd46edfeae7bf6e333ce14ca11b5fcb963cbd42005e02f914d909431bf201dc6d5 DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b73d838c3ed56abb0a221c0eaec02e5c838f952d492069d55d89e4c3493c59b38aa2af87df8181f8979213e7659b SHA512 acbd095361d9211a5a23474693dd170ed76bf4ea5b1df69791f1d975ef5cdaba1e5fb9f5be9f592a360db5826d71eaaf464005075397cb6630070fe32833c030 DIST gimp-2.10.18.tar.bz2 32946467 BLAKE2B eb1c756ca646ee9ddc42aebe214ad3e2dedf125940dc1b9cfd04a4424bd2b6255041f1bafbda3fc214f93d97e7802372234a42e1daa0ee56caaf0f0bedd908f9 SHA512 88990f2d70508b22f4acadeab6b687e20af19b765ebc6f245d0c99b3dd853fcd3d237c3b7607e50133aa95a1d71931069029dfd7ee94441ff419c542c141bc9f -DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B 11f88b1068fa1fe216a54bed27b26b94c3fdb2cbc67e1e444df74a080d00b678f8c81897a6c5fb5956fa107842b0a853ada44d15d51c2e58db7435ddd0f8e999 SHA512 b458dd710b786152f95a8e48a0727b71cac549fccb31ac9e1e6ac3c617652079773ce7076401f8ade750ed38bdc78dfdec3317423f4c4e9c931f78002bd7454e DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02 EBUILD gimp-2.10.14-r1.ebuild 6134 BLAKE2B db5b6dc954866203d1aafe9e2050e1fdebf5008a191854f24f1507db881083a6cf67e6d9f8a6f6112958207d3c75e9537b7c51c8d2492e8961147f6981b245a3 SHA512 3342bb7e935077ed7ac83ac9109e873029d0b572f34a4787787aca14d73fe71b5f5ac92648ae0a2d20f06bf6a9e30a8d29823a881312852cb0981740087b935d -EBUILD gimp-2.10.18-r1.ebuild 6154 BLAKE2B 793d339c64d9f83c504947c7eb2a8e59ea383274dff28b2be787886b2d095697e8466f21a2088afc64f0161c2d30debdea478f3f74dee83bac9eb3b1b82bc893 SHA512 57fe3b99a880e3fd90859a5323cfcd419191ae09b959ff9a60f917010fff49f9228f2f905c99b9d587532e7fd62e3d95574e786344f1eb3abee3d10c92231338 -EBUILD gimp-2.10.18.ebuild 5736 BLAKE2B 438cfe65d53d00b5656010944d4ef47ba748ed1cd2e6415b24836f4f7678623beb691045e0f989a714eaf829bf4332ffd40de1b718a28d0a9a9f1e9d55afe556 SHA512 83298e97c14c70b456ec932b2f1faab7b118a6d69ab77f4fc10869deec4cd43af6891a0bd1e77948439de51cda64a1365a32e01d471a6afb11bf5dc81431ce6e -EBUILD gimp-2.10.8-r2.ebuild 6122 BLAKE2B 7c9920ac058c8943f16bdc96414fc435f19edb14a5d930755aed8f82986682ba6486f64458f8eda6ddd0eafde676b0d1668645f9e06d93d92375c7f8075e77cd SHA512 199885da291857914cc9ece95f3754ea60d323621faab7db2fc06becde6567d849a7161489711d61289ffe6a906c2d4c99d25f90f8fe8bea1da19e3d1fd1e893 +EBUILD gimp-2.10.18-r1.ebuild 6152 BLAKE2B 13050ac978da7b8b99e408bd8a8fcb6aa6d725d665817e5c72953f809468007cfbdd87aa6aae852dc0ead9aa4c7cb475a43816f3892686bf38b9cb8dedd565fd SHA512 f0bd4b1790c3fede528bb25bd39f5bd4ec8080155ec510c82a1f6da1a3af39000f692effae0d3408cffa3a7933e24535d95303a1a41afc67ee2fc76570195a11 EBUILD gimp-2.8.22-r2.ebuild 5139 BLAKE2B 7e659b356107042884fddaff1622c20f1b1d627840556cdba0293fc80c43832fe02883d65ef6b338847b80d0cc041d95f6cce02ea230d071aa5545d89f55e8f8 SHA512 5b32326f52e21dd544c1f92e0f51612fb8a662ac6fa0addce482d3a3e1e9516a55b0c6a9e679407afee94b77c60a0224719ff37cd5aabcc7936a949629d4f189 EBUILD gimp-2.9.8-r1.ebuild 6068 BLAKE2B 86c853189f8a7aa5e6247d1f973337e3149ea44e13f4adc022b2e6f15eb51ecd4473e862721fd3ee841f5f36108230b2444039e5cb21898c274c97506a285800 SHA512 da7b01a4dafbd9d991ce050b3c8c5d1ce6b1f2d9cc8c4bde6463d5ebfcba2a8399c1f8f61062f1fb564c530acfea5036b6f8d5c3b4b1a291cd575a00df9deb28 EBUILD gimp-9999.ebuild 6188 BLAKE2B 34635a209811691a453e984a089faf958ac048ddf63adb17b93a22807924021ef134281b824d378e6d57a5ce88b747e6c2a6150d55b04806b14acc592e83a815 SHA512 ed5727af778d9acc7b1c3b2851c4d25329bc706d2054ecbb61e960c2e45b6fc0ea35e4aeddd97c4c1d8a1b0b71598be3ea65b401a0a3345c83ae67ca59a800db diff --git a/media-gfx/gimp/gimp-2.10.18-r1.ebuild b/media-gfx/gimp/gimp-2.10.18-r1.ebuild index 361fd3237c26..c9a15dfe4dd4 100644 --- a/media-gfx/gimp/gimp-2.10.18-r1.ebuild +++ b/media-gfx/gimp/gimp-2.10.18-r1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://www.gimp.org/" SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2" LICENSE="GPL-3 LGPL-3" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc64 ~x86" +KEYWORDS="~alpha ~amd64 arm64 ~ia64 ppc64 ~x86" IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/media-gfx/gimp/gimp-2.10.18.ebuild b/media-gfx/gimp/gimp-2.10.18.ebuild deleted file mode 100644 index bf39575cfc10..000000000000 --- a/media-gfx/gimp/gimp-2.10.18.ebuild +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF=yes -WANT_AUTOMAKE= - -inherit autotools gnome2 virtualx - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2" -LICENSE="GPL-3 LGPL-3" -SLOT="2" -KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86" - -IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - >=app-text/poppler-0.50[cairo] - >=app-text/poppler-data-0.4.7 - >=dev-libs/atk-2.2.0 - >=dev-libs/glib-2.56.0:2 - >=dev-libs/json-glib-1.2.6 - dev-libs/libxml2:2 - dev-libs/libxslt - >=gnome-base/librsvg-2.40.6:2 - >=media-gfx/mypaint-brushes-1.3.0 - >=media-libs/babl-0.1.74 - >=media-libs/fontconfig-2.12.4 - >=media-libs/freetype-2.1.7 - >=media-libs/gegl-0.4.22:0.4[cairo] - >=media-libs/gexiv2-0.10.6 - >=media-libs/harfbuzz-0.9.19 - >=media-libs/lcms-2.8:2 - >=media-libs/libmypaint-1.3.0:= - >=media-libs/libpng-1.6.25:0= - >=media-libs/tiff-3.5.7:0 - net-libs/glib-networking[ssl] - sys-libs/zlib - virtual/jpeg - >=x11-libs/cairo-1.12.2 - >=x11-libs/gdk-pixbuf-2.31:2 - >=x11-libs/gtk+-2.24.32:2 - x11-libs/libXcursor - >=x11-libs/pango-1.29.4 - aalib? ( media-libs/aalib ) - alsa? ( >=media-libs/alsa-lib-1.0.0 ) - aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) - heif? ( >=media-libs/libheif-1.3.2:= ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) - mng? ( media-libs/libmng:= ) - openexr? ( >=media-libs/openexr-1.6.1:= ) - postscript? ( app-text/ghostscript-gpl ) - udev? ( dev-libs/libgudev:= ) - unwind? ( >=sys-libs/libunwind-1.1.0:= ) - webp? ( >=media-libs/libwebp-0.6.0:= ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - xpm? ( x11-libs/libXpm ) -" - -RDEPEND=" - ${COMMON_DEPEND} - x11-themes/hicolor-icon-theme - gnome? ( gnome-base/gvfs ) -" - -DEPEND=" - ${COMMON_DEPEND} - >=dev-lang/perl-5.10.0 - dev-libs/appstream-glib - dev-util/gtk-update-icon-cache - >=dev-util/intltool-0.40.1 - sys-apps/findutils - >=sys-devel/gettext-0.19 - >=sys-devel/libtool-2.2 - virtual/pkgconfig -" - -DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" ) - -# Bugs 685210 (and duplicate 691070) -PATCHES=( - "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" -) - -src_prepare() { - # Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554 - sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \ - -e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die - - sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 - sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144 - - gnome2_src_prepare # calls eautoreconf - - sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 - fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test -} - -_adjust_sandbox() { - # Bugs #569738 and #591214 - local nv - for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do - # We do not check for existence as they may show up later - # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 - addwrite "${nv}" - done - - addwrite /dev/dri/ # bugs #574038 and #684886 - addwrite /dev/ati/ # bug #589198 - addwrite /proc/mtrr # bug #589198 -} - -src_configure() { - _adjust_sandbox - - local myconf=( - GEGL="${EPREFIX}"/usr/bin/gegl-0.4 - GDBUS_CODEGEN="${EPREFIX}"/bin/false - - --enable-default-binary - - --disable-check-update - --disable-python - --enable-mp - --with-appdata-test - --with-bug-report-url=https://bugs.gentoo.org/ - --with-xmc - --without-libbacktrace - --without-webkit - --without-xvfb-run - $(use_enable altivec) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable vector-icons) - $(use_with aalib aa) - $(use_with alsa) - $(use_with !aqua x) - $(use_with heif libheif) - $(use_with jpeg2k jpeg2000) - $(use_with mng libmng) - $(use_with openexr) - $(use_with postscript gs) - $(use_with udev gudev) - $(use_with unwind libunwind) - $(use_with webp) - $(use_with wmf) - $(use_with xpm libxpm) - ) - - gnome2_src_configure "${myconf[@]}" -} - -src_compile() { - export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - gnome2_src_compile -} - -# for https://bugs.gentoo.org/664938 -_rename_plugins() { - einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' - local prepend=gimp-org- - ( - cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1 - for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg" - mv ${plugin}/{,${prepend}}${plugin} || exit 1 - mv {,${prepend}}${plugin} || exit 1 - fi - done - ) -} - -src_test() { - virtx emake check -} - -src_install() { - gnome2_src_install - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die - - find "${D}" -name '*.la' -type f -delete || die - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - local gimp_app_version=$(get_version_component_range 1-2) - mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die - - # Remove gimp devel-docs html files if user doesn't need it - if ! use doc; then - rm -r "${ED%/}"/usr/share/gtk-doc || die - fi - - _rename_plugins || die -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/media-gfx/gimp/gimp-2.10.8-r2.ebuild b/media-gfx/gimp/gimp-2.10.8-r2.ebuild deleted file mode 100644 index 81f9d5d67b15..000000000000 --- a/media-gfx/gimp/gimp-2.10.8-r2.ebuild +++ /dev/null @@ -1,226 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -GNOME2_EAUTORECONF=yes - -MY_PV="${PV/_rc/-RC}" -MY_P="${PN}-${MY_PV}" - -inherit versionator virtualx autotools gnome2 multilib python-single-r1 ltprune - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${MY_P}.tar.bz2" -LICENSE="GPL-3 LGPL-3" -SLOT="2" -KEYWORDS="amd64 arm64 x86" - -LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW" -IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm" - -RDEPEND=">=dev-libs/glib-2.56.0:2 - >=dev-libs/atk-2.2.0 - >=x11-libs/gtk+-2.24.10:2 - >=x11-libs/gdk-pixbuf-2.31:2 - >=x11-libs/cairo-1.12.2 - >=x11-libs/pango-1.29.4 - xpm? ( x11-libs/libXpm ) - >=media-libs/freetype-2.1.7 - >=media-libs/harfbuzz-0.9.19 - >=media-libs/gexiv2-0.10.6 - >=media-libs/libmypaint-1.3.0 - >=media-gfx/mypaint-brushes-1.3.0 - >=media-libs/fontconfig-2.12.4 - sys-libs/zlib - dev-libs/libxml2 - dev-libs/libxslt - x11-themes/hicolor-icon-theme - >=media-libs/babl-0.1.58 - >=media-libs/gegl-0.4.12:0.4[cairo] - aalib? ( media-libs/aalib ) - alsa? ( media-libs/alsa-lib ) - aqua? ( x11-libs/gtk-mac-integration ) - gnome? ( gnome-base/gvfs ) - virtual/jpeg:0 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) - >=media-libs/lcms-2.8:2 - mng? ( media-libs/libmng ) - openexr? ( >=media-libs/openexr-1.6.1:= ) - >=app-text/poppler-0.44[cairo] - >=app-text/poppler-data-0.4.7 - >=media-libs/libpng-1.6.25:0= - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}] - >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}] - ') - ) - >=media-libs/tiff-3.5.7:0 - >=gnome-base/librsvg-2.40.6:2 - webp? ( >=media-libs/libwebp-0.6.0 ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - net-libs/glib-networking[ssl] - x11-libs/libXcursor - sys-libs/zlib - app-arch/bzip2 - >=app-arch/xz-utils-5.0.0 - postscript? ( app-text/ghostscript-gpl ) - udev? ( dev-libs/libgudev:= ) - unwind? ( sys-libs/libunwind:= ) - heif? ( >=media-libs/libheif-1.1.0:= )" -DEPEND="${RDEPEND} - >=dev-lang/perl-5.10.0 - dev-libs/appstream-glib - dev-util/gtk-update-icon-cache - sys-apps/findutils - virtual/pkgconfig - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.19 - doc? ( >=dev-util/gtk-doc-1 ) - >=sys-devel/libtool-2.2 - >=sys-devel/automake-1.11 - dev-util/gtk-doc-am" - -DOCS="AUTHORS ChangeLog* HACKING NEWS README*" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use python; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 - sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144 - - gnome2_src_prepare # calls eautoreconf - - sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 - fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test -} - -_adjust_sandbox() { - # Bugs #569738 and #591214 - local nv - for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do - # We do not check for existence as they may show up later - # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 - addwrite "${nv}" - done - - addwrite /dev/dri/ # bugs #574038 and #684886 - addwrite /dev/ati/ # bug #589198 - addwrite /proc/mtrr # bug #589198 -} - -src_configure() { - _adjust_sandbox - - local myconf=( - GEGL="${EPREFIX}"/usr/bin/gegl-0.4 - GDBUS_CODEGEN="${EPREFIX}"/bin/false - --enable-default-binary - $(use_with !aqua x) - $(use_with aalib aa) - $(use_with alsa) - $(use_enable altivec) - --with-appdata-test - --without-libbacktrace - --with-bug-report-url=https://bugs.gentoo.org/ - --without-webkit - $(use_with jpeg2k jpeg2000) - $(use_with postscript gs) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_with mng libmng) - $(use_with openexr) - $(use_with webp) - $(use_with heif libheif) - $(use_enable python) - --enable-mp - $(use_enable cpu_flags_x86_sse sse) - $(use_with udev gudev) - $(use_with unwind libunwind) - $(use_with wmf) - --with-xmc - $(use_with xpm libxpm) - $(use_enable vector-icons) - --without-xvfb-run - ) - - gnome2_src_configure "${myconf[@]}" -} - -src_compile() { - export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - gnome2_src_compile -} - -_clean_up_locales() { - [[ -z ${LINGUAS+set} ]] && return - einfo "Cleaning up locales..." - for lang in ${LANGS}; do - has ${lang} ${LINGUAS} && { - einfo "- keeping ${lang}" - continue - } - rm -Rf "${ED%/}"/usr/share/locale/"${lang}" - done -} - -# for https://bugs.gentoo.org/664938 -_rename_plugins() { - einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' - local prepend=gimp-org- - ( - cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1 - for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg" - mv ${plugin}/{,${prepend}}${plugin} || exit 1 - mv {,${prepend}}${plugin} || exit 1 - fi - done - ) -} - -src_test() { - virtx emake check -} - -src_install() { - gnome2_src_install - - if use python; then - python_optimize - fi - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die - - prune_libtool_files --all - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - local gimp_app_version=$(get_version_component_range 1-2) - mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die - - _rename_plugins || die - _clean_up_locales -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest index cf0625467689..8efa9faad47b 100644 --- a/media-gfx/gnome-photos/Manifest +++ b/media-gfx/gnome-photos/Manifest @@ -1,5 +1,3 @@ -DIST gnome-photos-3.32.1.tar.xz 632688 BLAKE2B 9fa7307d1571f6c4e07d6c9700fd947e4a0ff26f8308f7b1871da817e5d80b19861d3c94a1b8ffe0daa820862ad064075641c8eb42ad66134e7c554696448932 SHA512 31a52b93c27ee603ddb314998d663d02c1cfdbc33214d2d9f977f7b66f4fc131a52cd17b274efcfb80f2fb17d7b469157e99a783cbfe76e0b872a2a75363b208 DIST gnome-photos-3.34.1.tar.xz 636916 BLAKE2B 3d041f3a8349164e12b8788b028edf23c0db1e671c5da4356dbdc01f5129e8dfabd3ee9df3af82b2794e22c1d8d894b7726068d69a605b0d598ec1dc21754470 SHA512 9ee1bf299f82b4a55d2642e34cfa82e0a3a362cd5e415acd5421d54430da5ea5a9f831ecf5ccf6966eea056c851fde57385f9224441be3d06e086be108d53227 -EBUILD gnome-photos-3.32.1.ebuild 2299 BLAKE2B 48d413458167c1804b93de5c5f31a994062c171cc25532adab60bc93dcf8cf9a9e2ce921336574c7c116e1dbcafbdbcb78d12e794e4b3f6f3ae8a3c947284256 SHA512 3b3d34b0a1ddb9e97bd2c57fc53427331edc00621449f134d5b7bd1817305085695b1b4d75dbbd13db50e8ad587f10b3d46aa80de12826a1aef4708d67952b23 EBUILD gnome-photos-3.34.1.ebuild 2303 BLAKE2B 2c1d5d39d8c532b72ea27a6abcd8c35d49638a3c5b0e6ac24fd4ef2069e1fc93c54f8056e55a45d0e82d5becd134e50f4b7b464b13b65d7e9c8a6ff43d92262c SHA512 f49cc3c4c8aea3b6292dcfa858b5ff3f78c13c282e66700d5f5de8dde3bac3ceacce2201d92930aa8a503fc629b17130b484b6da7a4850ee822ec7f2d0fb3755 MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df diff --git a/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild deleted file mode 100644 index d70065133cfd..000000000000 --- a/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_6 ) - -inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg - -DESCRIPTION="Access, organize and share your photos on GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Photos" - -LICENSE="GPL-3+ LGPL-2+ CC0-1.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="flickr test upnp-av" -RESTRICT="!test? ( test )" - -DEPEND=" - media-libs/babl - >=x11-libs/cairo-1.14.0 - >=x11-libs/gdk-pixbuf-2.36.8:2 - >=media-libs/gegl-0.4.0:0.4[cairo,raw] - sci-geosciences/geocode-glib - >=media-libs/gexiv2-0.10.8 - >=dev-libs/glib-2.57.2:2 - >=net-libs/gnome-online-accounts-3.8.0:= - >=media-libs/grilo-0.3.5:0.3= - gnome-base/gsettings-desktop-schemas - >=x11-libs/gtk+-3.22.16:3 - >=dev-libs/libdazzle-3.26.0 - >=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts] - >=net-libs/libgfbgraph-0.2.1:0.2 - virtual/jpeg:0 - >=media-libs/libpng-1.6:0= - >=app-misc/tracker-2.0:0/2.0 - sys-apps/dbus -" -# gnome-online-miners is also used for google, facebook, DLNA - not only flickr -# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here, -# so don't pull it always, but only if either USE flag is enabled. -# tracker-miners gschema used at runtime. -RDEPEND="${DEPEND} - net-misc/gnome-online-miners[flickr?] - upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] ) - flickr? ( media-plugins/grilo-plugins:0.3[flickr] ) - >=app-misc/tracker-miners-2 -" -BDEPEND=" - dev-libs/appstream-glib - dev-util/desktop-file-utils - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') ) -" - -DOCS=() # meson installs docs itself - -python_check_deps() { - use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - xdg_src_prepare - sed -i -e "/photos_docdir.*=.*join_paths/s/meson.project_name()/'${PF}'/" meson.build -} - -src_configure() { - local emesonargs=( - $(meson_use test dogtail) - -Dinstalled_tests=false - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest index 205dff50c600..48d044136a91 100644 --- a/media-gfx/gnome-screenshot/Manifest +++ b/media-gfx/gnome-screenshot/Manifest @@ -1,5 +1,3 @@ -DIST gnome-screenshot-3.32.0.tar.xz 228876 BLAKE2B a7f742cf67815428da3013db23d36b34f52bf99c3d77002cac9243d2f5c5c5c1828cb92a34e0541d18c57f357d39f876a815d7caa432f92704c749a431faae95 SHA512 2747f3cc6ff6df6db6d64c9c13f7d7e3c0bf738cdace2850869c1158d23d02dd03b55e6704c9540f1e5b789626ea07741a0030ce3b06dd70c09f2fb2afa79c61 DIST gnome-screenshot-3.36.0.tar.xz 231420 BLAKE2B ce916d4d221252f47c84ebdec52ddcc2e25c2481df848cb6199842857c7ba537f56c22bdcb2a8e5b988d767fbc242d0c727119bc1ae9d569644eae15688aebf5 SHA512 fda599e7c50b37d8356352085b2f45f3b8c868af897352810998e127bd7333d5a1383369ec1cb980064f7e0aafa0e01bc5cdb31563ea56b1a7e4099fc18cc6b4 -EBUILD gnome-screenshot-3.32.0.ebuild 1204 BLAKE2B 7e2465f20e33696123deb1156db4e4a1356bb48b8613824be9d418b7f31c2a41ddf4fb25b0c422007e703ec7a68b8872b760f080988538b94c7a8bd2d5c52dc2 SHA512 1115c12624ba4bd0a218347775c8810c916f862e0155471a55e84ae38e214c9de19992d025a52b5ba685a506022a0091a307c8b14c61973f33edb9d8b44ef90a EBUILD gnome-screenshot-3.36.0.ebuild 1204 BLAKE2B 7e2465f20e33696123deb1156db4e4a1356bb48b8613824be9d418b7f31c2a41ddf4fb25b0c422007e703ec7a68b8872b760f080988538b94c7a8bd2d5c52dc2 SHA512 1115c12624ba4bd0a218347775c8810c916f862e0155471a55e84ae38e214c9de19992d025a52b5ba685a506022a0091a307c8b14c61973f33edb9d8b44ef90a MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild deleted file mode 100644 index 521236d8c9cd..000000000000 --- a/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg - -DESCRIPTION="Screenshot utility for GNOME" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" - -# libcanberra 0.26-r2 is needed for gtk+:3 fixes -DEPEND=" - x11-libs/libX11 - x11-libs/libXext - >=dev-libs/glib-2.35.1:2[dbus] - >=x11-libs/gtk+-3.12.0:3 - >=media-libs/libcanberra-0.26-r2[gtk3] -" -RDEPEND="${DEPEND} - >=gnome-base/gsettings-desktop-schemas-0.1.0 -" -BDEPEND=" - dev-libs/appstream-glib - dev-libs/libxml2:2 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - x11-base/xorg-proto -" - -DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to - non-interactive mode when launched from a terminal. If you want to choose - where to save the screenshot, run 'gnome-screenshot --interactive'" - -src_install() { - meson_src_install - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - readme.gentoo_print_elog -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/media-gfx/gpicview/Manifest b/media-gfx/gpicview/Manifest index 069dd975b382..656daa3d9943 100644 --- a/media-gfx/gpicview/Manifest +++ b/media-gfx/gpicview/Manifest @@ -1,4 +1,4 @@ DIST gpicview-0.2.5.tar.xz 349536 BLAKE2B c215e812693a30d55d3e606b9958d308b5d7f564ba0c3fc60e7606c492ec3ddd9997ae63f0865a6bebdf79c0a18e6a8b26a1e2c8d5dd7e2174d211130dbbe817 SHA512 afc7e67c7ae1252f9c1816ee46fe69e96ea7be9a60e03406a539f17b2e4f0e4b93a028c6f3f1c455f5433d6d7d78a58dcee2cb0ac91ea53093a21935bf454afd EBUILD gpicview-0.2.5-r1.ebuild 653 BLAKE2B 838de94b135c79ff24790e6b607b9caf962784b3eede113ab839ddb1353f551a2872980e68f59f82b76bfb1e5971d816b690f952c8896995e1691902175d49ff SHA512 ff7ed4054a9c8d5c77b65c4c2ffbde2016fff9da83e942529e601e88119f5b5a6a1931c869e01256bd3168fa9146cfc56803366c13afd3f5595bf8ea78744068 EBUILD gpicview-0.2.5.ebuild 548 BLAKE2B 7402a49ee6252fdc380528d96b8fb251da0f2f10c21c87867f8376630bceeaf025c26a2cf9b926be879184849c5786d752a4f42570e7f9b1a5de6feffd86ed5d SHA512 c65d2217ad28d00169b53997497ed000d0fd90d42c121071a69e7c7ff5d4305d8169c3b749409afa0aaa1fd3a3bea76a2ab33ad5e92e45940a7f93d24f6e00b0 -MISC metadata.xml 445 BLAKE2B d91e39bbfe204c70cc479af04d21d643a48077eef9940f4a2cab081ee8f5921291074d0c68c207798b9ec1400e27ba6092068a98e15ca80d2c0e45d5e02f33aa SHA512 bbc64e2e70d381c829c9ef28d202be2b2418b5d387d99f281db5f666a45bd67cbde4c161c99a2e39f4bdd2a3a276574aab878c0a7e0a861f2483aee0bdca55b5 +MISC metadata.xml 333 BLAKE2B e47d0b060a5ec16432ef5e75d3e04a18fa92dcd971052fcdab91cf22db89e44133e54afe7825796f460a00abd78d0163749f2723d51819bcf68c97c3f13a278e SHA512 504286d76109997d9e035c004b9f7292dd706b7899f9691c1d6e6c3a96ce04f39b56061fae5b117af79c95c18a21d154a25f46750ff133a88f47bcb79a0b4971 diff --git a/media-gfx/gpicview/metadata.xml b/media-gfx/gpicview/metadata.xml index 3266980e1ed0..2614d4cdfbbe 100644 --- a/media-gfx/gpicview/metadata.xml +++ b/media-gfx/gpicview/metadata.xml @@ -5,10 +5,6 @@ <email>graphics@gentoo.org</email> <name>Gentoo Graphics Project</name> </maintainer> - <maintainer type="project"> - <email>lxde@gentoo.org</email> - <name>Gentoo LXDE Project</name> - </maintainer> <upstream> <remote-id type="sourceforge">lxde</remote-id> </upstream> diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest index e99ee1aad84d..1822745f8f41 100644 --- a/media-gfx/graphicsmagick/Manifest +++ b/media-gfx/graphicsmagick/Manifest @@ -1,10 +1,6 @@ AUX graphicsmagick-1.3.19-flags.patch 1800 BLAKE2B 50f4f0de0cb3842fb84e136038bc0c9714a776868303bda17af26cca8f3c4160d7f9060d0a8a116ad30a17b416ddd2963da0e66d4ca76fdc351507c51ae30998 SHA512 fa1bdbe718ae8ae49a58f6fc1728f1bb6b869a907f77e41eec92c452f86e05cf821548409f2a5d55dcdb38b8a80d7ef2b1d37d2111c3fd5088a118626479ad2c AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865 -DIST GraphicsMagick-1.3.32.tar.xz 5535224 BLAKE2B 96fd7bfe62b4b1b25f9ffc0ff8e2ac023f0528b9af857fc27a5a9cd1123eeb6533b868c7bad8dca5b58e114a674dda009a62904df64622d7b5f3c0d72156283d SHA512 f84cdb9318962aed1dc25d70db4d0ca102e4f88748f468f8a56b77d228fd315b772afa48e90a396d32e8226eba9105717bcb94166bbe43723afeec58ead53e09 -DIST GraphicsMagick-1.3.33.tar.xz 5558348 BLAKE2B 9c3747ee63d94bc6d16c06c04c7fad2ca93e849df7ae4391523b416111b5569c7493226f6b967a5ff80e0ff2ccbe7f6de5a7223e935024fd66a96be401fdf26b SHA512 8afeb461d1a9dab9b88b9bc7c2d50b5c409463b369e6b0ba7ee39b0ece32da9393d7a5a4d18faf8f72a529346a3477bae61b802bac2af81aeae79d95c9d6cd13 DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c -EBUILD graphicsmagick-1.3.32.ebuild 3073 BLAKE2B 2b5f2568d3369c959b6754677e3806bd0600622bc17c6a92964120dfcee1cb45b75703d0dcacae855771898a08ab65c60ec5c5310fa69997250996753447ff9f SHA512 06ff45495b09e3dfd9f81bf2d6dca0c0bcf84423df38d6a8cbebc86732c2cf5f0fe6bf5678a3e9ad0075f909055bba359b16ad0774243032056635d8aac38d7d -EBUILD graphicsmagick-1.3.33.ebuild 3079 BLAKE2B 5683335f38a7d90554e705f65bc84ea44643bd6c18b5d7f48f2608d949efc4ecd8f562a6f7f989ee0dbc4e208efbc4a1190154f88baf69c89ad17da1d70ad5ae SHA512 13f6d72eb95a1be93d70d685fc3296885c7084536a951e9158e989169e5e5768c98591af22b0221bcb951ce4b4bbdeb90b21b93f3fa8589026316880d1dbe8cd -EBUILD graphicsmagick-1.3.35.ebuild 3073 BLAKE2B 2b5f2568d3369c959b6754677e3806bd0600622bc17c6a92964120dfcee1cb45b75703d0dcacae855771898a08ab65c60ec5c5310fa69997250996753447ff9f SHA512 06ff45495b09e3dfd9f81bf2d6dca0c0bcf84423df38d6a8cbebc86732c2cf5f0fe6bf5678a3e9ad0075f909055bba359b16ad0774243032056635d8aac38d7d +EBUILD graphicsmagick-1.3.35.ebuild 3085 BLAKE2B c0e6b0a3eae4087a3aa5130866629037ddeae03fb63dc0914b117ac9f7345f1f18c0ba2e41a9fe06fc80fe206013636f75d1a44c62e300487763bab2ed8f58ad SHA512 eeab4b3a5b8a8ffc5ee810125d5161b18339f06e10883a692592b9ec1f7c4296de9a56459f57f033d378a8638da4d8b30f1d04c5d16cff9d108ff99c8e2dc763 EBUILD graphicsmagick-9999.ebuild 3079 BLAKE2B 5683335f38a7d90554e705f65bc84ea44643bd6c18b5d7f48f2608d949efc4ecd8f562a6f7f989ee0dbc4e208efbc4a1190154f88baf69c89ad17da1d70ad5ae SHA512 13f6d72eb95a1be93d70d685fc3296885c7084536a951e9158e989169e5e5768c98591af22b0221bcb951ce4b4bbdeb90b21b93f3fa8589026316880d1dbe8cd MISC metadata.xml 1154 BLAKE2B f94864df05c239bd37ec05d00068e934e60e8dcbe03e52020df7d830842be94c08dbf339eca919c4e7fe18d5ad62bf3077ac9877b18ef6f09fd2b9f52c31aba0 SHA512 9bdbcace99fd11f192bea183b5d84bc9b2d06979db21d1a9a3e57677a4438f24a5812619c73a0becfc7fb81140414199fde3d0e8811abf1a92322535529f5d2c diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild deleted file mode 100644 index 38979f24cfd0..000000000000 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools toolchain-funcs - -MY_P=${P/graphicsm/GraphicsM} - -DESCRIPTION="Collection of tools and libraries for many image formats" -HOMEPAGE="http://www.graphicsmagick.org/" -LICENSE="MIT" -SLOT="0/${PV%.*}" - -if [[ ${PV} == "9999" ]] ; then - inherit mercurial - EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code" -else - SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -fi - -IUSE="bzip2 +cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp - perl png postscript q16 q32 static-libs svg threads tiff truetype - webp wmf X zlib" - -RDEPEND="dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - fpx? ( media-libs/libfpx ) - imagemagick? ( !media-gfx/imagemagick ) - jbig? ( media-libs/jbigkit ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - lzma? ( app-arch/xz-utils ) - perl? ( dev-lang/perl:= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - svg? ( dev-libs/libxml2 ) - tiff? ( media-libs/tiff:0 ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libSM - x11-libs/libXext - ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.19-flags.patch - "${FILESDIR}"/${PN}-1.3.19-perl.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local depth=8 - use q16 && depth=16 - use q32 && depth=32 - - local openmp=disable - if use openmp && tc-has-openmp; then - openmp=enable - fi - - local myeconfargs=( - --${openmp}-openmp - --enable-largefile - --enable-shared - $(use_enable static-libs static) - $(use_enable debug prof) - $(use_enable debug gcov) - $(use_enable imagemagick magick-compat) - $(use_with threads) - $(use_with modules) - --with-quantum-depth=${depth} - --without-frozenpaths - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options=INSTALLDIRS=vendor - $(use_with bzip2 bzlib) - $(use_with postscript dps) - $(use_with fpx) - $(use_with jbig) - $(use_with webp) - $(use_with jpeg) - --without-jp2 - $(use_with lcms lcms2) - $(use_with lzma) - $(use_with png) - $(use_with tiff) - $(use_with truetype ttf) - $(use_with wmf) - --with-fontpath="${EPREFIX}"/usr/share/fonts - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts - $(use_with svg xml) - $(use_with zlib) - $(use_with X x) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - default - use perl && emake perl-build -} - -src_test() { - unset DISPLAY # some perl tests fail when DISPLAY is set - default -} - -src_install() { - default - - if use perl; then - emake -C PerlMagick DESTDIR="${D}" install - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die -} diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.33.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.33.ebuild deleted file mode 100644 index 6e0e9fc4f818..000000000000 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.33.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools toolchain-funcs - -MY_P=${P/graphicsm/GraphicsM} - -DESCRIPTION="Collection of tools and libraries for many image formats" -HOMEPAGE="http://www.graphicsmagick.org/" -LICENSE="MIT" -SLOT="0/${PV%.*}" - -if [[ ${PV} == "9999" ]] ; then - inherit mercurial - EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code" -else - SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -fi - -IUSE="bzip2 +cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp - perl png postscript q16 q32 static-libs svg threads tiff truetype - webp wmf X zlib" - -RDEPEND="dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - fpx? ( media-libs/libfpx ) - imagemagick? ( !media-gfx/imagemagick ) - jbig? ( media-libs/jbigkit ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - lzma? ( app-arch/xz-utils ) - perl? ( dev-lang/perl:= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - svg? ( dev-libs/libxml2 ) - tiff? ( media-libs/tiff:0 ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libSM - x11-libs/libXext - ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.19-flags.patch - "${FILESDIR}"/${PN}-1.3.19-perl.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local depth=8 - use q16 && depth=16 - use q32 && depth=32 - - local openmp=disable - if use openmp && tc-has-openmp; then - openmp=enable - fi - - local myeconfargs=( - --${openmp}-openmp - --enable-largefile - --enable-shared - $(use_enable static-libs static) - $(use_enable debug prof) - $(use_enable debug gcov) - $(use_enable imagemagick magick-compat) - $(use_with threads) - $(use_with modules) - --with-quantum-depth=${depth} - --without-frozenpaths - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options=INSTALLDIRS=vendor - $(use_with bzip2 bzlib) - $(use_with postscript dps) - $(use_with fpx) - $(use_with jbig) - $(use_with webp) - $(use_with jpeg) - --without-jp2 - $(use_with lcms lcms2) - $(use_with lzma) - $(use_with png) - $(use_with tiff) - $(use_with truetype ttf) - $(use_with wmf) - --with-fontpath="${EPREFIX}"/usr/share/fonts - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts - $(use_with svg xml) - $(use_with zlib) - $(use_with X x) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - default - use perl && emake perl-build -} - -src_test() { - unset DISPLAY # some perl tests fail when DISPLAY is set - default -} - -src_install() { - default - - if use perl; then - emake -C PerlMagick DESTDIR="${D}" install - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die -} diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.35.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.35.ebuild index 38979f24cfd0..714842ff908c 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.35.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.35.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code" else SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" fi IUSE="bzip2 +cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index 10d78a908965..2515c1bb0930 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -2,6 +2,6 @@ AUX hugin-2019.0.0-exiv2-0.27.1.patch 998 BLAKE2B fd072b1bfb995f3e63ca78b0ad288c DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B 59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5 SHA512 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5 DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1 EBUILD hugin-2019.0.0.ebuild 2209 BLAKE2B 9206caa49b018f46613c673c26ebd555e6750e640aabff5753dd61a9c744d1718d6a05ab8298cb6d259e11e989d74c5a6224d1c77ea699448a377b9f839fbc10 SHA512 921e1aa1514125756ccba0ac9896978677ea4a1e5672c68eedd671bbd4e28e84f046c39ebddbe7f8489e32d93c9e4a637f8c9a9810ab8269913e4c60f83c0b8c -EBUILD hugin-2019.2.0.ebuild 2188 BLAKE2B 3a8957b1f5c620503b18ad71475e67b01540e9893a9b3d904ba1656f519dc7efca50cce5c8b986909caa86591d91fbe4c0297b4a0b5ccf9fc23400e454d07862 SHA512 7662be470548fdb35376af51088442751bed2f55a612b40df0eb9dfd93a0dfcd62cf6194bc7641c543bb776d87c8ed517d6a299b2031f01ade06d5a31c2af13c +EBUILD hugin-2019.2.0.ebuild 2185 BLAKE2B 25b087eccf301e5540e6e897161e7c1ccbe907a26b22feefd31a40357602c5f9c61f41e41b033958d0df171c2df04c4e49ee4061f9d0e5db002f2f8ed46c1edf SHA512 89c7d596a4fef47dc3d144ae30a4cce0745391b05760108d6755717413a76bc6bf5d790ec50b0af01a88ced13ce1467d4cc311a24c877c9584df14ad712545b0 EBUILD hugin-9999.ebuild 2058 BLAKE2B d7f7ab9b065dcc31cc85033a044b3e8da912779069709e2c1c02c3958744896c9c84cfb2bbf9c802b444e92ce6f6cd86d402254d3b2e5eb5f2b2b766eef069e0 SHA512 65ead2eab2416af88e8529704ee0c936901d3512558e1433eaff5ec3b3db5ba8659b2f72fd4613cc305afb9461003841ce7e3c04b8bbd201c8842ab7ddb5c5c7 MISC metadata.xml 445 BLAKE2B ac876779272c1b22b648f4231a766d738bedf3b8a5a195fed926e6976531bc4653181a992bdcfaeaa6bdd9c79c21971025f207681490870209852d561aeeae78 SHA512 f2684887481f43030dbe01cf4df354511e4b294d53d7f7fbb9627cdddeb29709d806c6017f2c32557e4e6e288615ab2430fe7d102ea30072e1ea733d60177945 diff --git a/media-gfx/hugin/hugin-2019.2.0.ebuild b/media-gfx/hugin/hugin-2019.2.0.ebuild index d78bbbd573ac..7cc3209c4c52 100644 --- a/media-gfx/hugin/hugin-2019.2.0.ebuild +++ b/media-gfx/hugin/hugin-2019.2.0.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 x86" LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW" IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})" diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 5fa8276d54d9..e5d37bcc59bc 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,20 +1,12 @@ AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57 -DIST ImageMagick-6.9.11-0.tar.xz 9072040 BLAKE2B 8e3df83c5a009e3a03599a20b9bc2d6f1e91add659d8de150a4ebeafb91218bc62aac25c755a6a1010e00c2d14853a0d8a4849e2b55c899587acdf2d28d8b7c5 SHA512 fe6786365dfe8973e4660f4070cb85335f88985ec9e2484fe382d1f5c1f0123476cdf8e976107072b5ed13b05190f906be89e5215e16dc62e5daebe3ede40bf2 -DIST ImageMagick-6.9.11-1.tar.xz 9069980 BLAKE2B fbbe707da57a9b1016e89496112b85f1f8500ff35a23015d708c46369c88255c61ed0dd08b8dc2f1160045d91252bab39e9869f490b833f34bd5b7b65d7133a5 SHA512 d18db31d6d2e506203ac530e3d3032c3dfb776fb693788cf813546128dbcb4255522586d8dd5deb9cf0b56a8d503a42929937ee1ec34c8e14ce64568b552bd05 -DIST ImageMagick-6.9.11-3.tar.xz 9068572 BLAKE2B 15ecc7c598c1cad29f6edbd34a83391b6ad8ae0a9d412431d8cd1dc8874afffa73e10bce28aa11f927ee912274d10e1541fc5de3d62a9e58ec57138adf70a8a2 SHA512 2af5029117077100304c366429e961f97a7d8efac7b824f1fcdfdca79f99a34dea1ac99bf8aef23bf4e828bf958722372a9cf073d74ff5a213cd3f9ecb809e76 DIST ImageMagick-6.9.11-7.tar.xz 9075300 BLAKE2B 669c9c4212afd7a8b6c336378b248607991156807522e0c53920bf846f87168deeba12e282a60e977d1056a32eb06302d8b2422d4982060e88048ae79ae8ad3a SHA512 7eb169679846ae18cc16fbf66d3e5903f4ad38373a4e24c1219fab7a5fe323afd60bd1c540c75931c069116ea8367a89d25c68283276dbfeda67cc4d601b2888 -DIST ImageMagick-7.0.10-0.tar.xz 9532856 BLAKE2B 510e1ac8010b7e2267950e868ce8d0fcd36e37c936c67b1603f4dfdc247cda8dd4aa59fc0d88f5d2a2c0a9a199331cca834797f315814964b68dfad1ab24f355 SHA512 d997429855fa4bc48da32e00ea5c45467a6bd3265c35c0aff8f150346e467451737f276833d4fa867f0e2e52110f532416af1dafdbc8e81d2d11dd0c4c80f011 -DIST ImageMagick-7.0.10-1.tar.xz 9531244 BLAKE2B e0c16627c23e0ae181e52d73f0c5ec91835fe87eb587e73fc8aff58b0e505e8b78b3c62f842be4d80a787d3f3df404e3e3feb58c80282b828ae623f1cd2fb5ed SHA512 086616507c073e1a6c8c1276273fee18e9d5ae5ea3a730ad770347459a975c898517985b5a79798b90922e4954cdf994b78daa1ab164cbb48087da389acf6db5 -DIST ImageMagick-7.0.10-3.tar.xz 9699848 BLAKE2B 80aa3d85a3129b9270571bc263eeb66e17010ddbcb82fe5d68257a097ac5ece400d24759a526a72ce9a6a009bf909772aa7f363a56075f45a3c446bc1ac359fe SHA512 680d88097ca85028cd9b2eba082d482335333687480eb1e0a2a98b9b3d1d04458e9a6c0b77a88324fbc188d6db861c05f9b8ae4157411dc59ebd7494ed4d28dd +DIST ImageMagick-6.9.11-9.tar.xz 9069640 BLAKE2B ab39f4723e4bc843a504ce29a840d24a0497d00ebaaf8a10589813d7bf13f5ef3774e9989dd38d667e1a9ad3dbc5357ca4a53533b5ef338781409c0b3bdde01a SHA512 8f8e6cdbbc4ff367304d29d3098dc208ac17e8037e31426e5e24d918ab13a292660e2944cb830fa814f297b69f8b2d693ac33b94f5ee4b8406cf52605ee00586 DIST ImageMagick-7.0.10-7.tar.xz 9685636 BLAKE2B 20dd94a034038d420906779e78c35c3c7c73370ee7ee29833f63833e8923fb52416a4e4f1a5700795b6722c29dc3b060a3dc1708e267815e86e9e9756200e074 SHA512 020adb329bcc50af52e590b33edc2caf5c0f7b15eacaabd18e5dc9b755314b8238c0b869420662b2b70c406453cf125ed10d2cf0ac94d309c05dfcd7e5820b26 -EBUILD imagemagick-6.9.11.0.ebuild 6922 BLAKE2B 8c72ebb14d2114501f87e9be29ce76a1aa17e92673c2cc5e57d90ce3bd449fb70216d21d77f257ee98047532e57ee39a9d3f2d421211aca46be190718c8f95b1 SHA512 5201f490b08c680d2b54507e51fee3583d83df7880523489b5f195ec9134d0a5333fce34e3fa1e6d4cb1e5a84b729eca6b68bfbc81f9676cd52e8dfd28c292c5 -EBUILD imagemagick-6.9.11.1.ebuild 7052 BLAKE2B 0d3b6fdd3ef7c9e74ce741a6ff275bc5b4c35ff006a103af8d849253ac703899662453cd54d2c460c7329788a12550ae82b7a4112c5840f7bd7150b8788839ea SHA512 df0e015e4e44c56991dd7a19856dff980bcfc17fd2ccc54b690c17e70c537658d5738d06ccfe7b7b367f8ff135660e6cfc28f81658f74e8d5ab458dac84e050e -EBUILD imagemagick-6.9.11.3.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49 -EBUILD imagemagick-6.9.11.7.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49 -EBUILD imagemagick-7.0.10.0.ebuild 7197 BLAKE2B 899419f5de38f2e53b546b9ec6c4c8936cd635e72b10966dcdbf2e592ba69a00d5eaf841584608e63c78cbe98dea44d4269a0e51bc052940114d5ae4347671c0 SHA512 c80bc83f4690b9e9b806df7b5210806cc980e3bb6e9a6d906de649c5a32f479a644b15aa0f507ace746b63834f80d8d53acbdae776c205b28701239050f6af0a -EBUILD imagemagick-7.0.10.1.ebuild 7328 BLAKE2B a30f3f2ff52707032e4f4a0eee05f846a08c37f8b6646d452831023cc8443d900b1f1d41954c2802d5f464b519700e71d8dd15dfc77620929c8dfbc32a49bb99 SHA512 e0968e3bc6595909eb378ea04ccb42a985bc1609c2f84b244436244ef79af1b37035f7fc4fda5e01399a74c32e931062f7c6998487d56a98ecebdaa165549f1e -EBUILD imagemagick-7.0.10.3.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00 -EBUILD imagemagick-7.0.10.7-r1.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00 +DIST ImageMagick-7.0.10-9.tar.xz 9681168 BLAKE2B 0a26df054f6799dcc0cc576dc3d3e30689d3311ce658b220f4575d6ddf31063e8e9b1de57d5065171480dad5ae4f3a0bdde0d5ef7a5a7cdd267f2e76a210f30c SHA512 db19b39c41e3401ce454016a14c83d1188d38d7e4a31848c29344bd86ef14d4250208bcfb4b9e519f7d2d193a61724d980ce39e9d6e2388c872281e9383e2f54 +EBUILD imagemagick-6.9.11.7.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b +EBUILD imagemagick-6.9.11.9.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49 +EBUILD imagemagick-7.0.10.7-r1.ebuild 7324 BLAKE2B 1d67b3846e05b04487a5e9f154de9d8d19afb024fc11d8c117ed4d2bdba8124414dc348b93c3c012ec6884a03e77e8e2f06bc90c448767998ff38486a92dd179 SHA512 a5df77b164a1c6ac1c6867d39afea790c3f69ff021a312abeb5d6476316d2e78caf1081235242559af1297fdb14a4add48514dd3bf611778123026fd7bc2e8bc +EBUILD imagemagick-7.0.10.9.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00 EBUILD imagemagick-9999.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00 MISC metadata.xml 1111 BLAKE2B 3592f2d81f67d91239152d723c736437a5e8056f8dba1fc5c97e2ead08efd4e913400b441eb6d6b90f26cccf3b89f115c18a5551bc070d1fd81e68dd218493c9 SHA512 33bd68bc4f88cd6029528b0feab9cc9fde0d60475ba5fad8c4f92ff6d373666628e6525d54268735e99182abd2658aa32c7c72ff22106c65f81ed8af5e4f7ea2 diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild deleted file mode 100644 index c2d4023dc3b0..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild +++ /dev/null @@ -1,250 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib - -MY_PV="$(ver_rs 3 '-')" -MY_P="ImageMagick-${MY_PV}" - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/6.9.11" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -RESTRICT="perl? ( userpriv ) - !test? ( test )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - heif? ( media-libs/libheif:= ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -S="${WORKDIR}/${MY_P}" -#S="${WORKDIR}/ImageMagick6-${MY_PV}" - -src_prepare() { - default - - # Apply hardening #664236 - cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die - sed -i -e '/^<policymap>$/ { - r policy-hardening.snippet - d - }' \ - config/policy.xml || \ - die "Failed to apply hardening of policy.xml" - einfo "policy.xml hardened" - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - local mesa_cards ati_cards nvidia_cards render_cards - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - use perl && perl_check_env - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with heif heic) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - - local im_command= IM_COMMANDS=() - IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built - IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used - IM_COMMANDS+=( "emake check" ) # Run tests - - for im_command in "${IM_COMMANDS[@]}"; do - eval "${S}"/magick.sh \ - ${im_command} || \ - die "Failed to run \"${im_command}\"" - done -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} - -pkg_postinst() { - local _show_policy_xml_notice= - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - _show_policy_xml_notice=yes - else - local v - for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "6.9.10.10-r2"; then - # This is an upgrade - _show_policy_xml_notice=yes - - # Show this elog only once - break - fi - done - fi - - if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" - elog "which will prevent the usage of the following coders by default:" - elog "" - elog " - PS" - elog " - PS2" - elog " - PS3" - elog " - EPS" - elog " - PDF" - elog " - XPS" - fi -} diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.1.ebuild deleted file mode 100644 index 532a05a66c86..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.11.1.ebuild +++ /dev/null @@ -1,255 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib - -MY_PV="$(ver_rs 3 '-')" -MY_P="ImageMagick-${MY_PV}" - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/6.9.11" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -RESTRICT="perl? ( userpriv ) - !test? ( test )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - heif? ( media-libs/libheif:= ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( - gnome-base/librsvg - media-gfx/potrace - ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -S="${WORKDIR}/${MY_P}" -#S="${WORKDIR}/ImageMagick6-${MY_PV}" - -src_prepare() { - default - - # Apply hardening #664236 - cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die - sed -i -e '/^<policymap>$/ { - r policy-hardening.snippet - d - }' \ - config/policy.xml || \ - die "Failed to apply hardening of policy.xml" - einfo "policy.xml hardened" - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - local mesa_cards ati_cards nvidia_cards render_cards - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - use perl && perl_check_env - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with heif heic) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - - local im_command= IM_COMMANDS=() - IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built - IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used - IM_COMMANDS+=( "emake check" ) # Run tests - - for im_command in "${IM_COMMANDS[@]}"; do - eval "${S}"/magick.sh \ - ${im_command} || \ - die "Failed to run \"${im_command}\"" - done -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} - -pkg_postinst() { - local _show_policy_xml_notice= - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - _show_policy_xml_notice=yes - else - local v - for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "6.9.10.10-r2"; then - # This is an upgrade - _show_policy_xml_notice=yes - - # Show this elog only once - break - fi - done - fi - - if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" - elog "which will prevent the usage of the following coders by default:" - elog "" - elog " - PS" - elog " - PS2" - elog " - PS3" - elog " - EPS" - elog " - PDF" - elog " - XPS" - fi -} diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.7.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.7.ebuild index 02b0c9655fe7..f37a0010b4c8 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.11.7.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.11.7.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" LICENSE="imagemagick" SLOT="0/6.9.11" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" REQUIRED_USE="corefonts? ( truetype ) diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.3.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild index 02b0c9655fe7..02b0c9655fe7 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.11.3.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.0.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.0.ebuild deleted file mode 100644 index a85c71b04448..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.0.10.0.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic libtool perl-functions toolchain-funcs multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" - inherit git-r3 - MY_P="imagemagick-9999" -else - MY_PV="$(ver_rs 3 '-')" - MY_P="ImageMagick-${MY_PV}" - SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" - -LICENSE="imagemagick" -SLOT="0/7.0.10" -IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" -RESTRICT="!test? ( test )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - heif? ( media-libs/libheif:= ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" - -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - X? ( x11-base/xorg-proto )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Apply hardening #664236 - cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die - sed -i -e '/^<policymap>$/ { - r policy-hardening.snippet - d - }' \ - config/policy.xml || \ - die "Failed to apply hardening of policy.xml" - einfo "policy.xml hardened" - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - local ati_cards mesa_cards nvidia_cards render_cards - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - use perl && perl_check_env - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with heif heic) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - --without-jxl - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - - local im_command= IM_COMMANDS=() - if [[ ${PV} == "9999" ]] ; then - IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild - else - IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built - fi - IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used - IM_COMMANDS+=( "emake check" ) # Run tests - - for im_command in "${IM_COMMANDS[@]}"; do - eval "${S}"/magick.sh \ - ${im_command} || \ - die "Failed to run \"${im_command}\"" - done -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} - -pkg_postinst() { - local _show_policy_xml_notice= - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - _show_policy_xml_notice=yes - else - local v - for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "7.0.8.10-r2"; then - # This is an upgrade - _show_policy_xml_notice=yes - - # Show this elog only once - break - fi - done - fi - - if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" - elog "which will prevent the usage of the following coders by default:" - elog "" - elog " - PS" - elog " - PS2" - elog " - PS3" - elog " - EPS" - elog " - PDF" - elog " - XPS" - fi -} diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.1.ebuild deleted file mode 100644 index d7175556d38a..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.0.10.1.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic libtool perl-functions toolchain-funcs multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" - inherit git-r3 - MY_P="imagemagick-9999" -else - MY_PV="$(ver_rs 3 '-')" - MY_P="ImageMagick-${MY_PV}" - SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" - -LICENSE="imagemagick" -SLOT="0/7.0.10" -IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" -RESTRICT="!test? ( test )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - heif? ( media-libs/libheif:= ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( - gnome-base/librsvg - media-gfx/potrace - ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" - -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - X? ( x11-base/xorg-proto )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Apply hardening #664236 - cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die - sed -i -e '/^<policymap>$/ { - r policy-hardening.snippet - d - }' \ - config/policy.xml || \ - die "Failed to apply hardening of policy.xml" - einfo "policy.xml hardened" - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - local ati_cards mesa_cards nvidia_cards render_cards - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - use perl && perl_check_env - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with heif heic) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - --without-jxl - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - - local im_command= IM_COMMANDS=() - if [[ ${PV} == "9999" ]] ; then - IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild - else - IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built - fi - IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used - IM_COMMANDS+=( "emake check" ) # Run tests - - for im_command in "${IM_COMMANDS[@]}"; do - eval "${S}"/magick.sh \ - ${im_command} || \ - die "Failed to run \"${im_command}\"" - done -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} - -pkg_postinst() { - local _show_policy_xml_notice= - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - _show_policy_xml_notice=yes - else - local v - for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "7.0.8.10-r2"; then - # This is an upgrade - _show_policy_xml_notice=yes - - # Show this elog only once - break - fi - done - fi - - if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" - elog "which will prevent the usage of the following coders by default:" - elog "" - elog " - PS" - elog " - PS2" - elog " - PS3" - elog " - EPS" - elog " - PDF" - elog " - XPS" - fi -} diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.7-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.7-r1.ebuild index 4d2561accf79..386e11f90ca1 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.10.7-r1.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.10.7-r1.ebuild @@ -13,7 +13,7 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="A collection of tools and libraries for many image formats" diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.3.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild index 4d2561accf79..4d2561accf79 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.10.3.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index aacf73eb2231..81562f13f1e1 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -4,15 +4,15 @@ AUX inkscape-0.91_pre3-exif.patch 321 BLAKE2B 36f9d7ce19c1716b56800431ac095f047c AUX inkscape-0.91_pre3-sk-man.patch 362 BLAKE2B adfe363332dcf46297d01feb986ffaf4e5fe2f2db88c5d7e663e477736a56f226183caa90ca2b421f064ce42e5e7b4e81419026681987aa85040f4379c74511d SHA512 5b4b6fd927b88fbf5d113da7fbd70a5d39a7926849b7e0118bbade0218e8429e751d977e0630894ba7f024d1628c4ff9e54c9a0a4ed6b9b87315e200b04bd8ab AUX inkscape-0.92.1-automagic.patch 5416 BLAKE2B 3b17fd7a4cd305b6e683fd6a3f6bd6b81559be5097603f80bb438467f63594dea353acdf92ed5410399b641b6a5a92950e5c6bea582807717891073fe2877b5b SHA512 48f5d20cc32bcaa5fbbd7b9177ef1c68f2c6d2d0c39553bfc9f8e37fa7e74c63129a9ad94d93f26265dd2492359c983c50539286b86830783e001bb5dc3fa4c5 AUX inkscape-0.92.1-desktop.patch 919 BLAKE2B c9952613e8d8dca1cd11146afd4d8db210be0f65f61b1a674cf5443dfaed3422e7082667cb93e183589d1e840ac3b55c7e70d03f44c0302b8c7db8ae621a976d SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2 +AUX inkscape-0.92.4-glibmm-2.62.patch 561 BLAKE2B df3797f6b9a4a01338ca707e39da8ccd07728cc3d0d4b57ed981081512c8bed10a82619247ed6d828c116b09c3bd2e5f753e11ad8566c04680d567a96725a834 SHA512 8c6d43760dedd0c2bcdf31aeb0344e8d6bb154cbe7b2fc8f37e933b405fd9c42e05f68e1725c0781818f9a1de7ea292b991b7f12228a694a387f16d0a39ff97b AUX inkscape-0.92.4-poppler-0.76.0.patch 1579 BLAKE2B c8c578dc3c6f0d79403bc0716bb6875544fbf19c98e721294cf9e5f58d9c89c1b8414dd58975846100c4ae5c21eba8e7e4797c037300ce05d741d9245a0dc59c SHA512 2f45e16aba67f4d1498cf012ac6198ec2bb977b9e39b3d4e2d14a216d86b1d407ff7ea5a889b58b5e800c129c0f99ec8bbc0a42dd7d41578d94ae1ab59208698 AUX inkscape-0.92.4-poppler-0.82.0.patch 3223 BLAKE2B 6e530a2d2602d61c9f97f61813fad837536ccd3dc25405cf79ebda6563c56ff09e4a98b99c83aced6e8995473b27c7942c5774abafc7c33a2dbe45df58f419e4 SHA512 4a5f2e3ec9f16abe76786945e3085e405bbe7a4c57dfa0e6e7d4ddd4aadd17463766c7392846db08fa41419e05ef8c688d989ded8905755c010db6b08afa2feb AUX inkscape-0.92.4-poppler-0.83.0.patch 4167 BLAKE2B cccc3ae0a4196815dcd7c2ff7260ed8ab8f81b4aaeecb557bb2f35d0f01ea616dfe7b0144dbf1638a679dc8642485448f479e6fa0a45274581c812ee792f51fc SHA512 1c6b1bd594bc49b392844d0cc232d79a8478e8f222179444cc197c6b93839cfefeb26b3a4cf702896baaa227d7ef5560dfefddc96ee6a9a1b1ea571fe4374bfc -AUX inkscape-1.0_beta1-detect-imagemagick.patch 653 BLAKE2B 1e217306b083550d1f4628dc8385c78336c4c9019f8b35fe474c18c1f917105f423d3a958491432109eea22ef04b63ad5c5d23c03ae36ed7663ed86de3e295ed SHA512 5ee7080d5134b970a7b70b6b5052523e98860d66ee42897b5a84c5e70676359c918ea0d5e603a83b27d0e4656d49f711ae76d2dad47083c8ade223cc7da9e123 -AUX inkscape-1.0_beta1-do-not-compress-man.patch 454 BLAKE2B d680993be80d9069c7986f110d512643849f97fae81a8fdf1ab020a418dfbe44cc2bce3d71c8a79e8acac5170dfc01d084420a439d83f6f0e85706acdc8a0399 SHA512 3fc7ac0750a67b9d90d4ec0eed404ffdaa6910397849fa916eeacf5fb1e77cb0cb17f3f1ba99ad39f16610f2b3d7df387e35d36a0404fbd1fd0f857fa8be822b DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120 DIST inkscape-1.0_rc1.tar.xz 31984596 BLAKE2B 7e4a3618522c7bc9bedba8bb2a846e1cbf40e23868f04548e67fa41b9f8f1e8f696af386c0698a43ae6f7033937e1a3d4e772518162f712468b614a5b4d3b4ad SHA512 13e14a6dad1e89e6edf7c0197c43506d127b2e5136a2d8d931ad5ea0671b65b3feed5baf2f631b1a4b8095f285c19ffe5170904c9ce5e3e484d00ca2f0800b89 -EBUILD inkscape-0.92.4-r2.ebuild 3836 BLAKE2B 39efa33d21c2ae8054827c76cfe451a60fbca48b12a4eeb106bd0b03895ecf02102df8fd2c28626d7daf4a720eaeb67d4e3642f214d9f4ad68b3c183826a4e47 SHA512 8c2304ac76e116472f726b952ebc3a47478ca78d50686c1594ea55555b7e39d1f1003118ec6572244735f871a18f55ec49391fbde3d327b204d518cf84978f03 -EBUILD inkscape-0.92.4-r3.ebuild 3871 BLAKE2B d0653e907e2586a9f2f2d348b62840a7a64856c1a250ffe61b867252ff01f971b756c2adba7b2f608a7a5de615efb582853f224105067de41f4363b45eeb8a3b SHA512 25d2f80dce93f59073e9b81c74a6c62aacbd335366e22a5d7ca9c63113e0bdd987bcfc11e050ed5a53066583f48bba283b50d0f41d09e6b21866abe85f1b7e55 -EBUILD inkscape-1.0_rc1.ebuild 4023 BLAKE2B 4c98a33fb88f8d8ae924dea960c9dbb8bf84b19ace03fedb49f817dc7548cbb4d1df11515e6dea6fa72125fb81af1337e224f791e5e4ebac7b034f7f1e44a338 SHA512 ca20e13243e51b67dbf5b910666444efd9c73ca7ce485351964c27e8796f39d2053a108b00a77773f055c51991e120ca8b605be9f27df0e30c84d0c3c9a54f55 -EBUILD inkscape-9999.ebuild 4058 BLAKE2B 4b97ab1b7a935d62a77398f6d7911bec599ced43db307f5c48b868eb4e3cf0255b4f23c10c8230e30f74b00d57cefd12f6222e56f85e7a0a7fae2b2738187ac0 SHA512 b4a228d2888c982f053fa4a1d456a3b5caea131fe0ecc95bb5bbfa2f2c06e443f27eeb25a29f56dee8d46166af07315db8dd15585ad75f8a4cf7f29cae2c64d6 +DIST inkscape-INKSCAPE_1_0.tar.gz 64306274 BLAKE2B 8bc4e2d156fad99b2b2a700bde29372dd56db6a1a9a8e825d46d214bbd18a1d29365510c16d51dbb2cad88f88fb10232f1bab403da4900beaa72de5d0f8726df SHA512 214c04c7f1d23dd0d296f4262743b2a206fe3b3df7abdb4bc4a4604a7f0caab2d7970d04b5795f121417d0e015e2d42d14be0b67438d752a81c4ad079b486f06 +EBUILD inkscape-0.92.4-r3.ebuild 3921 BLAKE2B ad0b135b5c24cd27954aa493d45b90eb74af7cd13fffcb919b6af4e9b4c66848bfc8ba5eeec5e36fdb6ca14052fa794f78f801c129c762ef4b4a3f9da43cdb58 SHA512 91705b00b90160ea40e2c055900ff51016f5cb0897ce8c23b9798a7158062a8485fc5077b18b5446baf3c5515e8161df1dc8377925ca2865037b9930656d7e53 +EBUILD inkscape-1.0.ebuild 4206 BLAKE2B 43931848f4450b4076f2d0094a0ef4ae24c4919fee8a4b2f8c8642846712ca6f66ea670ec42c0b80f787a46e109da125e70a3302f77dfef3bf662b1ebbab9dec SHA512 50636054af59a19a1365e8ac8d78970807630ab66c7ba947d3d81b65906297b6e0714a545507a48861d735eae9209004c791b6a139ea2f837e08878a8293316e +EBUILD inkscape-1.0_rc1.ebuild 4025 BLAKE2B a389779a3554e8ef91f98451ca92e9458d9491c9057845607f2f8c4090e1a8a6eaca2726a0001555a363ac446452059ef32dbe3b409add74947fe653763c903e SHA512 203d90d1d4f8915801d23513c4df476e93427134bd510df650c6484c9408bb0c20dfdb445d0ca4ff36aaeef7f7c73befffcf32c7726b98f5214fad49444bfca8 +EBUILD inkscape-9999.ebuild 4109 BLAKE2B 86555c26d13d9fcffbef05fb3b6a59338d110462b02b501443ec287b09856a9562cd06a466b09a594820c226bc2c0855d951e1b6e2d61f9d58ad60be4c05465c SHA512 181dfe6ce67120b3fcb08ac69838e5eeeb1853e83f55c5d5b78e93c9c448ba0193f36044d95eae242506c68dc3e51ece773225010fcda90a27e1105570cf4abf MISC metadata.xml 1178 BLAKE2B 437e874d080bbd913e0910e0c7dc3a86834ac88b770493d65f29623db9a87d96f2cfc72e04bcdf51fc9f5d688695742d07a19414db55ff2ccb1a1b20cef20ad2 SHA512 007d65995421695c434b0c4a80474c43c95b7604cbe1cf576f5c7c4741777e563daa19bb25421089a979e0d23ce86522efae01e3f12a0b210323fc5306a2d305 diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch b/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch new file mode 100644 index 000000000000..7a35d8d55ada --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch @@ -0,0 +1,14 @@ +diff -Naur a/configure.ac b/configure.ac +--- a/configure.ac 2019-01-15 04:29:27.000000000 +0000 ++++ b/configure.ac 2020-04-03 18:39:26.372870987 +0000 +@@ -879,10 +879,6 @@ + if test "x$enable_strict_build" != "xno"; then + CPPFLAGS="-DGDKMM_DISABLE_DEPRECATED $CPPFLAGS" + +- # Ensure that no deprecated glibmm symbols are introduced. +- # lp:inkscape builds cleanly with this option at r10957 +- CPPFLAGS="-DGLIBMM_DISABLE_DEPRECATED $CPPFLAGS" +- + dnl Pango 1.32.4 uses a deprecated Glib symbol: + dnl https://bugzilla.gnome.org/show_bug.cgi?id=689843 + dnl diff --git a/media-gfx/inkscape/files/inkscape-1.0_beta1-detect-imagemagick.patch b/media-gfx/inkscape/files/inkscape-1.0_beta1-detect-imagemagick.patch deleted file mode 100644 index ee4becfd1090..000000000000 --- a/media-gfx/inkscape/files/inkscape-1.0_beta1-detect-imagemagick.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake -index 91f93e7..95b2af2 100644 ---- a/CMakeScripts/DefineDependsandFlags.cmake -+++ b/CMakeScripts/DefineDependsandFlags.cmake -@@ -330,7 +330,7 @@ list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES}) - - if(WITH_IMAGE_MAGICK) - # we want "<" but pkg_check_modules only offers "<=" for some reason; let's hope nobody actually has 7.0.0 -- pkg_check_modules(MAGICK ImageMagick++<=7) -+ pkg_check_modules(MAGICK Magick++<=7) - if(MAGICK_FOUND) - set(WITH_GRAPHICS_MAGICK OFF) # prefer ImageMagick for now and disable GraphicsMagick if found - else() diff --git a/media-gfx/inkscape/files/inkscape-1.0_beta1-do-not-compress-man.patch b/media-gfx/inkscape/files/inkscape-1.0_beta1-do-not-compress-man.patch deleted file mode 100644 index c9d395e807e2..000000000000 --- a/media-gfx/inkscape/files/inkscape-1.0_beta1-do-not-compress-man.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeScripts/Pod2man.cmake b/CMakeScripts/Pod2man.cmake -index eda6292..b94d5af 100644 ---- a/CMakeScripts/Pod2man.cmake -+++ b/CMakeScripts/Pod2man.cmake -@@ -14,6 +14,8 @@ if(NOT GZIP) - message(STATUS "Could not find gzip - man pages uncompressed") - endif() - -+set(GZIP "") -+ - macro(pod2man PODFILE_FULL RELEASE SECTION CENTER) - get_filename_component(PODFILE ${PODFILE_FULL} NAME) - string(REPLACE "." ";" PODFILE_LIST ${PODFILE}) diff --git a/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild deleted file mode 100644 index bc73e6c6f57d..000000000000 --- a/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" -inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1 - -MY_P="${P/_/}" - -DESCRIPTION="SVG based generic vector-drawing program" -HOMEPAGE="https://inkscape.org/" -SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" -IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex" -IUSE+=" lcms nls spell static-libs visio wpg" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - >=app-text/poppler-0.26.0:=[cairo] - >=dev-cpp/glibmm-2.54.1 - >=dev-cpp/gtkmm-2.18.0:2.4 - >=dev-cpp/cairomm-1.9.8 - >=dev-libs/boehm-gc-7.1:= - >=dev-libs/glib-2.28 - >=dev-libs/libsigc++-2.0.12 - >=dev-libs/libxml2-2.6.20 - >=dev-libs/libxslt-1.0.15 - dev-libs/popt - media-gfx/potrace - media-libs/fontconfig - media-libs/freetype:2 - media-libs/libpng:0= - sci-libs/gsl:= - x11-libs/libX11 - >=x11-libs/gtk+-2.10.7:2 - >=x11-libs/pango-1.24 - cdr? ( - app-text/libwpg:0.3 - dev-libs/librevenge - media-libs/libcdr - ) - dbus? ( dev-libs/dbus-glib ) - exif? ( media-libs/libexif ) - gnome? ( >=gnome-base/gnome-vfs-2.0 ) - imagemagick? ( <media-gfx/imagemagick-7:=[cxx] ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - spell? ( - app-text/aspell - app-text/gtkspell:2 - ) - visio? ( - app-text/libwpg:0.3 - dev-libs/librevenge - media-libs/libvisio - ) - wpg? ( - app-text/libwpg:0.3 - dev-libs/librevenge - ) -" -# These only use executables provided by these packages -# See share/extensions for more details. inkscape can tell you to -# install these so we could of course just not depend on those and rely -# on that. -RDEPEND="${COMMON_DEPEND} - $(python_gen_cond_dep ' - || ( - dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - ) - ') - media-gfx/uniconvertor - dia? ( app-office/dia ) - latex? ( - media-gfx/pstoedit[plotutils] - app-text/dvipsk - app-text/texlive-core - ) - postscript? ( app-text/ghostscript-gpl ) -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/boost-1.36 - dev-util/glib-utils - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-0.92.1-automagic.patch" - "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch" - "${FILESDIR}/${PN}-0.92.1-desktop.patch" - "${FILESDIR}/${PN}-0.91_pre3-exif.patch" - "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch" - "${FILESDIR}/${PN}-0.48.4-epython.patch" - "${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246 - "${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch" - "${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch" -) - -S="${WORKDIR}/${MY_P}" - -RESTRICT="test" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]] && use openmp; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi -} - -src_prepare() { - default - - sed -i "s#@EPYTHON@#${EPYTHON}#" \ - src/extension/implementation/script.cpp || die - - eautoreconf - - # bug 421111 - python_fix_shebang share/extensions -} - -src_configure() { - # aliasing unsafe wrt #310393 - append-flags -fno-strict-aliasing - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable nls) - $(use_enable openmp) - $(use_enable exif) - $(use_enable jpeg) - $(use_enable lcms) - --enable-poppler-cairo - $(use_enable wpg) - $(use_enable visio) - $(use_enable cdr) - $(use_enable dbus dbusapi) - $(use_enable imagemagick magick) - $(use_with gnome gnome-vfs) - $(use_with inkjar) - $(use_with spell gtkspell) - $(use_with spell aspell) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake -C src helper/sp-marshal.h #686304 - emake AR="$(tc-getAR)" -} - -src_install() { - default - - find "${ED}" -name "*.la" -delete || die - python_optimize "${ED%/}"/usr/share/${PN}/extensions -} diff --git a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild index 912e7bba247d..1b9241b51aa1 100644 --- a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex" IUSE+=" lcms nls spell static-libs visio wpg uniconvertor" @@ -103,6 +103,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246 "${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch" "${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch" + "${FILESDIR}/${PN}-0.92.4-glibmm-2.62.patch" #715394 ) S="${WORKDIR}/${MY_P}" diff --git a/media-gfx/inkscape/inkscape-1.0.ebuild b/media-gfx/inkscape/inkscape-1.0.ebuild new file mode 100644 index 000000000000..3af00fe145cb --- /dev/null +++ b/media-gfx/inkscape/inkscape-1.0.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE="xml" + +inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 + +DESCRIPTION="SVG based generic vector-drawing program" +HOMEPAGE="https://inkscape.org/" +SRC_URI="https://gitlab.com/inkscape/inkscape/-/archive/${PN^^}_$(ver_rs 1-2 "_")/${PN}-${PN^^}_$(ver_rs 1-2 "_").tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls +openmp postscript spell static-libs svg2 visio wpg" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + dev-util/glib-utils + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-text/poppler-0.57.0:=[cairo] + >=dev-cpp/cairomm-1.12 + >=dev-cpp/glibmm-2.54.1 + dev-cpp/gtkmm:3.0 + >=dev-cpp/pangomm-2.40 + >=dev-libs/boehm-gc-7.1:= + dev-libs/double-conversion:= + >=dev-libs/glib-2.41 + >=dev-libs/libsigc++-2.8 + >=dev-libs/libxml2-2.7.4 + >=dev-libs/libxslt-1.1.25 + dev-libs/gdl:3 + dev-libs/popt + media-gfx/potrace + media-libs/fontconfig + media-libs/freetype:2 + media-libs/libpng:0= + net-libs/libsoup + sci-libs/gsl:= + x11-libs/libX11 + >=x11-libs/pango-1.37.2 + x11-libs/gtk+:3 + $(python_gen_cond_dep ' + dev-python/lxml[${PYTHON_MULTI_USEDEP}] + media-gfx/scour[${PYTHON_MULTI_USEDEP}] + ') + cdr? ( + app-text/libwpg:0.3 + dev-libs/librevenge + media-libs/libcdr + ) + dbus? ( dev-libs/dbus-glib ) + exif? ( media-libs/libexif ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + ) + jemalloc? ( dev-libs/jemalloc ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + spell? ( + app-text/aspell + app-text/gtkspell:3 + ) + visio? ( + app-text/libwpg:0.3 + dev-libs/librevenge + media-libs/libvisio + ) + wpg? ( + app-text/libwpg:0.3 + dev-libs/librevenge + ) +" +# These only use executables provided by these packages +# See share/extensions for more details. inkscape can tell you to +# install these so we could of course just not depend on those and rely +# on that. +RDEPEND="${COMMON_DEPEND} + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ') + dia? ( app-office/dia ) + postscript? ( app-text/ghostscript-gpl ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/boost-1.65 +" + +RESTRICT="test" + +S="${WORKDIR}"/${PN}-${PN^^}_$(ver_rs 1-2 "_") + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]] && use openmp; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi +} + +src_prepare() { + cmake_src_prepare + sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die +} + +src_configure() { + # aliasing unsafe wrt #310393 + append-flags -fno-strict-aliasing + + local mycmakeargs=( + # -DWITH_LPETOOL # Compile with LPE Tool and experimental LPEs enabled + -DENABLE_POPPLER=ON + -DENABLE_POPPLER_CAIRO=ON + -DWITH_PROFILING=OFF + -DWITH_LIBCDR=$(usex cdr) + -DWITH_DBUS=$(usex dbus) + -DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled + -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick + -DWITH_JEMALLOC=$(usex jemalloc) + -DENABLE_LCMS=$(usex lcms) + -DWITH_OPENMP=$(usex openmp) + -DBUILD_SHARED_LIBS=$(usex !static-libs) + -DWITH_SVG2=$(usex svg2) + -DWITH_LIBVISIO=$(usex visio) + -DWITH_LIBWPG=$(usex wpg) + ) + # We should also have, + # + # -DWITH_NLS=$(usex nls) + # + # in this list, but it's broken upstream at the moment: + # + # * https://bugs.gentoo.org/699658 + # * https://gitlab.com/inkscape/inkscape/issues/168 + + cmake_src_configure +} + +src_install() { + cmake_src_install + + find "${ED}" -type f -name "*.la" -delete || die + + find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die + + find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die + + # No extensions are present in beta1 + local extdir="${ED}"/usr/share/${PN}/extensions + + if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then + python_optimize "${ED}"/usr/share/${PN}/extensions + fi +} diff --git a/media-gfx/inkscape/inkscape-1.0_rc1.ebuild b/media-gfx/inkscape/inkscape-1.0_rc1.ebuild index e6249b176dd1..348785806287 100644 --- a/media-gfx/inkscape/inkscape-1.0_rc1.ebuild +++ b/media-gfx/inkscape/inkscape-1.0_rc1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE="xml" RELEASE_SUFFIX="1.0rc1_2020-04-09_09960d6f05" diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild index 158a19eeca9b..b87ca681947f 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -61,7 +61,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( - !graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] ) + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) @@ -96,14 +96,9 @@ DEPEND="${COMMON_DEPEND} >=dev-libs/boost-1.65 " -S="${WORKDIR}/${MY_P}" - RESTRICT="test" -PATCHES=( - "${FILESDIR}"/${PN}-1.0_beta1-detect-imagemagick.patch - "${FILESDIR}"/${PN}-1.0_beta1-do-not-compress-man.patch -) +S="${WORKDIR}/${MY_P}" pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]] && use openmp; then @@ -154,6 +149,10 @@ src_install() { find "${ED}" -type f -name "*.la" -delete || die + find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die + + find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die + # No extensions are present in beta1 local extdir="${ED}"/usr/share/${PN}/extensions diff --git a/media-gfx/iscan-plugin-network-nt/Manifest b/media-gfx/iscan-plugin-network-nt/Manifest index 4aa6e49da0f2..673737c2a9a4 100644 --- a/media-gfx/iscan-plugin-network-nt/Manifest +++ b/media-gfx/iscan-plugin-network-nt/Manifest @@ -1,3 +1,5 @@ +DIST imagescan-bundle-centos-8-3.62.0.x64.rpm.tar.gz 11111201 BLAKE2B 51b868569fa049f8bc35a911245895c0fe0c5e0060b129c1c84a39cddd0aa4344ea024b6896dadc535438bcfc0be74337348533adf1b2be8866aad4e30bcb41a SHA512 11af49d20fc8e828c25dc6e912d1dbefebcba9835b1ebe922bc57c30dd0d13b79508a1bb01ad260c721d865fd393a41bc2bf41dc84b42efb22512a28cc9542f3 DIST iscan-bundle-2.30.4.x64.deb.tar.gz 517592 BLAKE2B f7c0638575d406ed8612f478c06fdb1331e890f932b8dc96a4dcf9fbe499683f53159103c8dfd6c1036f2bc7930bbbc4c8b18d88c460d4b48798e07f31630e0b SHA512 6d967f5d2d554478df49c784d0ee785a9e1fc4f4b6ea4dc320270a50eca35cc3d533b918a1bda33cf3b0e9b783380e7828b77543730079b2e2f40ad9578db79d EBUILD iscan-plugin-network-nt-1.1.2.1.ebuild 1199 BLAKE2B 27d5e163fe667e5fc2716d7ca0f4b084c1086b4eadbe47895e456124cb456eeb5891d7eabe0e53814772c70decfda8a8c689bdb47407a5372f8e7b1d2e2302b0 SHA512 c29561704dc018bda0b2263d203372ca361fa52dd2015c2918fb68c1cfb38e2ead2bc5caaf5af9271870cf2a7c70eb83cacc0730934b1c5727d18a45dbd15af7 +EBUILD iscan-plugin-network-nt-1.1.3.ebuild 1123 BLAKE2B dbaa5263b12cc1bf780237394319619b5078e1d341c9705e01809ab9acaee6cf58ac1338ad5a99ca596ce008a698276a000aed799f0356a3f24428a26a4edde7 SHA512 6e4d5af17cf980749b39c8c3d3b2cbeb373feb7e70acda055c6e8b0e89b873bebc8fc403d36582de8b3f7745f4c003bd45efd47ac9dd2c4431e1f03a63b4838d MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2 diff --git a/media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.3.ebuild b/media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.3.ebuild new file mode 100644 index 000000000000..b1b7f05ba96d --- /dev/null +++ b/media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.3.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info rpm + +DESCRIPTION="Network scanning plugin for EPSON scanners (nonfree)" + +HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" +# This is distributed as part of the "bundle driver"; since we already have the +# opensource part separately we just install the nonfree part here. + +ISCAN_VERSION="3.62.0" + +SRC_URI="https://download2.ebz.epson.net/imagescanv3/centos/latest1/rpm/x64/imagescan-bundle-centos-8-${ISCAN_VERSION}.x64.rpm.tar.gz" +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="media-gfx/iscan" +RESTRICT="bindist mirror strip" +# https://bugs.gentoo.org/364129#c15 +CONFIG_CHECK="~SYN_COOKIES" +S=${WORKDIR} + +src_unpack() { + default + rpm_unpack ./imagescan-bundle-centos-8-${ISCAN_VERSION}.x64.rpm/plugins/imagescan-plugin-networkscan-${PV}-1epson4centos8.x86_64.rpm +} + +src_install() { + exeinto /usr/libexec/utsushi + doexe usr/libexec/utsushi/networkscan + + gunzip usr/share/doc/imagescan-plugin-networkscan/*.gz + dodoc usr/share/doc/imagescan-plugin-networkscan/* +} diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest index 747d833c8e47..7c85d6ae44e0 100644 --- a/media-gfx/iscan/Manifest +++ b/media-gfx/iscan/Manifest @@ -7,10 +7,12 @@ AUX iscan-2.30.3.1-fix-x86-unknown-types.patch 362 BLAKE2B c791249488661dbe3fcf3 AUX iscan-2.30.4.2-sscanf.patch 779 BLAKE2B 8e8255c0558e225b3c1bcb5faaf42f0d794177e463119595b53fd0e194b7918703d3b9ac3c8d8fa1939cc86799deda4605764f99b2aa666f3c2047ed21333f31 SHA512 345ac7ae1c75b6da24f16f9abd5f7f4352cfd3497d24229db8a15d26d767e62c8273220a7f40f18c452ab90094b56774eaf738c880c613f0463db04b6d5d9f3d AUX iscan-3.61.0-ijg-libjpeg.patch 1145 BLAKE2B 781c0c9a40848f9c10ddb3418c55b6c4a145f1590c5ec41e22e371830d3d7d63c4e013d8fa69a1f15f24d4883d569c0645df66b3c6120eb724f3a1f9643e3813 SHA512 b570bc0e6aa73f74750aaab4d3ca84838864c8723b14fbf5a45fe9163be3e7819035a12bd058587a4b4964325ba4af99673e78647b11d2a7b1bcf96039522191 AUX iscan-3.61.0-imagemagick-7.patch 1965 BLAKE2B 14685cc9540ccfda87587b5ff2df7b8c4755dd08bb428f33ce853c32baaf6ab7e6b2d3368df9153fa5f5b39d9ef17b8e468ea59530ac89098107542db2638f05 SHA512 d5545570865370229f2b132aef7131cbbfabd7e929795bee6ce1e0d791c2c623eefabdd0ec265c6cadcc41072049d61e07d5fca46a1f51c621323a38112dc316 +AUX iscan-3.62.0-boost-1.73.patch 991 BLAKE2B 0fda795d633dc7fadca96ce8eeb728f47f416a84a5f69d1011d2d53552f123ae29ee83c877ac03facce59041680ccc9dedaed0b1771dd182a59881f7d1f4cbaa SHA512 a68a82e68dc72c1ee746ee46d76602151f33ba6dc2be5209d6b321b62b7a31b8f573b975ae756903a37abbaf4cdb61628a802110e1e641e088016f20130f3404 +AUX iscan-3.62.0-gcc-10.patch 503 BLAKE2B 53a351f439f43003e668cad1b8f05231b58137dd4e4a88ea3b04aa326f8ae82d46e664d19a5fba89122c6959e9aeb33beab56a43128c73b483d99c9ec25bf835 SHA512 b32438d590419a8be3c7f28a545ed4dedab0a6f0bcd0c9f3a81def67164c4156dd52064d8d8ca93cf2550b2184de12c94cffd6b91ef82d832179eb3e9f554326 DIST imagescan_3.62.0.orig.tar.gz 12650003 BLAKE2B 732283eb8370192fdd0fba8939bc81e277a7a227b024f14856b8d3d5c562b7320c7b40aa48cfa627e23dc654544c9bac27d35add5e10bf0ca65ab0279290b90c SHA512 3b6188013d162c605a3ce1bcac9e5a7b16b1af6363bc7ef4b257aed1c0d3e3dfd402a048ec699b6b6cc42883d0b26f50f0c6f1bd0ddc917baed4ce8902a9d8fa DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90 EBUILD iscan-2.30.4.2.ebuild 3958 BLAKE2B 3e1284c43d52dd91a6b9e88c2c8d5aef7ee76ed2c7b7a1e0d35781db6f5882efe1ea6c1b1152df86bf0b831941a271bf8c5a9c75fb2fe26646e99d2f73d17da8 SHA512 9b23f93cc94371c33036fec992c96baec8e94b743e732c8579755eec94cfc35ec79c95b879df664783818e03cff648c932e23217b856537a3875bab9c38a228a -EBUILD iscan-3.62.0.ebuild 2141 BLAKE2B 64a1ce4f719c5238ddc5312df1f378c5e6ea53faebf52502e12c2ebbface0c4ba5863bd0138268c0f1babd1b2c2bbf6895549a1ce39c69be00c5604a982783ff SHA512 a4763ffddb05deb7ee5abdfa2bd640057c7cd16bbde038f9d0854c10bf561dc2075513c6c390437c02cb48c267ec241cea1fb224964fcdb22cce9d1e3608b9af +EBUILD iscan-3.62.0.ebuild 2227 BLAKE2B bc556c46a5d3eff26ff42b71ff8fa7c81574ca0c1a2eac7a83c2c597dde69140cb4d17a233c1d621c82728f9adbd0730b2a1bd911bc5d83ef69273c7bd0d2b01 SHA512 b232652df039cec4b8addc7eab24caeabd4060a8ac6ab0257df5f26648d21c1bb4ebcd23ca5b303f37e9d255bda67eab27d15ff1c8f40d3fd6ab540fcfac34a1 MISC metadata.xml 930 BLAKE2B d2cf4fae5cdcb660357ffe5566ad8d99eef6287f565a45f1824c810b3979e9d2930f458766ff524b231ef8dfd793062ff23cf4bfc2a78a36c5393a6c4224feea SHA512 d609a5cd8f8bbc7653e784d153757849eafb9c772355d0928325a6ecf673e8aa055623601d957f912709f9f16acfde5ca0b0480a1f2a17bfc24825895d861fc0 diff --git a/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch b/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch new file mode 100644 index 000000000000..d55a464823b8 --- /dev/null +++ b/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch @@ -0,0 +1,33 @@ +diff -urN a/drivers/esci/verify.cpp b/drivers/esci/verify.cpp +--- a/drivers/esci/verify.cpp 2019-11-18 04:08:45.000000000 +0200 ++++ b/drivers/esci/verify.cpp 2020-05-09 20:22:00.899968638 +0300 +@@ -58,6 +58,7 @@ + + using namespace utsushi; + using namespace _drv_::esci; ++using namespace boost::placeholders; + + using std::basic_string; + using std::ios_base; +diff -urN a/lib/monitor.cpp b/lib/monitor.cpp +--- a/lib/monitor.cpp 2019-11-18 04:08:08.000000000 +0200 ++++ b/lib/monitor.cpp 2020-05-09 20:22:26.392174029 +0300 +@@ -49,6 +49,7 @@ + namespace utsushi { + + using boost::filesystem::exists; ++using namespace boost::placeholders; + + class monitor::impl + { +diff -urN a/sane/handle.cpp b/sane/handle.cpp +--- a/sane/handle.cpp 2019-11-18 04:08:08.000000000 +0200 ++++ b/sane/handle.cpp 2020-05-09 20:21:49.559223712 +0300 +@@ -65,6 +65,7 @@ + using utsushi::_flt_::deskew; + using utsushi::_flt_::autocrop; + using utsushi::_flt_::pnm; ++using namespace boost::placeholders; + + namespace sane { + diff --git a/media-gfx/iscan/files/iscan-3.62.0-gcc-10.patch b/media-gfx/iscan/files/iscan-3.62.0-gcc-10.patch new file mode 100644 index 000000000000..4f8c63c7353b --- /dev/null +++ b/media-gfx/iscan/files/iscan-3.62.0-gcc-10.patch @@ -0,0 +1,20 @@ +--- a/utsushi/string.hpp 2020-05-08 23:20:11.642359134 +0200 ++++ b/utsushi/string.hpp 2020-05-08 23:20:21.834246187 +0200 +@@ -23,6 +23,7 @@ + + #include <iosfwd> + #include <string> ++#include <iostream> + + #include <boost/operators.hpp> + +--- a/utsushi/toggle.hpp 2019-11-18 03:08:06.000000000 +0100 ++++ b/utsushi/toggle.hpp 2020-05-08 23:23:40.284045167 +0200 +@@ -22,6 +22,7 @@ + #define utsushi_toggle_hpp_ + + #include <iosfwd> ++#include <iostream> + #include <boost/operators.hpp> + + namespace utsushi { diff --git a/media-gfx/iscan/iscan-3.62.0.ebuild b/media-gfx/iscan/iscan-3.62.0.ebuild index 2a2c97d15125..f01a67d24171 100644 --- a/media-gfx/iscan/iscan-3.62.0.ebuild +++ b/media-gfx/iscan/iscan-3.62.0.ebuild @@ -32,6 +32,8 @@ S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)" PATCHES=( "${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch "${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch + "${FILESDIR}"/${PN}-3.62.0-gcc-10.patch + "${FILESDIR}"/${PN}-3.62.0-boost-1.73.patch ) src_prepare() { diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest index 3c6863b768dd..13d3da01e5ae 100644 --- a/media-gfx/mypaint-brushes/Manifest +++ b/media-gfx/mypaint-brushes/Manifest @@ -1,3 +1,3 @@ DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414 -EBUILD mypaint-brushes-1.3.0-r1.ebuild 549 BLAKE2B 0970a579e79cec885408aa425feb74152faed0f46bcf8cdda2d2f853a6d6b97d932ba6e3f29c120e846232b05b30449fe2229c531e52cd01cba15f0d5c8dd890 SHA512 5439ca90c63bba1886e7956e69d74b579967f3a6114218220888c5251ff67459cd82d7cdd1b8e85705ddedf4d6f40be3bc8728218d0a3bb8e49f1be3aecb6d59 +EBUILD mypaint-brushes-1.3.0-r1.ebuild 548 BLAKE2B 9642df2b15e35d491179abb9312327e2a2ea6d36fadc8287e9d9d6597c0be9b897b5ca40526d458a16f3b9bc983ec9fcb55ed7a68788569fd51e76c68ae04705 SHA512 72697d62253c3a30bd115cc423b539649194f9221e8135b6d325d39566f1ace38f7ba8b51aedb804d17fa635fdf352e61880ae59177d36286053ffa2a1e552ab MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild index 64ae44b0d7f1..6b87f8055f3b 100644 --- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild +++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}. LICENSE="CC0-1.0" SLOT="1.0" # due to pkgconfig name "mypaint-brushes-1.0" -KEYWORDS="~alpha amd64 arm64 ~ia64 ~ppc64 x86" +KEYWORDS="~alpha amd64 arm64 ~ia64 ppc64 x86" IUSE="" DOCS=( AUTHORS NEWS README.md ) # to exclude README symlink diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest index b6912b94f762..b6e0c5545c39 100644 --- a/media-gfx/potrace/Manifest +++ b/media-gfx/potrace/Manifest @@ -1,5 +1,5 @@ DIST potrace-1.15.tar.gz 650840 BLAKE2B 1a2074ff0ff958e1c9cbcd35a6267ef7f4bdfa5ba9b511413fa2c5db16a7263ed27291a0bf7c76feb25abd59db099e1096b736eab28a6397accfce88f42fdeff SHA512 c9a8edd4f3339da587b9b32e12c83c8f7b993c7c23f551fa267545d9411679bc024924e23596ed1c83985693fc894b65dfa9f860275de395d9e0a88da37a4f02 DIST potrace-1.16.tar.gz 657314 BLAKE2B ee6b04f355d593dd1ebcc4833b244e25eaaa69c91f90987d530a4e5a454668dff6ecfb7a5d8270ebbd9e7c177fd447d1b3fe2a343fc4b9413dd3f507c0c6e417 SHA512 10d85ed3fada80951223c65e923b5e6ee3e76e071575971d5b09b996b477ec5ff2403e0337c44963c6b441cc3ba6c4f7009541124a25c16b7721fdebd1f774b9 -EBUILD potrace-1.15.ebuild 797 BLAKE2B e14884895d0ffc7dbc98a0b726d515e82e0778775f886ecd21bf1cc6648d8bd6c17b6c3a99c0e9531a447117e1bfe26a77043e765c001e2b6377d2b0ca873e28 SHA512 696d1e86adb2af816cab9a0a1a43ecb5da04a4617ee6e826db3a4b9925dbc115888988b23c7b6c99c7b0700b1e98d54e8f8cfb0af6b55951af49c02613b7e508 +EBUILD potrace-1.15.ebuild 796 BLAKE2B 3ca9c7636ce5e73b43a0f0b283702baecd5c2c9679bb748154f4b9628b8a5c0da1313541b765a5c6b29c90e2b5ba83983b70baf9f7be9d4e95879f45698148d7 SHA512 fa276bfc2dfe220688168102a2e04118611014b9511b0af6a8a1d38bde81fedac7365a928db71336b9db3b0cd28bd93dce6bab4da3dd4444dc4995f3e4e0fc7c EBUILD potrace-1.16.ebuild 806 BLAKE2B 4ebc44c22814b01d2e0bab270554e51ae362c60de11f1b74657df38f84e712aae8d633fa0884165cf86919a2983501db3836b165bcb16d0ad20f2dd88ac63671 SHA512 f471c5488ab1aed1093150b0642fbca2b9bf2d912a90459fac6938ed1e586d469aae487f12aa1b8c9c00be92241232b0d2b061c2f030f27ea861fb21e6260e18 MISC metadata.xml 534 BLAKE2B 04a21e1af300190548959fc595c0f0ca4918bcc949bb6f5ac6747f79806b3c2f3e57ecf25076e8d8a876ff1ee45b8b816e89c957f8ca4e05292ef390c5de32e0 SHA512 00f7a8a90caa7e7d9920929733f084d41baf72c45dc998255c54964eb50f6ec70d6af8666463fdefca27f95156834f1c4e9676f115bbb86538e979967a73b6c3 diff --git a/media-gfx/potrace/potrace-1.15.ebuild b/media-gfx/potrace/potrace-1.15.ebuild index cb607c612110..cd386d37305b 100644 --- a/media-gfx/potrace/potrace-1.15.ebuild +++ b/media-gfx/potrace/potrace-1.15.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="metric static-libs" RDEPEND="sys-libs/zlib" diff --git a/media-gfx/pqiv/Manifest b/media-gfx/pqiv/Manifest index 280a2e3f93e1..f651b99ea36c 100644 --- a/media-gfx/pqiv/Manifest +++ b/media-gfx/pqiv/Manifest @@ -1,4 +1,4 @@ DIST pqiv-2.11.tar.gz 139825 BLAKE2B 981d472ccd3284b2e9ad3da8e84233c95555a927af797f8421ac820225d3d39cab2275f01269a986bab54994e0fce2095b7c33b1201e7a6117e1c8399617341b SHA512 6017a9d7ed332915a9f6fa788bb02c3b9d4d83c2ae2f9a8ab7d7738caa14ba3e9d253906f2e73fdfd368bb5e7bc51380ee9906fd9921e5f7f113811fd3da66f7 -EBUILD pqiv-2.11.ebuild 1796 BLAKE2B df8f7a44179ec384667df001540f29a639677a24782ddec1d1892098f102eed7cc9b46050763e55c101c1fa50b163feead3653808d21a57c48172cbe6e494511 SHA512 ee143848f3fefacaa10c7c9e2ba37d0795418c3174418f6c6107fed98933f783c6ef5455c0b61f76dff0fb5ed6adc2e8668ff030097015eaf3b78982fac17b6a -EBUILD pqiv-9999.ebuild 1798 BLAKE2B 7ef990a30f601a6e3651e643f8b013cdfbe82300e2e69e100573b968d9358ea177ce5fd5aebdcafd339f0ce8c6d61063b3f0c0da6e95d753a01e7d1a94774802 SHA512 980df3cbbcafc40946a7cfa17b86580637457d2549f69e63dc4443e0829b90e58b7adc14db6a025e4bf0866252600ecd782609584a0f7c62ba737db372924a96 +EBUILD pqiv-2.11.ebuild 1728 BLAKE2B 232ba0e63bc478af137485dbe1868705f55c90d5ac0551682b25e6b63ac7c2087e778b06fdb09a786bd8ead5d662089b68b511a99a0db9ba843c5d1b75e6edd9 SHA512 3d57320d6c1daaf5ca59f2faf3b5676fbf31b753c79b57ca75b8e073ed115384f849deeafce5aae88d4a7c6044729293c0f7a3d16a1707a66aca2ab16b527146 +EBUILD pqiv-9999.ebuild 1730 BLAKE2B 078594b0e5901d7d8657ebd799431aef03418d501df182fabee3f4a288fc402c8938280ad932026668322f82e2823ee6bf6fa1d46b940d1d6dad7acdfc385dfa SHA512 472c909163057c8f0063d14a15b8614ab3d7dcd0b8ceb205c97c679a2cccca3607e8188d2984003665b0ae458658047cd0ee7d6fafca68913bbe7e45b7a920e4 MISC metadata.xml 584 BLAKE2B 5d617c553a0f5f4be6268f17dae36d3bb52e984c4c7c89df44b40e1bde1cff3e5619210548b93bf6ffc2e0ea32839d6b4fd39714b237aea23f1cad966c92b3ec SHA512 0d589cf085f6e6335aae5f6e32ccd153ddae1f0fa926fd3a135eabcdc20d5c560e2694216ba93b6d8c6c16bd8541f9d7aaa496e7ee4bc82fea90228a28320fbd diff --git a/media-gfx/pqiv/pqiv-2.11.ebuild b/media-gfx/pqiv/pqiv-2.11.ebuild index c094753f5a0d..bb2e9b03aec6 100644 --- a/media-gfx/pqiv/pqiv-2.11.ebuild +++ b/media-gfx/pqiv/pqiv-2.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,17 +17,14 @@ HOMEPAGE="https://github.com/phillipberndt/pqiv http://www.pberndt.com/Programme LICENSE="GPL-2" SLOT="0" -IUSE="archive ffmpeg imagemagick kernel_linux libav pdf postscript webp" +IUSE="archive ffmpeg imagemagick kernel_linux pdf postscript webp" RDEPEND=" >=dev-libs/glib-2.32:2 >=x11-libs/cairo-1.6 x11-libs/gtk+:3 archive? ( app-arch/libarchive:0= ) - ffmpeg? ( - !libav? ( media-video/ffmpeg:0= ) - libav? ( media-video/libav:0= ) - ) + ffmpeg? ( media-video/ffmpeg:0= ) imagemagick? ( media-gfx/imagemagick:0= ) pdf? ( app-text/poppler:0= ) postscript? ( app-text/libspectre:0= ) @@ -51,7 +48,7 @@ pkg_setup() { src_configure() { local backends="gdkpixbuf" use archive && backends+=",archive,archive_cbx" - use ffmpeg || use libav && backends+=",libav" + use ffmpeg && backends+=",libav" use imagemagick && backends+=",wand" use pdf && backends+=",poppler" use postscript && backends+=",spectre" diff --git a/media-gfx/pqiv/pqiv-9999.ebuild b/media-gfx/pqiv/pqiv-9999.ebuild index 499cd72f5f50..69023ebe5560 100644 --- a/media-gfx/pqiv/pqiv-9999.ebuild +++ b/media-gfx/pqiv/pqiv-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,17 +17,14 @@ HOMEPAGE="https://github.com/phillipberndt/pqiv http://www.pberndt.com/Programme LICENSE="GPL-2" SLOT="0" -IUSE="archive ffmpeg imagemagick kernel_linux libav pdf postscript webp" +IUSE="archive ffmpeg imagemagick kernel_linux pdf postscript webp" RDEPEND=" >=dev-libs/glib-2.32:2 >=x11-libs/cairo-1.6 x11-libs/gtk+:3 archive? ( app-arch/libarchive:0= ) - ffmpeg? ( - !libav? ( media-video/ffmpeg:0= ) - libav? ( media-video/libav:0= ) - ) + ffmpeg? ( media-video/ffmpeg:0= ) imagemagick? ( media-gfx/imagemagick:0= ) pdf? ( app-text/poppler:0= ) postscript? ( app-text/libspectre:0= ) @@ -51,7 +48,7 @@ pkg_setup() { src_configure() { local backends="gdkpixbuf" use archive && backends+=",archive,archive_cbx" - use ffmpeg || use libav && backends+=",libav" + use ffmpeg && backends+=",libav" use imagemagick && backends+=",wand" use pdf && backends+=",poppler" use postscript && backends+=",spectre" diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest index e996d45d599c..a30fc11cc010 100644 --- a/media-gfx/scrot/Manifest +++ b/media-gfx/scrot/Manifest @@ -6,6 +6,6 @@ DIST scrot_0.8-13.debian.tar.gz 7943 BLAKE2B 6c58c76f3a8dcf61a8ca4c31f5845cb27b4 DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c EBUILD scrot-0.8_p13-r1.ebuild 975 BLAKE2B 4f0920e23cada110c426fcd1ef874379f8ae3d9ed272dc5fd8a8cc4ffa0253066ee1f26428cad4d771bc5875fc205daea8d3e5fa381a204e5d13edcec2bab881 SHA512 b26b4f5aaa5a522a602404197697b17cd04d53d23229c7d1078e851400019c2fc506b96ba72b6aa36c9fe084711c67b9a57f4b75113e0b3ebb64289fd03fbf75 EBUILD scrot-1.2.ebuild 920 BLAKE2B b00fcbdf7665347b42716ce8ab78b8f6965f90b4b1f1a88acd2fffacd2978145208965afd206012c837ab22126ba7e78990b8760c5a58cccef373d2715991918 SHA512 341f2fbb5f4824b38d4c42e18929173cad358faf4b9b475d0c735ddc1a681962019c3a8a35892c5120afc42895ac1ac654c1faeb7a7fee5010725a61251bc7cd -EBUILD scrot-1.3.ebuild 923 BLAKE2B ee72990763af82704a92365c5ce74d9c23c9f5a6dc9f912636f93d57c2f0d6f07221f3da05a239b63f54c033af80376b1b371ea18ac1a51778964df3a73aab3e SHA512 85fcdaee1afc85db083bf0f4db2529adcbf03a2fdcc6626b7ee39a688d062de913f1a2c34c21fbe08129c5a21567b256d71483693b2ec62feb700ad7585c29e1 -EBUILD scrot-9999.ebuild 845 BLAKE2B 1f1a89cab451044255c8d772f3d906cf56ac764bad4a7ce5c1781e6945f7554faa4183f720f3408e20154625da3e571abb8295149b7a8d247a14648bd7e3ed93 SHA512 e259a61e4c430977f8d2d9ada66489454279b80f718d57d5a332026ca89c483b19a4bbdfe44d4e54163d02bdf9897e3f96b0d1b118021d99402915cdcfe50305 +EBUILD scrot-1.3-r1.ebuild 971 BLAKE2B f4daabaf37c8e2d6ea724d1b96f12928b4f5ece6301a0fa44dcffbbfdf00d4b213f56b5b066116b64eb45bb78100c9b9fd2fb451e2e8d9da664b9624c7f67c63 SHA512 552252c5ca01774197b34dd862a458399004f5be2f78b5d889176c0ebf072b05b08cfa842953205dc64da4ed3d4d011f81fb964a071992ea5b772c0ae69fcacd +EBUILD scrot-9999.ebuild 893 BLAKE2B b294cc0496f809a4066f2ddc84687a71b0dc5967dc09460e1dc1477f1d0a519051da24f6504afbdd2d57d66377e8d07178356c261fff7d7a9233b1d6795a1ef7 SHA512 10ee5b7d2afce6b7cf006575b25c71727854899032591725a22c9594e33821ceb2294398153eec59e5e7ff826b0f570e70ff676c5b0f292ea87ae3d6654eb00d MISC metadata.xml 327 BLAKE2B 44a3d3f80ed251d0864c6aabb7192146c942a2bab99a4e643189eb74445c52a92fc153e4f198b591e628697df09774a2576cf5678a58774295c881eda04e33ad SHA512 bed8805eb922c213b73629ec8c430a7825ec1451edcd332fffeaef9b855b71b9e57e490775fe462ef2234ad9b534a23f19a373f0f2131d84ff2f965b8a2ed25a diff --git a/media-gfx/scrot/scrot-1.3.ebuild b/media-gfx/scrot/scrot-1.3-r1.ebuild index cdebc92432c7..61281f19b1fb 100644 --- a/media-gfx/scrot/scrot-1.3.ebuild +++ b/media-gfx/scrot/scrot-1.3-r1.ebuild @@ -33,6 +33,7 @@ DOCS=( ) src_prepare() { + sed -i -e 's#-g -O3##g' src/Makefile.am || die default eautoreconf } diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild index 772693a4bf0f..a3ef577a9be9 100644 --- a/media-gfx/scrot/scrot-9999.ebuild +++ b/media-gfx/scrot/scrot-9999.ebuild @@ -33,6 +33,7 @@ DOCS=( ) src_prepare() { + sed -i -e 's#-g -O3##g' src/Makefile.am || die default eautoreconf } diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest index 6093ecc89dac..117fe707463a 100644 --- a/media-gfx/simple-scan/Manifest +++ b/media-gfx/simple-scan/Manifest @@ -1,9 +1,6 @@ AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08 -AUX simple-scan-3.32.2-unasigned-variable.patch 1294 BLAKE2B 7e513d96237872f5afc8c5a942d40f0f98632129eb9a2476099d8d28b1eb3660c0f5831d161c1c58f989327ff9eaeb4c5d426c3812fd1fe57270176b5dd37d29 SHA512 f3bcde7dd03ff9ade43f10b14124390aa08e0f2c00b7dc3b1cf08c5870c280a1e21dbdce7029a1f4c3372f72bac5f596026e7f70c7ee36c219d0c3f4df7e31a1 -DIST simple-scan-3.32.2.1.tar.xz 790848 BLAKE2B ded17193c29698a4e07e3d82689fbf84babceb36b2dedb09da5e81ed35399084d6db5b448d3bed56af559a6dc9c8708b4cda1730a248a094e005755b7dd49e95 SHA512 c49620c4be4289b18c792e35a01494a56a28b46e4f246a4c58203cf86cd34a1aa8f42738ef8b50ae6e99150630ec60f999b2000a8ee9674abc4f307db4c6c0cb -DIST simple-scan-3.32.2.tar.xz 790800 BLAKE2B 98e502cbc280285dbe20a0c843d5f8d8b38707e973f2ba6aba2ccef9d739165371f5f30d7d6658853c5a6a280ba2919a98acd02b4757b4e881f96d5a7b53449b SHA512 10322ae72461efe43a4e230443c3aca24aff6f0cab07750c6eab9ebb718889e51d8c77ff722c337f333a8952ac84f69d03ad88eedfd4432ef11f7c7493170e14 DIST simple-scan-3.34.4.tar.xz 795228 BLAKE2B b6f185bfbc1954ae2573fd1dcfa54f67e26290654c1019bfd34c229235e27cfc1eb40de0e6d5249f97b73c57745e1133fbd6fd1c3f9bdedb795b61068d5ed25d SHA512 b16b653e0a8ce399ecbdb88c4663d7780793518809eb73681c9c6281b9cde784167090c41720b21c184b9fdece28b07ba61fe8a97f10d792cc7326a458741ba4 -EBUILD simple-scan-3.32.2.1.ebuild 1528 BLAKE2B 821ca0207431cafe2cf83a4bb676df2fdade54289184bc4f248a7a326949534753d27adb63a74c195a92cfc430518bcf7efb955b5c98190539a7e6a6169337ab SHA512 0b44fb7b8837fe822085cae5dd5f10e98e56367559121a0932d24a57fec5bad475c4d495a6612095036246a625777690b466d614e7f40a7ae4cda50dbdd6ac9a -EBUILD simple-scan-3.32.2.ebuild 1526 BLAKE2B 759f8334d42a2296fceb82b2a3dd7268ea2d650247e31e72266ed34073dcc2686ab162cece76d75ff6de9239c947e1bee3b9b214b88b053b6f04971cd99a4859 SHA512 bc3b9c5722eb613e4325f21c47e0fbd23b0cb6cde2180a938dc7630e63438e37362054e3342024a3cb0af68144b00213261a13074929c076d6943503988f0813 +DIST simple-scan-3.34.6.tar.xz 801064 BLAKE2B 94c6bc386c2d7701bd13067e384eb294ce145d2e02d66e366e76a2c85fb5e3ac4e9bae0efa37fe13d3fc857b57c1730bf01961f7968d6744a4ea4dc47308cb23 SHA512 7b2d0eab13f08d4110d2143c4572e249297891e3868e6eb178a7a765b2d56960820931fbda538ede318014c578871657aa0e27518d184f861efc18ad4fdd900c EBUILD simple-scan-3.34.4.ebuild 1322 BLAKE2B b6359d130e933254fa3e5350ebb2ac562d4682f5c1af219f07321202e3deab61adf6dc9cd34e1dbbc3a04b0211ed091273e494692fadceca6a52bfebd1383c04 SHA512 16e305af51c31b4f775de7b4afe58cbe7ca51622dfa073c890a3e179b83a5f5853d333042aad26a738fbb19253621cc347e7b8a0984717fa2d04629443a9d219 +EBUILD simple-scan-3.34.6.ebuild 1324 BLAKE2B 61b1cd39eae6762f0cbee289d0b4ee56cb36633fc968fcfc80dad7b99163d19b2e0c0314716c957ae845a56e59ba81df78d68852b7d7ca933c7d22236fb71982 SHA512 dc4b204b412c840749383273bb7c8c3fb4bc4e44d53b8d3e2332b603a372476bf0bbce9780d13a5d5e07e3dc3e9c10145a7be1e08ac22dd44d53ef07a6fe0066 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47 diff --git a/media-gfx/simple-scan/files/simple-scan-3.32.2-unasigned-variable.patch b/media-gfx/simple-scan/files/simple-scan-3.32.2-unasigned-variable.patch deleted file mode 100644 index 9ba4aa721349..000000000000 --- a/media-gfx/simple-scan/files/simple-scan-3.32.2-unasigned-variable.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 47d3532459863e3b0bc1c7fd3a200f612863c814 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz <ricotz@ubuntu.com> -Date: Sat, 14 Sep 2019 20:03:47 +0200 -Subject: [PATCH] libwepmix: Fix use of possibly unassigned local variable - 'data' - ---- - src/libwebpmux.vapi | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/src/libwebpmux.vapi b/src/libwebpmux.vapi -index f2461a2..42d2886 100644 ---- a/src/libwebpmux.vapi -+++ b/src/libwebpmux.vapi -@@ -61,9 +61,7 @@ namespace WebP - [CCode (cname = "vala_set_image")] - public MuxError set_image (uint8[] bitstream, bool copy_data) - { -- Data data; -- data.bytes = bitstream; -- data.size = bitstream.length; -+ Data data = { bitstream, bitstream.length }; - return _set_image (data, copy_data); - } - -@@ -89,9 +87,7 @@ namespace WebP - public MuxError set_chunk (string fourcc, uint8[] chunk_data, bool copy_data) - requires (fourcc.length == 4) - { -- Data data; -- data.bytes = chunk_data; -- data.size = chunk_data.length; -+ Data data = { chunk_data ,chunk_data.length }; - return _set_chunk ((uchar[]) fourcc, data, copy_data); - } - --- -2.22.0 - diff --git a/media-gfx/simple-scan/simple-scan-3.32.2.ebuild b/media-gfx/simple-scan/simple-scan-3.32.2.ebuild deleted file mode 100644 index 79bbc6ac4fd0..000000000000 --- a/media-gfx/simple-scan/simple-scan-3.32.2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -VALA_MIN_API_VERSION="0.34" - -inherit gnome.org gnome2-utils meson vala xdg - -DESCRIPTION="Simple document scanning utility" -HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc64 x86" -IUSE="colord webp" # packagekit - -COMMON_DEPEND=" - >=dev-libs/glib-2.38:2 - >=x11-libs/gtk+-3.22:3 - >=sys-libs/zlib-1.2.3.1:= - x11-libs/cairo:= - x11-libs/gdk-pixbuf:2 - >=dev-libs/libgusb-0.2.7 - colord? ( >=x11-misc/colord-0.1.24:=[udev] ) - webp? ( media-libs/libwebp ) - >=media-gfx/sane-backends-1.0.20:= - - virtual/jpeg:0= -" -# packagekit? ( >=app-admin/packagekit-base-1.1.5 ) -RDEPEND="${COMMON_DEPEND} - x11-misc/xdg-utils -" -DEPEND="${COMMON_DEPEND} - $(vala_depend) - dev-libs/libxml2:2 - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - >=dev-libs/libgusb-0.2.7[vala] - colord? ( >=x11-misc/colord-0.1.24:=[vala] ) -" - -PATCHES=( - # Add control for optional dependencies - "${FILESDIR}"/3.26-add-control-optional-deps.patch - # libwepmix: Fix use of possibly unassigned local variable 'data' - # (from 3.34 branch) - "${FILESDIR}"/${PN}-3.32.2-unasigned-variable.patch -) - -src_prepare() { - vala_src_prepare - xdg_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_use colord) - -Dpackagekit=false - $(meson_use webp) - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/media-gfx/simple-scan/simple-scan-3.32.2.1.ebuild b/media-gfx/simple-scan/simple-scan-3.34.6.ebuild index a353c2802059..a2e99a48eaa5 100644 --- a/media-gfx/simple-scan/simple-scan-3.32.2.1.ebuild +++ b/media-gfx/simple-scan/simple-scan-3.34.6.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 VALA_MIN_API_VERSION="0.34" - inherit gnome.org gnome2-utils meson vala xdg DESCRIPTION="Simple document scanning utility" @@ -12,9 +11,9 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc64 ~x86" -IUSE="colord webp" # packagekit +IUSE="colord webp" -COMMON_DEPEND=" +DEPEND=" >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.22:3 >=sys-libs/zlib-1.2.3.1:= @@ -28,25 +27,22 @@ COMMON_DEPEND=" virtual/jpeg:0= " # packagekit? ( >=app-admin/packagekit-base-1.1.5 ) -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} x11-misc/xdg-utils " -DEPEND="${COMMON_DEPEND} +BDEPEND=" $(vala_depend) dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig - >=dev-libs/libgusb-0.2.7[vala] - colord? ( >=x11-misc/colord-0.1.24:=[vala] ) + dev-libs/libgusb[vala] + colord? ( x11-misc/colord[vala] ) " PATCHES=( # Add control for optional dependencies "${FILESDIR}"/3.26-add-control-optional-deps.patch - # libwepmix: Fix use of possibly unassigned local variable 'data' - # (from 3.34 branch) - "${FILESDIR}"/${PN}-3.32.2-unasigned-variable.patch ) src_prepare() { diff --git a/media-gfx/waifu2x-ncnn-vulkan/Manifest b/media-gfx/waifu2x-ncnn-vulkan/Manifest index 7aa06f977886..7bee840cb080 100644 --- a/media-gfx/waifu2x-ncnn-vulkan/Manifest +++ b/media-gfx/waifu2x-ncnn-vulkan/Manifest @@ -1,3 +1,5 @@ DIST waifu2x-ncnn-vulkan-20200224.tar.gz 34063828 BLAKE2B 9fa00abd31f0d81dd785be5253e44f5bd4082ae9b2fcae747562eb6c577fd7cccdfeaf7421d09c54119fd36285dffcc68d2889ddc06d1a6ddf47ea418066367e SHA512 13531a186817da99efb60fc0b16d0d3f455d0f2d2c9b4b53ddaedf7c50f622b2e5385e4f5dd29668cf845444b39645f0b7e810ab5084aa1e3ca6dbaf424a4e13 +DIST waifu2x-ncnn-vulkan-20200414.tar.gz 34063752 BLAKE2B eb52cc3cf857bdb428497acf8721d51abd6e067b4ae2f126833dfcf8402eae118cfa112b310b366e3e945b871b8c3306e5d826426c43e66b6e1055729644f222 SHA512 c0c5d40fdbf0b643b589d5bca5460ec59fbf38ede33af510c4b30b3211f18cd44d665980a11c13ee922cacf7a05d89b076078bcb8fa59c0523ad6b985a804d97 EBUILD waifu2x-ncnn-vulkan-20200224.ebuild 846 BLAKE2B 1f1674a2fd28d5e045b30b1122a46442d22e7d67a9690acffe1be24ea570b049d43caf005fc794ea064192d2208b5f5a81e8183462c4238c2f79b0ebd53314cb SHA512 4ed5fee1692e928ce7703e25d87fcda114a1e615fbcb6cbdbe8ab9437173f09c2816f949c22807fdab260a3e5af0ac8dc10c9f78004f92786b7318794422cb5c +EBUILD waifu2x-ncnn-vulkan-20200414.ebuild 846 BLAKE2B 1f1674a2fd28d5e045b30b1122a46442d22e7d67a9690acffe1be24ea570b049d43caf005fc794ea064192d2208b5f5a81e8183462c4238c2f79b0ebd53314cb SHA512 4ed5fee1692e928ce7703e25d87fcda114a1e615fbcb6cbdbe8ab9437173f09c2816f949c22807fdab260a3e5af0ac8dc10c9f78004f92786b7318794422cb5c MISC metadata.xml 342 BLAKE2B 718aec175f149d204eb6afabb3a2a59e47366538f16d346a1baeeae03afdfb68bd4c5c39d642af862400f0736644141eb156b43014f4125df61a0b9979bdb83d SHA512 a9b596ab9b9e2bd6052bbb11d7b19e2b6a4fbf69935345498cf5f5fa4934731bfccaf3e3391da0260e6f165198f71545ae8f86b1b01b8507fb9b003cd7e56809 diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200414.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200414.ebuild new file mode 100644 index 000000000000..77225416ea89 --- /dev/null +++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200414.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="waifu2x converter using ncnn and vulkan" +HOMEPAGE="https://github.com/nihui/waifu2x-ncnn-vulkan" + +SRC_URI="https://github.com/nihui/waifu2x-ncnn-vulkan/archive/${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~x86" + +LICENSE="MIT" +SLOT="0" +IUSE="" + +DEPEND=" + dev-libs/ncnn + media-libs/vulkan-loader" + +RDEPEND="${DEPEND}" +BDEPEND="" + +#S="${WORKDIR}/${P}/src" +CMAKE_USE_DIR="${S}/src" + +src_prepare() { + # Make finding models actually possible. + sed -i 's|path_t model = PATHSTR("models-cunet")|path_t model = PATHSTR("/usr/share/waifu2x-ncnn-vulkan/models-cunet")|' src/main.cpp\ + + cmake_src_prepare +} + +src_install() { + dobin "${BUILD_DIR}"/waifu2x-ncnn-vulkan + + insinto "/usr/share/${PN}" + doins -r models/* +} diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest index a18d09cd8e29..7fb40d6eee6c 100644 --- a/media-gfx/xdot/Manifest +++ b/media-gfx/xdot/Manifest @@ -1,4 +1,4 @@ DIST xdot-1.1.tar.gz 134215 BLAKE2B e241a4fb1ec69a8613f7813dc159761e6bffb82ea9f58876287d01946f4c93e66e5eef66e6844abb7738979412c2c7d2d26f76bc0563ad0c3c8550d9e8023b47 SHA512 d67c45c8c071013551f79d671a21ce546b680fac5997ba9631a882ffa3c44c15a69949643ed5e8211417006152575a1d99450ccfb6062427521d1e2bc0814f55 -EBUILD xdot-1.1.ebuild 1107 BLAKE2B 878320bb37b745a6cd5a4d5a0ddd48bf0c5df3ba2968fff576a32c3f75b7c1c3592225b446954bb2730f5e9b5a3ca13dee50c29ffd4843589d2be7d9cdddb850 SHA512 a8cedfbe8a0887251abea5a56b686ed52d260209258327774b0b1026edc4723ec7f47bbf72e657860571001bc703b458d9a95be1408ff2769cb14c3428b18473 +EBUILD xdot-1.1.ebuild 1114 BLAKE2B 513ae720f7a58fa9fa7bc47fd819a5f1d0ed10c3ca0814d7542efe04699a4a003f80a02ffae942e97cbe173fc32babb20169620b8f7d9af35b9ba39cd5686edf SHA512 a63a6f0eb7bda0625ae297ddf3b59a991988d7732ab1a96c64935028e0e234b8c83a32e6a498e3c0d103d8301bfb34b4d28a4bd57caef06a67ebe38cdc60aad6 EBUILD xdot-9999.ebuild 1102 BLAKE2B 154a7034a320211af04a977697e0e8fd7ea53ab37de9ef0e5d34fc60f13ab8c7e8861c1d4e24ae8a0a2a2e727ab3cd57070338ce058f693946eacfc98e7b2ef7 SHA512 86d2c030cadded62e64e90466ade5733919487fb07e816b089e6cd98f88345ad5f0d00460e47dac10dbe536c84292b347e3b916e12fafa6c97448759ca92daed MISC metadata.xml 483 BLAKE2B 50b03bb7d189da9bd6ca793f30c1ba3d13d12151533b42c99321a849515d7664398ec1b10720596c0453c48d35e2a6083b0559eb127199e1d6f4fc2a93aa04c4 SHA512 7e734dd60daa1e74b28f0932f508787e8deebc75a8f46c41f77007b6c8f96751cd6b07f6638cb89b38eb81d4fd2c6f7ba9f6d449f24f17ad25fb001d7f4f5ff7 diff --git a/media-gfx/xdot/xdot-1.1.ebuild b/media-gfx/xdot/xdot-1.1.ebuild index 29c4dca47278..a17f9dbf4fcc 100644 --- a/media-gfx/xdot/xdot-1.1.ebuild +++ b/media-gfx/xdot/xdot-1.1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" SRC_URI="" else - KEYWORDS="amd64 ~ppc64 x86" + KEYWORDS="amd64 ~arm64 ~ppc64 x86" MY_P="${MY_PN}-${PV}" S="${WORKDIR}/${MY_P}" SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest index 35ab9f93b925..2758bc62bdc1 100644 --- a/media-gfx/yafaray/Manifest +++ b/media-gfx/yafaray/Manifest @@ -1,7 +1,5 @@ -AUX yafaray-3.3.0-blender-exporter-paths.patch 536 BLAKE2B 558b85f1ffc6afe3daf58a395b54e31d7affc239a5f5fd79dead9410925e09b14ff907bb2ddf3899b57451e19b11d776cd5c7a0ebf8e590a8c45a337a5100abd SHA512 a7ee5f2112a21da653049f36b50851551f3402a54b4f1644e3e151beb83b827493c2992059a94ad06583e9906bd58f8929a79c6da49ccc9dcba63c9397e69440 -AUX yafaray-3.3.0-respect-cflags.patch 502 BLAKE2B 1df4f8667e8c2577812c690baf17c200912abc12748b41f0ea436add977eb111077b0655ba0cf83b3994d819e96b35893fa8ba4c29c85414b000178497115577 SHA512 ce1ebe180240861d553b54bccc42cbf01a91b5767a5e52e0d1578c8b4be4247a92331069a3946a628fa45d62fd02fd2112c3cd028cf1d1cdc05083d4e1dabd79 -AUX yafaray-3.3.0-strip-debug-mode.patch 767 BLAKE2B 42351950158441bd328e3fd3265e8e9e0f96ee51cf9aadf427c3dda7b57b77716e022801183271dd7206d9ec58b1e239159736894423ca53885c033a2b7e8e0f SHA512 f139d622162d02bfd1d95d38ffa2fcb29fd32cdd51cc14aec986dc481c00aa3c982e537ead2ae8d1972401312aaf9ef8cd92b81fc1fd3ee819f350eadac5d2d2 -DIST yafaray-blender-exporter-3.3.0.tar.gz 377928 BLAKE2B 7876c78ca6228282648909e566803b33304be0082fab48819340845e3927877b9734f7bc7e09702bf7cbf6477c68932637eb766dc98b9e8e4ab42ca99d2a3595 SHA512 70a1a806d97f6f3b43cdb5d6caac6104f0f63720d5920f6a623078e05e6977d065d2fabca4da1644deb97f09176b88347f0278e4bc699c783d807d3f530421d0 -DIST yafaray-core-3.3.0.tar.gz 1135360 BLAKE2B 67f6956a3866bfe0b4167f30a7c2c7f05ee23556e9fff7041ff3937e90011e4c2538b706ae27e02351ae555d0d05531f3eb711257591d85f779683c9c42ac6f7 SHA512 32efb87872485c4a188483ae1172cac2eca2281e7b9ab29f184c047b94f3986d65da199a74c169d0e2fd6af59cf37b7deb69dcfb1cb4763bb1ebca30d46b5b90 -EBUILD yafaray-3.3.0-r2.ebuild 3595 BLAKE2B c003f4f4c09d588962f46b13526035fe8f8c54bef3be260fdf0a66ed47d5111f0068b0fa7dbcaf9d979749946ea3a15c4ef97e39b04a82aa9571a96f6067782d SHA512 6f80e1877fe2ed934819d2cb336e249fa3f81667396b85e99a853ab0ba59e401f36c6eadce72d42d754f851cbbfbb7d9e2b5106229c29c90a07f31a2dea7885f +AUX yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch 1160 BLAKE2B 2145d744a269b25dad27b78afb52baec14b23c7a90041263b907020145b51482165ccd4dd833c537dadd4ca0074cdd90fefb642d8fb3bb5853d37164f5e3f2eb SHA512 d6b327c887badb28685277487fcb76917206781aa5e1d6ebd0f6832a28d573945bca2cce5a0e856a1b573c103a696cf7b7b10a91bb6135649249e8ca143ff8fc +DIST yafaray-blender-exporter-3.4.1.tar.gz 381253 BLAKE2B b1483c79b14581729f598b92ca504af4a8a73cff54ff2014e8be646eaa2eea7f10074d1dc8c58251d8a987ac6e5ac10d1bc34b80c229f74e6d580bbaa3a3c461 SHA512 1f7baf7bf5953be8b4e004b1509cc23164df0a05e28d33a2301195ea21ad4d4cd6fdd67a0b1af11c1075bab7018e64b38f564be8b647d8513db46feee7d8bf85 +DIST yafaray-core-3.4.1.tar.gz 1136077 BLAKE2B a2ce3945f52315084ee744ff4a6733255018196f0000ca6b1786fbd2ec49ade64cb62e98dfba95dca4dec361f47235d59a8c9bd95ee7d095214fc0afbdcb1ee4 SHA512 a9116273fbc2aaaadbc38a65b1eaaa502070ff06f8a2929e880714a9db57188e65cf319c20a3f96e08146af36a67aea139709a633eb024be65319a64330e6f68 +EBUILD yafaray-3.4.1.ebuild 4381 BLAKE2B ac952d608b2aac41f46e17a080fa1d86f5619f3adf97498a275da52279fea0ee4f6ee4112fc1d66131fdb832693661147e68c7309ef88f8f29a510b81e5b4d09 SHA512 c13a2d24795a64c8d6f2f64bf937f7f0367320efc0d1bb5c34c9fca374d4f2bbe76edccb5814b3fdc0d4e4da1b0b94cf0654ce13c482a38d3e2de0a38d33a250 MISC metadata.xml 1135 BLAKE2B c889a0d76e5dace50fac8a3b2ec5dc8e04b88baba19ff7db575a3790ea92b90c9a17cad5320f85e5de85ccb6db3c37323589118cd9d4cf10d8f9f674a04f6318 SHA512 86c9cb6eeab7ed39b4192a6e1a9caf7b4d75df2c7e9fe8e16ccec5a1b11e9663c828ef62160240c228847ee6b1ffb7d0c8589a4b4f5aba20ba34cba59ae2c3fa diff --git a/media-gfx/yafaray/files/yafaray-3.3.0-blender-exporter-paths.patch b/media-gfx/yafaray/files/yafaray-3.3.0-blender-exporter-paths.patch deleted file mode 100644 index 9bf4f2b91f68..000000000000 --- a/media-gfx/yafaray/files/yafaray-3.3.0-blender-exporter-paths.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/work/Blender-Exporter-3.3.0/__init__.py b/work/Blender-Exporter-3.3.0/__init__.py -index 85dc1c2..70a79e8 100644 ---- a/__init__.py -+++ b/__init__.py -@@ -22,8 +22,8 @@ import sys - import os - import ctypes - --PLUGIN_PATH = os.path.join(__path__[0], 'bin', 'yafaray-plugins') --BIN_PATH = os.path.join(__path__[0], 'bin') -+PLUGIN_PATH = '/usr/lib/yafaray-plugins' -+BIN_PATH = '/usr/bin' - YAF_ID_NAME = "YAFA_V3_RENDER" - - # Version to be automatically populated during the cmake build process, getting the version from git tags diff --git a/media-gfx/yafaray/files/yafaray-3.3.0-respect-cflags.patch b/media-gfx/yafaray/files/yafaray-3.3.0-respect-cflags.patch deleted file mode 100644 index c22ff7e41ea6..000000000000 --- a/media-gfx/yafaray/files/yafaray-3.3.0-respect-cflags.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/work/Core-3.3.0/CMakeLists.txt b/work/Core-3.3.0/CMakeLists.txt -index 75fd2c6..94c2502 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -219,9 +219,6 @@ if(NOT WIN32) - set(YAF_BINDINGS_RUBY_DIR ${YAF_LIB_DIR}) - endif(NOT YAF_BINDINGS_RUBY_DIR) - -- # build flags -- set(CMAKE_CXX_FLAGS "-Wall" CACHE STRING "Default compiler flags" FORCE) -- - if(USER_RELEASE_OPTIMIZATION_FLAGS) - set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS}) - else(USER_RELEASE_OPTIMIZATION_FLAGS) diff --git a/media-gfx/yafaray/files/yafaray-3.3.0-strip-debug-mode.patch b/media-gfx/yafaray/files/yafaray-3.3.0-strip-debug-mode.patch deleted file mode 100644 index 3bdb4eeef361..000000000000 --- a/media-gfx/yafaray/files/yafaray-3.3.0-strip-debug-mode.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/work/Core-3.3.0/CMakeLists.txt b/work/Core-3.3.0/CMakeLists.txt -index 75fd2c6..52c6b3d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,7 +17,6 @@ option(WITH_YAF_PY_BINDINGS "Enable the YafaRay Python bindings" ON) - option(WITH_YAF_RUBY_BINDINGS "Enable the YafaRay Ruby bindings" OFF) - option(WITH_OSX_ADDON "Enable the use of blender's included python lib on OSX platforms" OFF) - option(WITH_OpenCV "Build OpenCV image processing support" ON) --option(DEBUG_BUILD "Enable debug build mode" OFF) - option(EMBED_FONT_QT "Embed font for QT GUI (usefull for some buggy QT installations)" OFF) - option(FAST_MATH "Enable mathematic approximations to make code faster" ON) - option(FAST_TRIG "Enable trigonometric approximations to make code faster" ON) diff --git a/media-gfx/yafaray/files/yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch b/media-gfx/yafaray/files/yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch new file mode 100644 index 000000000000..90b2786c3c54 --- /dev/null +++ b/media-gfx/yafaray/files/yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch @@ -0,0 +1,35 @@ +From 2f77edf05ed02955dc08821f322a529063dbfa28 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl@gmail.com> +Date: Sun, 19 Apr 2020 15:39:45 +0200 +Subject: [PATCH] Respect user pre-defined CXXFLAGS + +Signed-off-by: Bernd Waibel <waebbl@gmail.com> +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 047456f..6733b7d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -224,7 +224,7 @@ if(NOT WIN32) + endif(NOT YAF_BINDINGS_RUBY_DIR) + + # build flags +- set(CMAKE_CXX_FLAGS "-Wall" CACHE STRING "Default compiler flags" FORCE) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" CACHE STRING "Default compiler flags" FORCE) + + if(USER_RELEASE_OPTIMIZATION_FLAGS) + set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS}) +@@ -263,7 +263,7 @@ else(NOT WIN32) + + # build flags + if(MINGW) +- set(CMAKE_CXX_FLAGS "-Wall" CACHE STRING "Default compiler flags" FORCE) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" CACHE STRING "Default compiler flags" FORCE) + + if(USER_RELEASE_OPTIMIZATION_FLAGS) + set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS}) +-- +2.26.1 + diff --git a/media-gfx/yafaray/yafaray-3.3.0-r2.ebuild b/media-gfx/yafaray/yafaray-3.3.0-r2.ebuild deleted file mode 100644 index b1f99de4d347..000000000000 --- a/media-gfx/yafaray/yafaray-3.3.0-r2.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) - -inherit cmake flag-o-matic python-single-r1 - -DESCRIPTION="A free open-source montecarlo raytracing engine" -HOMEPAGE="http://www.yafaray.org" -SRC_URI="https://github.com/YafaRay/Core/archive/v${PV}.tar.gz -> ${PN}-core-${PV}.tar.gz - https://github.com/YafaRay/Blender-Exporter/archive/v${PV}.tar.gz -> ${PN}-blender-exporter-${PV}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+blender +fastmath +fasttrig jpeg opencv openexr png +python tiff truetype" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/boost:= - dev-libs/libxml2:2 - sys-libs/zlib - blender? ( media-gfx/blender ) - jpeg? ( virtual/jpeg:0 ) - opencv? ( >=media-libs/opencv-3.1.0:=[openexr?] ) - openexr? ( >=media-libs/openexr-2.2.0:= ) - png? ( media-libs/libpng:0= ) - python? ( ${PYTHON_DEPS} ) - tiff? ( media-libs/tiff:0 ) - truetype? ( media-libs/freetype:2 ) -" -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/swig" - -S="${WORKDIR}/Core-${PV}" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - append-flags "-pthread" - cmake_src_prepare - - sed -i -e "s/@YAFARAY_BLENDER_EXPORTER_VERSION@/v${PV}/" "${WORKDIR}/Blender-Exporter-${PV}/__init__.py" || die - - eapply "${FILESDIR}/${P}-strip-debug-mode.patch" - eapply "${FILESDIR}/${P}-respect-cflags.patch" - pushd "${WORKDIR}/Blender-Exporter-${PV}" || die - eapply "${FILESDIR}/${P}-blender-exporter-paths.patch" - popd || dir - eapply_user -} - -src_configure() { - local mycmakeargs=( - -DYAF_LIB_DIR=$(get_libdir) - -DWITH_YAF_PY_BINDINGS=$(usex python) - -DYAF_PY_VERSION=${EPYTHON#python} - -DWITH_YAF_RUBY_BINDINGS=OFF - -DBLENDER_ADDON=OFF # addon is a separate package called blender-exporter - -DCMAKE_SKIP_RPATH=ON # NULL DT_RUNPATH security problem - -DFAST_MATH=$(usex fastmath) - -DFAST_TRIG=$(usex fasttrig) - -DWITH_JPEG="$(usex jpeg)" - -DWITH_OpenCV="$(usex opencv)" - -DWITH_OpenEXR="$(usex openexr)" - -DWITH_PNG="$(usex png)" - -DWITH_QT=OFF # qt4 only at the moment - -DWITH_TIFF="$(usex tiff)" - -DWITH_Freetype="$(usex truetype)" - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - python_domodule "${BUILD_DIR}/src/bindings/yafaray_v3_interface.py" - python_domodule "${BUILD_DIR}/src/bindings/_yafaray_v3_interface.so" - rm -v "${ED}"/usr/$(get_libdir)/{yafaray_v3_interface.py,_yafaray_v3_interface.so} || die - rm -rv "${ED}"/usr/share/doc/${PN} || die - - if use blender; then - pushd "${WORKDIR}/Blender-Exporter-${PV}" || die - rm README LICENSES INSTALL CHANGELOG .gitignore || die - # grab blender version number for plugin directory - local blender_plugin_dir=$(best_version media-gfx/blender) - blender_plugin_dir=${blender_plugin_dir##*/} # remove category - blender_plugin_dir=${blender_plugin_dir#*-} # remove package name - blender_plugin_dir=${blender_plugin_dir%%-*} # remove revision number if exists - insinto /usr/share/blender/${blender_plugin_dir}/scripts/addons/yafaray_v3 - doins -r . - popd || die - fi -} - -pkg_postinst() { - einfo "To confirm your installation is working as expected, run" - einfo "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml" - einfo "as an input file, then compare the result to" - einfo "'/usr/share/yafaray/tests/test01/test01 - expected render result.png'" - if use blender; then - elog - elog "To use within Blender, navigate to File -> User Preferences -> Add-ons (tab)" - elog "and enable 'Render: YafaRay v3 Exporter'. This will make YafaRay available" - elog "in the render engines drop-down." - fi -} diff --git a/media-gfx/yafaray/yafaray-3.4.1.ebuild b/media-gfx/yafaray/yafaray-3.4.1.ebuild new file mode 100644 index 000000000000..e583d32d4b7c --- /dev/null +++ b/media-gfx/yafaray/yafaray-3.4.1.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_6 ) + +# doesn't build with ninja when qt5 and python USE flags are both enabled +CMAKE_MAKEFILE_GENERATOR="emake" + +inherit cmake flag-o-matic python-single-r1 + +DESCRIPTION="A free open-source montecarlo raytracing engine" +HOMEPAGE="http://www.yafaray.org" +SRC_URI="https://github.com/YafaRay/Core/archive/v${PV}.tar.gz -> ${PN}-core-${PV}.tar.gz + blender? ( https://github.com/YafaRay/Blender-Exporter/archive/v${PV}.tar.gz -> ${PN}-blender-exporter-${PV}.tar.gz )" + +S="${WORKDIR}/Core-${PV}" + +LICENSE="blender? ( GPL-2+ ) LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="blender +fastmath +fasttrig jpeg opencv openexr png +python qt5 tiff truetype" +RESTRICT="test" + +REQUIRED_USE=" + blender? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +# Note: according to upstream, the blender plugin doesn't work with blender-2.8 (yet). +RDEPEND=" + dev-libs/boost:=[nls] + dev-libs/libxml2:2 + sys-libs/zlib + jpeg? ( virtual/jpeg:0 ) + opencv? ( >=media-libs/opencv-3.1.0:= ) + openexr? ( >=media-libs/openexr-2.2.0:= ) + png? ( media-libs/libpng:0= ) + python? ( + ${PYTHON_DEPS} + blender? ( ~media-gfx/blender-2.79b[${PYTHON_SINGLE_USEDEP}] ) + ) + qt5? ( dev-qt/qtwidgets:5 ) + tiff? ( media-libs/tiff:0 ) + truetype? ( media-libs/freetype:2 ) +" +DEPEND="${RDEPEND}" +BDEPEND="python? ( dev-lang/swig )" + +PATCHES=( + "${FILESDIR}/${P}-0001-Respect-user-pre-defined-CXXFLAGS.patch" +) + +DOCS=( AUTHORS CHANGELOG CODING INSTALL README ) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + append-flags -pthread + append-ldflags -pthread + + cmake_src_prepare + + if use blender; then + # fix PLUGIN_PATH + sed -e "s/PLUGIN_PATH = os.path.join(__path__\[0\], 'bin'/PLUGIN_PATH = os.path.join(__path__\[0\], '"$(get_libdir)"'/" \ + -e "s/@YAFARAY_BLENDER_EXPORTER_VERSION@/v"${PV}"/" \ + -i "${WORKDIR}"/Blender-Exporter-${PV}/__init__.py || die "patching startup file failed" + fi +} + +src_configure() { + local mycmakeargs=( + # enabling BLENDER_ADDON doesn't build anything, but set's some wierd + # installation paths, so keep it off and install the files manually. + -DBLENDER_ADDON=OFF + -DCMAKE_SKIP_RPATH=ON # NULL DT_RUNPATH security problem + -DFAST_MATH=$(usex fastmath) + -DFAST_TRIG=$(usex fasttrig) + -DWITH_Freetype=$(usex truetype) + -DWITH_JPEG=$(usex jpeg) + -DWITH_OpenCV=$(usex opencv) + -DWITH_OpenEXR=$(usex openexr) + -DWITH_PNG=$(usex png) + -DWITH_QT=$(usex qt5) + -DWITH_TIFF=$(usex tiff) + -DWITH_XML_LOADER=ON # internal + -DWITH_YAF_PY_BINDINGS=$(usex python) + -DWITH_YAF_RUBY_BINDINGS=OFF + -DYAF_LIB_DIR=$(get_libdir) + ) + + if use python; then + mycmakeargs+=( -DYAF_PY_VERSION=${EPYTHON#python} ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use python; then + python_domodule "${BUILD_DIR}/src/bindings/yafaray_v3_interface.py" + mv "${ED}"/usr/$(get_libdir)/_yafaray_v3_interface.so "${ED}"/$(python_get_sitedir)/ || die + rm -v "${ED}"/usr/$(get_libdir)/yafaray_v3_interface.py || die + + if use qt5; then + python_domodule "${BUILD_DIR}/src/bindings/yafqt.py" + mv "${ED}"/usr/$(get_libdir)/_yafqt.so "${ED}"/$(python_get_sitedir)/ || die + rm -v "${ED}"/usr/$(get_libdir)/yafqt.py || die + fi + fi + + rm -rv "${ED}"/usr/share/doc/${PN} || die + + if use blender; then + pushd "${WORKDIR}/Blender-Exporter-${PV}" || die + # grab blender version number for plugin directory + local blender_plugin_dir=$(best_version media-gfx/blender) + blender_plugin_dir=${blender_plugin_dir##*/} # remove category + blender_plugin_dir=${blender_plugin_dir#*-} # remove package name + blender_plugin_dir=${blender_plugin_dir%%-*} # remove revision number if exists + insinto /usr/share/blender/${blender_plugin_dir}/scripts/addons/yafaray_v3 + doins -r . + popd || die + fi +} + +pkg_postinst() { + einfo "To confirm your installation is working as expected, run" + einfo "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml" + einfo "as an input file, then compare the result to" + einfo "'/usr/share/yafaray/tests/test01/test01 - expected render result.png'" + if use blender; then + elog + elog "To use within Blender, navigate to File -> User Preferences -> Add-ons (tab)" + elog "and enable 'Render: YafaRay v3 Exporter'. This will make YafaRay available" + elog "in the render engines drop-down." + fi +} diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index 54bd8c86cc17..6564c69ed3c4 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -1,10 +1,13 @@ AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1 -AUX zbar-0.10_p20121015-ImageMagick-7.patch 1135 BLAKE2B 103cfe85d547cd3087a08676abdfd5966b9b4dd32de4c35e1aee144247af8562e6425d65d170fcb98bcb43e0bc18dcd39d4cf3baf46eea4a1c81814a14946bb0 SHA512 c67dee821338d0bbb54b3c4b22a75616e876ad56e5bbcaad856fe16b39ef3e07b7b80dcb6c25023857ebd561c55ac4faab144fa4ead05424df24d5af7c2509dc +AUX zbar-0.23.1_fix_leftover_on_shell_compatibility.patch 877 BLAKE2B 6eb1778024ba3ab0df8bc64ae80987be0e17cd30b692f0e04766fcad3148fe1ce49f52f7ec147d3f22c34754288fe0f9721ffa91e3e78c5b357c167f372f4e5d SHA512 98c203f122811128e091f8cc31f0c92362cc8693e38f5cdd7a48cf6d5ef57889bd6ccf921631a1646214f070c3be2eb78f08c429351bec275f4b550b2e15b122 +AUX zbar-0.23.1_fix_unittest.patch 2703 BLAKE2B fcbde8262803be3a009a93d052d6866998ca0a214a64f0c2989ded4925394c3cc78755b539defd0560dbc01e318f12a89b16a6065e028eec58db16d58a8bdcb5 SHA512 cc867bcb92094edb94dc699c0929547dd7bf08f71579605b4817e1068da55e0c2455655e535fc560375c773c158f50a79f77846ef06a3566a0deec22a459e120 AUX zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch 2109 BLAKE2B 8e32a3d0115fe7dc31a8208021659827f959bebbd1a56972765a379e03c7aca704c394d7eecb928f3547b9b42afff6cdaa1e564875bb6a94ac0cdb9a55422fe1 SHA512 dfbbe1caf384dc769d97ecebaf544b81c1fa266c78ca4fa8087673724b3408fe2e77535b60aefe904aa42dd1ed1182676623f98aed565910566c511908b8ecee AUX zbar-0.23_fix_Qt5X11Extras_detect.patch 643 BLAKE2B 27485c866503189670424eaf81a0a9b6aefa284576789ba6533af03cb1af59a2c531f22e09adcc8e2b9b6418f861f8b96a1bf602502d0e863ae9785ac2d336c7 SHA512 ee40586c64ded170e314ee2961588518234e22d9cee9e9a55f994231cd50b120e82225c551c5a2e85988de1c14a5c0baf6303fffea0663e2e4808df3a0c8421a AUX zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch 1122 BLAKE2B e4330ca4ce75a4659466faa618a99280ad7868aa21d1fe30db837917460cb9fc3594421cb2cb70457813611764c7e976e5ba9acc414be5fa95808f91d995eb0b SHA512 c6d6b3bf93f59f87687e03294742ec7a4803308d7395869d8cccefdb186c69ad429c631f2f4d0c4de0a2dd495f3b99342622d01acb1e823ceb9250380549ca20 AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a655718b952d06ce0ec003bb08bf30979d6c467b2b50e6fb9a6cd06f95230ed4ae55e14599c276f9f41f03677b4d18167c6665c4 SHA512 d24d75f840d84488986cede3378e067ac68d218acac34a8c34888c88611df8f4b1b397cfd5ecfcda82480fd56ea2bada29d8373cc6e93ae8050b84e801c36ca7 AUX zbar-0.23_reset_conversion_descriptor_after_close.patch 829 BLAKE2B b39c63a1aa11a79123226ebf91ba0b4d047412b96b12d8ed591e85625c96e3de1fcfd0624b622c4f59c98d4e4e3483c74d6699ae2579a18352d12698b3b0f430 SHA512 c641b83c81c07e850a17672a8ad5a16ab650330ccffcba98d209ed105058cc66664aff76d391803503b6d784daaf2b31d9faad2aa9dd69221598b13187e27dd1 +DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b EBUILD zbar-0.23-r1.ebuild 5030 BLAKE2B 53eda120af7cfab90e0894f8e8e07a92f2a45b0c4e4187e161ba877d49bfa044f9c207c7f6123ef3605bca451aa8f56f5a4537eb29d96a4474f8e251d44c9991 SHA512 6968f47c8a701b8d97c4abecccad03c26ba9e52cd58247a89ad34a4c1817e7d46763757dc4e92647ea3dbf637496397c85842de141aa0261b62665824d6afe95 +EBUILD zbar-0.23.1.ebuild 5181 BLAKE2B 1747eab55152a9b46cb12f81be7c17d83b804c25a51231c6f78f08fe4791ba9e398f116d0e792437b993c83f26112f640fb7c436628c6baa38c955539dedad0f SHA512 dd167474e1b85eca3c9f8e624f25f27d4b6edbbfb69e8c56353371f6227a1257cc43879ea7dd81b7b4b6089cbda0ebed7d69c63b8e0fff9679f26ccc63f09f2a MISC metadata.xml 931 BLAKE2B a8c611d728a6fd0dbc94f333681a5a0ec4fc2bd8529cca7dcebfa8e1774c1d5e069c870baffd29fa033ce0529d2c2cb2ee3a1a54c089b1fd988b0d2c1ce82aae SHA512 c42caef53bc9c8743f8f02f5c96f687b605248a4311efea44777781a85a4b5a31e586cbdd7d85b07a6b2aca8138f5c7238b1f35a37b13741a297e9751731da19 diff --git a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch deleted file mode 100644 index f58c3e4d9c45..000000000000 --- a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fixed build with imagemagick-7 (bug #592324). -Thanks-to: Jürgen Rose - -diff -r -U3 zbar-0.10_p20121015_orig/configure.ac zbar-0.10_p20121015/configure.ac ---- zbar-0.10_p20121015_orig/configure.ac 2016-08-28 16:59:23.969753652 +0200 -+++ zbar-0.10_p20121015/configure.ac 2016-08-28 17:17:15.384494517 +0200 -@@ -324,7 +324,7 @@ - dnl double check ImageMagick install (bug #2582232) - CPPFLAGS_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS" -- AC_CHECK_HEADER([wand/MagickWand.h], -+ AC_CHECK_HEADER([MagickWand/MagickWand.h], - [have_IM="yes"], - [have_IM="broken"]) - CPPFLAGS="$CPPFLAGS_save"])]) -diff -r -U3 zbar-0.10_p20121015_orig/zbarimg/zbarimg.c zbar-0.10_p20121015/zbarimg/zbarimg.c ---- zbar-0.10_p20121015_orig/zbarimg/zbarimg.c 2015-08-05 11:10:32.000000000 +0200 -+++ zbar-0.10_p20121015/zbarimg/zbarimg.c 2016-08-28 17:10:39.532787196 +0200 -@@ -44,7 +44,7 @@ - #endif - - #ifdef HAVE_IMAGEMAGICK --# include <wand/MagickWand.h> -+# include <MagickWand/MagickWand.h> - - /* ImageMagick frequently changes API names - just use the original - * (more stable?) names to match GraphicsMagick diff --git a/media-gfx/zbar/files/zbar-0.23.1_fix_leftover_on_shell_compatibility.patch b/media-gfx/zbar/files/zbar-0.23.1_fix_leftover_on_shell_compatibility.patch new file mode 100644 index 000000000000..62993a8b2b25 --- /dev/null +++ b/media-gfx/zbar/files/zbar-0.23.1_fix_leftover_on_shell_compatibility.patch @@ -0,0 +1,24 @@ +From 8e74a2e223bd40e8cf95ac2580df56ac8500a859 Mon Sep 17 00:00:00 2001 +From: Boyuan Yang <byang@debian.org> +Date: Wed, 22 Apr 2020 10:29:39 -0400 +Subject: [PATCH] configure.ac: Fix leftover on shell compatibility + +Uses "=" instead of "==" in string comparision for POSIX +compatibility. This is a leftover of previous similar fix. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 105da09..df0220a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -845,7 +845,7 @@ dnl summary log + echo "" + echo "please verify that the detected configuration matches your expectations:" + echo "------------------------------------------------------------------------" +-AS_IF([test "x$USE_NLS" == "xyes"], ++AS_IF([test "x$USE_NLS" = "xyes"], + [echo "gettext $USE_NLS"] + ) + AS_IF([test "x$win32" != "xno"], diff --git a/media-gfx/zbar/files/zbar-0.23.1_fix_unittest.patch b/media-gfx/zbar/files/zbar-0.23.1_fix_unittest.patch new file mode 100644 index 000000000000..3f538c81138f --- /dev/null +++ b/media-gfx/zbar/files/zbar-0.23.1_fix_unittest.patch @@ -0,0 +1,78 @@ +diff -ur a/configure.ac b/configure.ac +--- a/configure.ac 2020-04-21 00:09:21.000000000 +0300 ++++ b/configure.ac 2020-04-23 16:53:06.654339488 +0300 +@@ -336,6 +336,14 @@ + AC_SUBST(DBUS_CONFDIR) + ]) + ++dnl zbarimg tests ++AC_ARG_WITH([zbarimg_tests], ++ [AS_HELP_STRING([--without-zbarimg-tests], ++ [disable tests for zbarimg])], ++ [], ++ [with_zbarimg_tests="yes"]) ++AM_CONDITIONAL([HAVE_ZBARIMG_TESTS], [test "x$with_zbarimg_tests" = "xyes"]) ++ + dnl libjpeg + AC_ARG_WITH([jpeg], + [AS_HELP_STRING([--without-jpeg], +@@ -724,25 +732,12 @@ + + AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)]) + AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."]) ++AC_SUBST(CLASSPATH) + +-dnl Search for Java unit test library +-AS_IF([test -z "$JUNIT_HOME"], +- [JUNIT_HOME="/usr/share/java"]) +- +-AS_IF([test -f "$JUNIT_HOME/junit4.jar"], +- [JUNIT="$JUNIT_HOME/junit4.jar"], +- [AS_IF([test -f "$JUNIT_HOME/junit.jar"], +- [JUNIT="$JUNIT_HOME/junit.jar"])]) +- +-AS_IF([test "x$JUNIT" != "x"], +- [AS_IF([test -f "/usr/share/java/hamcrest/all.jar"], +- [CLASSPATH="$JUNIT:/usr/share/java/hamcrest/all.jar:$CLASSPATH" +- AC_SUBST(CLASSPATH) +- with_java_unit="yes"])], +- [AS_IF([test -f "/usr/share/java/hamcrest-all.jar"], +- [CLASSPATH="$JUNIT:/usr/share/java/hamcrest-all.jar:$CLASSPATH" +- AC_SUBST(CLASSPATH) +- with_java_unit="yes"])]) ++AC_ARG_WITH([java_unit], ++ [AS_HELP_STRING([--without-java-unit], ++ [Enable java unittest])], ++ [with_java_unit="yes"]) + + AM_CONDITIONAL([HAVE_JAVA_UNIT], [test "x$with_java_unit" = "xyes"]) + +@@ -905,6 +900,8 @@ + [echo " => the Java interface will *NOT* be built"]) + AS_IF([test "x$with_java_unit" != "xyes"], + [echo " => the Java unit test will *NOT* be enabled"]) ++AS_IF([test "x$with_zbarimg_tests" != "xyes"], ++ [echo " => zbarimg tests will *NOT* be enabled"]) + #echo "NPAPI Plugin --with-npapi=$with_npapi" + #AS_IF([test "x$with_mozilla" != "xyes"], + # [echo " => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"]) +diff -ur a/test/Makefile.am.inc b/test/Makefile.am.inc +--- a/test/Makefile.am.inc 2020-04-21 00:09:21.000000000 +0300 ++++ b/test/Makefile.am.inc 2020-04-23 17:03:07.819999370 +0300 +@@ -91,11 +91,16 @@ + regress-decoder: test/test_decode + @abs_top_builddir@/test/test_decode -q -n 100000 + ++if HAVE_ZBARIMG_TESTS + check-images-py: zbarimg/zbarimg + @PYTHON@ @abs_top_srcdir@/test/barcodetest.py + + check-images: zbarimg/zbarimg + @abs_top_builddir@/test/test_examples.sh ++else ++check-images-py: ++check-images: ++endif + + check-convert: test/test_convert + @abs_top_srcdir@/test/test_convert diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild new file mode 100644 index 000000000000..c284e6b7e988 --- /dev/null +++ b/media-gfx/zbar/zbar-0.23.1.ebuild @@ -0,0 +1,224 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx + +DESCRIPTION="Library and tools for reading barcodes from images or video" +HOMEPAGE="https://github.com/mchehab/zbar" +SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv" +REQUIRED_USE=" + introspection? ( gtk ) + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( + ${PYTHON_REQUIRED_USE} + X? ( imagemagick ) + ) + xv? ( X )" + +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + gtk? ( + dev-libs/glib:2[${MULTILIB_USEDEP}] + x11-libs/gtk+:3[${MULTILIB_USEDEP}] + introspection? ( dev-libs/gobject-introspection ) + ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] ) + ) + jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + ) + v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] ) + )" + +RDEPEND="${COMMON_DEPEND} + java? ( >=virtual/jre-1.8 )" + +DEPEND="${COMMON_DEPEND} + java? ( + >=virtual/jdk-1.8 + test? ( + dev-java/hamcrest-core:1.3 + dev-java/junit:4 + ) + ) + test? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pillow[${PYTHON_MULTI_USEDEP}] + ') + )" + +BDEPEND=" + app-text/xmlto + virtual/pkgconfig + gtk? ( dev-util/glib-utils ) + nls? ( + sys-devel/gettext + virtual/libiconv + )" + +PATCHES=( + "${FILESDIR}/${P}_fix_leftover_on_shell_compatibility.patch" + "${FILESDIR}/${P}_fix_unittest.patch" + "${FILESDIR}/zbar-0.23_fix_Qt5X11Extras_detect.patch" + "${FILESDIR}/zbar-0.23_fix_python_detect.patch" +) + +DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog ) + +pkg_setup() { + if use python || use test; then + python-single-r1_pkg_setup + fi + use java && java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default + + if use python || use test; then + if use test; then + # make tests happy + # because one of the test requires loadable py module from the current ${BUILD_DIR} + sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \ + -i test/Makefile.am.inc || die + fi + + python_fix_shebang \ + examples/*.py \ + test/{test_python,barcodetest}.py # test_pygtk.py — py2 only + fi + + if use java; then + java-pkg-opt-2_src_prepare + sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \ + -i java/Makefile.am || die + fi + + # do not install {LICENSE,INSTALL,etc} doc files with 'make install' (use DOCS=() instead) + sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die + + eautoreconf +} + +multilib_src_configure() { + append-cppflags -DNDEBUG + + local myeconfargs=( + $(use_with dbus) + $(use_with gtk gtk gtk3) # default is gtk2 + $(use_with jpeg) + $(multilib_native_use_with introspection gir) + $(multilib_native_use_with java) + $(multilib_native_use_with python python auto) + $(use_enable nls) + $(use_enable static-libs static) + $(use_enable threads pthread) + $(use_enable v4l video) + $(use_with X x) + $(use_with X xshm) + $(use_with xv xv) + ) + + if multilib_is_native_abi; then + # both must be enabled to use GraphicsMagick + if use graphicsmagick; then + myeconfargs+=( + --with-graphicsmagick + --without-imagemagick + ) + elif use imagemagick; then + myeconfargs+=( + --with-imagemagick + --without-graphicsmagick + ) + else + myeconfargs+=( + --without-imagemagick + --without-graphicsmagick + ) + fi + + if use java; then + export JAVACFLAGS="$(java-pkg_javac-args)" + append-cflags "$(java-pkg_get-jni-cflags)" + if use test; then # bug 629078 + myeconfargs+=( --with-java-unit ) + java-pkg_append_ CLASSPATH . + java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar) + java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar) + fi + fi + + if use qt5; then + myeconfargs+=( + --with-qt + --with-qt5 + ) + else + myeconfargs+=( --without-qt ) + fi + else + myeconfargs+=( + --without-graphicsmagick + --without-imagemagick + --without-qt + ) + + # zbarimg tests with native abi only + # (this option from the patch above, stay up to date) + use test && myeconfargs+=( --without-zbarimg-tests ) + fi + + ECONF_SOURCE="${S}" \ + econf "${myeconfargs[@]}" + + # work around out-of-source build issues for multilib systems (bug 672184) + mkdir qt zbarcam || die +} + +src_test() { + virtx multilib-minimal_src_test +} + +src_install() { + if use qt5; then + local MULTILIB_WRAPPED_HEADERS=( + /usr/include/zbar/QZBar.h + /usr/include/zbar/QZBarImage.h + ) + fi + multilib-minimal_src_install +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die +} + +pkg_preinst() { + use java && java-pkg-opt-2_pkg_preinst +} |