gentoo auto-resync : 14:05:2024 - 00:01:24

6 files changed, 76 insertions, 5 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index e75990f1c8ce..b1eaa02a7658 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index 48ca746b6ab2..b38f0f1bc75c 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -2,5 +2,5 @@ AUX qemacs-0.4.1_pre20170225-Makefile.patch 954 BLAKE2B 16fce167962370753730dbe6
 AUX qemacs-0.4.1_pre20170225-manpage.patch 372 BLAKE2B 68e2d415700e576c5706788036665271cffee46a4b896573de3691c3e8cc96db9972fd0f170033b9d85fb048578c8cf3502a53a5c4ad8b7c9858c0771e195a42 SHA512 1c81e3570a2d00df04fa9a4dfae404be2f1c684b9b86ef67aa3f13a4b6f734d99d768350d41c75dc8c2874ccf853d021e497c87c751d86e2df1015f42fe97889
 AUX qemacs-0.4.1_pre20170225-nostrip.patch 1771 BLAKE2B af8ad554ea5dbdcd8e7a3df32a4ff5402e84f56642a74f228b0c5be8166895b82b90e291f043a5e18a757b6e6de69ed50af3950c719f2b40be1e3d1e031c2031 SHA512 9ad3c3cd4a7744894718099ff8df2648e11385c6926a137f3f04ed33ef449d658cfb873476276bc52de7a7cee5ed2a2319893d8f47e7a2413d00d61378123656
 DIST qemacs-0.4.1_pre20170225.tar.xz 1147408 BLAKE2B 369f3c5ff1b1f7b22bbd1f70f0c150e425a5b68828e62db427e4b41c58c8ee9ae0449a83693e9354d88fc482691d7a5f3661360ef602aeaba963776c4725b894 SHA512 a17c8901c917f91401e16b4f857735957ab0d3533d9dcc7a0decf768f453b68023f45e1241225a84d35ba793beb69754e0f2caa857165f8223882d5041d56c99
-EBUILD qemacs-0.4.1_pre20170225.ebuild 1523 BLAKE2B 2cb0eb2d3aa9061f6e4e71e04797e4cf12dad9ec0ea58fd1d43aa13a8f6af6b6a1cc913b5a97fa67e0c72e034ab680cfc316e2616d214233456335663d29c4b7 SHA512 a6b57e99ab0421357863d8d58ce0a8e9cfa49ac24b4ea6ab3b039680a5051bb8cd9078034f819bfc007aaf98ecc0808c2203e1ba1bcfa630007334a35b88d1b6
+EBUILD qemacs-0.4.1_pre20170225-r1.ebuild 1522 BLAKE2B 60592ab8fb2334da2151ea11f1c0edeeff43deff635283436df42d6d563dbd5c3a4b246110bcb401e89a78715307cb69623c288640e9e7333817a445a6218a4c SHA512 e0bf568ba0cbc6978882304ebdee3235ad19f56f0a9bbc2087153ae2a5eb7ce06353bd64cb44e566219630541e77aa3be1afd524a3fc8aaae6928ed28c677145
 MISC metadata.xml 2016 BLAKE2B 9e154f975526e4a36555d752924cdd7610c01a7f643351bd6cdbadf027c2e62f7bbd3296b74a9693331aa3092afd7edf8977460d4420c7b9772fa0d6f168e683 SHA512 8445c0dfc407c03f87799917d1f422bf50cbd39956b679131461f903aea439b80474f9f4677e82d2d50759d88cf7460b32ef6e246098186e393cd5e3dbbdc7f7
diff --git a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild b/app-editors/qemacs/qemacs-0.4.1_pre20170225-r1.ebuild
index bebc3f453493..307c9f40c805 100644
--- a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
+++ b/app-editors/qemacs/qemacs-0.4.1_pre20170225-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -9,6 +9,7 @@ DESCRIPTION="QEmacs is a very small but powerful UNIX editor"
 HOMEPAGE="https://savannah.nongnu.org/projects/qemacs/"
 # snapshot of http://cvs.savannah.gnu.org/viewvc/?root=qemacs
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="LGPL-2.1+ GPL-2+"
 SLOT="0"
@@ -26,8 +27,6 @@ DEPEND="${RDEPEND}
 	>=app-text/texi2html-5
 	gui? ( x11-base/xorg-proto )"
 
