gentoo auto-resync : 29:11:2022 - 07:19:33

4 files changed, 8 insertions, 58 deletions

diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index c3a272773ab4..7dcf120155e4 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -1,8 +1,5 @@
-DIST svn2git-1.0.16.tar.gz 44489 BLAKE2B 0be673592a6032b0f46f7ab80e50862e6979a6540d17eadb2c0e4c3f40737283fb17cc51340810bbfc17dba7ee258537d5618de95da3843851e20ae843a47626 SHA512 11289c98fcae98ec2137b778c064e73f47957c987a8d413946a8cde44d679565eae878e69e3a60b5c48c0753dd4935d001eb6ba28253cea995ee4fd40379b583
-DIST svn2git-1.0.17.tar.gz 46473 BLAKE2B ab862a310f8d21b33d49f5152df458fb1524abe2e353e6395d7b20d80ee3967338ca04ff5e282623937ca13b38e9018ba81d4c3e89f3c69e1002bff7ddd8621a SHA512 6d02ffa0923bcc80878c08e5a4f2f00476485e34d1c7361ddfa8bdfd521c0d36a22b46e7cd872e617ecd604f2d724166ea95008338bba41ee7e1200dc919baf4
 DIST svn2git-1.0.18.tar.gz 53514 BLAKE2B 1e40318e484df4eee9ab3586b73cc6a7d9599f8f04e31531e2591dc0bb6f84190d35fb6b9128dd512bab59648e838f479fd81894f97cfce7af4365e0932b26e4 SHA512 ff851a5c3a225c8b6efa9fbf90bd72439bc1303f8138384c2bac779d6cfe52c77125ec3b80b320205e08bbee9910c5203a95c112909c3336750938d2271c2517
-EBUILD svn2git-1.0.16.ebuild 1034 BLAKE2B ddbb36477b2dbd88f52598c46dfe6c357a3ee03f17ba668897a11cdf1da6b2d11bbaa160526b7ece14437883ba7583a596f3f9c66f5fdf65c693d76427a7b8b7 SHA512 61d9606dc51ba6efd15b615d6573a357a73b84c01303c6b561b6f3f09aed6db4e9698231b86622913a97118b8a85c36df71b238ee5a2bb0390475c13c7c68d1e
-EBUILD svn2git-1.0.17.ebuild 1034 BLAKE2B bf4bc2dd9ccd89a21f5161275c5d4b6536c3824cb0f4f8218b0603ee24f01d2d0d87f63aac37bd47b6f673946d688aff9e6888aa6f51c333db683567cab49b03 SHA512 f0993c376ae1c3949cc00a51d09112eca009230d8a671dd37cc30b385a474f19d3ac135a3f3b22f1e789d5498f6ebbaafa19d169a3df32e295f67c31cdf2f230
+EBUILD svn2git-1.0.18-r1.ebuild 1026 BLAKE2B 5f19c15f7c7db328795f28d4dc3c5c84a3a1882f63b7e962908da72eaf35f2672e97def62d7be3712f17105b6cfca0991e004ba0c251d01ccdf9c637c2a4617c SHA512 cb9fe406acbbf25f2a0c1065704355a4407f4d14548033311891c59667dd460043529f28e48c11cf4bac6f309baaa19da2b789feb04b7fa17b3db7847fa19eae
 EBUILD svn2git-1.0.18.ebuild 1034 BLAKE2B bf4bc2dd9ccd89a21f5161275c5d4b6536c3824cb0f4f8218b0603ee24f01d2d0d87f63aac37bd47b6f673946d688aff9e6888aa6f51c333db683567cab49b03 SHA512 f0993c376ae1c3949cc00a51d09112eca009230d8a671dd37cc30b385a474f19d3ac135a3f3b22f1e789d5498f6ebbaafa19d169a3df32e295f67c31cdf2f230
-EBUILD svn2git-9999.ebuild 1038 BLAKE2B 059a84ce943445d0779faf33c7c370c238f23de5917c6a7fdbabff1b835a87be854f99094eed0f801a13409ff94ec08c93f126020fa5d8223b6e70081d40099f SHA512 79e71b22e1df2c6a9e94d262bd2851507cc5fe284706e65e24dfa83be2364e9434a33067a4ddbe10b4a4a4841b2452c2eea4285dbbbf08fa859d59b6b98cae65
+EBUILD svn2git-9999.ebuild 1030 BLAKE2B 4247ae3c8727646523a62fb5bd30905776dae0efed247406e691bedc4456348c877c072c2e45793647b2cbf45fc2f41e0afcdb3df836ae048f1209c6361bab11 SHA512 5ce0a42798aa47c88b8b1cc3b1dd0d076b35f89c80f2aac2c10c313650768b49c8be94d56c1119d2a4a7575290c17cddaef1d77b999c875c166579dfa2649606
 MISC metadata.xml 342 BLAKE2B 6979ab5bc57e2ce266d7907bdba2498d60028107152811ccd07cb9c23087c575dbcf0cd867b3a4b879d0521f7c31586d03c439f98f214ffa9f03312f27953bb3 SHA512 0f1f3d6c555daafd485fa93c5575ba38522c183b471f97141649d4487dc2966938896cd9550b58728a3ed122abf8b9900e50e2f6c64c47db81d3786e45deaa80
diff --git a/dev-vcs/svn2git/svn2git-1.0.17.ebuild b/dev-vcs/svn2git/svn2git-1.0.17.ebuild
deleted file mode 100644
index 7b8fb13d3724..000000000000
--- a/dev-vcs/svn2git/svn2git-1.0.17.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils
-[[ "${PV}" == "9999" ]] && inherit git-r3
-
-DESCRIPTION="Tool for one-time conversion from svn to git"
-HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
-else
-	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-# KEYWORDS way up
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-vcs/subversion"
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-
-DOCS=( README.md )
-
-src_configure() {
-	local qmake_args=(
-		APR_INCLUDE=/usr/include/apr-1
-		PREFIX=/usr
-		SVN_INCLUDE=/usr/include/subversion-1
-		VERSION=${PV}
-	)
-	eqmake5 "${qmake_args[@]}" fast-export2.pro
-}
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/${PN}/samples
-	doins samples/*.rules
-	dobin svn-all-fast-export
-	dosym svn-all-fast-export /usr/bin/svn2git
-}
diff --git a/dev-vcs/svn2git/svn2git-1.0.16.ebuild b/dev-vcs/svn2git/svn2git-1.0.18-r1.ebuild
index 0db87be987a4..23d663c4c084 100644
--- a/dev-vcs/svn2git/svn2git-1.0.16.ebuild
+++ b/dev-vcs/svn2git/svn2git-1.0.18-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop qmake-utils
+inherit qmake-utils
 [[ "${PV}" == "9999" ]] && inherit git-r3
 
 DESCRIPTION="Tool for one-time conversion from svn to git"
diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild
index 71f0f843766f..7db66f10e468 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop qmake-utils
+inherit qmake-utils
 [[ "${PV}" == "9999" ]] && inherit git-r3
 
 DESCRIPTION="Tool for one-time conversion from svn to git"