[gentoo-commits] repo/gentoo:master commit in: net-libs/ntirpc/, net-libs/ntirpc/files/

[Thomas Deutschmann]

commit:     4676232a53d77ad98745a2aea4b8ecaa45f507a0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 23:23:43 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 23:29:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4676232a

net-libs/ntirpc: Cleanup old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-libs/ntirpc/Manifest                           |  3 --
 .../ntirpc/files/ntirpc-1.4.1-city-header.patch    | 60 ----------------------
 net-libs/ntirpc/ntirpc-1.4.1.ebuild                | 33 ------------
 net-libs/ntirpc/ntirpc-1.5.2.ebuild                | 29 -----------
 net-libs/ntirpc/ntirpc-1.5.3.ebuild                | 32 ------------
 5 files changed, 157 deletions(-)

diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
index 737c2dc2546..c8e476b8921 100644
--- a/net-libs/ntirpc/Manifest
+++ b/net-libs/ntirpc/Manifest
@@ -1,4 +1 @@
-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
 DIST ntirpc-1.6.1.tar.gz 397485 BLAKE2B 2dcc4c3a14eff55b4db52f297b65a48d5dff46ef4b1659912c65ca9104958cca02d542bb3b72f2ce63993414c5d53bb9716b1b1d4ce4b335735ee99da77f3770 SHA512 d176fbe71f1f66e5ee477c1ec2722b77742d36d67856eb4029f1b01474b08349171779a9943c0039d2a30e05debc9ab389d92ea137eabb4d7737fc91e47b0b24

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 25c10e39379..00000000000
--- 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@××××××××.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@××××××××.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 61ddf68d5d6..00000000000
--- 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.2.ebuild b/net-libs/ntirpc/ntirpc-1.5.2.ebuild
deleted file mode 100644
index 0f07315803a..00000000000
--- a/net-libs/ntirpc/ntirpc-1.5.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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}"
-
-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.3.ebuild b/net-libs/ntirpc/ntirpc-1.5.3.ebuild
deleted file mode 100644
index baba07b564d..00000000000
--- 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
-}