summaryrefslogtreecommitdiff
path: root/net-libs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-04-08 23:33:13 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-04-08 23:33:13 +0100
commit900dd293f8087dff1643b45d7b836702a9ea8fd9 (patch)
tree0829d8047ff5fda91e78e53de3bd01c094d837b8 /net-libs
parent02f2b9c649c1687088b6ccb6d30b35f519f107cf (diff)
gentoo auto-resync : 08:04:2023 - 23:33:13
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/Manifest.gzbin32791 -> 32802 bytes
-rw-r--r--net-libs/libnpupnp/Manifest4
-rw-r--r--net-libs/libnpupnp/libnpupnp-5.0.0.ebuild48
-rw-r--r--net-libs/libnpupnp/libnpupnp-5.0.1.ebuild2
-rw-r--r--net-libs/libpcap/Manifest5
-rw-r--r--net-libs/libpcap/libpcap-1.10.4.ebuild97
-rw-r--r--net-libs/libpcap/libpcap-9999.ebuild2
-rw-r--r--net-libs/xrootd-ceph/Manifest2
-rw-r--r--net-libs/xrootd-ceph/xrootd-ceph-5.5.2.ebuild38
-rw-r--r--net-libs/xrootd/Manifest11
-rw-r--r--net-libs/xrootd/metadata.xml1
-rw-r--r--net-libs/xrootd/xrootd-5.4.3-r1.ebuild135
-rw-r--r--net-libs/xrootd/xrootd-5.4.3-r2.ebuild2
-rw-r--r--net-libs/xrootd/xrootd-5.5.0.ebuild134
-rw-r--r--net-libs/xrootd/xrootd-5.5.4-r1.ebuild (renamed from net-libs/xrootd/xrootd-5.5.2.ebuild)71
-rw-r--r--net-libs/xrootd/xrootd-5.5.4.ebuild135
16 files changed, 171 insertions, 516 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 197d61336bec..8a7171140373 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
Binary files differ
diff --git a/net-libs/libnpupnp/Manifest b/net-libs/libnpupnp/Manifest
index 7bdd1f69434e..bf317c908585 100644
--- a/net-libs/libnpupnp/Manifest
+++ b/net-libs/libnpupnp/Manifest
@@ -1,5 +1,3 @@
-DIST libnpupnp-5.0.0.tar.gz 545368 BLAKE2B a0b83186df66ff5608a7d579d3653028497ce92536ea85abc03c73134046c4f55ad31fb849c7231cf7842a424e4f408747f7da3769aae441499fd7ec7ae2544f SHA512 325be49f64d901e67aaf3893ac91f21523e81b1810c717f70a40486dde65080620ffa38f622ec785475b181f84a6d51fad89a86e709a9bd5554f278b90ae92f9
DIST libnpupnp-5.0.1.tar.gz 553258 BLAKE2B 141967e60a4776b6470dc55d2b0736e17281c671d7f102aee9553ff48d66833ec0c97d405427161989130f6cac21c90c2663f945e6c69c317de710a08e84627a SHA512 2a8cd7c1f2bd710a9b72d69dde56b2e5094ef1b6282239377f7fd15e0a6d9f85218f5b95ec17dabc678897f2d597cf7bf800890524762488c0e6fcc315a8cef7
-EBUILD libnpupnp-5.0.0.ebuild 850 BLAKE2B ef0c518353ca869a56e171b36f11063acaa153a44711c460e37f77e25304aeccf961c6c8f69a20806f860711399c0514f1316876fcf38979ac7837d7ec15e973 SHA512 41dfed61f5fc31eae948fa457d9b660d6af76c2b129ebca47a14e7b9bc7d2a02c054abb87dcb50365fca0e55198a26d7a8c359f24c844ad0acf540386e584031
-EBUILD libnpupnp-5.0.1.ebuild 852 BLAKE2B d7f52fb82134a5ce8488bb3c1c2aecc1bb45b4f04bdc1538b5612637d358491af9d62c74597ca98aa0938a589ad99ab78663c321c1fc5364043ee728faeacbd4 SHA512 a0ec2060419d6d691eb674f79ba8edb0510cc3834755d0bb7b0a04efc085c5e1e88296e3e2fe289d013853ad35a2a6c96abf29a4f9e7029b5dedf77f13765dad
+EBUILD libnpupnp-5.0.1.ebuild 850 BLAKE2B ef0c518353ca869a56e171b36f11063acaa153a44711c460e37f77e25304aeccf961c6c8f69a20806f860711399c0514f1316876fcf38979ac7837d7ec15e973 SHA512 41dfed61f5fc31eae948fa457d9b660d6af76c2b129ebca47a14e7b9bc7d2a02c054abb87dcb50365fca0e55198a26d7a8c359f24c844ad0acf540386e584031
MISC metadata.xml 536 BLAKE2B 10f40312537ef0896c90f23ff327c320fd6c983227f182b46fa2d2d3bbe83044894f07449c9c119c5aa89dc8a889405f14437c0a84c6c52d0116818f9d169d39 SHA512 82d22e0273ed07ff51ce763851f8ea0070e10f6665763543cf96518ab9ef53005c88588cfe3f94855da74a17eae68118d263f12478f0928aca4cad6cce849677
diff --git a/net-libs/libnpupnp/libnpupnp-5.0.0.ebuild b/net-libs/libnpupnp/libnpupnp-5.0.0.ebuild
deleted file mode 100644
index f1e07f46c8cb..000000000000
--- a/net-libs/libnpupnp/libnpupnp-5.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp"
-HOMEPAGE="https://framagit.org/medoc92/npupnp"
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
- dev-libs/expat
- net-libs/libmicrohttpd
- net-misc/curl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --enable-client \
- --enable-debug \
- --enable-device \
- --enable-gena \
- --enable-ipv6 \
- --enable-optssdp \
- --enable-reuseaddr \
- --enable-soap \
- --enable-ssdp \
- --enable-tools \
- --enable-webserver
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libnpupnp/libnpupnp-5.0.1.ebuild b/net-libs/libnpupnp/libnpupnp-5.0.1.ebuild
index 9990fede9a9f..f1e07f46c8cb 100644
--- a/net-libs/libnpupnp/libnpupnp-5.0.1.ebuild
+++ b/net-libs/libnpupnp/libnpupnp-5.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-libs/expat
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 5aa03a1579d7..a2e0d6de7ff7 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -7,8 +7,11 @@ DIST libpcap-1.10.2.tar.gz 951063 BLAKE2B f8280c8e12065b4d86e451df8504c834da9c94
DIST libpcap-1.10.2.tar.gz.sig 442 BLAKE2B c470ff70e58c13dfd1a6d72a00d83883515b9ca63e1561b3acbb75d744b043726df9b8dcb70dfa5ea1c0fa54624a407364d85e83fd3ec4dfd605aa401f5351df SHA512 122bf14c2525a05b2781f6d7bc029d73bcf4584c184220b9f9716def327cc0521ec78d658ad58bdf8a9cd9415ab9ad4d1d24ed1880db25ace6a01a93786bcc5e
DIST libpcap-1.10.3.tar.gz 951869 BLAKE2B 3614042f7d8cd5a25221f52d2ed09f9f44643cdc0901ff21041ddb7ba85193c667036f7d989c8b59e6e205d630e062da46533110914dd287013a9ff80b31e97f SHA512 57bc07cbc8c326e203ce10ce1eb9f55760fc33320718d8643c65a68949334291877dffcf19af5f61eb9b4eda2d8ffe7bacee38363d2d6536cc85ae81c851684d
DIST libpcap-1.10.3.tar.gz.sig 442 BLAKE2B 30f0053bc05564fd06aeac751d85eb4838c55c783a0eed450f4de238391c87b8915378f4dc679a14276c9e5e17e9bc74b861241a0a0e86bb22dc2680552f43db SHA512 dc5ae51a96f9dfc570009a5c711a1e4eca012e99d6eb7af3b35c5636199b3273e92a657fdf85688650c093cc9b6c435ba1e9b84100469b2604b8d3125613b4ab
+DIST libpcap-1.10.4.tar.gz 952153 BLAKE2B 05a7eafc1e1817f7844008db89d8fb10cd2525c22f7ee6c9e3d582b14229412f38ccced5e9d80a96dd459ef9eab12eccb5c1dd4978ddc9f66267469212005e4c SHA512 1f6d6ddd07dae7c557054cb246437ecdaf39d579592a5a6bdf1144eea6cb5a779ac4ca647cfed11ec1b0bb18efc63b845444e497070bacefaaed19a5787ae5e1
+DIST libpcap-1.10.4.tar.gz.sig 442 BLAKE2B d0eb5da9a57003848b24d458e50a201d0bb8876a12e63f6627bf9dc1a784e780610cd0c858243cc75a63999b40bc64507b078777ae844ede7c07eef9f4f9e0d5 SHA512 34aa401c2e162d708c61b78b445af2fe4ddc0e57de9124b5cc3a05679ffbc3834088160f83892d827e25c65b33313fe71aa73c2de09935d387252ab315ca5ee1
EBUILD libpcap-1.10.1-r2.ebuild 2927 BLAKE2B 1a4024dd0a7109b98e4af91fde9c60eceaa519b7fd23c14f24cf3509b89c6275e33b2681dc795e34604ebfb08f65b389eaf6932e35ad611de0d6419cc9343758 SHA512 3f5d60f071b61dad9f9fa0695f7b8706ee6675a2b8a3e864f6cb511d2caf3ddbc997fbec4f555bfe1703da5bbe879623aab15325639e7ce529e122603dd1857a
EBUILD libpcap-1.10.2.ebuild 2393 BLAKE2B 25557edcd034e83df4ec0d63636774e52c8c02f10bc88082e218721e9e33541e7609ecf6356c65cd73adc060dbe8ba6b67dd648d5f07f4ef81ca4a82e5d3030d SHA512 813925973f46a57f620018d657666d6e36889a592f31c8d2e61941e5e6b09edb1bf1be256c4bfacebd7d76b46d8d501ee48f58a12e64c24b7377bf710a570d8f
EBUILD libpcap-1.10.3.ebuild 2391 BLAKE2B 39db7d77a94ddda6cb05c8cc619121c17c1ce5d5e03c434a3c0f8b0305869049b67d9f857d761aa33f067ce22293ab1589debebfbeb674e2d4da406e5c76b00d SHA512 b9b425c72a2caa5946b234f0ca885c9e51cae5eb35b798d22362366a0f7e12757e49691bec35201e1881841fe605f07282e9433865fc3fea9adbb228e229f98b
-EBUILD libpcap-9999.ebuild 2393 BLAKE2B 25557edcd034e83df4ec0d63636774e52c8c02f10bc88082e218721e9e33541e7609ecf6356c65cd73adc060dbe8ba6b67dd648d5f07f4ef81ca4a82e5d3030d SHA512 813925973f46a57f620018d657666d6e36889a592f31c8d2e61941e5e6b09edb1bf1be256c4bfacebd7d76b46d8d501ee48f58a12e64c24b7377bf710a570d8f
+EBUILD libpcap-1.10.4.ebuild 2399 BLAKE2B 378880215fe65a1f1a79563887c8d7cce979cf2ae85e04e791afdd8d258212f3be1f825c4e79110f0926eb0f10509ae815221cd7f00b77bb09949ecc0aa7ef5b SHA512 47fb528c03588b0f8a2c07144254370fd91fd9c4e8c0a0868507907424835f09b595cf8f1fb4a32a5e85701c78f80e31da028c2d7f03a7f0dd9092459c4823dd
+EBUILD libpcap-9999.ebuild 2399 BLAKE2B 378880215fe65a1f1a79563887c8d7cce979cf2ae85e04e791afdd8d258212f3be1f825c4e79110f0926eb0f10509ae815221cd7f00b77bb09949ecc0aa7ef5b SHA512 47fb528c03588b0f8a2c07144254370fd91fd9c4e8c0a0868507907424835f09b595cf8f1fb4a32a5e85701c78f80e31da028c2d7f03a7f0dd9092459c4823dd
MISC metadata.xml 811 BLAKE2B d3c9d3d8ed42bb512b1d1608076d19ee7f3d3f06f5c622bfbe2f4ea1326397bd03fb480f4c01caf8c367b58a3f466f0b94b5e94b14c9d66cc7cbbde3c70651ec SHA512 bbef3e91d4958ec7070871f176aef2934e15d6bb45a45249dbd903b7dc108931c48df691df5810ad0e95c6bca2be707f88646b79b0d42a4a3c8966b6d0918dfb
diff --git a/net-libs/libpcap/libpcap-1.10.4.ebuild b/net-libs/libpcap/libpcap-1.10.4.ebuild
new file mode 100644
index 000000000000..a229dbe01d7e
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.10.4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap"
+
+if [[ ${PV} == *9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
+ inherit git-r3
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
+ inherit verify-sig
+
+ SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
+ SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
+
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="bluetooth dbus netlink rdma remote static-libs test usb yydebug"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+ remote? ( virtual/libcrypt:=[${MULTILIB_USEDEP}] )
+ rdma? ( sys-cluster/rdma-core )
+ usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-alternatives/yacc
+ sys-devel/flex
+ dbus? ( virtual/pkgconfig )
+"
+
+if [[ ${PV} != *9999* ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
+fi
+
+src_prepare() {
+ default
+
+ if ! [[ -f VERSION ]]; then
+ echo ${PV} > VERSION || die
+ fi
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # bug #884275
+ export LEX=flex
+
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable bluetooth) \
+ $(use_enable dbus) \
+ $(use_enable rdma) \
+ $(use_enable remote) \
+ $(use_enable usb) \
+ $(use_enable yydebug) \
+ $(use_with netlink libnl) \
+ --enable-ipv6
+}
+
+multilib_src_compile() {
+ emake all shared
+ use test && emake testprogs
+}
+
+multilib_src_test() {
+ testprogs/findalldevstest || die
+}
+
+multilib_src_install_all() {
+ dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
+
+ # remove static libraries (--disable-static does not work)
+ if ! use static-libs; then
+ find "${ED}" -name '*.a' -exec rm {} + || die
+ fi
+
+ find "${ED}" -name '*.la' -delete || die
+
+ # We need this to build pppd on G/FBSD systems
+ if [[ "${USERLAND}" == "BSD" ]]; then
+ insinto /usr/include
+ doins pcap-int.h portability.h
+ fi
+}
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 9bda8d87fb64..a229dbe01d7e 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="BSD"
diff --git a/net-libs/xrootd-ceph/Manifest b/net-libs/xrootd-ceph/Manifest
index 42e05fa699e9..d90ab6fe319e 100644
--- a/net-libs/xrootd-ceph/Manifest
+++ b/net-libs/xrootd-ceph/Manifest
@@ -1,8 +1,6 @@
AUX xrootd-ceph-5.4.0_no-werror.patch 537 BLAKE2B c07404d729e6b8328c849125b543d2d31df51c05d97dd7481c39762c5b32a20b6e9715afdd9db448d90b06be15b6207021bf1c213593c8c2046304c4c284e312 SHA512 1418e185a6c799ebf9d4eb97044055cba3afdfd8f742f08e34f6cea8a01f795cf538a7a3ec1b387e9cbdba01776bbad27d83f8c58898c3f128d369c342830ce9
DIST xrootd-ceph-5.4.3.tar.gz 82057 BLAKE2B 3ca2a812e6a55d696c1336b28114e9d4ec46c18d764ab8966533e150bb7e3a040c58a957c73adfd4f79038b82ebafcc3b09eae2d7b06aba41e36ce94c36ac3fe SHA512 b1065cf55d3918eef5083ebd1737139a761a28e4cc41cd2b796e2a0157d7a86850e643cecd89aeef89419485397676ac7040df5a5e2e9f7405d26320dbe1c9e3
-DIST xrootd-ceph-5.5.2.tar.gz 82023 BLAKE2B 50976230f0832b7065cf73c2eaf57e4455788ce3d10b471183ce6735befd88791952702cc25dcc53a54b6458f75a9c816cc420e610e95485c0fa9c9027ae47f5 SHA512 cfa425d84ba065b92868f493f3dd72597bcfddbcc4a5d91cd75b440b4adce2a8cebfe448bd9747a07717819862bb231829d6ffbffeb6cc80e3491e8bb36c274a
DIST xrootd-ceph-5.5.4.tar.gz 82015 BLAKE2B cfd2ec0151bfb7113954a7bab4f522984b0692700a2cd141c7039418d528693bf45e65308395a8eacf4e1a5b34389fc3c0b83f0575af132730103376bc8e07fc SHA512 59cc73505e8cb8ec9e43b30f3773872458257c3c463919337ef97e77de928378803719300f191877d54c1d67dbf45b54aa115ebc9bbac0f64acf51f4e7c23cc5
EBUILD xrootd-ceph-5.4.3.ebuild 930 BLAKE2B 3e9e600166da09de8b7834638d9c4dbf0188a1b0843198d1e3074bf7a57686f82323a27b9331482e2b0178fc1550435cf233f4d9adf0b95c7a0ad19867297a10 SHA512 cab7ccd34c1ea2097480b33de8b6884279f15d3f23f73e4f6144af63d05771bb7401d0f3a40887639e29b6b49af88fff406937b81c1034a87a57bde915afe62b
-EBUILD xrootd-ceph-5.5.2.ebuild 931 BLAKE2B c048e3c4b0492c2467ab124aeab665a81b22d2051b51a1bccc090f9c2b7f4280430b39719d626dbaeed0bd1a983a55fa7b827f90c57feb716d6ed4e32f603280 SHA512 7aaef26e87d7e11a16c6b8b23417a452ff5de903a0d2de443f7b9d9493e3ef7c579ef49b2522f03eb705976ff406addd7fa2472b7a1c77b5585016becfd975e6
EBUILD xrootd-ceph-5.5.4.ebuild 931 BLAKE2B c048e3c4b0492c2467ab124aeab665a81b22d2051b51a1bccc090f9c2b7f4280430b39719d626dbaeed0bd1a983a55fa7b827f90c57feb716d6ed4e32f603280 SHA512 7aaef26e87d7e11a16c6b8b23417a452ff5de903a0d2de443f7b9d9493e3ef7c579ef49b2522f03eb705976ff406addd7fa2472b7a1c77b5585016becfd975e6
MISC metadata.xml 580 BLAKE2B b962435892e924eb2df46bdfc27d96a7fc38f1d222c83c8fb23a0b171fd9cc979b09b306f39cf5f240b292fa493db3def90879541ca3060378b25c028081aed4 SHA512 9a53d67bd49dde3e990285fafef71d8f47d756be58ff9b945f3482c6aa0925c6543ada86b5694a659462e541848e0ec901adbae2c4ee628c8e494c598ca24783
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.5.2.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.5.2.ebuild
deleted file mode 100644
index ef04b6db3238..000000000000
--- a/net-libs/xrootd-ceph/xrootd-ceph-5.5.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform"
-HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://github.com/xrootd/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="~net-libs/xrootd-${PV}
- sys-cluster/ceph"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-util/cppunit )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.4.0_no-werror.patch
-)
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrdCeph.*-$(ver_cut 1)\.so
- /usr/lib.*/libXrdCephTests\.so"
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_TESTS=$(usex test)
- )
- cmake_src_configure
-}
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 9943d98c23d8..05a5bf38f208 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -8,13 +8,8 @@ AUX xrootd-5.4.3-python_tests_py3.patch 4491 BLAKE2B 61e3eb0e10de6e746b1447c7a1d
AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
DIST xrootd-5.4.3.tar.gz 3182127 BLAKE2B ed3f6a943167eafb5f6d7f78ca34f44c9a18b5ed672a4e622acb1e6e6997bd21756a30bf24f0b799ab4f16e7e1fb3f61a042f4e5e00f965b898fc5a287bf995a SHA512 189ec8e20901fd07093494187502e031a60d4ade22af33067313fad7a1bf6a6feb5c5d9d59d3a86d13a6a767e5a93cf4836da02e9cae11c81ccac07199898d72
-DIST xrootd-5.5.0.tar.gz 3227490 BLAKE2B 3d9c0ab859f95d6e651ae98dc132ade389f9981a20c738798bc2079a5470d766cd882df326359ccd4777389e15bf064537e6d4f7f653fbb5fe251b019b4ca5fd SHA512 d13d76be54eacc097363cd1c06448f87bffdd32c81eaad12b4c3321be31c7b221ef34b1bf5da50ee5128d9682e13dc670554317c29c13607c246c781a1fefffe
-DIST xrootd-5.5.2.tar.gz 3236018 BLAKE2B 033a9698b60d839fb683aab22172d3cbd6e0d8041b64270a8c3045f0504d3ef7941ad439dcaf85fa16303cb1e2dfcecbbf7d2de1145ef3f1ae96c5099b08fe2b SHA512 7e8691d8df5dd0047702d9a4785b1fc3c5487210044de7f448e555cf89d170feee16899419fbc45d09d95751129b04c262600ab81f33703f5a28bef789071f3d
DIST xrootd-5.5.4.tar.gz 3241021 BLAKE2B 505890ab7dbd0530d3c42390c9a6858cf0c8b53d42631b3bed615cb9b7c4d738bb791d26e625b010fef79f57291eb8bcd653ec629d240df92d37c12c973210f8 SHA512 1bf8fec3e20950e1dfbb5a7914c2f2b1d7d1fc1ce6b419dda129bb6cfb083ae674a14732b7b7330dee2287635749d91f8ee7e16badd71c723d189a1a44c309dd
-EBUILD xrootd-5.4.3-r1.ebuild 3236 BLAKE2B 9dc93e947832d1126f1690bab7630778fb37d737d188d204b44596da97b5a7b1baf4a8bbe16b6ffbdcda3d54cd37c60f8712de2a63416a1a8fadc4e9a581e370 SHA512 5d672ed76e470c57e16f09f475a9b6b675ccf8f2ca6b6659ac5bea6ba98553c72fc04b27e1c8539915a567e9fbc62a2a4b0602c64d7e23cd84235007b213e3df
-EBUILD xrootd-5.4.3-r2.ebuild 4627 BLAKE2B b91619cb8bd8d0b7e4f6a23f918df462b04a93182bd42ddca33ca312e2f2ff50f2976d9f3d2da95162c7430436653754a112c545df6e640632fa8625ba2ecb58 SHA512 056567b9a7d14374721ce563bc1221f65eb8eaf199dcc5fdda6c07f93f6680ff39b116b6753d3c2a4c8112c0e90992eec86e6699190bea8ff854a2dd5b11f78f
+EBUILD xrootd-5.4.3-r2.ebuild 4627 BLAKE2B c3820362346a32f41c9a9afe447854211af4a2015e3e0950b98e18e6346ec9ec7528ae3ec7cef8be29dbaf069a9188dce4fad2a31023c87cb82cef709dc03c03 SHA512 705bd4e6189c67a0b7f31dc96241b086145268a13113826292ab6b00fdf739c497c67cb00033f5f42181f51dcc0476bf816fc5daf2dbace16d14c989fecd8589
EBUILD xrootd-5.4.3.ebuild 3186 BLAKE2B 39211730f3cf2da1f616c3cb88e0fbe5449b534fdb9612c47f919537162fb1cb14e4a225feeeed6b51428ae51c7550d31a875b71a0c1b5b3ee3b12e2cd474f26 SHA512 3ab16277df556260c833c1a60cb47c964ffefa7cef623aba61038d73be6959f2dbae41f2ccef28e95274472d0995a840347128fb38d4e5d8f171af709d8267f2
-EBUILD xrootd-5.5.0.ebuild 3210 BLAKE2B 890177297f6618994a88de72f4c20678db458822e7ec596d1c07b2a263b6c58e3b6f5134a268e4fba2b07802a20e77ec772515379423bb4b5b85619be078ad6c SHA512 91c87c4304b2bc47f98f53d9483cd427d28667726ddf93f97a0955d0c88f152f19d911b440a69aa53b7eec2223cb387062db8411acad0760847c3f53e7ccf075
-EBUILD xrootd-5.5.2.ebuild 3243 BLAKE2B 6f7846e62497051dbe5ce3bde4f8cdaf2e8a3171ba572f6d9529eaa4e00c444d147456dd4954b9fdc4080f51dbbdc53d862b5c1d963bac07c525dfa984582915 SHA512 8b274457af21ab750e49256c9115c470c023a1486002e3e4ecaeb9a1a5713bac7d9fc8fca6283db0c0a60aca0e8ea300a4b47ad3401b57e1385b9d762190391a
-EBUILD xrootd-5.5.4.ebuild 3243 BLAKE2B 6f7846e62497051dbe5ce3bde4f8cdaf2e8a3171ba572f6d9529eaa4e00c444d147456dd4954b9fdc4080f51dbbdc53d862b5c1d963bac07c525dfa984582915 SHA512 8b274457af21ab750e49256c9115c470c023a1486002e3e4ecaeb9a1a5713bac7d9fc8fca6283db0c0a60aca0e8ea300a4b47ad3401b57e1385b9d762190391a
-MISC metadata.xml 1126 BLAKE2B 9bacae6f9c9e281863060fc5cad1f6e882c7c017bb35b5c87bdfeaa85b5aafcae6c5e9babc04f869be29a6e1d9707871118e8b922eb36ab3d5a67f8849fb9ce7 SHA512 c542a70cee2b7cd8b5ecaee7e25d6c1d37f24918daf039f0e9d4519d08719eb54103096d356d3fa8a7a6b4cefee86ad4ad1cfc4ab11c26d9df66de73170cf8bf
+EBUILD xrootd-5.5.4-r1.ebuild 4748 BLAKE2B 8f79e55faa53023dafe99665fde9df7c2001bc6802182dc7368ac21938c4324d75f916776c0ab74ba35ae917467159850ab22c47d316ec25c8f0de2e86fc8f9e SHA512 6201c640e26cd23d94388381ccb4b4d3a58d9265bbe999190c5a3dba7e0c9091260f792cabe78f2cbece1c8c28f308a9e45038a71afc1f879090167bab372e49
+MISC metadata.xml 1035 BLAKE2B c81c606529973beb7936c49a35eff0a91bde2c604b4d0cea3a91cdb7aff0aeeba15ae6e9c6913897272e6f76c811427b920514d73280b2c0f13e4d035f4c5b3c SHA512 df74f8ac010f34a63e16979a5c3a222119f9c9b201f0a83b8b8f20bf3b5d102ad1ccdedfdd557a599701fbe234c42b1bb5ec34384445f428a40716ba2c1a6ae2
diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml
index 9305cd64fd69..dae43a78f13c 100644
--- a/net-libs/xrootd/metadata.xml
+++ b/net-libs/xrootd/metadata.xml
@@ -18,6 +18,5 @@
<flag name="http">Enable http protocol support</flag>
<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML parsing (preferred) instead of bundled tinyxml</flag>
<flag name="server">Install xrootd server and related plug-ins</flag>
- <flag name="test-suite">Install additional components useful for testing xrootd</flag>
</use>
</pkgmetadata>
diff --git a/net-libs/xrootd/xrootd-5.4.3-r1.ebuild b/net-libs/xrootd/xrootd-5.4.3-r1.ebuild
deleted file mode 100644
index 744c2fed9672..000000000000
--- a/net-libs/xrootd/xrootd-5.4.3-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fuse http kerberos +libxml2 python readline +server systemd test-suite"
-
-# No actual build-time test suite
-RESTRICT="test"
-
-CDEPEND="acct-group/xrootd
- acct-user/xrootd
- dev-libs/openssl:0=
- sys-libs/zlib
- virtual/libcrypt:=
- fuse? ( sys-fs/fuse:0= )
- http? ( net-misc/curl:= )
- kerberos? ( virtual/krb5 )
- libxml2? ( dev-libs/libxml2:2= )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:0= )
- systemd? ( sys-apps/systemd:= )
- test-suite? ( dev-util/cppunit )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
- doc? (
- app-doc/doxygen[dot]
- virtual/latex-base
- python? ( dev-python/sphinx )
- )
- python? ( $(python_gen_cond_dep 'dev-python/pip[${PYTHON_USEDEP}]') )
-"
-RDEPEND="${CDEPEND}
- dev-lang/perl
-"
-REQUIRED_USE="
- http? ( kerberos )
- python? ( ${PYTHON_REQUIRED_USE} )
- test-suite? ( server )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.8.3-crc32.patch
- "${FILESDIR}"/${PN}-5.4.3-no_automagic.patch
-)
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so
- /usr/lib.*/libXrdClTests\.so"
-
-pkg_setup() {
- use python && python_setup
-}
-
-# FIXME: support xrdec - currently only builds against bundled isa-l
-src_configure() {
- local mycmakeargs=(
- -DENABLE_FUSE=$(usex fuse)
- -DENABLE_HTTP=$(usex http)
- -DENABLE_KRB5=$(usex kerberos)
- -DENABLE_LIBXML2=$(usex libxml2)
- -DENABLE_PYTHON=$(usex python)
- -DENABLE_READLINE=$(usex readline)
- -DENABLE_TESTS=$(usex test-suite)
- -DENABLE_VOMS=no
- -DFORCE_ENABLED=yes
- -DPIP_OPTIONS="--ignore-installed" # bug 861452
- -DXRDCL_ONLY=$(usex server "no" "yes")
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- if use doc; then
- doxygen Doxyfile || die
- if use python; then
- emake -C bindings/python/docs html
- fi
- fi
-}
-
-src_install() {
- use doc && HTML_DOCS=( doxydoc/html/. )
- dodoc docs/ReleaseNotes.txt
- cmake_src_install
- find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
- # base configs
- insinto /etc/xrootd
- doins packaging/common/*.cfg
-
- fowners root:xrootd /etc/xrootd
- keepdir /var/log/xrootd
- fowners xrootd:xrootd /var/log/xrootd
-
- if use server; then
- local i
- for i in cmsd frm_purged frm_xfrd xrootd; do
- newinitd "${FILESDIR}"/${i}.initd ${i}
- done
- # all daemons MUST use single master config file
- newconfd "${FILESDIR}"/xrootd.confd xrootd
- fi
-
- if use python; then
- python_optimize "${D}/$(python_get_sitedir)"
-
- if use doc; then
- docinto python
- docompress -x "/usr/share/doc/${PF}/python/html"
- dodoc -r bindings/python/docs/build/html
- fi
- if use examples; then
- docinto python
- dodoc -r bindings/python/examples
- fi
- fi
-}
diff --git a/net-libs/xrootd/xrootd-5.4.3-r2.ebuild b/net-libs/xrootd/xrootd-5.4.3-r2.ebuild
index 5b19756c4d84..fd1b2bdf0993 100644
--- a/net-libs/xrootd/xrootd-5.4.3-r2.ebuild
+++ b/net-libs/xrootd/xrootd-5.4.3-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP571="setuptools"
+DISTUTILS_USE_PEP517="setuptools"
inherit cmake distutils-r1
diff --git a/net-libs/xrootd/xrootd-5.5.0.ebuild b/net-libs/xrootd/xrootd-5.5.0.ebuild
deleted file mode 100644
index 8d3b8f9f1431..000000000000
--- a/net-libs/xrootd/xrootd-5.5.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
-PYTHON_COMPAT=( python3_{9..11} )
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="
- media-gfx/graphviz
- virtual/latex-base
- python? ( dev-python/sphinx )
-"
-
-inherit cmake docs python-single-r1
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples fuse http kerberos +libxml2 python readline +server systemd test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
- acct-user/xrootd
- dev-libs/openssl:0=
- net-libs/davix
- sys-libs/zlib
- virtual/libcrypt:=
- fuse? ( sys-fs/fuse:0= )
- http? ( net-misc/curl:= )
- kerberos? ( virtual/krb5 )
- libxml2? ( dev-libs/libxml2:2= )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:0= )
- systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
- python? ( $(python_gen_cond_dep 'dev-python/pip[${PYTHON_USEDEP}]') )
- test? ( dev-util/cppunit )
-"
-RDEPEND="${CDEPEND}
- dev-lang/perl
-"
-REQUIRED_USE="
- http? ( kerberos )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( server )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.8.3-crc32.patch
- "${FILESDIR}"/${PN}-5.4.3-no_automagic.patch
-)
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so
- /usr/lib.*/libXrdClTests\.so"
-
-pkg_setup() {
- use python && python_setup
-}
-
-# FIXME: support xrdec - currently only builds against bundled isa-l
-src_configure() {
- local mycmakeargs=(
- -DENABLE_FUSE=$(usex fuse)
- -DENABLE_HTTP=$(usex http)
- -DENABLE_KRB5=$(usex kerberos)
- -DENABLE_LIBXML2=$(usex libxml2)
- -DENABLE_PYTHON=$(usex python)
- -DENABLE_READLINE=$(usex readline)
- -DENABLE_TESTS=$(usex test)
- -DENABLE_VOMS=no
- -DFORCE_ENABLED=yes
- -DPIP_OPTIONS="--ignore-installed" # bug 861452
- -DXRDCL_ONLY=$(usex server "no" "yes")
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- docs_compile
-
- # secondary documentation for python bindings
- if use python && use doc; then
- emake -C bindings/python/docs html
- fi
-}
-
-src_install() {
- dodoc docs/ReleaseNotes.txt
- cmake_src_install
- find "${ED}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
- # base configs
- insinto /etc/xrootd
- doins packaging/common/*.cfg
-
- fowners root:xrootd /etc/xrootd
- keepdir /var/log/xrootd
- fowners xrootd:xrootd /var/log/xrootd
-
- if use server; then
- local i
- for i in cmsd frm_purged frm_xfrd xrootd; do
- newinitd "${FILESDIR}"/${i}.initd ${i}
- done
- # all daemons MUST use single master config file
- newconfd "${FILESDIR}"/xrootd.confd xrootd
- fi
-
- if use python; then
- python_optimize "${D}/$(python_get_sitedir)"
-
- if use doc; then
- docinto python
- docompress -x "/usr/share/doc/${PF}/python/html"
- dodoc -r bindings/python/docs/build/html
- fi
- if use examples; then
- docinto python
- dodoc -r bindings/python/examples
- fi
- fi
-}
diff --git a/net-libs/xrootd/xrootd-5.5.2.ebuild b/net-libs/xrootd/xrootd-5.5.4-r1.ebuild
index aabea613b0cf..ea3bc8cea605 100644
--- a/net-libs/xrootd/xrootd-5.5.2.ebuild
+++ b/net-libs/xrootd/xrootd-5.5.4-r1.ebuild
@@ -3,9 +3,9 @@
EAPI=8
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517="setuptools"
DOCS_BUILDER="doxygen"
DOCS_DEPEND="
media-gfx/graphviz
@@ -13,7 +13,7 @@ DOCS_DEPEND="
python? ( dev-python/sphinx )
"
-inherit cmake docs python-single-r1
+inherit cmake docs distutils-r1
DESCRIPTION="Extended ROOT remote file server"
HOMEPAGE="https://xrootd.slac.stanford.edu/"
@@ -23,6 +23,7 @@ LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples fuse http kerberos +libxml2 python readline +server systemd test"
+
RESTRICT="!test? ( test )"
CDEPEND="acct-group/xrootd
@@ -41,7 +42,11 @@ CDEPEND="acct-group/xrootd
"
DEPEND="${CDEPEND}"
BDEPEND="
- python? ( $(python_gen_cond_dep 'dev-python/pip[${PYTHON_USEDEP}]') )
+ python? (
+ ${PYTHON_DEPS}
+ ${DISTUTILS_DEPS}
+ test? ( >=dev-python/pytest-7.1.2[${PYTHON_USEDEP}] )
+ )
test? ( dev-util/cppunit )
"
RDEPEND="${CDEPEND}
@@ -55,6 +60,8 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}"/${PN}-4.8.3-crc32.patch
+ "${FILESDIR}"/${PN}-5.4.3-cmake_no_python.patch
+ "${FILESDIR}"/${PN}-5.4.3-python_tests_py3.patch
)
# xrootd plugins are not intended to be linked with,
@@ -67,36 +74,75 @@ pkg_setup() {
use python && python_setup
}
+src_prepare() {
+ cmake_src_prepare
+
+ if use python; then
+ pushd "${S}"/bindings/python > /dev/null || die
+ distutils-r1_src_prepare
+ popd > /dev/null || die
+ fi
+}
+
# FIXME: support xrdec - currently only builds against bundled isa-l
src_configure() {
local mycmakeargs=(
-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex libxml2 "no" "yes")
+ -DCMAKE_DISABLE_FIND_PACKAGE_systemd=$(usex systemd "no" "yes")
-DENABLE_FUSE=$(usex fuse)
-DENABLE_HTTP=$(usex http)
-DENABLE_KRB5=$(usex kerberos)
+ -DENABLE_MACAROONS=no
-DENABLE_PYTHON=$(usex python)
-DENABLE_READLINE=$(usex readline)
- -DENABLE_MACAROONS=no
-DENABLE_SCITOKENS=no
-DENABLE_TESTS=$(usex test)
-DENABLE_VOMS=no
-DFORCE_ENABLED=yes
- -DPIP_OPTIONS="--ignore-installed" # bug 861452
-DXRDCL_ONLY=$(usex server "no" "yes")
)
cmake_src_configure
+
+ if use python; then
+ pushd "${BUILD_DIR}"/bindings/python > /dev/null || die
+ distutils-r1_src_configure
+ popd > /dev/null || die
+ fi
}
src_compile() {
cmake_src_compile
- docs_compile
+ if use python; then
+ pushd "${BUILD_DIR}"/bindings/python > /dev/null || die
+ distutils-r1_src_compile
+ popd > /dev/null || die
+ fi
+ docs_compile
# secondary documentation for python bindings
if use python && use doc; then
emake -C bindings/python/docs html
fi
}
+python_test() {
+ epytest
+}
+
+src_test() {
+ pushd "${BUILD_DIR}/tests" > /dev/null || die
+ # There are more tests but since these are ones currently run by upstream in their CI,
+ # let's follow their example.
+ ./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/UtilsTest/" || die
+ ./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/SocketTest/" || die
+ ./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/PollerTest/" || die
+ popd > /dev/null || die
+
+ # Python tests currently require manual configuration and start-up of an xrootd server.
+ # TODO: get this to run properly.
+ #use python && distutils-r1_src_test
+}
+
src_install() {
dodoc docs/ReleaseNotes.txt
cmake_src_install
@@ -120,7 +166,9 @@ src_install() {
fi
if use python; then
- python_optimize "${D}/$(python_get_sitedir)"
+ pushd "${BUILD_DIR}"/bindings/python > /dev/null || die
+ distutils-r1_src_install
+ popd > /dev/null || die
if use doc; then
docinto python
@@ -132,4 +180,11 @@ src_install() {
dodoc -r bindings/python/examples
fi
fi
+
+ if use test; then
+ for f in test-runner xrdshmap; do
+ rm "${ED}"/usr/bin/${f} || die "Failed to remove test helper ${f} from installed tree"
+ done
+ rm "${ED}"/usr/$(get_libdir)/libXrdClTest*.so || die "Failed to remove test libraries from installed tree"
+ fi
}
diff --git a/net-libs/xrootd/xrootd-5.5.4.ebuild b/net-libs/xrootd/xrootd-5.5.4.ebuild
deleted file mode 100644
index aabea613b0cf..000000000000
--- a/net-libs/xrootd/xrootd-5.5.4.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
-PYTHON_COMPAT=( python3_{9..11} )
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="
- media-gfx/graphviz
- virtual/latex-base
- python? ( dev-python/sphinx )
-"
-
-inherit cmake docs python-single-r1
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples fuse http kerberos +libxml2 python readline +server systemd test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
- acct-user/xrootd
- dev-libs/openssl:0=
- net-libs/davix
- sys-libs/zlib
- virtual/libcrypt:=
- fuse? ( sys-fs/fuse:0= )
- http? ( net-misc/curl:= )
- kerberos? ( virtual/krb5 )
- libxml2? ( dev-libs/libxml2:2= )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:0= )
- systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
- python? ( $(python_gen_cond_dep 'dev-python/pip[${PYTHON_USEDEP}]') )
- test? ( dev-util/cppunit )
-"
-RDEPEND="${CDEPEND}
- dev-lang/perl
-"
-REQUIRED_USE="
- http? ( kerberos )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( server )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.8.3-crc32.patch
-)
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so
- /usr/lib.*/libXrdClTests\.so"
-
-pkg_setup() {
- use python && python_setup
-}
-
-# FIXME: support xrdec - currently only builds against bundled isa-l
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex libxml2 "no" "yes")
- -DENABLE_FUSE=$(usex fuse)
- -DENABLE_HTTP=$(usex http)
- -DENABLE_KRB5=$(usex kerberos)
- -DENABLE_PYTHON=$(usex python)
- -DENABLE_READLINE=$(usex readline)
- -DENABLE_MACAROONS=no
- -DENABLE_SCITOKENS=no
- -DENABLE_TESTS=$(usex test)
- -DENABLE_VOMS=no
- -DFORCE_ENABLED=yes
- -DPIP_OPTIONS="--ignore-installed" # bug 861452
- -DXRDCL_ONLY=$(usex server "no" "yes")
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- docs_compile
-
- # secondary documentation for python bindings
- if use python && use doc; then
- emake -C bindings/python/docs html
- fi
-}
-
-src_install() {
- dodoc docs/ReleaseNotes.txt
- cmake_src_install
- find "${ED}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
- # base configs
- insinto /etc/xrootd
- doins packaging/common/*.cfg
-
- fowners root:xrootd /etc/xrootd
- keepdir /var/log/xrootd
- fowners xrootd:xrootd /var/log/xrootd
-
- if use server; then
- local i
- for i in cmsd frm_purged frm_xfrd xrootd; do
- newinitd "${FILESDIR}"/${i}.initd ${i}
- done
- # all daemons MUST use single master config file
- newconfd "${FILESDIR}"/xrootd.confd xrootd
- fi
-
- if use python; then
- python_optimize "${D}/$(python_get_sitedir)"
-
- if use doc; then
- docinto python
- docompress -x "/usr/share/doc/${PF}/python/html"
- dodoc -r bindings/python/docs/build/html
- fi
- if use examples; then
- docinto python
- dodoc -r bindings/python/examples
- fi
- fi
-}