gentoo auto-resync : 24:09:2023 - 05:21:45

3 files changed, 85 insertions, 0 deletions

diff --git a/dev-perl/Tk/Manifest b/dev-perl/Tk/Manifest
index a22d717816bc..887139ae4285 100644
--- a/dev-perl/Tk/Manifest
+++ b/dev-perl/Tk/Manifest
@@ -1,7 +1,9 @@
 AUX Tk-804.034-xorg.patch 1741 BLAKE2B 06b07dd1d2c189677bffc0be09872f8b480fa1f597103509d2bf5d10bce993a21075936a7b62c793a4eae087b95a0b5c1198f20a2093dfa9f11ea03b9def3787 SHA512 368f68fe1a6c48d01adbd9a411ce38131f11bf9fc260e281f13c81bc5234bc8f2d364deda538db5ab8a88400aba30cd5e319304693e156fc6d7caeebd3fb049c
 AUX Tk-804.036-configure-clang16.patch 1016 BLAKE2B 76a5f1e9cf6afdff054dd74e61c30e16c10e20e75b05643d5d1ac6c785e81979bfa23d97b52f04c2bc5c65695a45f0a59b0baa53217ce742387bf681ffeb0e37 SHA512 33ba249b55f7dbeded13327d6b273b965889ccf68e63da4bf909c7d622162915c850ecb4d78f0ad87c45a8c17bded3ceaa9c6ba66036072722f3f34b283578f1
 AUX Tk-804.036-crash.patch 5883 BLAKE2B fea732b231ca001065795f6cdc4e4b998c261936d4988e423670fa9a30a599747933a6bc26499843f53c17d6eedb92ad62fdce169c762ee777e53c8abe5dd187 SHA512 529b605a1579ab0b7f609b83f4c627238effc852502e6a4bdd432b4b229fd7f44cefb4b48be46125183005a10c6df5dc153bfe0e7ead4c3b562f241520e26473
+AUX Tk-804.036-incompatible-function-pointer-types.patch 587 BLAKE2B e4c289f1dc79664df31892a1c805e20af9ab54552d6d2aaab3ee419fb5577d92eb59069e6e4951f425d2c1c539ceeef50aa3d03b364d80da59d9750b3a9a526b SHA512 b1b4671888310a6b728592160d53ad3013a4e43dfed3c047386d6b107f0dcfba8e5085eb4be8818a614f2677a367250f769bca95943396a2c03acd48d51ba15d
 DIST Tk-804.036.tar.gz 7024993 BLAKE2B 0ec47bc7f24af7ea5cf3fb539b2636e978a22707d591cea0a5c1ba9182a70afcf749a9fbc03fd2bf7e969ddb1a57572bd6e1b7b68210ad38b1804c877cb771ee SHA512 7d8b82127a5fdbb2f0387f541af8844a09f1230f377b92d511ecb12e81bfd5ef56d4fe925cac064a798a96a003bb8465b6df37cff18a960f3631bb3a214cd812
 EBUILD Tk-804.36.0-r1.ebuild 1889 BLAKE2B 55f080f0852b537b684648c0a5912ce14fd5c9f9946c972bf5a39c439480852af0fbbc968b7ece5e7ad35f2f9bfdfaeb2459b43bacea2c9d23d0079ecbd7c157 SHA512 cfe8309e0545ae00744b7f48269f5bd72042c10542b5d0370a48b7a0a37d8ef9db48f0f1c86ef6bc3fd5679b8ebbf9b392b1fd9f0f2279ec681106aee15b82bd
+EBUILD Tk-804.36.0-r2.ebuild 1959 BLAKE2B f6567f56d57f662d4e0916345c0521ef7fa457f9b8f982220973b4d49828abb91c439a57ec38713cb548e337df8ecb222b58a4325e4b14ad1412cb002ec767b8 SHA512 67b1144d63478d3bdf4591bf11ee890954cb2e5df7a30e15a6726c518595d28b0fc7626c173062a717ea522c04af92e22395cdf4b1d91e65739ba1bc52867eae
 EBUILD Tk-804.36.0.ebuild 1780 BLAKE2B 97612e9e98b96b7b352570ef865e66982723dde928b52db52db75a43354f256b0e87cfb32dcf3080199f5aac83f2e6a5c9ffc391687eb89e62867ff73f7ad538 SHA512 42b69bd381c1abc92b04ee50fae9e72fa415d215e4ac2e20ed755be2a82a3c5eed39e75ff46f30e6f3253409611ef6301fc3655974f6c0b5ee25128e4b10b43f
 MISC metadata.xml 7606 BLAKE2B d893e5bed29497b8c444eb6ed1f32d2cc0f378a27398e6299560eed4ca4202a7e58c9cbd604395c62b2ad126a2c501a406297c746db04a6cb2b523b754d8b0ae SHA512 6d593703f6ad6141faf2d6b4e46fb633fabbd808e7377c0510e6bc877d34d708beb81f8788340a90d37ddfa430e729607f0dd986b4cc70e8b8e079b1b85782d9
