Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/ntirpc/, net-libs/ntirpc/files/
Date: Mon, 06 Mar 2017 18:17:34
Message-Id: 1488824133.f56569afdbbf7331d42c20ff34a7895e88680196.vapier@gentoo
1 commit: f56569afdbbf7331d42c20ff34a7895e88680196
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 6 18:15:23 2017 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 6 18:15:33 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f56569af
7
8 net-libs/ntirpc: initial ebuild from Chromium OS
9
10 net-libs/ntirpc/Manifest | 1 +
11 .../ntirpc/files/ntirpc-1.4.1-city-header.patch | 60 ++++++++++++++++++++++
12 net-libs/ntirpc/metadata.xml | 14 +++++
13 net-libs/ntirpc/ntirpc-1.4.1.ebuild | 33 ++++++++++++
14 4 files changed, 108 insertions(+)
15
16 diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
17 new file mode 100644
18 index 00000000000..8b2bada00f3
19 --- /dev/null
20 +++ b/net-libs/ntirpc/Manifest
21 @@ -0,0 +1 @@
22 +DIST ntirpc-1.4.1.tar.gz 446025 SHA256 0e0a8a33f49ae91bccd73cfe7cc0ba33641df3cb9ed589dd5d81140a9d8838d0 SHA512 49a27dbd68b3e292437392acf2c010cc968b4d29b82b6e1a84e6c81a0c3979d3b38338212b391294b543ccd321073a33b16d7231ab68d797ead414d1b919137c WHIRLPOOL 01a287654bacf6a1647bb0847197ea7a427cfe6bdb6c379846ab9ca1dc872173edb8c899fe11511155fcddbafec24e4a6536607d4ce31c0b0476c872c8d41176
23
24 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
25 new file mode 100644
26 index 00000000000..25c10e39379
27 --- /dev/null
28 +++ b/net-libs/ntirpc/files/ntirpc-1.4.1-city-header.patch
29 @@ -0,0 +1,60 @@
30 +From c2416e1996f694ea0cefb217f806e45931ef0b03 Mon Sep 17 00:00:00 2001
31 +From: Dylan Reid <dgreid@××××××××.org>
32 +Date: Wed, 15 Feb 2017 12:31:55 -0800
33 +Subject: [PATCH] Make city.h includes consistent
34 +
35 +Most of the code base already uses <misc/city.h>. Modify the places
36 +that include "city.h" to follow that pattern. cmake doesn't add misc to
37 +the include paths passed to the compiler. I ran into "can't find
38 +city.h" errors when attempting to add an ebuild for gentoo.
39 +
40 +Change-Id: I1e07d82bbe58fbae4759263734ac22170220eeb7
41 +Signed-off-by: Dylan Reid <dgreid@××××××××.org>
42 +---
43 + ntirpc/misc/citycrc.h | 2 +-
44 + src/city-test.c | 2 +-
45 + src/citycrc.h | 2 +-
46 + 3 files changed, 3 insertions(+), 3 deletions(-)
47 +
48 +diff --git a/ntirpc/misc/citycrc.h b/ntirpc/misc/citycrc.h
49 +index 57069344f1f8..d3620158a5ca 100644
50 +--- a/ntirpc/misc/citycrc.h
51 ++++ b/ntirpc/misc/citycrc.h
52 +@@ -34,7 +34,7 @@
53 + #ifndef CITY_HASH_CRC_H_
54 + #define CITY_HASH_CRC_H_
55 +
56 +-#include "city.h"
57 ++#include <misc/city.h>
58 +
59 + /* Hash function for a byte array. */
60 + uint128 CityHashCrc128(const char *s, size_t len);
61 +diff --git a/src/city-test.c b/src/city-test.c
62 +index 03d98a2ba9ec..8b504dd5c57c 100644
63 +--- a/src/city-test.c
64 ++++ b/src/city-test.c
65 +@@ -27,7 +27,7 @@
66 + #include <string.h>
67 + #include <stdio.h>
68 +
69 +-#include "city.h"
70 ++#include <misc/city.h>
71 + #ifdef __SSE4_2__
72 + #include "citycrc.h"
73 + #endif
74 +diff --git a/src/citycrc.h b/src/citycrc.h
75 +index f6cab94eff04..7998521b68cf 100644
76 +--- a/src/citycrc.h
77 ++++ b/src/citycrc.h
78 +@@ -33,7 +33,7 @@
79 + #ifndef CITY_HASH_CRC_H_
80 + #define CITY_HASH_CRC_H_
81 +
82 +-#include "city.h"
83 ++#include <misc/city.h>
84 +
85 + /* Hash function for a byte array. */
86 + uint128 CityHashCrc128(const char *s, size_t len);
87 +--
88 +2.11.1
89 +
90
91 diff --git a/net-libs/ntirpc/metadata.xml b/net-libs/ntirpc/metadata.xml
92 new file mode 100644
93 index 00000000000..e95e6d1fbae
94 --- /dev/null
95 +++ b/net-libs/ntirpc/metadata.xml
96 @@ -0,0 +1,14 @@
97 +<?xml version="1.0" encoding="UTF-8"?>
98 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
99 +<pkgmetadata>
100 +<maintainer type="project">
101 + <email>base-system@g.o</email>
102 +</maintainer>
103 +<use>
104 + <flag name="gssapi">Include support for RPCSEC GSS</flag>
105 + <flag name="rdma">Include support for RDMA RPC</flag>
106 +</use>
107 +<upstream>
108 + <remote-id type="github">nfs-ganesha/ntirpc</remote-id>
109 +</upstream>
110 +</pkgmetadata>
111
112 diff --git a/net-libs/ntirpc/ntirpc-1.4.1.ebuild b/net-libs/ntirpc/ntirpc-1.4.1.ebuild
113 new file mode 100644
114 index 00000000000..61ddf68d5d6
115 --- /dev/null
116 +++ b/net-libs/ntirpc/ntirpc-1.4.1.ebuild
117 @@ -0,0 +1,33 @@
118 +# Copyright 1999-2017 Gentoo Foundation
119 +# Distributed under the terms of the GNU General Public License v2
120 +
121 +EAPI="5"
122 +
123 +inherit cmake-multilib
124 +
125 +DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
126 +HOMEPAGE="https://github.com/linuxbox2/ntirpc"
127 +SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
128 +
129 +LICENSE="BSD"
130 +SLOT="0"
131 +KEYWORDS="~amd64 ~x86"
132 +IUSE="gssapi rdma"
133 +
134 +# Since the GSS option only controls some extra files to be enabled,
135 +# there's nothing to list in the depend string for it.
136 +RDEPEND="app-crypt/mit-krb5
137 + rdma? ( sys-fabric/librdmacm )"
138 +DEPEND="${RDEPEND}"
139 +
140 +PATCHES=(
141 + "${FILESDIR}"/${P}-city-header.patch
142 +)
143 +
144 +multilib_src_configure() {
145 + local mycmakeargs=(
146 + $(cmake-utils_use_use gssapi GSS)
147 + $(cmake-utils_use_use rdma RPC_RDMA)
148 + )
149 + cmake-utils_src_configure
150 +}