gentoo auto-resync : 07:01:2024 - 06:54:33

4 files changed, 5 insertions, 52 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index ca31bdcc39e2..78a20b380bf9 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/squirrelsh/Manifest b/app-shells/squirrelsh/Manifest
index 136417f98b4f..7ce725cdca4a 100644
--- a/app-shells/squirrelsh/Manifest
+++ b/app-shells/squirrelsh/Manifest
@@ -6,6 +6,5 @@ AUX squirrelsh-no-strip.patch 903 BLAKE2B cefa3bb32d03e26f9aba808fcdfd9d8c7a7d2c
 AUX squirrelsh-remove-forced-abi.patch 653 BLAKE2B 92710dce7c0375d8a2a5a9cde5300f9d7630a9296e82a2c7b15311f1298615e85a974af9fa77def60ef2a0e966e00decc5e4ac236f6c1e4257f1e4241277c85f SHA512 6e2b43c7ecff32fda8e2655722f97f48a0a92f6fe5e1e3aeb28bc3b5459fccefa3aa4c04aca016001661af229c59982caf7b09209d7004c2dd397493c873cd50
 AUX squirrelsh-rename-LDFLAGS.patch 4981 BLAKE2B 405bf56a8dec4ac1c0e62d3cbdc4c3b6fbcd38b443304607b42f85132e22ebb79211939fa651271db56702b7de5b0f46515f38ea57ed43b048fad14aeee6bb6b SHA512 eb8058878bd23332dd58970caac5121838bd52b7a63249013b305b09a95a1ca5914a526e4d0d052772f32086d1e2237feae56bfc4549987e71a6db60ffff6cd3
 DIST squirrelsh-1.2.7-src.tar.bz2 673462 BLAKE2B a2e6a1e0c3e3c5eeb329ec33596514e09657439723d34069b66b744f525318d237d15e951bf4c8fe364d50091cd8dcb2d25cae837ebdfd5a219c0bab20d1adce SHA512 7db82cad969ba209cae6b2d1c4cf76ba10acbf79c051f4340556ae81dc98d36dfb6f1f6993e9198e5a5254eaaab3fbaca3d01fc547c2f303572060b2093af78a
-EBUILD squirrelsh-1.2.7-r1.ebuild 1200 BLAKE2B b5c3956dcaa9241ea3cec392ee5baf653f792c8251ce8d10640ff52d9cf9e181dfe4a6fd819ff44eed59c0571ccb8beac1bc0bc880c5b582c3054665131ddc01 SHA512 4d2c6fce21da47e406aa391df39fced95a4b373a78539bace163094a79b653ef685189445ce2278472770da6f55e0bd2129871446bbd73498781193d3d5b5cc4
-EBUILD squirrelsh-1.2.7.ebuild 1176 BLAKE2B 72c1895670ffb0b9f64d71dc4727238f2e8822c88d95502926d31bf08952032b7f5b613ea9b6478d90b36af443c549a767d40ee28fe816d24bb2c1052fb787a6 SHA512 9e4e55135edfb6ab009bc3bc9471d3a820114ac62057cf8d9355d243c668f2eb6c56165f0f77fa0bc1f5b1e4239383e52556a1f73e2101564b0fae3daf368950
+EBUILD squirrelsh-1.2.7-r1.ebuild 1240 BLAKE2B b1eca2e1715ad2df987de297bf82d933a03fa4b8805cf7529ecf2eeb0c985da957c6f7fae1c5c62214165b102bbf89b67cedd4c768480bab9bc3d60fa94665b9 SHA512 331a0a265545b255196875f5d2af9b6eef2683f00f8bfc46ab39f21c42d8586b465682a73ec963877024e3daa230d0e4adcad68cc4fc0db2ea13f3f1f67cbb0b
 MISC metadata.xml 248 BLAKE2B adbfd1f3d31aac1d9331ecddb0749fd1a9139c28cd880ede04560ee2c8a760de99813b4c867df0a1f9c20a4d5b01f8bacc9e5327c097001d802748a77af8f0a3 SHA512 097dccbb7f6f015abc4741bedf802e2659e864a9aca4d55eaee6cb0664364cac362dbe607b278eddfe052cc9f76a52ea861e6bbfaf967d9bf9e7703358872ada
diff --git a/app-shells/squirrelsh/squirrelsh-1.2.7-r1.ebuild b/app-shells/squirrelsh/squirrelsh-1.2.7-r1.ebuild
index 91c3a8e154d8..24519dc74079 100644
--- a/app-shells/squirrelsh/squirrelsh-1.2.7-r1.ebuild
+++ b/app-shells/squirrelsh/squirrelsh-1.2.7-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
@@ -6,10 +6,10 @@ EAPI=8
 inherit edo toolchain-funcs
 
 DESCRIPTION="Cross-platform object-oriented scripting shell using the squirrel language"
-HOMEPAGE="http://squirrelsh.sourceforge.net/"
+HOMEPAGE="https://squirrelsh.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
@@ -31,6 +31,7 @@ PATCHES=(
 src_configure() {
 	# This package uses a custom written configure script
 	edo ./configure --prefix="${D}"/usr \
+		--with-librarian="$(tc-getAR) rc" \
 		--with-cc="$(tc-getCC)" \
 		--with-cpp="$(tc-getCXX)" \
 		--with-linker="$(tc-getCXX)" \
diff --git a/app-shells/squirrelsh/squirrelsh-1.2.7.ebuild b/app-shells/squirrelsh/squirrelsh-1.2.7.ebuild
deleted file mode 100644
index 2a89668fd0ab..000000000000
--- a/app-shells/squirrelsh/squirrelsh-1.2.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Cross-platform object-oriented scripting shell using the squirrel language"
-HOMEPAGE="http://squirrelsh.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/libpcre"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-rename-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-no-strip.patch
-	"${FILESDIR}"/${PN}-fix-in_LDFLAGS.patch
-	"${FILESDIR}"/${PN}-remove-forced-abi.patch
-	"${FILESDIR}"/${PN}-no-docs.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_configure() {
-	#This package uses a custom written configure script
-	./configure --prefix="${D}"/usr \
-		--with-cc="$(tc-getCC)" \
-		--with-cpp="$(tc-getCXX)" \
-		--with-linker="$(tc-getCXX)" \
-		--libdir=/usr/"$(get_libdir)" \
-		--with-pcre="system" \
-		--with-squirrel="local" \
-		--with-mime=no || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doman doc/${PN}.1
-	dodoc HISTORY INSTALL README
-	use doc && dodoc doc/*.pdf
-}