[gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/

["David Seifert" <soap@gentoo.org>]

commit:     35149d666b723af3eddf41e7158a4243c7f511ef
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 19:21:16 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 19:21:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35149d66

sys-devel/gettext: drop USE='cvs'

Closes: https://github.com/gentoo/gentoo/pull/29668
Closes: https://bugs.gentoo.org/867928
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-devel/gettext/gettext-0.21.1.ebuild |  6 ++----
 sys-devel/gettext/metadata.xml          | 27 ++++++++++-----------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/sys-devel/gettext/gettext-0.21.1.ebuild b/sys-devel/gettext/gettext-0.21.1.ebuild
index df051017c102..7b9266695787 100644
--- a/sys-devel/gettext/gettext-0.21.1.ebuild
+++ b/sys-devel/gettext/gettext-0.21.1.ebuild
@@ -23,7 +23,7 @@ fi
 # so put that license behind USE=cxx.
 LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
 SLOT="0"
-IUSE="acl cvs +cxx doc emacs git java ncurses nls openmp static-libs"
+IUSE="acl +cxx doc emacs git java ncurses nls openmp static-libs"
 
 # only runtime goes multilib
 # Note: The version of libxml2 corresponds to the version bundled via gnulib.
@@ -40,11 +40,9 @@ DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 	ncurses? ( sys-libs/ncurses:0= )
 	java? ( virtual/jdk:1.8 )"
 RDEPEND="${DEPEND}
-	!git? ( cvs? ( dev-vcs/cvs ) )
 	git? ( dev-vcs/git )
 	java? ( virtual/jre:1.8 )"
 BDEPEND="
-	!git? ( cvs? ( dev-vcs/cvs ) )
 	git? ( dev-vcs/git )
 	verify-sig? ( sec-keys/openpgp-keys-gettext )"
 PDEPEND="emacs? ( app-emacs/po-mode )"
@@ -119,12 +117,12 @@ multilib_src_configure() {
 		--without-included-libxml
 
 		--disable-csharp
+		--without-cvs
 
 		$(use_enable acl)
 		$(use_enable cxx c++)
 		$(use_enable cxx libasprintf)
 		$(use_with git)
-		$(usex git --without-cvs $(use_with cvs))
 		$(multilib_native_use_enable java)
 		$(use_enable ncurses curses)
 		$(use_enable nls)

diff --git a/sys-devel/gettext/metadata.xml b/sys-devel/gettext/metadata.xml
index 502becbd6b66..aad767169a65 100644
--- a/sys-devel/gettext/metadata.xml
+++ b/sys-devel/gettext/metadata.xml
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="cvs">
-		When running `autopoint`, use cvs to store the internal development files;
-		this requires cvs at runtime, but will be faster/smaller than raw archives
-	</flag>
-	<flag name="git">
-		When running `autopoint`, use git to store the internal development files;
-		this requires git at runtime, but will be faster/smaller than raw archives
-	</flag>
-</use>
-<upstream>
-	<remote-id type="cpe">cpe:/a:gnu:gettext</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="git">When running `autopoint`, use git to store the internal development files; this requires git at runtime, but will be faster/smaller than raw archives</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:gettext</remote-id>
+	</upstream>
 </pkgmetadata>