gentoo auto-resync : 13:08:2023 - 12:10:18

6 files changed, 242 insertions, 8 deletions

diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 417ef0148d23..83980368adbe 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -3,9 +3,14 @@ AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274
 AUX graphicsmagick-1.3.40-libjpeg-turbo-3-001.patch 2445 BLAKE2B 64779cb1c77576acf69fc72a56db2c526632650bff9dc24d9ce2bb708743e337a02c7cc447345e40ae6537f4173643fe349c558123b0c741441bc058e261a9f3 SHA512 6bcdad66f3b66944ce5039f4417c1f4959264f7b2da096f11e90c124e36857f6546c83f70b31d94233b58ebd4dbd40a3071e5b79716e4d7a6d0db689600ba0e0
 AUX graphicsmagick-1.3.40-libjpeg-turbo-3-002.patch 1735 BLAKE2B 36514306292a07130b0a38828d758019f3ddf2bc3080d65b754d525d1271af0f8a4fb3f36d2267a91296a337268ab6fa4717c836bf1ed42ce5761de86b163343 SHA512 4133e53d855a71c5f9432510fd10b5cd6fdd2aa3d20178ef16732e98b87ea11e186314c54d09c743bb903b62a10529c7aea791b7e40b920049f0c1ea6baceb4f
 AUX graphicsmagick-1.3.40-libjpeg-turbo-3-003.patch 1232 BLAKE2B 05268740f0774df6dfdafb744922e1dab6d0a6774ea4939c46195fe2f7f56d87fe3e4ca2b46dfa842b2110c56d6c1a77b87977f38936b73ea2d302b47cc03059 SHA512 4385bb7e8129c130d1c5ab2e1a248de6ba4241066bd40fe122a9b67309c03b15151fe8a41acd0c0ec0bc63483bbbb0a49085cc0a6456e72b4b3b822ac1357661
+AUX graphicsmagick-1.3.41-flags.patch 1677 BLAKE2B 43eecb10dd3d45fad8283635144b1ee7c8adfc30d2b75ea597a574d899b57819f5a2c5d33ff68cc547b59af30990bea8a59a674475250055e41e5b70b1087b6c SHA512 2dad1b9b73d7fbd113ac842cabe974f8398ff8c8f2d1a8d7e98a91849a7b2953f2904cfc2d3720dd4096771a5ef0f7fa1744ff35502705f4ac98a1f804caa8e0
+AUX graphicsmagick-1.3.41-perl.patch 482 BLAKE2B 8bdd60e4cc7c5ce7b2f6fac01c069a124148f593b8b4435b8b3a6aa1da644c4cb4e895d12a211a1aab5c4a6b35a4e775f0964961577a289fc1ca59ebdd346e88 SHA512 4e3d50bb32e7ed5ccac9a6e9d3938ab09ce86f1f02f43d02b6108cfa536b19b14a55a1f2ccdb0e1c9bb5c9180b6e37c8a5802193fd6df6a9e905195d0b3f5368
 DIST GraphicsMagick-1.3.40.tar.xz 5507792 BLAKE2B 2052eb34931f07c902a9c68192ebe4d36137cd23219b1598bae2fa78c5c8bfd1efadf9fd430ed4fee8dc903e50ffabe5a9c76bf55966b85b6f303b2decdca6ee SHA512 e64902aa2a8702d03d188350bd4252a2263e431611f9a70f38cd8beede8a38cc91bb4de3603fedf15420ebbba488f609f218e9b45e356b9f8dc8e4a75f380ee5
 DIST GraphicsMagick-1.3.40.tar.xz.asc 228 BLAKE2B 70eaaa0cd30cfe23ac6dc5e8edc026c57eea7b1a608e83da3408f6fa9fc2cceeb8190e4e9015f321ee688f2a32689d244d69bc61764a99ab0f99ada72143a575 SHA512 82c628e4a260a690c7b1941321881a97d54b4c9580dcbfd8ae786a1774dc43c46e8542488ca875346446858e7475847c440cfca572315a5fe123315b187a240a
