7 files changed, 96 insertions, 40 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 3216caa7d5db..3474a4f15a00 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index fd106ff1b48b..0aa578c6e186 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,3 +1,5 @@
 DIST dos2unix-7.4.3.tar.gz 788278 BLAKE2B da959b06e583bbf27a2cb2ce5b1f1a41380722aa09ac75b3d31260e92fd6f1203d87266d3a12201b036a69796b4aa4f23718741036e20fe686801bb368fbde22 SHA512 1c6d81348de8aca451174794141d0802685487cf6847fa91f7de745d89bcf2af864fc2ec549b9af72031891d4efcb9731fe823ce05da36d1f9e9890ff2cb60fb
+DIST dos2unix-7.4.4.tar.gz 914647 BLAKE2B eb8d33344780bb15201eed571d7a6a21db0bc13e8e94388c70e1daea84cc0d1dfb9f16b7ed1cd216bb31ffd84dee706e7f2fb46050a299602f7c67c53915ded9 SHA512 e7a6b1d90bf0a32aa53b22caa1660dcf58c5874d02a45e80f4cc811cae9bd7b0cb8144301fb6808798100a057c03210925da1d8461e380dff1059f6bee086f55
 EBUILD dos2unix-7.4.3.ebuild 2124 BLAKE2B 926692e61a59b1faeae5c60f3a2c0cac80e0496da2018896fc59603991b008f970a5d73a43f9199fafa480c167238e968e5b5301d88663488bff58b212b67e7a SHA512 480e3539f63c8b7a1f5e884004976c715927a8078cc08eaa1689c15761974008d190c178ea98cadeffdd625a45b3af3bf4aa0c9b987257080224a1b6ca84331c
+EBUILD dos2unix-7.4.4.ebuild 2146 BLAKE2B 1bf975aef1c01fdab5470cdb4c48b07d79d947448eacce1009600e05541a8827e35d593b9bb8f5b0e4fb70fc285f0346fa1bd6318aa1f3b6498c313dfc86049f SHA512 59b3357de6dbd65c9d750c5c5f72a5363effcf41b01040f1f58d762787fbf5c1180677c0f5cb4d1b0e1ea8dede500db7457339beca0cb97e664f55a06db63ae6
 MISC metadata.xml 344 BLAKE2B ec6c66c1693ed09d8434840bb0e5eaf6689d629c787a115eedad537972c06c3aae6d739cd55a9acf85ed21043314e9721030b7c570c85eea4361c083d7db9fe1 SHA512 63d5baa4e84950d6cb2fd604f93e60842bc210af298eef73bc9e59e3d811957b99a95e2538ddd6df7d2ac6a50e30ff5bda66af4d7dbb573cec4ef83a38e42919
