From 266d65d0cceeb55ab2cc3bf4e465d7f35502a900 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Apr 2024 12:04:36 +0100 Subject: gentoo auto-resync : 12:04:2024 - 12:04:36 --- Manifest | 30 +-- Manifest.files.gz | Bin 29790 -> 29798 bytes media-libs/Manifest.gz | Bin 69506 -> 69510 bytes media-libs/netpbm/Manifest | 5 +- .../netpbm-11.6.1-incompatible-pointer-types.patch | 13 + media-libs/netpbm/netpbm-11.2.9-r1.ebuild | 265 +++++++++++++++++++++ media-libs/netpbm/netpbm-11.2.9.ebuild | 264 -------------------- media-libs/netpbm/netpbm-11.6.1-r1.ebuild | 260 ++++++++++++++++++++ media-libs/netpbm/netpbm-11.6.1.ebuild | 259 -------------------- metadata/Manifest.gz | Bin 11009 -> 11008 bytes metadata/dtd/timestamp.chk | 2 +- metadata/glsa/Manifest | 28 +-- metadata/glsa/timestamp.chk | 2 +- metadata/md5-cache/Manifest.gz | Bin 28380 -> 28377 bytes metadata/md5-cache/media-libs/Manifest.gz | Bin 122363 -> 122366 bytes metadata/md5-cache/media-libs/netpbm-11.2.9 | 15 -- metadata/md5-cache/media-libs/netpbm-11.2.9-r1 | 15 ++ metadata/md5-cache/media-libs/netpbm-11.6.1 | 15 -- metadata/md5-cache/media-libs/netpbm-11.6.1-r1 | 15 ++ metadata/news/Manifest | 28 +-- metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.commit | 2 +- metadata/timestamp.x | 2 +- metadata/xml-schema/timestamp.chk | 2 +- 26 files changed, 622 insertions(+), 606 deletions(-) create mode 100644 media-libs/netpbm/files/netpbm-11.6.1-incompatible-pointer-types.patch create mode 100644 media-libs/netpbm/netpbm-11.2.9-r1.ebuild delete mode 100644 media-libs/netpbm/netpbm-11.2.9.ebuild create mode 100644 media-libs/netpbm/netpbm-11.6.1-r1.ebuild delete mode 100644 media-libs/netpbm/netpbm-11.6.1.ebuild delete mode 100644 metadata/md5-cache/media-libs/netpbm-11.2.9 create mode 100644 metadata/md5-cache/media-libs/netpbm-11.2.9-r1 delete mode 100644 metadata/md5-cache/media-libs/netpbm-11.6.1 create mode 100644 metadata/md5-cache/media-libs/netpbm-11.6.1-r1 diff --git a/Manifest b/Manifest index f84bc80ac3ce..b9d794fe047d 100644 --- a/Manifest +++ b/Manifest @@ -1,23 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -MANIFEST Manifest.files.gz 29790 BLAKE2B 59550b45afa6b80d4cc74fc564a11d73539d8304327b65e22f93a91b328cabeb1fcbd4b3ffdac9f7e3f640ab51f6ffd4350eca95eeda89476f6c06e0d5630a33 SHA512 0df0d2090ac54ef60d06b8d3c42bce20dd703c94097e7a8caa27679d9e839856953e66b6a5246c7a50902275b793726ab8d83319093e021538f8e4e471d0e6aa -TIMESTAMP 2024-04-12T09:40:33Z +MANIFEST Manifest.files.gz 29798 BLAKE2B 81ff72a4b12b1a8b5c63e4d2160e10157bd35154bc115d462fe21c42d3da5928503287b83a31e0384b0fcca26936973fc9ed9ffd1bb105a30208d90577a9dbb2 SHA512 9142ac6ca63460ee80b8d88894d2629998f1270ec930d12d7b7154493e8eb9d4e69e64941f80e07a72e27ea4290a1abbb1736e4ac2335c3967898f2a03b51d35 +TIMESTAMP 2024-04-12T10:10:36Z -----BEGIN PGP SIGNATURE----- -iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYZAZFfFIAAAAAALgAo +iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYZCJxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY -klCaEg//aja5y+UoTw/el5Mex1f5Q6sBrwPwKDmMl0HxrDrPbu/h/d8Wff1oYRjA -Mn+1XFZkjJcTWSxy9tqBMMCkm0VpX7GVA75FKkJpAiAjqItS3+FmlyahqHdX+vvQ -cwBBeD0pUWRftC2GjkSf++5KBw4jSpj6YWEVl4UvPzbv7zQdfNwecmUw30Q07nqg -HvhWfltt8q3Xyk0bxsB4Meu4UHGZ1QCoIcf8l5uyCxddRCcOni7jeEas1DkMSzGj -enU3ELeA9LWqh83nWExyWLk3KJR//3ES4DJjk42/h1/DgiE+cfDyDFMCf7jO9lMS -lHZOHL9BLvTXOGn+vFoa6GOID2Hcqs3sqQRILo4/jSfX7iKkL8vo1nMcohD2A278 -uoE1Zi4wbgnhpQl8BZAHar+ussWbKXnYcfk4leYlShruVlV/xSJd7L8mLdkyBHhy -rgRhrjsiO/UAParcAOvLHyahd10gwVyM4wKeAHUMS0ke4ZBV/weIWVIPaI1cW0kl -2IZiPdsYGQ5Ep5Llw4Rt5sfpxrZBtGgOFklkHeoVIg3cq264DB1eVlimiVl3b6tJ -mDO8Bcvqk8u5MT+i9QOXfoTUm7/nEhpK9SlXpW0nmU6aFx5BhY7Y9A+tbY/QpBox -McMwGwAFnLYGWN8nLfjLGYA2T5Sk9oOst9B16YvCMKMGRA5HVwo= -=YxJP +klCVSg//Xy+v3Us7yzVI9DVanQUD5o3xIhwxqDOR78DDheJrUkbmSsa+9Ih80neW +vWpIxOX+Jxjd8f93dr6re5iCb/4f06AhST0GUPbjih2tk6ZetGSOVRZgWENndmrl +mpnD/jjUqNMuqqvpFmybhyu8oc/DMrK90aastaBsCP64279HGAly0zWNDahlKOEf +cKX84ZuEqHTYYWTM/MN5dTRAk4QhpKB/c449pTYtFfBbPozjjfEQ0xAzraw+46YO +Y4lvXLvXm2uuIR7+OSNBODYebEPD1Puah0IX8s+qYHnaEmFqJUVRzoTclKilnPW9 +t3MineqUiHF9aiXVkE1d/akwNuvkZc864dJOegvsJansswvDyPbShnCYwn6PeVbB +qrKJ0f64lrRXiZaP3C4qi2A906pW4VunB+I2e9VCuIKoD4Y3hSc2HeTKNuj96DEo +vSGf1Z5ZTWJwV6rvVI4BM8/0aDvMtWEebeEezmdccpgFM4vypsjx34vF7PFjrD4Z +Ie4H7AtzBj5whry0VgFTM2wNi3H9sM7O77fKgCHY8eEbBk4o7q7UfZGfDJLI+s+Q +Y+4lmMsbg82Sn/d6H7IeGmvrLDl9C5Pl4cr3Zf5DSvPDgYSubaozuKqS+HHJNHZv +Ow2hjoSufce1+fMrrQJUbyhbXhLXvtRfkUYajkUYr5ySBRt5jhk= +=h3u1 -----END PGP SIGNATURE----- diff --git a/Manifest.files.gz b/Manifest.files.gz index 521b79294eb2..c9035278cda5 100644 Binary files a/Manifest.files.gz and b/Manifest.files.gz differ diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index bd81d26ada98..14759606cb31 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index eeda41d9b680..dbc474bd50ff 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -4,10 +4,11 @@ AUX netpbm-11.0.0-misc-deps.patch 1446 BLAKE2B 721e926a83d50d04d4a407051ee077db5 AUX netpbm-11.1.0-fix-clang-O2.patch 773 BLAKE2B a8d2bef659d384b0f94560fec847d37731315f5cdb67e5474efb596672d146446c6d545caa816d74f9d4c32fe486ce49f8cb55f38e9706bae6b0ba79c0dbbb5e SHA512 0a0049415d5c252603c47325d69ae582bec76ac15f442682ef0a2ff8c5a8cd19e28543644883bde891f2a376a401f43ed923b184112f49c67d295b9215d519de AUX netpbm-11.2.7-fix-pnmcolormap2-test.patch 7051 BLAKE2B 741d4943b2e9eab1fb0061d6265271df8e25e458c1eb39f50aed8a392edf8369c9f0f3c43fc6ca0b940dd376166c9419c5039ddeaf10487859a7ea9bec4e6075 SHA512 4c7be95b582db27e3ce542b8f53bfdad2e6882b22ccc383aa7ca480cb5ba2a6aa000724dae3c5107efd1071bb87fac0648061dd46b0b75f1072ef05b7e128a68 AUX netpbm-11.5.2-fix-tests-musl.patch 4779 BLAKE2B 049b20cecdaf40e77c37ad01cfe4e17b8006c3788f47971319e553bfbab760e7e0bb3a970060e74860a7c3326945f5505680519efe7c2feee5fa6ee08ba45202 SHA512 260f4282dcfd6dd0922b62e4c3f217e33d159ab2df779ec0c1df27f16c8075fb77927ce2aadd34c20475d38b7482506758e38b7571df7c3d5a92de9c5cc496d6 +AUX netpbm-11.6.1-incompatible-pointer-types.patch 514 BLAKE2B 0ea8a3c50838776ee645e61accc13645a690dc7e75cde2c33afd1ac7f07abbcb85a97b7e113217af12617ec5ad314eca0324c7bfbe7beb445aee85de47649ffb SHA512 a3a46607904c8ff9757f0a136aa2336382033760bc69bcca5a5d7662ca824f9a7d4281fe3996efc57456c3b30ddf7319fb70a1cb950ef974507f82340a226abb DIST netpbm-11.2.7.tar.xz 3780372 BLAKE2B 8a6a75bd0358acf21faa3defd2b3ca886aacd38a28a1f8b65280a9d6c1667102a47efb734fe2ff2dfae38a5d0995b5efaa4b3ec70138bac7ad07e3e6e79c6063 SHA512 3fb00524b958d97304066749d4117b11ce5e23b7c8e08e68bfb5109575cc40a52dbe0f44559e6c0832a4397298efbea50a8ed0b9d2b57e41a09275729574bace DIST netpbm-11.2.9.tar.xz 3782172 BLAKE2B b5acec8306c820e7b0ac2dec21ab5df8f2cdbec01d3d59f82b307d90111954e81e1b01ad7d8e25e8fbd0ea7cf61e8b023e3dfaed6d1cab71b51f7e367d792e56 SHA512 02961bb2ac4a4292e028ed5dbd05daf89ac795f50d36d97be67c49a61be0cbd977e954aa9266c4649d9a46de3fbe7c4b2b51c8363cc7bee322926dd4a9af2ab1 DIST netpbm-11.6.1.tar.xz 3792940 BLAKE2B e48ec658708baac53708c96feb7aac94c32debae675d8f9114393aaccabc1f59309bf577bff98d252fecab37fb0faa1cc29955269636f736563a859edbdd947d SHA512 844256dc61d29c4f1ba164d5c1ec0b7c6cb8e97c4c6c04cf7b92cd7c118b99994cf7dda4a256f35ef575cb718a7a7f253468b60ba567733a613da8102d23bebf EBUILD netpbm-11.2.7.ebuild 6976 BLAKE2B 18225d4d04fe229802a170d569d297f9231b1c0d46c05239ec4221a10da0e4934b01c6ac294e8d972333e0ab90b8b71c5334ea5a4c85fac006c3fe87060f99f7 SHA512 4da684cb71c45de8b76bae5c7f79269bb25fb4b3fac9cc71cde5707923bdddb7e52e527c1e47755df7185e7fd18c1a19ebbbbc94f9e6a171583415735602de2c -EBUILD netpbm-11.2.9.ebuild 7056 BLAKE2B 98516177afd25c82919639f5d31dcd5c98201b10c4084c606c0d2c2b2b2dee5de7c6dbc4edb5585f2fce74cb0464a01a889937a63c4e2d49122253becce4877b SHA512 a17e4559de67e1d479748eaa3f783deaec6af76e1f8b8929d4d21a5075655fcbdfe4cc82dbab47ae16841bb1ba709147f1a083cf50534c363f8fe8d44521fba4 -EBUILD netpbm-11.6.1.ebuild 6922 BLAKE2B bcceeb28fbb881a7c71ee1794b0f190cc14881b78f7345f315d099c496172d72f5a0ff5ffbe061118bbb0e9ccffcb25421b0c0ddd46edf3b74915d416528d805 SHA512 4dd64564ded09bdd30e106ac194de5a62bfb8a3356ce5be08dbd7685cf4cc3ce8dc85d706782579477c98986d5337f98c4593cb98cd78e336102d22cc3956747 +EBUILD netpbm-11.2.9-r1.ebuild 7118 BLAKE2B aae0530d8a34216c44bf574553225ba1961b2ef02b7494d0c508881b24415dca098bf19b046bdeb1c1bd91bbc81a4497026e0f3e3b2f444b4fa10aff33ead613 SHA512 4997bae85799ffd0ea77c9a13aaa2979bf763b331ff5f5dfe1e1b492d33e0e33bbf75a76c62d816dd7778002b12797330e2f448a4ea43e6ad91694cc9769cb03 +EBUILD netpbm-11.6.1-r1.ebuild 6984 BLAKE2B ee29cdaf8e397781efdca52bf3b55f9912158381328b8b05fdab124fee06fa2e988a5a7d32d3d0245662716f85cdb924b151fb966e5b75450f368502e1da7a9a SHA512 4e40c3d736311711de6c1bd21b041086215499b9bdc9e3a7ca0e248f196d6a50431128faba4fa572909b5dba75d4b5156e87592e75e552716710a3def25cb03f MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80 diff --git a/media-libs/netpbm/files/netpbm-11.6.1-incompatible-pointer-types.patch b/media-libs/netpbm/files/netpbm-11.6.1-incompatible-pointer-types.patch new file mode 100644 index 000000000000..785ca247719c --- /dev/null +++ b/media-libs/netpbm/files/netpbm-11.6.1-incompatible-pointer-types.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/929019 + +--- a/converter/other/pnmtorle.c ++++ b/converter/other/pnmtorle.c +@@ -374,7 +374,7 @@ + if (cmdline.header) { + skipData(ifP, width, height, maxval, format); + } else { +- rle_addhist(argv, NULL, &hdr); ++ rle_addhist((char**)argv, NULL, &hdr); + writeRleHeader(cmdline.alpha, format, width, height, &hdr); + writeRleData(verbose, cmdline.alpha, ifP, &hdr, + width, height, maxval, format); diff --git a/media-libs/netpbm/netpbm-11.2.9-r1.ebuild b/media-libs/netpbm/netpbm-11.2.9-r1.ebuild new file mode 100644 index 000000000000..042c3ac90c65 --- /dev/null +++ b/media-libs/netpbm/netpbm-11.2.9-r1.ebuild @@ -0,0 +1,265 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic multilib toolchain-funcs + +# Upstream has 3 flavors of netpbm: super stable, stable and advanced. +# They only provide a tarball for super stable, but super stable is a bit lagging. +# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable" +# and the advanced branch of their svn (currently versions 11.6.yy) on SLOT "0/advanced". +# The stable branch is stabilized according to usual Gentoo rules, while the +# advanced branch will not be stabilized. +# A detailed explanation is here https://netpbm.sourceforge.net/release.html + +DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" +HOMEPAGE="https://netpbm.sourceforge.net/" +SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz" + +LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain" +SLOT="0/stable" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml" + +# app-text/ghostscript-gpl is really needed for postscript +# some utilities execute /usr/bin/gs +# some installed programs are perl scripts +RDEPEND=" + dev-lang/perl + jbig? ( media-libs/jbigkit:= ) + jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) + png? ( + >=media-libs/libpng-1.4:0= + sys-libs/zlib + ) + postscript? ( + app-text/ghostscript-gpl + sys-libs/zlib + ) + rle? ( media-libs/urt:= ) + svga? ( media-libs/svgalib ) + tiff? ( >=media-libs/tiff-3.5.5:= ) + xml? ( dev-libs/libxml2 ) + X? ( x11-libs/libX11 ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + app-arch/xz-utils + app-alternatives/lex + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/netpbm-10.86.21-build.patch + "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch + "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch + "${FILESDIR}"/netpbm-11.2.7-fix-pnmcolormap2-test.patch + "${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch +) + +netpbm_libtype() { + case ${CHOST} in + *-darwin*) echo dylib;; + *) echo unixshared;; + esac +} + +netpbm_libsuffix() { + local suffix=$(get_libname) + echo ${suffix//\.} +} + +netpbm_ldshlib() { + case ${CHOST} in + *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; + *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; + esac +} + +netpbm_config_lib() { + usex ${1} -l${2:-$1} NONE +} + +# for bug #828127 +netpbm_cflags_for_build() { + if is-flagq -fPIC; then + echo -fPIC + fi +} + +src_prepare() { + default + + # make sure we use system libs + sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die + rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die + + # fix typo in a test + sed -i \ + -e 's:^o#! /bin/sh:#! /bin/sh:' \ + test/stdin-ppm3.test || die + + # take care of the importinc stuff ourselves by only doing it once + # at the top level and having all subdirs use that one set #149843 + sed -i \ + -e '/^importinc:/s|^|importinc:\nmanual_|' \ + -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ + common.mk || die + sed -i \ + -e '/%.c/s: importinc$::' \ + common.mk lib/Makefile lib/util/Makefile || die + sed -i \ + -e 's:pkg-config:$(PKG_CONFIG):' \ + GNUmakefile converter/other/Makefile other/pamx/Makefile || die + + # The postscript knob is currently bound up with a fork test. + if ! use postscript ; then + sed -i \ + -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ + converter/other/Makefile generator/Makefile || die + sed -i -r \ + -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ + test/all-in-place.{ok,test} || die + sed -i \ + -e 's:lps-roundtrip.*::' \ + -e 's:pbmtextps-dump.*::' \ + -e 's:pbmtextps.*::' \ + test/Test-Order || die + sed -i \ + -e '/^$/d' \ + test/all-in-place.ok || die + sed -i \ + '2iexit 80' \ + test/ps-{alt-,flate-,}roundtrip.test || die + fi + + # the new postscript test needs +x + chmod +x test/lps-roundtrip.test || die + + # Do not test png if not built + if ! use png ; then + sed -i -E \ + -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ + test/all-in-place.{ok,test} || die + sed -i \ + -e '/^$/d' \ + test/all-in-place.ok || die + + sed -i -E \ + -e 's:(pamrgbatopng|pngtopnm).*::' \ + test/legacy-names.{ok,test} || die + sed -i \ + -e '/^$/d' \ + test/legacy-names.ok || die + sed -i \ + -e 's:png-roundtrip.*::' \ + -e 's:winicon-roundtrip.*::' \ + test/Test-Order || die + fi + + # pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl + # pbmtext-utf8 requires locale, not available on musl + # ppmpat-random is broken on musl + # bug #907295 + if use elibc_musl; then + sed \ + -e 's:pbmtext-iso88591.*::' \ + -e 's:pbmtext-utf8.*::' \ + -e 's:ppmpat-random.*::' \ + -i test/Test-Order || die + fi +} + +src_configure() { + cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed" + # Misc stuff + BUILD_FIASCO = N + SYMLINK = ln -sf + + # These vars let src_test work by default + PKGDIR_DEFAULT = ${T}/netpbm + RESULTDIR_DEFAULT = ${T}/netpbm-test + + # Toolchain options + CC = $(tc-getCC) -Wall + LD = \$(CC) + CC_FOR_BUILD = $(tc-getBUILD_CC) + LD_FOR_BUILD = \$(CC_FOR_BUILD) + AR = $(tc-getAR) + RANLIB = $(tc-getRANLIB) + PKG_CONFIG = $(tc-getPKG_CONFIG) + + STRIPFLAG = + CFLAGS_SHLIB = -fPIC + CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build) + + LDRELOC = \$(LD) -r + LDSHLIB = $(netpbm_ldshlib) + LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to + LINKERISCOMPILER = Y + NETPBMLIBSUFFIX = $(netpbm_libsuffix) + NETPBMLIBTYPE = $(netpbm_libtype) + STATICLIB_TOO = $(usex static-libs Y N) + + # The var is called SSE, but the code is actually SSE2. + WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) + + # Gentoo build options + TIFFLIB = $(netpbm_config_lib tiff) + # Let tiff worry about its own dependencies #395753 + TIFFLIB_NEEDS_JPEG = N + TIFFLIB_NEEDS_Z = N + JPEGLIB = $(netpbm_config_lib jpeg) + PNGLIB = $(netpbm_config_lib png) + ZLIB = $($(tc-getPKG_CONFIG) --libs zlib) + LINUXSVGALIB = $(netpbm_config_lib svga vga) + XML2_LIBS = $(netpbm_config_lib xml xml2) + JBIGLIB = $(netpbm_config_lib jbig) + JBIGHDR_DIR = + JASPERLIB = NONE + JASPERHDR_DIR = + URTLIB = $(netpbm_config_lib rle) + URTHDR_DIR = + X11LIB = $(netpbm_config_lib X X11) + X11HDR_DIR = + EOF +} + +src_compile() { + emake -j1 pm_config.h version.h manual_importinc #149843 + emake +} + +src_test() { + # The code wants to install everything first and then test the result. + emake install.{bin,lib,data} + emake check +} + +src_install() { + # Subdir make targets like to use `mkdir` all over the place + # without any actual dependencies, thus the -j1. + emake -j1 package pkgdir="${ED}"/usr + + if [[ $(get_libdir) != "lib" ]] ; then + mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die + fi + + # Remove cruft that we don't need, and move around stuff we want + rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die + + dodir /usr/share + mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die + + doman userguide/*.[0-9] + dodoc README + + cd doc || die + dodoc HISTORY Netpbm.programming USERDOC + docinto html + dodoc -r ../userguide/*.html +} diff --git a/media-libs/netpbm/netpbm-11.2.9.ebuild b/media-libs/netpbm/netpbm-11.2.9.ebuild deleted file mode 100644 index ed27be399d6c..000000000000 --- a/media-libs/netpbm/netpbm-11.2.9.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic multilib toolchain-funcs - -# Upstream has 3 flavors of netpbm: super stable, stable and advanced. -# They only provide a tarball for super stable, but super stable is a bit lagging. -# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable" -# and the advanced branch of their svn (currently versions 11.6.yy) on SLOT "0/advanced". -# The stable branch is stabilized according to usual Gentoo rules, while the -# advanced branch will not be stabilized. -# A detailed explanation is here https://netpbm.sourceforge.net/release.html - -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" -HOMEPAGE="https://netpbm.sourceforge.net/" -SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz" - -LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain" -SLOT="0/stable" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml" - -# app-text/ghostscript-gpl is really needed for postscript -# some utilities execute /usr/bin/gs -# some installed programs are perl scripts -RDEPEND=" - dev-lang/perl - jbig? ( media-libs/jbigkit:= ) - jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) - png? ( - >=media-libs/libpng-1.4:0= - sys-libs/zlib - ) - postscript? ( - app-text/ghostscript-gpl - sys-libs/zlib - ) - rle? ( media-libs/urt:= ) - svga? ( media-libs/svgalib ) - tiff? ( >=media-libs/tiff-3.5.5:= ) - xml? ( dev-libs/libxml2 ) - X? ( x11-libs/libX11 ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - app-arch/xz-utils - app-alternatives/lex - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/netpbm-10.86.21-build.patch - "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch - "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch - "${FILESDIR}"/netpbm-11.2.7-fix-pnmcolormap2-test.patch -) - -netpbm_libtype() { - case ${CHOST} in - *-darwin*) echo dylib;; - *) echo unixshared;; - esac -} - -netpbm_libsuffix() { - local suffix=$(get_libname) - echo ${suffix//\.} -} - -netpbm_ldshlib() { - case ${CHOST} in - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; - esac -} - -netpbm_config_lib() { - usex ${1} -l${2:-$1} NONE -} - -# for bug #828127 -netpbm_cflags_for_build() { - if is-flagq -fPIC; then - echo -fPIC - fi -} - -src_prepare() { - default - - # make sure we use system libs - sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die - rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die - - # fix typo in a test - sed -i \ - -e 's:^o#! /bin/sh:#! /bin/sh:' \ - test/stdin-ppm3.test || die - - # take care of the importinc stuff ourselves by only doing it once - # at the top level and having all subdirs use that one set #149843 - sed -i \ - -e '/^importinc:/s|^|importinc:\nmanual_|' \ - -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ - common.mk || die - sed -i \ - -e '/%.c/s: importinc$::' \ - common.mk lib/Makefile lib/util/Makefile || die - sed -i \ - -e 's:pkg-config:$(PKG_CONFIG):' \ - GNUmakefile converter/other/Makefile other/pamx/Makefile || die - - # The postscript knob is currently bound up with a fork test. - if ! use postscript ; then - sed -i \ - -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ - converter/other/Makefile generator/Makefile || die - sed -i -r \ - -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ - test/all-in-place.{ok,test} || die - sed -i \ - -e 's:lps-roundtrip.*::' \ - -e 's:pbmtextps-dump.*::' \ - -e 's:pbmtextps.*::' \ - test/Test-Order || die - sed -i \ - -e '/^$/d' \ - test/all-in-place.ok || die - sed -i \ - '2iexit 80' \ - test/ps-{alt-,flate-,}roundtrip.test || die - fi - - # the new postscript test needs +x - chmod +x test/lps-roundtrip.test || die - - # Do not test png if not built - if ! use png ; then - sed -i -E \ - -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ - test/all-in-place.{ok,test} || die - sed -i \ - -e '/^$/d' \ - test/all-in-place.ok || die - - sed -i -E \ - -e 's:(pamrgbatopng|pngtopnm).*::' \ - test/legacy-names.{ok,test} || die - sed -i \ - -e '/^$/d' \ - test/legacy-names.ok || die - sed -i \ - -e 's:png-roundtrip.*::' \ - -e 's:winicon-roundtrip.*::' \ - test/Test-Order || die - fi - - # pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl - # pbmtext-utf8 requires locale, not available on musl - # ppmpat-random is broken on musl - # bug #907295 - if use elibc_musl; then - sed \ - -e 's:pbmtext-iso88591.*::' \ - -e 's:pbmtext-utf8.*::' \ - -e 's:ppmpat-random.*::' \ - -i test/Test-Order || die - fi -} - -src_configure() { - cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed" - # Misc stuff - BUILD_FIASCO = N - SYMLINK = ln -sf - - # These vars let src_test work by default - PKGDIR_DEFAULT = ${T}/netpbm - RESULTDIR_DEFAULT = ${T}/netpbm-test - - # Toolchain options - CC = $(tc-getCC) -Wall - LD = \$(CC) - CC_FOR_BUILD = $(tc-getBUILD_CC) - LD_FOR_BUILD = \$(CC_FOR_BUILD) - AR = $(tc-getAR) - RANLIB = $(tc-getRANLIB) - PKG_CONFIG = $(tc-getPKG_CONFIG) - - STRIPFLAG = - CFLAGS_SHLIB = -fPIC - CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build) - - LDRELOC = \$(LD) -r - LDSHLIB = $(netpbm_ldshlib) - LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to - LINKERISCOMPILER = Y - NETPBMLIBSUFFIX = $(netpbm_libsuffix) - NETPBMLIBTYPE = $(netpbm_libtype) - STATICLIB_TOO = $(usex static-libs Y N) - - # The var is called SSE, but the code is actually SSE2. - WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) - - # Gentoo build options - TIFFLIB = $(netpbm_config_lib tiff) - # Let tiff worry about its own dependencies #395753 - TIFFLIB_NEEDS_JPEG = N - TIFFLIB_NEEDS_Z = N - JPEGLIB = $(netpbm_config_lib jpeg) - PNGLIB = $(netpbm_config_lib png) - ZLIB = $($(tc-getPKG_CONFIG) --libs zlib) - LINUXSVGALIB = $(netpbm_config_lib svga vga) - XML2_LIBS = $(netpbm_config_lib xml xml2) - JBIGLIB = $(netpbm_config_lib jbig) - JBIGHDR_DIR = - JASPERLIB = NONE - JASPERHDR_DIR = - URTLIB = $(netpbm_config_lib rle) - URTHDR_DIR = - X11LIB = $(netpbm_config_lib X X11) - X11HDR_DIR = - EOF -} - -src_compile() { - emake -j1 pm_config.h version.h manual_importinc #149843 - emake -} - -src_test() { - # The code wants to install everything first and then test the result. - emake install.{bin,lib,data} - emake check -} - -src_install() { - # Subdir make targets like to use `mkdir` all over the place - # without any actual dependencies, thus the -j1. - emake -j1 package pkgdir="${ED}"/usr - - if [[ $(get_libdir) != "lib" ]] ; then - mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die - fi - - # Remove cruft that we don't need, and move around stuff we want - rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die - - dodir /usr/share - mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die - - doman userguide/*.[0-9] - dodoc README - - cd doc || die - dodoc HISTORY Netpbm.programming USERDOC - docinto html - dodoc -r ../userguide/*.html -} diff --git a/media-libs/netpbm/netpbm-11.6.1-r1.ebuild b/media-libs/netpbm/netpbm-11.6.1-r1.ebuild new file mode 100644 index 000000000000..b63b5a302d37 --- /dev/null +++ b/media-libs/netpbm/netpbm-11.6.1-r1.ebuild @@ -0,0 +1,260 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic multilib toolchain-funcs + +# Upstream has 3 flavors of netpbm: super stable, stable and advanced. +# They only provide a tarball for super stable, but super stable is a bit lagging. +# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable" +# and the advanced branch of their svn (currently versions 11.6.yy) on SLOT "0/advanced". +# The stable branch is stabilized according to usual Gentoo rules, while the +# advanced branch will not be stabilized. +# A detailed explanation is here https://netpbm.sourceforge.net/release.html + +DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" +HOMEPAGE="https://netpbm.sourceforge.net/" +SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz" + +LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain" +SLOT="0/advanced" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml" + +# app-text/ghostscript-gpl is really needed for postscript +# some utilities execute /usr/bin/gs +# some installed programs are perl scripts +RDEPEND=" + dev-lang/perl + jbig? ( media-libs/jbigkit:= ) + jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) + png? ( + >=media-libs/libpng-1.4:0= + sys-libs/zlib + ) + postscript? ( + app-text/ghostscript-gpl + sys-libs/zlib + ) + rle? ( media-libs/urt:= ) + svga? ( media-libs/svgalib ) + tiff? ( >=media-libs/tiff-3.5.5:= ) + xml? ( dev-libs/libxml2 ) + X? ( x11-libs/libX11 ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + app-arch/xz-utils + app-alternatives/lex + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/netpbm-10.86.21-build.patch + "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch + "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch + "${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch +) + +netpbm_libtype() { + case ${CHOST} in + *-darwin*) echo dylib;; + *) echo unixshared;; + esac +} + +netpbm_libsuffix() { + local suffix=$(get_libname) + echo ${suffix//\.} +} + +netpbm_ldshlib() { + case ${CHOST} in + *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; + *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; + esac +} + +netpbm_config_lib() { + usex ${1} -l${2:-$1} NONE +} + +# for bug #828127 +netpbm_cflags_for_build() { + if is-flagq -fPIC; then + echo -fPIC + fi +} + +src_prepare() { + default + + # make sure we use system libs + sed '/SUPPORT_SUBDIRS/s:urt::' -i GNUmakefile || die + rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die + + # take care of the importinc stuff ourselves by only doing it once + # at the top level and having all subdirs use that one set #149843 + sed \ + -e '/^importinc:/s|^|importinc:\nmanual_|' \ + -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ + -i common.mk || die + sed \ + -e '/%.c/s: importinc$::' \ + -i common.mk lib/Makefile lib/util/Makefile || die + sed \ + -e 's:pkg-config:$(PKG_CONFIG):' \ + -i GNUmakefile converter/other/Makefile other/pamx/Makefile || die + + # The postscript knob is currently bound up with a fork test. + if ! use postscript ; then + sed \ + -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ + -i converter/other/Makefile generator/Makefile || die + sed -r \ + -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ + -i test/all-in-place.{ok,test} || die + sed \ + -e 's:lps-roundtrip.*::' \ + -e 's:pbmtextps-dump.*::' \ + -e 's:pbmtextps.*::' \ + -i test/Test-Order || die + sed \ + -e '/^$/d' \ + -i test/all-in-place.ok || die + sed \ + '2iexit 80' \ + -i test/ps-{alt-,flate-,}roundtrip.test || die + fi + + # the new postscript test needs +x + chmod +x test/lps-roundtrip.test || die + + # Do not test png if not built + if ! use png ; then + sed -E \ + -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ + -i test/all-in-place.{ok,test} || die + sed \ + -e '/^$/d' \ + -i test/all-in-place.ok || die + + sed -E \ + -e 's:(pamrgbatopng|pngtopnm).*::' \ + -i test/legacy-names.{ok,test} || die + sed \ + -e '/^$/d' \ + -i test/legacy-names.ok || die + sed \ + -e 's:png-roundtrip.*::' \ + -e 's:winicon-roundtrip.*::' \ + -i test/Test-Order || die + fi + + # pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl + # pbmtext-utf8 requires locale, not available on musl + # ppmpat-random and pnmindex are broken on musl + # bug #907295 + if use elibc_musl; then + sed \ + -e 's:pbmtext-iso88591.*::' \ + -e 's:pbmtext-utf8.*::' \ + -e 's:ppmpat-random.*::' \ + -e 's:pnmindex.*::' \ + -i test/Test-Order || die + fi +} + +src_configure() { + cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed" + # Misc stuff + BUILD_FIASCO = N + SYMLINK = ln -sf + + # These vars let src_test work by default + PKGDIR_DEFAULT = ${T}/netpbm + RESULTDIR_DEFAULT = ${T}/netpbm-test + + # Toolchain options + CC = $(tc-getCC) -Wall + LD = \$(CC) + CC_FOR_BUILD = $(tc-getBUILD_CC) + LD_FOR_BUILD = \$(CC_FOR_BUILD) + AR = $(tc-getAR) + RANLIB = $(tc-getRANLIB) + PKG_CONFIG = $(tc-getPKG_CONFIG) + + STRIPFLAG = + CFLAGS_SHLIB = -fPIC + CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build) + + LDRELOC = \$(LD) -r + LDSHLIB = $(netpbm_ldshlib) + LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to + LINKERISCOMPILER = Y + NETPBMLIBSUFFIX = $(netpbm_libsuffix) + NETPBMLIBTYPE = $(netpbm_libtype) + STATICLIB_TOO = $(usex static-libs Y N) + + # The var is called SSE, but the code is actually SSE2. + WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) + + # Gentoo build options + TIFFLIB = $(netpbm_config_lib tiff) + # Let tiff worry about its own dependencies #395753 + TIFFLIB_NEEDS_JPEG = N + TIFFLIB_NEEDS_Z = N + JPEGLIB = $(netpbm_config_lib jpeg) + PNGLIB = $(netpbm_config_lib png) + ZLIB = $($(tc-getPKG_CONFIG) --libs zlib) + LINUXSVGALIB = $(netpbm_config_lib svga vga) + XML2_LIBS = $(netpbm_config_lib xml xml2) + JBIGLIB = $(netpbm_config_lib jbig) + JBIGHDR_DIR = + JASPERLIB = NONE + JASPERHDR_DIR = + URTLIB = $(netpbm_config_lib rle) + URTHDR_DIR = + X11LIB = $(netpbm_config_lib X X11) + X11HDR_DIR = + EOF +} + +src_compile() { + emake -j1 pm_config.h version.h manual_importinc #149843 + emake +} + +src_test() { + # The code wants to install everything first and then test the result. + emake install.{bin,lib,data} + emake check +} + +src_install() { + # Subdir make targets like to use `mkdir` all over the place + # without any actual dependencies, thus the -j1. + emake -j1 package pkgdir="${ED}"/usr + + if [[ $(get_libdir) != "lib" ]] ; then + mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die + fi + + # Remove cruft that we don't need, and move around stuff we want + rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die + + dodir /usr/share + mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die + + doman userguide/*.[0-9] + dodoc README + + cd doc || die + dodoc HISTORY USERDOC + docinto html + dodoc -r ../userguide/*.html +} diff --git a/media-libs/netpbm/netpbm-11.6.1.ebuild b/media-libs/netpbm/netpbm-11.6.1.ebuild deleted file mode 100644 index 56896f092bd3..000000000000 --- a/media-libs/netpbm/netpbm-11.6.1.ebuild +++ /dev/null @@ -1,259 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic multilib toolchain-funcs - -# Upstream has 3 flavors of netpbm: super stable, stable and advanced. -# They only provide a tarball for super stable, but super stable is a bit lagging. -# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable" -# and the advanced branch of their svn (currently versions 11.6.yy) on SLOT "0/advanced". -# The stable branch is stabilized according to usual Gentoo rules, while the -# advanced branch will not be stabilized. -# A detailed explanation is here https://netpbm.sourceforge.net/release.html - -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" -HOMEPAGE="https://netpbm.sourceforge.net/" -SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz" - -LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain" -SLOT="0/advanced" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml" - -# app-text/ghostscript-gpl is really needed for postscript -# some utilities execute /usr/bin/gs -# some installed programs are perl scripts -RDEPEND=" - dev-lang/perl - jbig? ( media-libs/jbigkit:= ) - jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) - png? ( - >=media-libs/libpng-1.4:0= - sys-libs/zlib - ) - postscript? ( - app-text/ghostscript-gpl - sys-libs/zlib - ) - rle? ( media-libs/urt:= ) - svga? ( media-libs/svgalib ) - tiff? ( >=media-libs/tiff-3.5.5:= ) - xml? ( dev-libs/libxml2 ) - X? ( x11-libs/libX11 ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - app-arch/xz-utils - app-alternatives/lex - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/netpbm-10.86.21-build.patch - "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch - "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch -) - -netpbm_libtype() { - case ${CHOST} in - *-darwin*) echo dylib;; - *) echo unixshared;; - esac -} - -netpbm_libsuffix() { - local suffix=$(get_libname) - echo ${suffix//\.} -} - -netpbm_ldshlib() { - case ${CHOST} in - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; - esac -} - -netpbm_config_lib() { - usex ${1} -l${2:-$1} NONE -} - -# for bug #828127 -netpbm_cflags_for_build() { - if is-flagq -fPIC; then - echo -fPIC - fi -} - -src_prepare() { - default - - # make sure we use system libs - sed '/SUPPORT_SUBDIRS/s:urt::' -i GNUmakefile || die - rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die - - # take care of the importinc stuff ourselves by only doing it once - # at the top level and having all subdirs use that one set #149843 - sed \ - -e '/^importinc:/s|^|importinc:\nmanual_|' \ - -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ - -i common.mk || die - sed \ - -e '/%.c/s: importinc$::' \ - -i common.mk lib/Makefile lib/util/Makefile || die - sed \ - -e 's:pkg-config:$(PKG_CONFIG):' \ - -i GNUmakefile converter/other/Makefile other/pamx/Makefile || die - - # The postscript knob is currently bound up with a fork test. - if ! use postscript ; then - sed \ - -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ - -i converter/other/Makefile generator/Makefile || die - sed -r \ - -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ - -i test/all-in-place.{ok,test} || die - sed \ - -e 's:lps-roundtrip.*::' \ - -e 's:pbmtextps-dump.*::' \ - -e 's:pbmtextps.*::' \ - -i test/Test-Order || die - sed \ - -e '/^$/d' \ - -i test/all-in-place.ok || die - sed \ - '2iexit 80' \ - -i test/ps-{alt-,flate-,}roundtrip.test || die - fi - - # the new postscript test needs +x - chmod +x test/lps-roundtrip.test || die - - # Do not test png if not built - if ! use png ; then - sed -E \ - -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ - -i test/all-in-place.{ok,test} || die - sed \ - -e '/^$/d' \ - -i test/all-in-place.ok || die - - sed -E \ - -e 's:(pamrgbatopng|pngtopnm).*::' \ - -i test/legacy-names.{ok,test} || die - sed \ - -e '/^$/d' \ - -i test/legacy-names.ok || die - sed \ - -e 's:png-roundtrip.*::' \ - -e 's:winicon-roundtrip.*::' \ - -i test/Test-Order || die - fi - - # pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl - # pbmtext-utf8 requires locale, not available on musl - # ppmpat-random and pnmindex are broken on musl - # bug #907295 - if use elibc_musl; then - sed \ - -e 's:pbmtext-iso88591.*::' \ - -e 's:pbmtext-utf8.*::' \ - -e 's:ppmpat-random.*::' \ - -e 's:pnmindex.*::' \ - -i test/Test-Order || die - fi -} - -src_configure() { - cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed" - # Misc stuff - BUILD_FIASCO = N - SYMLINK = ln -sf - - # These vars let src_test work by default - PKGDIR_DEFAULT = ${T}/netpbm - RESULTDIR_DEFAULT = ${T}/netpbm-test - - # Toolchain options - CC = $(tc-getCC) -Wall - LD = \$(CC) - CC_FOR_BUILD = $(tc-getBUILD_CC) - LD_FOR_BUILD = \$(CC_FOR_BUILD) - AR = $(tc-getAR) - RANLIB = $(tc-getRANLIB) - PKG_CONFIG = $(tc-getPKG_CONFIG) - - STRIPFLAG = - CFLAGS_SHLIB = -fPIC - CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build) - - LDRELOC = \$(LD) -r - LDSHLIB = $(netpbm_ldshlib) - LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to - LINKERISCOMPILER = Y - NETPBMLIBSUFFIX = $(netpbm_libsuffix) - NETPBMLIBTYPE = $(netpbm_libtype) - STATICLIB_TOO = $(usex static-libs Y N) - - # The var is called SSE, but the code is actually SSE2. - WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) - - # Gentoo build options - TIFFLIB = $(netpbm_config_lib tiff) - # Let tiff worry about its own dependencies #395753 - TIFFLIB_NEEDS_JPEG = N - TIFFLIB_NEEDS_Z = N - JPEGLIB = $(netpbm_config_lib jpeg) - PNGLIB = $(netpbm_config_lib png) - ZLIB = $($(tc-getPKG_CONFIG) --libs zlib) - LINUXSVGALIB = $(netpbm_config_lib svga vga) - XML2_LIBS = $(netpbm_config_lib xml xml2) - JBIGLIB = $(netpbm_config_lib jbig) - JBIGHDR_DIR = - JASPERLIB = NONE - JASPERHDR_DIR = - URTLIB = $(netpbm_config_lib rle) - URTHDR_DIR = - X11LIB = $(netpbm_config_lib X X11) - X11HDR_DIR = - EOF -} - -src_compile() { - emake -j1 pm_config.h version.h manual_importinc #149843 - emake -} - -src_test() { - # The code wants to install everything first and then test the result. - emake install.{bin,lib,data} - emake check -} - -src_install() { - # Subdir make targets like to use `mkdir` all over the place - # without any actual dependencies, thus the -j1. - emake -j1 package pkgdir="${ED}"/usr - - if [[ $(get_libdir) != "lib" ]] ; then - mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die - fi - - # Remove cruft that we don't need, and move around stuff we want - rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die - - dodir /usr/share - mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die - - doman userguide/*.[0-9] - dodoc README - - cd doc || die - dodoc HISTORY USERDOC - docinto html - dodoc -r ../userguide/*.html -} diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz index 8f6ecf14ec74..ca14ae8fa918 100644 Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index 8c0e8aa2aa5b..23f9303f2b6e 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Fri, 12 Apr 2024 09:40:28 +0000 +Fri, 12 Apr 2024 10:10:32 +0000 diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest index 05d60432bad7..0c2ad63690a9 100644 --- a/metadata/glsa/Manifest +++ b/metadata/glsa/Manifest @@ -2,22 +2,22 @@ Hash: SHA512 MANIFEST Manifest.files.gz 569494 BLAKE2B 475196fd0ff28d6023f45e6c22284bded2028bbe891778e3828fb75c3727438168bcd5ab63fe48683bb5874710c096e12470eee93163ae90c07d1f9d79810710 SHA512 94822c7f83b3b68b28e1885c442c2d9b5794eb5f861b8a0862162601a2c2b03cdc2bb6144d8b4a1d61befedf2ff1952e540c518e34c7f15ff5af14b7dc567fcb -TIMESTAMP 2024-04-12T09:40:32Z +TIMESTAMP 2024-04-12T10:10:36Z -----BEGIN PGP SIGNATURE----- -iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYZAZBfFIAAAAAALgAo +iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYZCJxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY -klAROg/8CUZnc+e4i8ShUNiOv5pCMtWYKiUI0HrLKkCCM2Q5cDddAO1OiHvPHU1j -OcrWWrYayDQDOY9q/YsjkiR0DfK2d3sSNCZw8Ko1ESOWonyMN05moAgPIn5bFQaJ -Ut/ww6IaalXAbTUUNjxcFVD2uEn6Tub0V4evtIPAKcE19RqGi92pIzLxTe/hzQHe -kFfOVtJL37G5DHsfZE7JA7BGR2zMQ43ezdafalrnfESU1s5U8rExCXg1VJDtbyY0 -giFE03oejngRKUF64RSs2xZOlB3nnPg6wG9AeQEM9Ur2AXplHO22o4O1rmj+uOC7 -iEBrdEyuyTe/Nk+oNSbEaOfX9E64rHpjBPGqJ32uRHeVRNio70bl/WzdDE5Qa5mT -PI87Ol0sthg2OMAwWCHF985pMwS7d7/YMjZuCN6+0Nx8VLZ+DRl3dDrW1o/0XXzV -GdfXsxBtzRPO3CnQ6rN5l/hiR3PedZVm7p8eEC+qn06uxWYAlzrwTcWk/5bwiuaF -J4yMStX5iql81c6zsEzH5ynuUaCAxVabk6t6hM844rF/rAAL08IYkBXUmEGJOCcz -U42h2lv5nnNQI7tkJ2MQ1n8qIaQV6BYlbdH9Z2/abaWwPkTo1t36AF+2fsRgJYek -RLsYL234V/clSdEbBB0LzUPqyyFK49xMMjkx+rv3D1OznbNlWJg= -=/dZJ +klDfJg//XEwKCS/rF2jTzafF8RMBNcLL1k9yv3sglV3sw9CNCuTMV1D58ZOXZEIO +X8l/tSPmlG1Te/FRoGSQZnNXsQpB4+iwF+YF/CvnwJDQnqscbcmKnaugIEoOVhWs +zs3aSdfBOPzdvzLBPjmBWV1sTRXItia++UckjaUN7EQJjABeD9sXJR6Bd70NFGcX +biyywzaPs1T/VwT9unTfHEnYaBD2/9fp4phdrBBXGbJPZ69fYA0jVFELqGYgp9Vb +sUQAxUsdtBhbkUEprQDXwqI5IvmaeizObMyNPqcbuTq0oxANVUP5HgynD1GO/Ctc +TmvS71kaUsXKizb2TKNlWcQ3Zmv0AMn313Hp2ZSrCZP/llWCgmKVLTvneDOpvLX8 +HxtS8/wQoFz3YaFOBk702Z490pnW/I5ls43CECHfALP6T3e1wsm4g4g8c2jf0HnZ +915ZdBqGB0YZZWXSysoU5Y4+0ixr1FP+HRaLSlyWDDrv4j7wBVfUjZYKCAyhZ52Z +sT9nLqtLSdIKZF4njFzSdW+pE6n6f8v7nXZrAEifVq8C+CPwMU4IK1yBFL4ZYBUf +pTdcXYsJV3YPXamAw5fXKksBBi9qKQc+/fzrz19lvFzGAewvavKEVek2EwMBoaSf +yod1DsiKQLNb3g2S5gDjh3L9l6LAxdkOKMHNLsKJ9vUlp8cIkq8= +=cW0W -----END PGP SIGNATURE----- diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index 8c0e8aa2aa5b..23f9303f2b6e 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Fri, 12 Apr 2024 09:40:28 +0000 +Fri, 12 Apr 2024 10:10:32 +0000 diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz index adb1a41884a0..cebfba85dabb 100644 Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz index 4b722e9fb0ad..5f5f2aedbd3a 100644 Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ diff --git a/metadata/md5-cache/media-libs/netpbm-11.2.9 b/metadata/md5-cache/media-libs/netpbm-11.2.9 deleted file mode 100644 index 623efc770ce5..000000000000 --- a/metadata/md5-cache/media-libs/netpbm-11.2.9 +++ /dev/null @@ -1,15 +0,0 @@ -BDEPEND=app-arch/xz-utils app-alternatives/lex virtual/pkgconfig -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-lang/perl jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:= ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 ) x11-base/xorg-proto -DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats -EAPI=8 -HOMEPAGE=https://netpbm.sourceforge.net/ -INHERIT=flag-o-matic multilib toolchain-funcs -IUSE=jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux -LICENSE=Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain -RDEPEND=dev-lang/perl jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:= ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 ) -SLOT=0/stable -SRC_URI=https://dev.gentoo.org/~ceamac/media-libs/netpbm/netpbm-11.2.9.tar.xz -_eclasses_=flag-o-matic 288c54efeb5e2aa70775e39032695ad4 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084 -_md5_=ffeee55edf9ff3ac1a398337d872eac0 diff --git a/metadata/md5-cache/media-libs/netpbm-11.2.9-r1 b/metadata/md5-cache/media-libs/netpbm-11.2.9-r1 new file mode 100644 index 000000000000..2a41e2354280 --- /dev/null +++ b/metadata/md5-cache/media-libs/netpbm-11.2.9-r1 @@ -0,0 +1,15 @@ +BDEPEND=app-arch/xz-utils app-alternatives/lex virtual/pkgconfig +DEFINED_PHASES=compile configure install prepare test +DEPEND=dev-lang/perl jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:= ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 ) x11-base/xorg-proto +DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats +EAPI=8 +HOMEPAGE=https://netpbm.sourceforge.net/ +INHERIT=flag-o-matic multilib toolchain-funcs +IUSE=jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux +LICENSE=Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain +RDEPEND=dev-lang/perl jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:= ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 ) +SLOT=0/stable +SRC_URI=https://dev.gentoo.org/~ceamac/media-libs/netpbm/netpbm-11.2.9.tar.xz +_eclasses_=flag-o-matic 288c54efeb5e2aa70775e39032695ad4 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084 +_md5_=61406b45d31ccb38fd0a293c1bbcfc16 diff --git a/metadata/md5-cache/media-libs/netpbm-11.6.1 b/metadata/md5-cache/media-libs/netpbm-11.6.1 deleted file mode 100644 index 76e21f5d6c7e..000000000000 --- a/metadata/md5-cache/media-libs/netpbm-11.6.1 +++ /dev/null @@ -1,15 +0,0 @@ -BDEPEND=app-arch/xz-utils app-alternatives/lex virtual/pkgconfig -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-lang/perl jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:= ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 ) x11-base/xorg-proto -DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats -EAPI=8 -HOMEPAGE=https://netpbm.sourceforge.net/ -INHERIT=flag-o-matic multilib toolchain-funcs -IUSE=jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux -LICENSE=Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain -RDEPEND=dev-lang/perl jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:= ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 ) -SLOT=0/advanced -SRC_URI=https://dev.gentoo.org/~ceamac/media-libs/netpbm/netpbm-11.6.1.tar.xz -_eclasses_=flag-o-matic 288c54efeb5e2aa70775e39032695ad4 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084 -_md5_=e11c400c1fd2a7a33223168a4bb3bf41 diff --git a/metadata/md5-cache/media-libs/netpbm-11.6.1-r1 b/metadata/md5-cache/media-libs/netpbm-11.6.1-r1 new file mode 100644 index 000000000000..d925da1f2989 --- /dev/null +++ b/metadata/md5-cache/media-libs/netpbm-11.6.1-r1 @@ -0,0 +1,15 @@ +BDEPEND=app-arch/xz-utils app-alternatives/lex virtual/pkgconfig +DEFINED_PHASES=compile configure install prepare test +DEPEND=dev-lang/perl jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:= ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 ) x11-base/xorg-proto +DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats +EAPI=8 +HOMEPAGE=https://netpbm.sourceforge.net/ +INHERIT=flag-o-matic multilib toolchain-funcs +IUSE=jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux +LICENSE=Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain +RDEPEND=dev-lang/perl jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:= ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 ) +SLOT=0/advanced +SRC_URI=https://dev.gentoo.org/~ceamac/media-libs/netpbm/netpbm-11.6.1.tar.xz +_eclasses_=flag-o-matic 288c54efeb5e2aa70775e39032695ad4 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084 +_md5_=582cd270b6587e18a45fc8d50472ae28 diff --git a/metadata/news/Manifest b/metadata/news/Manifest index 2e73dba1da8c..6ddb3157c06c 100644 --- a/metadata/news/Manifest +++ b/metadata/news/Manifest @@ -2,22 +2,22 @@ Hash: SHA512 MANIFEST Manifest.files.gz 17308 BLAKE2B d6f0e1960300dcb206a4c928e0f5497ce5fdccacc5a0e5c2508a7af6e8f9498d7b9fb9ec3f5d3954053fc79e8414e01e57845b94cb5cd6f55794cf59ea3c0d33 SHA512 5f19269ff35bf881a2c86ab1b5ce45cd93f05493fcf48e1b653586b091edc5c0a54df7ffbf400b137990209ea574d0bf309d777111a8f29a227fc82a5ed91540 -TIMESTAMP 2024-04-12T09:40:32Z +TIMESTAMP 2024-04-12T10:10:36Z -----BEGIN PGP SIGNATURE----- -iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYZAZBfFIAAAAAALgAo +iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYZCJxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY -klBuvw/7BR0Uzp/F8sTSozqwT2GvXPysny4FDbplhOgA9j0xnKqTZj+mLEnmfaEY -3QomK+Yaq7kBhJ+WSvnRk9nhSP6GoxQY+DaCtEDmHm1FmER6vvJiKVeZG17FTX0P -uV/H7slLoln4js2cfXD7pFegmJK0qhZzOrLxtHvtyEdlH2c0yGuOwuiLmOa56SwO -bnBediOGGNSfP2Q9Dl2pJCFFw05fF+/r0aymwplQV7z3ozQbr7JdFXtzFd6EXxcO -vEbfHhjDS43wrHWms0eTkic+cguTGqquDHd/DJeQfnfpKAme6EJxzVPxr865OBGO -SG8aU7whX36OcPkGO4s7N4XjRyF8E+0folztaG/djnSoejE7XJWo/lOTueLzuH0k -EKUTx4+bwWfl8R9DLFNs66nfzD7bogsUYHGw/k6ZvSg2ERqV3K0Gkl9KgnS+59A8 -7Ety63NCi6TZqIxLT/fl44SVlFQ1ia0611J0ick2X1IItcmI7/SsHCM9PBV9MYHI -wWugv97DDUDwJrwJ2NJ2RQpUIfBKeKF7AaM+7shI+mJXn4e62Oq0yNhiMn2CbzSS -ay7W507nyRh9CFelfE0YQ5JN93k3yz+RbHKaM1Wk46+FtipFbZgyJ0LklTsDpjfJ -0Qwa5iO1K0lyzCrmHnP0E1Kkw9Ga1+QGSuEbXgvoBuOxbLS5CUU= -=Ismw +klD+ew//bIJjU1rNdTCCOQaRnE/a+BsRi5lMIsTrqoIlpiihalQNX3vm2yMd9cPt +OXyQTn72dXOu6yk6xZmdruFtyToQ81PAmZqxfalZnejYllYP5hoMwILlPRri5iD8 +TuZeYSLhEK+8tjfIy5msxZ/Be+2f+zV/smGYyiIta4Ce6WIacGetJMRf6jRZoq8z +Or5KQZjRanPbbOVcW1X0XKoBjazueBNFZhuL2heHKVO/V0Bro2SdJ2amnH6asX7m +NbWDLuJhpIbqpVLUz9fkYrajZAa5+nDxAifNp3hvqkt4AE1xbsR8rkDyC3yBGxDF +xO/1VVZCh+u88a8ZihTB9Jxs7HOyuhwMkuwZ2q1bEyPl4AC9S4UC12rwVJLCDVIj +gwn1a5bd4mWv5TdoPnTbuYGbX/pz0HIUiaQ8OFGCAu/zrO0ozLr4Q0nVk3kaEfIq +XZZHPqIGKxt/JgD7/03scY6DAcB0vE1tmIvHQh/ft84p8gwdU2vGZEsYjwKsug47 +iKd2cKA6RDUyaVdgNUPOUJd16IXHkiI5P2Kh/Zw08Jw/EB3jaSeB9VkvHcXyc8Tk +Pl0rz80aw8MiPp04spqC57fvsRiInvy6EzH/tjRahg/Ht8PJH2EPSmX0Vflwtc5C +2+L3poxYb8HBU3r/GBPD4uX7lvnENdZFGh73FN6L+waD8sLa7JY= +=TrVl -----END PGP SIGNATURE----- diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index 8c0e8aa2aa5b..23f9303f2b6e 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Fri, 12 Apr 2024 09:40:28 +0000 +Fri, 12 Apr 2024 10:10:32 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index d1a9d86eb24b..3568685a2338 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Fri Apr 12 09:40:28 AM UTC 2024 +Fri Apr 12 10:10:32 AM UTC 2024 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index 679583acc3fb..a0f3ab6c18a5 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Fri, 12 Apr 2024 09:45:00 +0000 +Fri, 12 Apr 2024 10:15:00 +0000 diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit index b5ea4862f43d..3c68185feff4 100644 --- a/metadata/timestamp.commit +++ b/metadata/timestamp.commit @@ -1 +1 @@ -c6076072b2f0378f92e5d4f280a9509041ff2a18 1712914034 2024-04-12T09:27:14+00:00 +767b1858b6e42a550309b1daff116f1dda1ba4f4 1712916284 2024-04-12T10:04:44+00:00 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 8e72c36aa737..d30edd33e2fd 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1712914800 Fri 12 Apr 2024 09:40:00 AM UTC +1712916600 Fri 12 Apr 2024 10:10:00 AM UTC diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk index 8c0e8aa2aa5b..23f9303f2b6e 100644 --- a/metadata/xml-schema/timestamp.chk +++ b/metadata/xml-schema/timestamp.chk @@ -1 +1 @@ -Fri, 12 Apr 2024 09:40:28 +0000 +Fri, 12 Apr 2024 10:10:32 +0000 -- cgit v1.2.3