gentoo resync : 25.11.2020

3 files changed, 13 insertions, 13 deletions

diff --git a/sys-libs/libhx/Manifest b/sys-libs/libhx/Manifest
index 9db8ea3641b2..58dea9c78aa2 100644
--- a/sys-libs/libhx/Manifest
+++ b/sys-libs/libhx/Manifest
@@ -1,6 +1,6 @@
 AUX libhx-3.22-no-lyx.patch 495 BLAKE2B ae31b2ada8230a223413e4f7470b7743592191e829800b05124781660888bca1f153e287af5e79e106cd590539a64880e6d111054fb0ee31e9cd02cf65d59f01 SHA512 f4299755b65c7e3b64937df81feed58851bfe7e4938c4b47cd94f818bb7d5c80eecac34b7e80b1c051b07490b3730cc74d6f38cd47a7c4321882a8715ff4b802
-DIST libHX-3.22.tar.xz 875516 BLAKE2B 1a782834bb792898275ed549eff1b70b3356f9efe7b58e6aa48e34492b3ad8b5e8a66a142643ad6c13163e5eab6762fdcebd3fe4897d8b0d3f75c80f7ef60b6c SHA512 4a50b7171be9f60e1a1bfefb0641f74fa8879c0edb258533ee04ec89617802c48358dc244497fb18d02dc37f828f79f7c52dd5ce2a07d8a2f5e6e6f7b4e97646
 DIST libHX-3.24.tar.xz 876992 BLAKE2B 518b99e78acc0cb412f444c0dacaae830a853294a0ee549facfbe65a423a9f32d0388e30e255c87c3f5325102bea45e5e9d72d3fce5b89139b689fddcb299f93 SHA512 faf7af53b628efe1531568ccb2b7e9910db833b14583ab1487eb6a554b407a7546bc75348f7d2344c29ab53fd2df061f6f8de8db634bbd62c3672dc4347d27e4
-EBUILD libhx-3.22-r1.ebuild 709 BLAKE2B f7a01fb27edd2031018031ac5fb2f6e8598c66b8766661e400bfd90dd2766d1fc953030d4aefa3f2f4cbf844d7a0b9713a56bfd83409ae8913b6f807b9a7d219 SHA512 47abb821f0e087b219f82cfc900727d4548e60ad80c40f852280be5a275943cb55a47dea155ae25d78725d8ef26cca9b4a93825998ead6d4b91c16389859cd0b
-EBUILD libhx-3.24.ebuild 715 BLAKE2B 7126386f55a104a6c4acb34e37cea593d19abe8c5c2f39e85dd97e64994c6606b1c4c107cb2de5633bb7cb04a589f3f25fc56aac865700cf087a8e6cf3af734b SHA512 21690472f32d85174965638b40a4298592f96ea901a68994e9781d8189eab5a76d79e79721422f326651a9c09eedf47dad1467587ce992545b4035cf6b0f065d
+DIST libHX-3.25.tar.xz 890576 BLAKE2B d8e13a7fb0ea2cd033edc6b179ef3d4b30c37f522b1e90aea0de96d225655b654d1a7cb133834ef2f10044ccbe60e7559b2280ecbc136a458fd3a2237b8f83ab SHA512 221000fddd1316b6c452babbcb7e234683e3bad559a4b1a608936a086143ad8f17cec489606f8d50ea66775b9f8305ec52c7401d568f01b33372388f75bdea94
+EBUILD libhx-3.24-r1.ebuild 718 BLAKE2B 98cd19910cd4bc2535c24e85eda1b15a3556d718ca6331b0fc00a3d2d1b9314ab5334b1c9e2f2bdd35802edd8c99714add97bd64f154c1f30bfc1f26ed013543 SHA512 8deab8c5bdb21898166746cb5a15d9376137d6ca0cfe1a406438b8d511ec6e9bb5f25acb36c61b0af24425f800bf9356ff6c52706389b73ecf10ef5fc645fcf5
+EBUILD libhx-3.25.ebuild 742 BLAKE2B c5051165968e9c55d5b8e4df181f3a5959a51bdfc861e0f429d61f32ce7e9117a64ada79b1f866648e6f74a414c64cb96e8b73de337b4790c3f53e24c83ceaa2 SHA512 85d3a0ee8eed8e2235196e99e1b5d7c6c7b7b41ee183c4e8a0faa8697873a7655ae59d1f41aa97933906cf6b2215e9fe1d55dd3f4c8d19a291b4ac7e733d69a5
 MISC metadata.xml 321 BLAKE2B 1410ec484da1ae53d0f21c278b0f208b1bc87f179df17afd4bbf3f963b7b1790d818374f31b3b81862e0f95497f9d11193420b1de23f4a7d8364313562e39e10 SHA512 b97b5a7b8c3bc0a90c28a377787b1ee4cf08a969264a22f5637388d7946baf4cd06ad78679c8844f3ec38061b41c2551f53ee77a9d7301b378b273fbb974d277
diff --git a/sys-libs/libhx/libhx-3.24.ebuild b/sys-libs/libhx/libhx-3.24-r1.ebuild
index 150e714d3ad1..e2938546ea0b 100644
--- a/sys-libs/libhx/libhx-3.24.ebuild
+++ b/sys-libs/libhx/libhx-3.24-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://libhx.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/libHX-${PV}.tar.xz"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/28"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc"
 
diff --git a/sys-libs/libhx/libhx-3.22-r1.ebuild b/sys-libs/libhx/libhx-3.25.ebuild
index c697c04a25d7..5f6d32a514e4 100644
--- a/sys-libs/libhx/libhx-3.22-r1.ebuild
+++ b/sys-libs/libhx/libhx-3.25.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils ltprune
+inherit autotools
 
 DESCRIPTION="Platform independent library providing basic system functions"
-HOMEPAGE="http://libhx.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/libHX-${PV}.tar.xz"
+HOMEPAGE="https://inai.de/projects/libhx/"
+SRC_URI="https://inai.de/files/${PN}/libHX-${PV}.tar.xz"
 
 LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+SLOT="0/32" # soname version
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc"
 
 DEPEND="app-arch/xz-utils"
@@ -19,7 +19,7 @@ RDEPEND=""
 
 S="${WORKDIR}/libHX-${PV}"
 
-PATCHES=( "${FILESDIR}/${P}-no-lyx.patch" )
+PATCHES=( "${FILESDIR}/${PN}-3.22-no-lyx.patch" )
 
 src_prepare() {
 	default
@@ -33,8 +33,8 @@ src_install() {
 		dodoc doc/*.txt
 	else
 		dodoc doc/changelog.txt
-		rm "${D}/usr/share/doc/${PF}/"*.pdf || die
+		rm "${ED}/usr/share/doc/${PF}/"*.pdf || die
 	fi
 
-	prune_libtool_files --all
+	find "${ED}" -name "*.la" -delete || die
 }