diff --git a/app-text/dos2unix/dos2unix-7.4.4.ebuild b/app-text/dos2unix/dos2unix-7.4.4.ebuild
new file mode 100644
index 000000000000..5c0b6d2870e4
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-7.4.4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="ca da de eo es fr fur hu ja ka ko nb nl pl pt_BR ro ru sr sv uk vi zh_CN zh_TW"
+
+inherit plocale toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="https://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
+SRC_URI="
+	https://www.xs4all.nl/~waterlan/${PN}/${P/_/-}.tar.gz
+	mirror://sourceforge/${PN}/${P/_/-}.tar.gz
+"
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="BSD-2"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug nls test"
+
+RDEPEND="
+	!app-text/hd2u
+	virtual/libintl"
+
+DEPEND="
+	${RDEPEND}
+	test? ( virtual/perl-Test-Simple )
+"
+BDEPEND="
+	dev-lang/perl
+	nls? ( sys-devel/gettext )
+"
+
+RESTRICT="!test? ( test )"
+
+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror "po*/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	rm_loc() { rm po*/$1.po || die; }
+	plocale_for_each_disabled_locale rm_loc
+}
+
+src_prepare() {
+	default
+
+	handle_locales
+
+	sed \
+		-e '/^LDFLAGS/s|=|+=|' \
+		-e '/CFLAGS_OS \+=/d' \
+		-e '/LDFLAGS_EXTRA \+=/d' \
+		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
+		-i Makefile || die
+
+	if use debug ; then
+		sed -e "/^DEBUG/s:0:1:" \
+			-e "/EXTRA_CFLAGS +=/s:-g::" \
+			-i Makefile || die
+	fi
+
+	tc-export CC
+}
+
+lintl() {
+	# same logic as from virtual/libintl
+	use !elibc_glibc && use !elibc_musl && echo "-lintl"
+}
+
+src_compile() {
+	emake prefix="${EPREFIX}/usr" \
+		$(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+		$(usex nls "" "ENABLE_NLS=") install
+}
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 73e1d215d7b7..e8db4e1d6aa4 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,9 +1,7 @@
 DIST libpaper-2.0.4.tar.gz 1286975 BLAKE2B 2751422ca3176d1f47d98c74d948d986e6dcff15acbac126535f526312900650e25fa0a4d68ceebc5d718f5135be22a9f9407d690dc5d5e22eab9dc55b040fc8 SHA512 d603a807c8fdc57b704cdfdc90bedf05c54c8a7b67e8cf52f26298c22a6cee5291fcadc6e67d28b00cf9d68f4890a394e56c8e91f0b97c8edfac4662fe4dc8f0
-DIST libpaper-2.0.5.tar.gz 1287165 BLAKE2B 49577f97e29dd64f08aac30dc22a9e738c7efcd41e9a6c91b512216a19489234c78beea5070033ca27e8314b6b78dee5e5999132e559a69b8d4f874263ecba07 SHA512 ce8160d84e61a80ca998f78272e21ced9e3b061396d38c6d75861294b5451337a5abeb36bc5bc91792f7c484d771c601170aa19311d71be1b6db7789b54218df
-DIST libpaper-2.0.7.tar.gz 1288966 BLAKE2B cac216c0a265c9299ac0eca3151280ea5c3f1466dabf726b3532f524af49e9d6ed2e5eac1fa908cea14dbffec9b9d59556459b2deaf20da49f14bd72402e432b SHA512 5c552266adc4a887c4fde0e1a29f9d79ba8b959bd842399a04939b20c75d86f48424c06d37087a21dcd3e2e65d42d95b170eac8d825ebdae3f15534c14d5a6c7
+DIST libpaper-2.0.8.tar.gz 1304248 BLAKE2B d42b239b5e6d79fccc42508ab55e3d0a7b7f688c288aae7a75286332cd13d563e6164289195e7b67ef1216d5b4d4127a75dffe4bbe97080e093f89b64f48a57b SHA512 06318779cee2d1cf9bea090a5956f90bf8cccc0d753eb7c931615c0dcb321e012ea870a20613b84e7f4350ab608237a2d21d5170c119d8908c86a94e0cba1d1f
 DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc
 EBUILD libpaper-1.1.28.ebuild 1148 BLAKE2B b5556a5ae27415083aa89ca18a6f9dc232026a37fae823b9f96ef0325d28f2c1e37e3f34ecee1f4773793fb0b31b7f607ea955c9fa96a88d18a4b90eca8f54be SHA512 07e36537c2278711c602c667e50e72091aef0bbbb79de8a99ed915c7c1f600be4c7d53f7446578b3b1734375a07ab8464e5ab0b342ef50516d1e2b0e7c325d07
-EBUILD libpaper-2.0.4.ebuild 864 BLAKE2B 4b20c4a2ce4c35cdf611050f7420140263e8056e59a6e5f0244970b645b1ee1fe05bfa3cccbe3998d4bbd6cf25adbd10ca8dd014e2d67fdf89a85bbd7058bfc7 SHA512 632fe156df584720edcbf49dbeb43bdbbec4064c2d15424d289ff230a9a5d79a49afb00d773012d68be68936f5f327891424f9c7a85801796257d67e3528acb2
-EBUILD libpaper-2.0.5.ebuild 871 BLAKE2B 597e64bfee57d111e1c5f605632e35016f44cc1fd598b03bbf32e9cb42296c9a7b072438a974210e0d4bcc5f351b8c0927076ef679e10bcce580502b4af02a11 SHA512 3433d90ee1672d2190d2bc21ecb35d8d4985b15ab9e2328bb699d16e07868c97a0492f0715a2798e1b9a1916a0a1f3c40d7627f6bd221ccb5c6c17de6540d80b
-EBUILD libpaper-2.0.7.ebuild 871 BLAKE2B 597e64bfee57d111e1c5f605632e35016f44cc1fd598b03bbf32e9cb42296c9a7b072438a974210e0d4bcc5f351b8c0927076ef679e10bcce580502b4af02a11 SHA512 3433d90ee1672d2190d2bc21ecb35d8d4985b15ab9e2328bb699d16e07868c97a0492f0715a2798e1b9a1916a0a1f3c40d7627f6bd221ccb5c6c17de6540d80b
+EBUILD libpaper-2.0.4.ebuild 863 BLAKE2B 3e0d9e2cbdf03710e90764064f0b1200028ad0ce9f850d243bcbfe76a674cd1e1c849d872d29cf895dad88bb0af568805f8b8b9fd725372b27128bb8bb181034 SHA512 d2b1345af00be4c2c723f08362f12a0e0570ab28bb401d68f533d8c866f61a95e662f089ec56fdb0fd85e17cf92252606d29fe2e84979bf06958cfa407244be1
+EBUILD libpaper-2.0.8.ebuild 759 BLAKE2B 3ab49f8c1b8d2bbe5672c6021e0b04ff4c10692bfe3cac95e212d2425e0b7a39f80982e07a7f08ab71cb6ba0da9e2855437ba184eb79762fa397e8b161073a44 SHA512 69bc2bee9595ae86e843b2413d9cee5458d2655cb6a20e478628817dd520cd3450f26b08589f9b13b2f5b6f73db5485df3d9653951a0f33888fc80ff2a3c2138
 MISC metadata.xml 342 BLAKE2B 28767bfca8e43186de0792106c408d3a8e0ef8c9c59836789b045c23f12163e43b9eb547c93f1751f031b8f61bd7940f50ccaa95f2ecc14cdf5a9267be721d0e SHA512 0d16a636e3cce2ee9051bd694f34a072ff13d4ca6f4c9f3e81443cea386f48f5863db03ca9cb050f43a6a1fa483d401969617597d68024fee10058a0c72b3585
diff --git a/app-text/libpaper/libpaper-2.0.4.ebuild b/app-text/libpaper/libpaper-2.0.4.ebuild
index 7b2b029b49ce..36348bb3139b 100644
--- a/app-text/libpaper/libpaper-2.0.4.ebuild
+++ b/app-text/libpaper/libpaper-2.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rrthomas/libpaper/releases/download/v${PV}/${P}.tar.
 # paperspecs is public-domain
 LICENSE="LGPL-2.1+ GPL-3+ public-domain"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="sys-apps/help2man"
 
diff --git a/app-text/libpaper/libpaper-2.0.7.ebuild b/app-text/libpaper/libpaper-2.0.7.ebuild
deleted file mode 100644
index 544d83470fe7..000000000000
--- a/app-text/libpaper/libpaper-2.0.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Library for handling paper characteristics"
-HOMEPAGE="https://github.com/rrthomas/libpaper"
-SRC_URI="https://github.com/rrthomas/libpaper/releases/download/v${PV}/${P}.tar.gz"
-
-# See README.
-# paperspecs is public-domain
-LICENSE="LGPL-2.1+ GPL-3+ public-domain"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="sys-apps/help2man"
-
-# False positive (runs within a conditional)
-QA_AM_MAINTAINER_MODE=".*help2man.*"
-
-src_configure() {
-	econf --enable-relocatable
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/libpaper/libpaper-2.0.5.ebuild b/app-text/libpaper/libpaper-2.0.8.ebuild
index 544d83470fe7..d77438c2f590 100644
--- a/app-text/libpaper/libpaper-2.0.5.ebuild
+++ b/app-text/libpaper/libpaper-2.0.8.ebuild
@@ -13,11 +13,6 @@ LICENSE="LGPL-2.1+ GPL-3+ public-domain"
 SLOT="0/$(ver_cut 1)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-BDEPEND="sys-apps/help2man"
-
-# False positive (runs within a conditional)
-QA_AM_MAINTAINER_MODE=".*help2man.*"
-
 src_configure() {
 	econf --enable-relocatable
 }