-EBUILD graphicsmagick-1.3.40-r1.ebuild 4048 BLAKE2B 65e0494327fc645befb63408a7f3c174c21a0b0920251d8e3f208b395fb79e9c6c990e2905484532511bdacdab9d19f0bfe43a8dac5ac21871f73812aee4062c SHA512 893e9ffc32e637c5cc4c5fa09c8c2b959b6c056fbdc1f821f4a6d3f7adb8d0016376e4510b5db6513898f2011e9efff08abd722e215aed373e73c536b80c2653
+DIST GraphicsMagick-1.3.41.tar.xz 5533080 BLAKE2B 878c785b19feb3153cd2ea9cb105938ff7c4e577ce5e563cfdde501ca26b48f4c3ac6e875de240229938fa1b5776564607a35398dcc9adfd0fd801341d87ab63 SHA512 f2b850818f992349e8cb8f74ed8e897af4e1f4b9af9f3622c1ff30f3af5bc8530a60efbb24875fda80ff49e0db0304dfd6a39de87bd2e29b8ce42d653846890e
+DIST GraphicsMagick-1.3.41.tar.xz.asc 228 BLAKE2B 298c1445d7de5114e38e02f4b3c5c91569b70c126849526a822cc5a2fc2623b6bc83b74a4a58cf0e326741a96ace95b60108f9a07bf9c37a3d9ca722485eb8be SHA512 13bb0218a436ab083518f4a32d17b231a941abd960b32b13a05e4fca3d6b57112f2b496bf7fba0996c2c9855c15158f8223003fcbcf4335bd0ba1a1ae7ee8ba9
+EBUILD graphicsmagick-1.3.40-r1.ebuild 4043 BLAKE2B 1c20b0a861af09e71c93176c0b317a9116a2d8146dcfb6d1fe25f90af62458009e98d365dd79766583c56a4309fdd0538044a437a5547a25e177e78cd71284e9 SHA512 f0bcbc0b78ea7be2141d510d2e9da0440de58d7839b2cc815dec36a84598ae1c49dce771f06225a3e4f22fbcfe6639a2f269ad488b494ebb5a7451681824b79a
 EBUILD graphicsmagick-1.3.40.ebuild 3851 BLAKE2B 5364a3e3f0e5f57089443ad1010a75371507d5a2ed6c4c365b722238518acb26dada10c24ea897507069e0ff23af5f8077908f3b922cc37c686bc23ac075e181 SHA512 fb54d82d2deda4e66b823c33281b382b02e6f14209607f91fd51c60a0d27c2cad59be034b5b9a212a3b42a4dd79cd371ae797a6afce52eb1ca9f63250dcc5b79
