Skip to content

Commit edf0722

Browse files
committed
dev-libs/rinutils: New package
Required by dev-games/freecell-solver... Package consists only of headers, so keeping all ~arch KEYWORDS from dev-games/freecell-solver where it was split out of. Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <[email protected]>
1 parent 97e0c78 commit edf0722

File tree

4 files changed

+141
-0
lines changed

4 files changed

+141
-0
lines changed

dev-libs/rinutils/Manifest

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DIST rinutils-0.2.0.tar.xz 17008 BLAKE2B d8f40558e50a54a2ab450131c1e3873ff68128d8a6ddfcfd6e8455dff98d3a0b9bbe4baef2a6e8220a3cc9429f1e661b3bf8a6e96a1311352dd0f22d7d331339 SHA512 82d09313f014fd118025438575a90dbc5b9a46d3d58ed9ffc774380d285b32ed00e7d9b453097ce0b8efc20a85a783e178b0d6831e925da3cd65f35037306dc3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
From 02c781a35a844f0ef4434268fb0d7f9ea2d3f130 Mon Sep 17 00:00:00 2001
2+
From: Andreas Sturmlechner <[email protected]>
3+
Date: Thu, 26 Mar 2020 13:07:37 +0100
4+
Subject: [PATCH] Use GNUInstallDirs
5+
6+
Fix cmake module install path while at it.
7+
Fix pkgconfig libdir path while at it.
8+
---
9+
CMakeLists.txt | 15 +++++++--------
10+
RinutilsConfig.cmake.in | 2 +-
11+
librinutils.pc.in | 4 ++--
12+
3 files changed, 10 insertions(+), 11 deletions(-)
13+
14+
diff --git a/CMakeLists.txt b/CMakeLists.txt
15+
index 9829c49..753a138 100644
16+
--- a/CMakeLists.txt
17+
+++ b/CMakeLists.txt
18+
@@ -9,6 +9,7 @@ option (WITH_TEST_SUITE "Also build and run the test suite." ON)
19+
option (DISABLE_APPLYING_RPATH "Disable applying rpath")
20+
21+
INCLUDE(FindPkgConfig)
22+
+INCLUDE(GNUInstallDirs)
23+
24+
# Introduces VERSION , CPACK_PACKAGE_VERSION_MAJOR,
25+
# CPACK_PACKAGE_VERSION_MAJOR, and CPACK_PACKAGE_VERSION_PATCH
26+
@@ -54,7 +55,7 @@ IF (NOT DISABLE_APPLYING_RPATH)
27+
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
28+
29+
# the RPATH to be used when installing
30+
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
31+
+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}")
32+
33+
# add the automatically determined parts of the RPATH
34+
# which point to directories outside the build tree to the install RPATH
35+
@@ -99,14 +100,14 @@ INSTALL(
36+
"rinutils/include/rinutils/typeof_wrap.h"
37+
"rinutils/include/rinutils/unused.h"
38+
DESTINATION
39+
- "include/rinutils"
40+
+ "${CMAKE_INSTALL_INCLUDEDIR}/rinutils"
41+
)
42+
43+
INSTALL(
44+
FILES
45+
"${CMAKE_CURRENT_BINARY_DIR}/lib${CPACK_PACKAGE_NAME}.pc"
46+
DESTINATION
47+
- "lib${LIB_SUFFIX}/pkgconfig"
48+
+ "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
49+
)
50+
51+
CONFIGURE_FILE(
52+
@@ -128,20 +129,18 @@ ADD_CUSTOM_COMMAND(
53+
ARGS "config.h.in"
54+
)
55+
56+
-set(INCLUDE_INSTALL_DIR include)
57+
-set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
58+
include(CMakePackageConfigHelpers)
59+
configure_package_config_file(RinutilsConfig.cmake.in
60+
${CMAKE_CURRENT_BINARY_DIR}/RinutilsConfig.cmake
61+
- INSTALL_DESTINATION ${LIB_INSTALL_DIR}/Rinutils/cmake
62+
- PATH_VARS INCLUDE_INSTALL_DIR)
63+
+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Rinutils
64+
+ PATH_VARS CMAKE_INSTALL_INCLUDEDIR)
65+
write_basic_package_version_file(
66+
${CMAKE_CURRENT_BINARY_DIR}/RinutilsConfigVersion.cmake
67+
VERSION 1.2.3
68+
COMPATIBILITY SameMajorVersion )
69+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/RinutilsConfig.cmake
70+
${CMAKE_CURRENT_BINARY_DIR}/RinutilsConfigVersion.cmake
71+
- DESTINATION ${LIB_INSTALL_DIR}/Rinutils/cmake )
72+
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Rinutils )
73+
74+
IF (WITH_TEST_SUITE)
75+
76+
diff --git a/RinutilsConfig.cmake.in b/RinutilsConfig.cmake.in
77+
index 480fda0..f81f685 100644
78+
--- a/RinutilsConfig.cmake.in
79+
+++ b/RinutilsConfig.cmake.in
80+
@@ -2,6 +2,6 @@ set(RINUTILS_VERSION x.y.z)
81+
82+
@PACKAGE_INIT@
83+
84+
-set_and_check(RINUTILS_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
85+
+set_and_check(RINUTILS_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
86+
87+
check_required_components(Rinutils)
88+
diff --git a/librinutils.pc.in b/librinutils.pc.in
89+
index 6cdb514..1af6238 100644
90+
--- a/librinutils.pc.in
91+
+++ b/librinutils.pc.in
92+
@@ -1,7 +1,7 @@
93+
prefix="@CMAKE_INSTALL_PREFIX@"
94+
exec_prefix=${prefix}
95+
-libdir=${exec_prefix}/lib
96+
-includedir=${prefix}/include
97+
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
98+
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
99+
100+
Name: rinutils
101+
Description: Ad hoc headers library for C
102+
--
103+
2.26.0
104+

dev-libs/rinutils/metadata.xml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3+
<pkgmetadata>
4+
<maintainer type="project">
5+
<email>[email protected]</email>
6+
<name>Gentoo KDE Project</name>
7+
</maintainer>
8+
<upstream>
9+
<remote-id type="github">shlomif/rinutils</remote-id>
10+
</upstream>
11+
</pkgmetadata>
+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Copyright 1999-2020 Gentoo Authors
2+
# Distributed under the terms of the GNU General Public License v2
3+
4+
EAPI=7
5+
6+
inherit cmake
7+
8+
DESCRIPTION="Set of C headers containing macros and static functions"
9+
HOMEPAGE="https://www.shlomifish.org/open-source/projects/ https://github.com/shlomif/rinutils"
10+
SRC_URI="https://github.com/shlomif/${PN}/releases/download/${PV}/${P}.tar.xz"
11+
12+
LICENSE="MIT"
13+
SLOT="0"
14+
KEYWORDS="~amd64 ~arm64 ~x86"
15+
16+
PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
17+
18+
src_configure() {
19+
local mycmakeargs=(
20+
-DDISABLE_APPLYING_RPATH=OFF
21+
-DWITH_TEST_SUITE=OFF # tests require perl
22+
)
23+
24+
cmake_src_configure
25+
}

0 commit comments

Comments
 (0)