diff --git a/dev-perl/Tk/Tk-804.36.0-r2.ebuild b/dev-perl/Tk/Tk-804.36.0-r2.ebuild
new file mode 100644
index 000000000000..962e432cb9a7
--- /dev/null
+++ b/dev-perl/Tk/Tk-804.36.0-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=SREZIC
+DIST_VERSION=804.036
+DIST_EXAMPLES=("examples/*")
+inherit perl-module virtualx
+
+DESCRIPTION="A Perl Module for Tk"
+
+LICENSE+=" tcltk BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libpng-1.4:0
+	x11-libs/libX11
+	x11-libs/libXft
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-804.034-xorg.patch
+	"${FILESDIR}"/${PN}-804.036-configure-clang16.patch
+	"${FILESDIR}"/${PN}-804.036-crash.patch
+	"${FILESDIR}"/${PN}-804.036-incompatible-function-pointer-types.patch
+)
+
+PERL_RM_FILES=( "t/pod.t" )
+
+src_prepare() {
+	myconf=( X11ROOT="${EPREFIX}"/usr XFT=1 -I"${EPREFIX}"/usr/include/ -l"${EPREFIX}"/usr/$(get_libdir) )
+	mydoc="ToDo VERSIONS"
+
+	perl-module_src_prepare
+	# fix detection logic for Prefix, bug #385621
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" myConfig || die
+	# having this around breaks with perl-module and a case-IN-sensitive fs
+	rm build_ptk || die
+
+	# Remove all bundled libs, fixes #488194
+	local BUNDLED="PNG/libpng \
+					PNG/zlib \
+					JPEG/jpeg"
+
+	# Move files required for tests temporarily
+
+	mkdir -p "${T}/stash" || die "can't create temporary stash"
+	mv "${S}/JPEG/jpeg/testimg.jpg" "${T}/stash/testimg.jpg" || die "can't move testimg.jpg"
+
+	for dir in ${BUNDLED}; do
+		einfo "Removing bundled: ${dir}"
+		rm -r "${S}/${dir}" || die "Can't remove bundle"
+		# Makefile.PL can copy files to ${S}/${dir}, so recreate them back.
+		mkdir -p "${S}/${dir}" || die "Can't restore bundled dir"
+		sed -i "\#^${dir}#d" "${S}"/MANIFEST || die 'Can not remove bundled libs from MANIFEST'
+	done
+
+	# Restore test files
+	mv "${T}/stash/testimg.jpg" "${S}/JPEG/jpeg/testimg.jpg" || die "can't restore testimg.jpg"
+}
+
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/Tk/files/Tk-804.036-incompatible-function-pointer-types.patch b/dev-perl/Tk/files/Tk-804.036-incompatible-function-pointer-types.patch
new file mode 100644
index 000000000000..9eefdf1b4e23
--- /dev/null
+++ b/dev-perl/Tk/files/Tk-804.036-incompatible-function-pointer-types.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/883391
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271521
+https://cgit.freebsd.org/ports/commit/?id=ecedf2f3cd2c933fb5df179f174c704c89cf1f31
+--- a/pTk/Xlib.t
++++ b/pTk/Xlib.t
+@@ -331,7 +331,7 @@ VFUNC(int,XIntersectRegion,V_XIntersectRegion,_ANSI_AR
+ #endif /* !DO_X_EXCLUDE */
+ 
+ #ifndef XKeycodeToKeysym
+-VFUNC(KeySym,XKeycodeToKeysym,V_XKeycodeToKeysym,_ANSI_ARGS_((Display *, unsigned int, int)))
++VFUNC(KeySym,XKeycodeToKeysym,V_XKeycodeToKeysym,_ANSI_ARGS_((Display *, KeyCode, int)))
+ #endif /* #ifndef XKeycodeToKeysym */
+ 
+ #ifndef XKeysymToString