gentoo auto-resync : 17:06:2024 - 00:09:46

5 files changed, 101 insertions, 14 deletions

diff --git a/dev-libs/editline/Manifest b/dev-libs/editline/Manifest
index 22cf8461c409..c858d84d82f8 100644
--- a/dev-libs/editline/Manifest
+++ b/dev-libs/editline/Manifest
@@ -1,4 +1,7 @@
 AUX editline-1.16.0-rename-man.patch 466 BLAKE2B 0fa3edfe0733d2a72fe2bed1c03dfb0ff3f14cac9b33d6258a19489cb5db3b97b2fed3d6fd9c2fe3b350db102f287ade6006627ec92a3e956309550e3af218a6 SHA512 2226b4312f13d433248d705d6abf6ba77e71bebdf1774af131909139856541bdcac4e7483a8e2e38b3e9f009016bc6b36838519fcf423ba9562020d97dd6cfcf
+AUX editline-1.17.1_p20240527-rename-man.patch 305 BLAKE2B 012233bba2e87e9db8b44f033243594dc4af06108b92e9e1770e7b29f06d04eeb3381cd721b194b47ea325e2a1659ce25664e7a5359ae12924dcc5f08954f740 SHA512 3684351dc274e6270ef90406ee14e9b68224387002c9f8072cfe5aeb35821be154f22232c49abcc621602b652a9ce3515606f2ff7246ee7ebc3cdf574b052ab5
 DIST editline-1.17.1.tar.xz 252196 BLAKE2B ae25ebc8efcc5ddf7d68553b6a5d93738e4fbf67c556b4089ace7386cb70058f36137d99df2385e324b36a285aa319b49e1c2eb82059d99d511c43c70f55ce11 SHA512 9b3f5f4a833e9e38c4f99d2e7f8d2716d4db74b6a2d3362e6c513505ff17a79044496405458835d508efd79cbe9046f3c1db602aaad210926312c22057145d35
-EBUILD editline-1.17.1.ebuild 750 BLAKE2B 76aec6faea7414e0db9b88306387d99c289dacfee56ce8f37e9e1992b24a554b111b54b4d30d463232de513b3bf6ee44426e923f424a6eb2a4354d4f0781a177 SHA512 a9212f7b2e938a68d0ae317d5da4061d11e36a49c565c9b6b7bee5e1f880d778c8689626389b0ca390dd0aabee3563b885b721ae29c56c0da5c774ee8644be9f
-MISC metadata.xml 251 BLAKE2B 6eebd5eb731ca8b43437902bfad1f90c793849142f79eb7ef37c0b2c446b03b01d05dbba804c83b94215f979face0af761c846ca16e20a982f4abb3869012c3a SHA512 f40eeb372d081e0be29f97e34cbc9f873104a25c66476c103510d45b30124abb05ff3678aba11934c5a7c84e9cffff9a6f1abe35acb875df2373f463814ee54e
+DIST editline-1.17.1_p20240527.tar.gz 45801 BLAKE2B d9a529f72a6b0f5e70b12f96902405c0600c187a21a6af328763e9bfc7b47fcde862e523380ccc3fb3472f131a8f6c51adbd41c54ef4c2d681cf7f46a809f8c1 SHA512 e12221864432f2da75715737a2fe687eb5af17fb96f689c69e17a728802140ff908355017627a0e5ff9fcc2e78376a3f9bd1fdb335394140016c6e2939c5a77b
+EBUILD editline-1.17.1-r1.ebuild 894 BLAKE2B d522a0cad9ffd40db71345b64ff7539acfc3a4a4132fd338d7a8a2b6b9f847b5517fdeb2b97dc8a019654a0d40bcc31620d66e91f197fd4d971f8a90cb4eeebe SHA512 01cd521f0c6d97f8030f9a8fe5c84d33ceb13aed7a8d96a4791a12f7d307f486b688600b93051daee77539e9b15e5b70fd3978da8ba85f1b9236ae13a307afc3
+EBUILD editline-1.17.1_p20240527.ebuild 1057 BLAKE2B cec33345e3b9611f44b3fc055b63455f1faa6c5e4e8cf45e367a23fe8b832847d2b9e6ee2f9a9a957c7aa6f3509b257113b1fcc7532defe5e3797573dfce5b48 SHA512 15722ba606088b7d05fe0007b31d46f24a6f1e47e376c3c6221c039c097d7a91824abb93abf1919731940f6d9cbcb835960f0c19f1266e9f54fbea0f61e36542
+MISC metadata.xml 890 BLAKE2B ddff4129f99b1fada74c8fd4f4b291f471cb4d8e2c4c4ee1beb068efd02264d68d345a239f08775e283fbe0968196a14ecc7f43eb3c10b058e5796b8a01432c0 SHA512 f629987823a4da1cb3533355e66c2a428b2c4f56156eaa5d6dfd8f8ca15609b8d929ccf0ec113913fbdbb25b616707113edc63ad58c8b1137be67a8a6c94c8ac
diff --git a/dev-libs/editline/editline-1.17.1.ebuild b/dev-libs/editline/editline-1.17.1-r1.ebuild
index 0bba672748cf..72f6f005b20b 100644
--- a/dev-libs/editline/editline-1.17.1.ebuild
+++ b/dev-libs/editline/editline-1.17.1-r1.ebuild
@@ -1,17 +1,28 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="line editing library for UNIX call compatible with the FSF readline"
-HOMEPAGE="https://troglobit.com/projects/editline/"
-SRC_URI="https://github.com/troglobit/editline/releases/download/${PV}/${P}.tar.xz"
+HOMEPAGE="https://troglobit.com/projects/editline/
+	https://github.com/troglobit/editline/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/troglobit/${PN}.git"
+else
+	SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
+SLOT="0/1.0.2"
 
