commit: 448a3ec950e76342573cd6f1721cbadce07c4fbc Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org> AuthorDate: Tue Jul 4 07:05:52 2023 +0000 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org> CommitDate: Tue Jul 4 07:14:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=448a3ec9
net-libs/xrootd: merge duplicate REQUIRED_USE added by mistake Closes: https://bugs.gentoo.org/909428 Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org> net-libs/xrootd/xrootd-5.5.5-r1.ebuild | 12 +++++------- net-libs/xrootd/xrootd-5.6.0.ebuild | 16 +++++++--------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/net-libs/xrootd/xrootd-5.5.5-r1.ebuild b/net-libs/xrootd/xrootd-5.5.5-r1.ebuild index 7b7be06008c8..b80cac774a68 100644 --- a/net-libs/xrootd/xrootd-5.5.5-r1.ebuild +++ b/net-libs/xrootd/xrootd-5.5.5-r1.ebuild @@ -26,8 +26,11 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="examples fuse http kerberos +libxml2 macaroons python readline scitokens +server systemd test xrdec" REQUIRED_USE=" - macaroons? ( server ) - scitokens? ( server ) + http? ( kerberos ) + macaroons? ( server ) + python? ( ${PYTHON_REQUIRED_USE} ) + scitokens? ( server ) + test? ( server ) " RESTRICT="!test? ( test )" @@ -63,11 +66,6 @@ BDEPEND=" RDEPEND="${CDEPEND} dev-lang/perl " -REQUIRED_USE=" - http? ( kerberos ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( server ) -" PATCHES=( "${FILESDIR}"/${PN}-4.8.3-crc32.patch diff --git a/net-libs/xrootd/xrootd-5.6.0.ebuild b/net-libs/xrootd/xrootd-5.6.0.ebuild index eb7a9c37b3a2..dd92b0da08dc 100644 --- a/net-libs/xrootd/xrootd-5.6.0.ebuild +++ b/net-libs/xrootd/xrootd-5.6.0.ebuild @@ -26,13 +26,16 @@ SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz"; +RESTRICT="!test? ( test )" + REQUIRED_USE=" - macaroons? ( server http ) - scitokens? ( server ) + http? ( kerberos ) + macaroons? ( server http ) + python? ( ${PYTHON_REQUIRED_USE} ) + scitokens? ( server ) + test? ( server ) " -RESTRICT="!test? ( test )" - CDEPEND="acct-group/xrootd acct-user/xrootd dev-libs/openssl:0= @@ -68,11 +71,6 @@ BDEPEND=" RDEPEND="${CDEPEND} dev-lang/perl " -REQUIRED_USE=" - http? ( kerberos ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( server ) -" PATCHES=( "${FILESDIR}"/${PN}-4.8.3-crc32.patch
