diff options
Diffstat (limited to 'net-libs/ntirpc')
| -rw-r--r-- | net-libs/ntirpc/Manifest | 9 | ||||
| -rw-r--r-- | net-libs/ntirpc/files/ntirpc-1.4.1-city-header.patch | 60 | ||||
| -rw-r--r-- | net-libs/ntirpc/ntirpc-1.4.1.ebuild | 33 | ||||
| -rw-r--r-- | net-libs/ntirpc/ntirpc-1.5.3.ebuild | 32 | ||||
| -rw-r--r-- | net-libs/ntirpc/ntirpc-1.6.1.ebuild (renamed from net-libs/ntirpc/ntirpc-1.5.2.ebuild) | 9 |
5 files changed, 7 insertions, 136 deletions
diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest index 674148225017..dcdd1c2447b2 100644 --- a/net-libs/ntirpc/Manifest +++ b/net-libs/ntirpc/Manifest @@ -1,8 +1,3 @@ -AUX ntirpc-1.4.1-city-header.patch 1703 BLAKE2B a43c14b57e2488d9a23ceb0bef8e9cd58601a5e3c9671eabb76ebf6bd5f4865dbc22d41dcccaaca155551c0b454c273c81e8f9d9eefc2c4e09570b4337a24e44 SHA512 568abe507aafacb5a3a80fa7aca09379ff89a08386027aba26664f6f4dfc4fd7423fea5b9eb19de79e2daf2c37bfa246a7dac82a9cdaa2433a9171ac611b15f3 -DIST ntirpc-1.4.1.tar.gz 446025 BLAKE2B 07966a9411b7919b14c318b5427c0f69b151a42c1e2137902bae9287be76dd681270b9e7baae415f4ce9acfda1007af490a6dabbd996dda0c6e7286278ea9418 SHA512 49a27dbd68b3e292437392acf2c010cc968b4d29b82b6e1a84e6c81a0c3979d3b38338212b391294b543ccd321073a33b16d7231ab68d797ead414d1b919137c -DIST ntirpc-1.5.2.tar.gz 433706 BLAKE2B ea531472f418d66fc1f530236eddef4c92ac1092150c68f19764af41e9b10e016b38073b98dc7b4a4991542977aa63b3b4330604ea5866f304fe41ac2fd85d12 SHA512 5bbc48ab5bf2aba7e4c473a6faf586c1aef27a2009bf92082495456c436c707dfdcfc5e16a56c3e31ba3fb68afc3d2d47e8d27ed03be5c0be44e22e24a0cb68e -DIST ntirpc-1.5.3.tar.gz 434096 BLAKE2B c39eaa48e4a9e648a8ce6c34e749f766bee0b9235747138a3d7535b9e07eb2dee5e85076b0dfc30907a931d8145c014938d40e65cb142ae3256eaf408b410bd2 SHA512 bc879e5cb9c16bf76b173f09fac50475ed7616837a625abd433175610cc16399abba2294a8657aadc71d4f45b4b53c97414a77bd52b1f81df3dd990407957363 -EBUILD ntirpc-1.4.1.ebuild 791 BLAKE2B ff3a10f8df2974fb3c1311cbd53462d5e634c04d501fca76c9e53f1b192c88b606e719dfed75185327fe2637805e35cc478dcc726d6250bcc4f9c5a0101a3db9 SHA512 b455cdefaad312a7bc1112a4fa5f1cdee295f4c29ff502d87b5da9a68a397340483f8d6cbb1ca58eb27c8681b95f662d08bae1fdb1b45a4b1c3d01ca29aaf3e6 -EBUILD ntirpc-1.5.2.ebuild 724 BLAKE2B 063506793365373f3d59648b6e9f2e704f61e502b18c1c0546d7e94c44e686645accd268b4ce2223ff865c5202c7d88506dfea5856f4adf6714040feac30802a SHA512 bd058c16d0b26ad849948f205b29c01f5380e402134784003a0e1c74b68de3d36c877d0cbd041b1179c3869fa16533782082a75d7de89ac340376d0e4684eccf -EBUILD ntirpc-1.5.3.ebuild 809 BLAKE2B c6187455848769896a1b77b9d00783dbccff78606f9fd941fd88ac7aef9a3f1ab823659f89c9a9b18d3ff6ee01c9304c960beca909acf4e6e84f8868a81e779d SHA512 925ee0874d29b8eed85c41d2162d1964f0e479583cad73cccadffb248826cf82ba4148eedadd839dd9134e622482a0233456d9594b3f1261e550704e0e1aa6fa +DIST ntirpc-1.6.1.tar.gz 397485 BLAKE2B 2dcc4c3a14eff55b4db52f297b65a48d5dff46ef4b1659912c65ca9104958cca02d542bb3b72f2ce63993414c5d53bb9716b1b1d4ce4b335735ee99da77f3770 SHA512 d176fbe71f1f66e5ee477c1ec2722b77742d36d67856eb4029f1b01474b08349171779a9943c0039d2a30e05debc9ab389d92ea137eabb4d7737fc91e47b0b24 +EBUILD ntirpc-1.6.1.ebuild 745 BLAKE2B 6e27521646f75937f2133353f0cee42c9197ce40691275ecb09f17f4807992318f16549bf0cea56af7bb6b37a793de213ef99921454aa0602cb6265d21c7523d SHA512 63fddc3d67d9ec404c9d3bb6f7187a61973558997e5e5cd81692b2516d32dbdf0705d530647748b671ccbf78004f0e761f93e8874d8a56509fcbb460cc671595 MISC metadata.xml 427 BLAKE2B ffd3f6c32d343557e17c17eb78cff8a0a14f93a2298cf607169ebbc1d618cbe30df849c6f3b8dc4b34d7e1a17920e9d0b1483523d4b2b2ff481068c0de5a8317 SHA512 99f5af46839fbf52e5217cf831a7a95fa3f5d501d61ff63488aa7989e0ec98151b2f94607a39f879e0e5b0ba79bc732ee7224a9e4196ff9a40fa13253ece0b0c diff --git a/net-libs/ntirpc/files/ntirpc-1.4.1-city-header.patch b/net-libs/ntirpc/files/ntirpc-1.4.1-city-header.patch deleted file mode 100644 index 25c10e393797..000000000000 --- a/net-libs/ntirpc/files/ntirpc-1.4.1-city-header.patch +++ /dev/null @@ -1,60 +0,0 @@ -From c2416e1996f694ea0cefb217f806e45931ef0b03 Mon Sep 17 00:00:00 2001 -From: Dylan Reid <dgreid@chromium.org> -Date: Wed, 15 Feb 2017 12:31:55 -0800 -Subject: [PATCH] Make city.h includes consistent - -Most of the code base already uses <misc/city.h>. Modify the places -that include "city.h" to follow that pattern. cmake doesn't add misc to -the include paths passed to the compiler. I ran into "can't find -city.h" errors when attempting to add an ebuild for gentoo. - -Change-Id: I1e07d82bbe58fbae4759263734ac22170220eeb7 -Signed-off-by: Dylan Reid <dgreid@chromium.org> ---- - ntirpc/misc/citycrc.h | 2 +- - src/city-test.c | 2 +- - src/citycrc.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/ntirpc/misc/citycrc.h b/ntirpc/misc/citycrc.h -index 57069344f1f8..d3620158a5ca 100644 ---- a/ntirpc/misc/citycrc.h -+++ b/ntirpc/misc/citycrc.h -@@ -34,7 +34,7 @@ - #ifndef CITY_HASH_CRC_H_ - #define CITY_HASH_CRC_H_ - --#include "city.h" -+#include <misc/city.h> - - /* Hash function for a byte array. */ - uint128 CityHashCrc128(const char *s, size_t len); -diff --git a/src/city-test.c b/src/city-test.c -index 03d98a2ba9ec..8b504dd5c57c 100644 ---- a/src/city-test.c -+++ b/src/city-test.c -@@ -27,7 +27,7 @@ - #include <string.h> - #include <stdio.h> - --#include "city.h" -+#include <misc/city.h> - #ifdef __SSE4_2__ - #include "citycrc.h" - #endif -diff --git a/src/citycrc.h b/src/citycrc.h -index f6cab94eff04..7998521b68cf 100644 ---- a/src/citycrc.h -+++ b/src/citycrc.h -@@ -33,7 +33,7 @@ - #ifndef CITY_HASH_CRC_H_ - #define CITY_HASH_CRC_H_ - --#include "city.h" -+#include <misc/city.h> - - /* Hash function for a byte array. */ - uint128 CityHashCrc128(const char *s, size_t len); --- -2.11.1 - diff --git a/net-libs/ntirpc/ntirpc-1.4.1.ebuild b/net-libs/ntirpc/ntirpc-1.4.1.ebuild deleted file mode 100644 index 61ddf68d5d6f..000000000000 --- a/net-libs/ntirpc/ntirpc-1.4.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit cmake-multilib - -DESCRIPTION="Transport Independent RPC library for nfs-ganesha" -HOMEPAGE="https://github.com/linuxbox2/ntirpc" -SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gssapi rdma" - -# Since the GSS option only controls some extra files to be enabled, -# there's nothing to list in the depend string for it. -RDEPEND="app-crypt/mit-krb5 - rdma? ( sys-fabric/librdmacm )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-city-header.patch -) - -multilib_src_configure() { - local mycmakeargs=( - $(cmake-utils_use_use gssapi GSS) - $(cmake-utils_use_use rdma RPC_RDMA) - ) - cmake-utils_src_configure -} diff --git a/net-libs/ntirpc/ntirpc-1.5.3.ebuild b/net-libs/ntirpc/ntirpc-1.5.3.ebuild deleted file mode 100644 index baba07b564de..000000000000 --- a/net-libs/ntirpc/ntirpc-1.5.3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-multilib - -COMMIT="fadcbdedb65998925482b26c88964b4213b9e1ac" -DESCRIPTION="Transport Independent RPC library for nfs-ganesha" -HOMEPAGE="https://github.com/linuxbox2/ntirpc" -SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gssapi rdma" - -# Since the GSS option only controls some extra files to be enabled, -# there's nothing to list in the depend string for it. -RDEPEND="app-crypt/mit-krb5 - rdma? ( sys-fabric/librdmacm )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${PN}-${COMMIT}" - -multilib_src_configure() { - local mycmakeargs=( - -DUSE_GSS="$(usex gssapi)" - -DUSE_PRC_RDMA="$(usex rdma)" - ) - cmake-utils_src_configure -} diff --git a/net-libs/ntirpc/ntirpc-1.5.2.ebuild b/net-libs/ntirpc/ntirpc-1.6.1.ebuild index 0f07315803a4..c78565d83635 100644 --- a/net-libs/ntirpc/ntirpc-1.5.2.ebuild +++ b/net-libs/ntirpc/ntirpc-1.6.1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="6" inherit cmake-multilib DESCRIPTION="Transport Independent RPC library for nfs-ganesha" -HOMEPAGE="https://github.com/linuxbox2/ntirpc" +HOMEPAGE="https://github.com/nfs-ganesha/ntirpc" SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" @@ -17,13 +17,14 @@ IUSE="gssapi rdma" # Since the GSS option only controls some extra files to be enabled, # there's nothing to list in the depend string for it. RDEPEND="app-crypt/mit-krb5 + net-libs/libnsl rdma? ( sys-fabric/librdmacm )" DEPEND="${RDEPEND}" multilib_src_configure() { local mycmakeargs=( -DUSE_GSS="$(usex gssapi)" - -DUSE_PRC_RDMA="$(usex rdma)" + -DUSE_RPC_RDMA="$(usex rdma)" ) cmake-utils_src_configure } |