gentoo auto-resync : 28:02:2024 - 23:41:01

3 files changed, 21 insertions, 61 deletions

diff --git a/dev-scheme/guile-ssh/Manifest b/dev-scheme/guile-ssh/Manifest
index 22b3288bb813..76da1caf3315 100644
--- a/dev-scheme/guile-ssh/Manifest
+++ b/dev-scheme/guile-ssh/Manifest
@@ -1,6 +1,4 @@
 AUX guile-ssh-0.16.2-tests.patch 295 BLAKE2B 6935922a090f542773bf7c9a910bcb5c09648553677745faa29e46e9383981a65324e4895cb2b4e89e795b00a42e866e78e1924e97de393a43f4f99c512e9232 SHA512 b5014323f972b423864631299986bc8ccaaec49f70d5394ab90f9b72a1d3efa81ebe886e02858b517db77b0496561761546279ddee285601a3dd04083eca5863
-DIST guile-ssh-0.16.3.tar.gz 524546 BLAKE2B e8cbe500493d80962f31b1d9ab97f5dc45c2e3612f419244528676b6cc3cf517a7dd84022b84356b0da456cdca404cca3ee25bef1762da9f0e126e086f34a721 SHA512 7b66dd5a29d47f3f7beaefb6576f74f62fe30736ddf97870a72612b44a608d61edd5ba9bc520e577b6f19a9de9044743e880601bae26b9645dafbef2c3134609
 DIST guile-ssh-0.16.4.tar.gz 532702 BLAKE2B 47dd2fde37aa2047d836f464d567736208bfed8afee668bf76d35910a866b1c3e869f346b89b4fce7b747d5806a004933cd673851015f8d76afc61c06a398ad2 SHA512 1c70d4885a6f821c3018650d2537316de981ad5f76eadc51ed2c5dd51225e39e67ad1b979769b1b81a0f061ddeecd11d878b3844d9f8e78fdd0915e2f1a28838
-EBUILD guile-ssh-0.16.3.ebuild 1141 BLAKE2B 2a25d17ee39d004b1b2098de9643d7b9e093b38619b59272a0451a863585fd052a726e7925e42a2e7b43ce162e350967cb1093ecfad064289a4895791e27edf9 SHA512 021e9295348361e90bb3078ddba3c82bb2564a16972330cf0c208d4118b2b0c799765019da9d2d23eb1dca4eaddbff04450dea6241a64de27ba7fde9691bb540
-EBUILD guile-ssh-0.16.4.ebuild 1141 BLAKE2B 2a25d17ee39d004b1b2098de9643d7b9e093b38619b59272a0451a863585fd052a726e7925e42a2e7b43ce162e350967cb1093ecfad064289a4895791e27edf9 SHA512 021e9295348361e90bb3078ddba3c82bb2564a16972330cf0c208d4118b2b0c799765019da9d2d23eb1dca4eaddbff04450dea6241a64de27ba7fde9691bb540
+EBUILD guile-ssh-0.16.4-r1.ebuild 1299 BLAKE2B be0acdfb064d9ef9fd819e9e5fffb0418cc372a1679be94d0a24e1be416d8e81264a6ef8eea14d798d379a1ee804261ff1fd9794f9831353a440199bf41d8d20 SHA512 9d93d71acabcbe9ea7fb344280bc33d212856fc3e3607d4afb86d22791fb4d9932c19738d9662529e626153e1da86521687e2b2a8ce5865bd0dc66c0956d3bda
 MISC metadata.xml 431 BLAKE2B ffc50f05ec61ce0379d33825d3a8a6785160b534f958ee50baf65a4724780c116a92802c35d58af7303a161c77cb330e304e9a0d4c67e7ce5287f7f9c727c8f2 SHA512 54b85f6747b45a37e792aed4a4ded07c9f9bdae0e48fcc3f9ba249007f9027018bb5831a872912eee73d834d0e42cbd9c130fb101755d9691e0dc0948738b4f0
diff --git a/dev-scheme/guile-ssh/guile-ssh-0.16.3.ebuild b/dev-scheme/guile-ssh/guile-ssh-0.16.4-r1.ebuild
index bda391d671fb..5a331431ce4e 100644
--- a/dev-scheme/guile-ssh/guile-ssh-0.16.3.ebuild
+++ b/dev-scheme/guile-ssh/guile-ssh-0.16.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,22 +8,35 @@ inherit autotools
 DESCRIPTION="Library providing access to the SSH protocol for GNU Guile"
 HOMEPAGE="https://memory-heap.org/~avp/projects/guile-ssh/
 	https://github.com/artyom-poptsov/guile-ssh/"
-SRC_URI="https://github.com/artyom-poptsov/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/artyom-poptsov/${PN}.git"
+else
+	SRC_URI="https://github.com/artyom-poptsov/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-scheme/guile-2.0.0:=
 	net-libs/libssh:0=[server,sftp]
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.16.2-tests.patch
+	"${FILESDIR}/${PN}-0.16.2-tests.patch"
 )
 
 # guile generates ELF files without use of C or machine code
@@ -32,11 +45,10 @@ QA_PREBUILT='*[.]go'
 
 src_prepare() {
 	default
+	eautoreconf
 
 	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
 	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	eautoreconf
 }
 
 src_install() {
diff --git a/dev-scheme/guile-ssh/guile-ssh-0.16.4.ebuild b/dev-scheme/guile-ssh/guile-ssh-0.16.4.ebuild
deleted file mode 100644
index bda391d671fb..000000000000
--- a/dev-scheme/guile-ssh/guile-ssh-0.16.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Library providing access to the SSH protocol for GNU Guile"
-HOMEPAGE="https://memory-heap.org/~avp/projects/guile-ssh/
-	https://github.com/artyom-poptsov/guile-ssh/"
-SRC_URI="https://github.com/artyom-poptsov/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-scheme/guile-2.0.0:=
-	net-libs/libssh:0=[server,sftp]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.16.2-tests.patch
-)
-
-# guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
-QA_PREBUILT='*[.]go'
-
-src_prepare() {
-	default
-
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-
-	# Workaround llvm-strip problem of mangling guile ELF debug
-	# sections: https://bugs.gentoo.org/905898
-	dostrip -x "/usr/$(get_libdir)/guile"
-}