-PATCHES=("${FILESDIR}"/${PN}-1.16.0-rename-man.patch)
+PATCHES=(
+	"${FILESDIR}/${PN}-1.16.0-rename-man.patch"
+)
 
 src_prepare() {
 	default
@@ -28,6 +39,5 @@ src_configure() {
 src_install() {
 	default
 
-	# package installs .pc file
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -type f -name "*.la" -delete || die
 }
diff --git a/dev-libs/editline/editline-1.17.1_p20240527.ebuild b/dev-libs/editline/editline-1.17.1_p20240527.ebuild
new file mode 100644
index 000000000000..5bb5cf61df41
--- /dev/null
+++ b/dev-libs/editline/editline-1.17.1_p20240527.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="line editing library for UNIX call compatible with the FSF readline"
+HOMEPAGE="https://troglobit.com/projects/editline/
+	https://github.com/troglobit/editline/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/troglobit/${PN}.git"
+else
+	[[ "${PV}" == *p20240527 ]] && COMMIT="caf4b3c0ce3b0785791198b11de6f3134e9f05d8"
+
+	SRC_URI="https://github.com/troglobit/${PN}/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0/1.0.2"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.17.1_p20240527-rename-man.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# To avoid collision with dev-libs/libedit
+	# we rename man/editline.3 to man/libeditline.3
+	mv man/editline.3 man/libeditline.3 || die
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	find "${D}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/editline/files/editline-1.17.1_p20240527-rename-man.patch b/dev-libs/editline/files/editline-1.17.1_p20240527-rename-man.patch
new file mode 100644
index 000000000000..d7b6aec5e55c
--- /dev/null
+++ b/dev-libs/editline/files/editline-1.17.1_p20240527-rename-man.patch
@@ -0,0 +1,11 @@
+To avoid collision with dev-libs/libedit
+we rename man/editline.3 to man/libeditline.3
+
+This patch also needs a rename from outside the patch:
+    $ mv man/editline.3 man/libeditline.3
+
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -3,1 +3,1 @@
+-dist_man_MANS = editline.3
++dist_man_MANS = libeditline.3
diff --git a/dev-libs/editline/metadata.xml b/dev-libs/editline/metadata.xml
index 94a7a4cd944f..f0044c4e5ed8 100644
--- a/dev-libs/editline/metadata.xml
+++ b/dev-libs/editline/metadata.xml
@@ -1,8 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">troglobit/editline</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <longdescription>
+    Editline is a line editing library for UNIX. It can be linked into
+    almost any program to provide command line editing and history. It is
+    call compatible with the FSF readline library, but is a fraction of the
+    size (and offers fewer features). The small size, lack of dependencies
+    and the free license should make this library interesting to many
+    embedded developers seeking a replacement for the GNU readline library.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/troglobit/editline/issues/</bugs-to>
+    <remote-id type="github">troglobit/editline</remote-id>
+  </upstream>
 </pkgmetadata>