-EBUILD graphicsmagick-9999.ebuild 3859 BLAKE2B ecc9180502d00af2bfeb3d96125cfe610a7a1e304720a09bfce47b7a1c702a29a19b600fd5354a15d32588e363d663164efff0966ebeccfbf1e1d330e2f8c20c SHA512 d697391be219a2dbb275cc73d9cee4e7692033d9a65d096f43c772c58f7e572aeee932222d3b2c1c0f3f86503873d8d20fa3a26268be182a275a941d58d4cee5
+EBUILD graphicsmagick-1.3.41.ebuild 3890 BLAKE2B 8b4ec37c52acdd0d38bf64f29c3ddff022a4a8f494c5f8c5c20665ff78bed432d623de57e05c9030698010c717bf21957e8d0a4c15411e77bef019ac7e7c806a SHA512 bb67ff184d197366dbb021caf7b10e304e0802f5028f78c0ea1b67fbae366b412a5ace96501342381b01a7ea45b6ae80fc7cdd175120a988ac7e5c530e52504f
+EBUILD graphicsmagick-9999.ebuild 3890 BLAKE2B 8b4ec37c52acdd0d38bf64f29c3ddff022a4a8f494c5f8c5c20665ff78bed432d623de57e05c9030698010c717bf21957e8d0a4c15411e77bef019ac7e7c806a SHA512 bb67ff184d197366dbb021caf7b10e304e0802f5028f78c0ea1b67fbae366b412a5ace96501342381b01a7ea45b6ae80fc7cdd175120a988ac7e5c530e52504f
 MISC metadata.xml 1299 BLAKE2B 8b52e6f32fd37011471723ec75a32611ae53f92a092dd2ef5eba48391b7282f00ffd20131dbeb86c30b77e697634e13a72dcc218f547a005ff828cf7d43bf658 SHA512 a96a6ee1fc8b7c2b3162e356be1536bfde975dceb37894eca59c80fb9623fcce309b2fd0cc233da9f572925aad9821623748c871c7e2e2f61733d1831a1ca368
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.41-flags.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.41-flags.patch
new file mode 100644
index 000000000000..f3f871cced37
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.41-flags.patch
@@ -0,0 +1,53 @@
+--- a/Magick++/bin/GraphicsMagick++-config.in
++++ b/Magick++/bin/GraphicsMagick++-config.in
+@@ -36,7 +36,7 @@ while test $# -gt 0; do
+       echo '@CXX@'
+       ;;
+     --cxxflags)
+-      echo '@CXXFLAGS@'
++      echo '@MAGICK_API_CXXFLAGS@'
+       ;;
+     --ldflags)
+       echo '@MAGICK_API_LDFLAGS@'
+--- a/configure.ac
++++ b/configure.ac
+@@ -338,6 +338,7 @@ fi
+ 
+ AC_OPENMP([C])
+ CFLAGS="$OPENMP_CFLAGS $CFLAGS"
++MAGICK_API_CFLAGS="$MAGICK_API_CFLAGS $OPENMP_CFLAGS"
+ #CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS"
+ #LDFLAGS="$LDFLAGS $OPENMP_CFLAGS"
+ AC_SUBST([OPENMP_CFLAGS])
+@@ -3883,9 +3884,10 @@ MAGICK_DEP_LIBS=`echo $MAGICK_DEP_LIBS | sed -e 's/  */ /g'`
+ MAGICK_EXTRA_DEP_LIBS=`echo $MAGICK_EXTRA_DEP_LIBS | sed -e 's/  */ /g'`
+ #LIBS=`echo $LIBS | sed -e 's/  */ /g'`
+ 
+-MAGICK_API_CFLAGS=$CFLAGS
++MAGICK_API_CFLAGS=`echo $MAGICK_API_CFLAGS | sed -e 's/  */ /g'`
+ MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/  */ /g'`
+-MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS"
++MAGICK_API_CXXFLAGS=""
++MAGICK_API_LDFLAGS="-L$LIB_DIR"
+ MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS"
+ MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS $MAGICK_EXTRA_DEP_LIBS"
+ 
+@@ -3915,6 +3917,7 @@ AC_SUBST([X_CFLAGS])
+ 
+ AC_SUBST([MAGICK_API_CFLAGS])
+ AC_SUBST([MAGICK_API_CPPFLAGS])
++AC_SUBST(MAGICK_API_CXXFLAGS)
+ AC_SUBST([MAGICK_API_PC_CPPFLAGS])
+ AC_SUBST([MAGICK_API_LDFLAGS])
+ AC_SUBST([MAGICK_API_LIBS])
+--- a/magick/GraphicsMagick-config.in
++++ b/magick/GraphicsMagick-config.in
+@@ -33,7 +33,7 @@ while test $# -gt 0; do
+       echo '@CC@'
+       ;;
+     --cflags)
+-      echo '@CFLAGS@'
++      echo '@MAGICK_API_CFLAGS@'
+       ;;
+     --cppflags)
+       echo '@MAGICK_API_CPPFLAGS@'
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.41-perl.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.41-perl.patch
new file mode 100644
index 000000000000..15cd28aba24c
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.41-perl.patch
@@ -0,0 +1,12 @@
+Link perl bindings against built libraries instead of system libraries (bug #456180).
+--- a/PerlMagick/Makefile.PL.in
++++ b/PerlMagick/Makefile.PL.in
+@@ -23,7 +23,7 @@ my $magick_LDFLAGS='@LDFLAGS@';
+ my $magick_BIN_DIR="$ENV{'DESTDIR'}@BIN_DIR@";
+ my $magick_API_LIBS='@MAGICK_API_LIBS@';
+ my $magick_PERLMAINCC='@PERLMAINCC@';
+-my $magick_LIB_DIR="$ENV{'DESTDIR'}@MAGICKLIBDIR@";
++my $magick_LIB_DIR="../magick/.libs";
+ 
+ # Compute test specification
+ my $delegate_tests='t/*.t';
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.40-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.40-r1.ebuild
index 119b6ba3c803..8fc6cab9765d 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.40-r1.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.40-r1.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.asc )"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
 fi
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.41.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.41.ebuild
new file mode 100644
index 000000000000..e829330a5e8f
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.41.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+MY_P=${P/graphicsm/GraphicsM}
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/ https://hg.osdn.net/view/graphicsmagick/GM"
+
+if [[ ${PV} == 9999 ]] ; then
+	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
+	inherit mercurial
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bobfriesenhahn.asc
+	inherit verify-sig
+
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+	SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.asc )"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV%.*}"
+IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpegxl lcms lzma"
+IUSE+=" openmp perl png postscript q16 q32 static-libs svg tcmalloc tiff truetype"
+IUSE+=" webp wmf X zlib zstd"
+
+RDEPEND="
+	dev-libs/libltdl
+	bzip2? ( app-arch/bzip2 )
+	fpx? ( media-libs/libfpx )
+	heif? ( media-libs/libheif:= )
+	imagemagick? ( !media-gfx/imagemagick )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpegxl? ( media-libs/libjxl:= )
+	lcms? ( media-libs/lcms:2 )
+	lzma? ( app-arch/xz-utils )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:= )
+	postscript? ( app-text/ghostscript-gpl )
+	svg? ( dev-libs/libxml2 )
+	tcmalloc? ( dev-util/google-perftools:= )
+	tiff? ( media-libs/tiff:= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+	)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND+=" virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.41-flags.patch
+	"${FILESDIR}"/${PN}-1.3.41-perl.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local depth=8
+
+	use q16 && depth=16
+	use q32 && depth=32
+
+	local myeconfargs=(
+		--enable-largefile
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable debug prof)
+		$(use_enable debug gcov)
+		$(use_enable imagemagick magick-compat)
+		$(use_enable openmp)
+		--with-threads
+		$(use_with dynamic-loading modules)
+		--with-quantum-depth=${depth}
+		--without-frozenpaths
+		$(use_with cxx magick-plus-plus)
+		$(use_with heif)
+		$(use_with jpegxl jxl)
+		$(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)
+		# Needs last-rited/unpackaged jasper
+		--without-jp2
+		$(use_with lcms lcms2)
+		$(use_with lzma)
+		$(use_with png)
+		$(use_with tcmalloc)
+		$(use_with tiff)
+		--without-trio
+		$(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 zstd)
+		$(use_with X x)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	use perl && emake perl-build
+}
+
+src_test() {
+	# Some perl tests fail when DISPLAY is set
+	unset DISPLAY
+
+	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-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index 4e497a4945c2..e829330a5e8f 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -10,11 +10,12 @@ DESCRIPTION="Collection of tools and libraries for many image formats"
 HOMEPAGE="http://www.graphicsmagick.org/ https://hg.osdn.net/view/graphicsmagick/GM"
 
 if [[ ${PV} == 9999 ]] ; then
-	inherit mercurial
 	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
+	inherit mercurial
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bobfriesenhahn.asc
 	inherit verify-sig
+
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.asc )"
 	S="${WORKDIR}/${MY_P}"
@@ -26,7 +27,6 @@ fi
 
 LICENSE="MIT"
 SLOT="0/${PV%.*}"
-
 IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpegxl lcms lzma"
 IUSE+=" openmp perl png postscript q16 q32 static-libs svg tcmalloc tiff truetype"
 IUSE+=" webp wmf X zlib zstd"
@@ -63,10 +63,11 @@ RDEPEND="
 	zstd? ( app-arch/zstd:= )
 "
 DEPEND="${RDEPEND}"
+BDEPEND+=" virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.36-flags.patch
-	"${FILESDIR}"/${PN}-1.3.19-perl.patch
+	"${FILESDIR}"/${PN}-1.3.41-flags.patch
+	"${FILESDIR}"/${PN}-1.3.41-perl.patch
 )
 
 pkg_pretend() {
@@ -141,7 +142,8 @@ src_compile() {
 }
 
 src_test() {
-	unset DISPLAY # some perl tests fail when DISPLAY is set
+	# Some perl tests fail when DISPLAY is set
+	unset DISPLAY
 
 	default
 }