-S="${WORKDIR}/${PN}"
-
 src_prepare() {
 	eapply "${FILESDIR}/${P}-Makefile.patch"
 	eapply "${FILESDIR}/${P}-nostrip.patch"
diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest
index 1e750f8a8675..9f73c41fa956 100644
--- a/app-editors/xmlcopyeditor/Manifest
+++ b/app-editors/xmlcopyeditor/Manifest
@@ -1,3 +1,5 @@
+AUX xmlcopyeditor-1.3.1.0-libxml2-2.12.patch 462 BLAKE2B 7fb468a7d29f57073943d50eb08517209fc3d88bf6ccab40f77415c27204e88b2b1a9152ad9e6fb42f6e5aac11d005b7fca0c8cd00400ccdee1df5eec98aa392 SHA512 5a63d2d15b56da0ef4182d8a15f43b9c7a89a0d7a2700d03c3b03973c50ac4d38b9b2065610f9742361347a083e6e07211a39c6ff373fe6ede3b8288d0146515
 DIST xmlcopyeditor-1.3.1.0.tar.gz 5273837 BLAKE2B e3174587defb1941f4d40d91eec101e7de3996b5faf81061f66cdc6b7d092637a273a9b4ed5a83e72c5b0fcfd5d12e80420cb6890d71a667f0440ab818098df8 SHA512 ea262e1ac6536b71e3328e695ae5825a9aff7db7a8024eedc1b3f568a75deda06f0aaff838438f91ba44de5280d6288dc8dc2d85f74f1eb638ecc01e60481be7
+EBUILD xmlcopyeditor-1.3.1.0-r1.ebuild 1042 BLAKE2B 5a39ed35feba0cedb971665226234a7ee7330dcd0ddab383c1b56675bf9d52e9e6e02e3cb460ebaeaa1f76a634f495ed546ceb8212ee44b67c2cd2d63b90460d SHA512 4299d85ae115de6c251c69edfb658682183f968d7ee18f5aa6e88e597501f58793ef04274f209eef4eafe05becce9ecc597266c1088c8a646e7a7a3f83f38b50
 EBUILD xmlcopyeditor-1.3.1.0.ebuild 981 BLAKE2B c60b08d7437c12622599ddf51f321afb355ee79a2160711f0e94ed23d4ab7f0f1f5883e1abbab0e18a9c21ca4c19a6bf953b15333ddd6a42c1e92354366e91d9 SHA512 7cac432dfe43f0ccf1f82ad6ef5fb91bccdc0f7592487017e937317bcf14e3a7db9d766958f34aa093be8e19920a86d478a42d3bd45d32c825d273d5d47546ff
 MISC metadata.xml 251 BLAKE2B beeccf7350e2e1c3c316ff8f50e8b237dc77b2cfc087205abceae07ec412ad01185adb8774f13404795020391457055ccc6055b41f1a87e774af210727cf3f27 SHA512 955dca0667fad24cef685b0ea3fd7d0d30310997a4f814d583d933903f443f0775a2e7662836134cc7555d754b5bbf1fc352d0bc939a3ff4af24d15c517f0f28
diff --git a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.1.0-libxml2-2.12.patch b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.1.0-libxml2-2.12.patch
new file mode 100644
index 000000000000..c3036584524c
--- /dev/null
+++ b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.1.0-libxml2-2.12.patch
@@ -0,0 +1,20 @@
+--- a/src/wraplibxml.cpp
++++ b/src/wraplibxml.cpp
+@@ -706,7 +706,7 @@
+ 

+ wxString WrapLibxml::getLastError()

+ {

+-	xmlErrorPtr err = xmlGetLastError();

++	const xmlError *err = xmlGetLastError();

+ 

+ 	if ( !err )

+ 		return nonParserError;

+@@ -722,7 +722,7 @@
+ 

+ std::pair<int, int> WrapLibxml::getErrorPosition()

+ {

+-	xmlErrorPtr err = xmlGetLastError();

++	const xmlError *err = xmlGetLastError();

+ 	if ( !err )

+ 		return std::make_pair ( 1, 1 );

+ 

diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.1.0-r1.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.1.0-r1.ebuild
new file mode 100644
index 000000000000..7c171ac605c7
--- /dev/null
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.1.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+inherit autotools wxwidgets xdg
+
+DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor"
+HOMEPAGE="https://xml-copy-editor.sourceforge.io"
+SRC_URI="https://downloads.sourceforge.net/xml-copy-editor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -ppc ~x86 ~amd64-linux ~x86-linux"  # -ppc due SSE2 requirement
+IUSE="aqua nls"
+
+RDEPEND="
+	app-text/enchant:2
+	>=dev-libs/libxml2-2.12.5
+	dev-libs/libxslt
+	dev-libs/xerces-c[cpu_flags_x86_sse2,icu]
+	dev-libs/libpcre2
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-libxml2-2.12.patch )
+
+src_prepare() {
+	default
+
+	# bug #440744
+	sed -i  -e 's/ -Wall -g -fexceptions//g' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	setup-wxwidgets unicode
+	econf \
+		--with-gtk=3.0 \
+		--with-wx-config="${WX_CONFIG}" \
+		$(use_enable nls)
+}