| 1 |
commit: 3eb5406f9676ae7d7cd01012b1c0e2901606b19b |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 29 09:38:48 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 29 09:38:48 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eb5406f |
| 7 |
|
| 8 |
sys-libs/libcap: Revbump to fix dependencies of pkgconfig files |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
.../libcap/files/libcap-2.29-libpsx_pkgconfig.patch | 18 +++++++++--------- |
| 14 |
.../{libcap-2.29-r2.ebuild => libcap-2.29-r3.ebuild} | 0 |
| 15 |
2 files changed, 9 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-libs/libcap/files/libcap-2.29-libpsx_pkgconfig.patch b/sys-libs/libcap/files/libcap-2.29-libpsx_pkgconfig.patch |
| 18 |
index 413b27908b4..4ebdb887aa6 100644 |
| 19 |
--- a/sys-libs/libcap/files/libcap-2.29-libpsx_pkgconfig.patch |
| 20 |
+++ b/sys-libs/libcap/files/libcap-2.29-libpsx_pkgconfig.patch |
| 21 |
@@ -1,15 +1,15 @@ |
| 22 |
-From e13e5b24fb98dc3ec2f76bc51ed0d714460e75d8 Mon Sep 17 00:00:00 2001 |
| 23 |
+From 8dbae11750ac0f85332355e6aab97005533dfb38 Mon Sep 17 00:00:00 2001 |
| 24 |
From: Lars Wendler <polynomial-c@g.o> |
| 25 |
Date: Sat, 28 Dec 2019 18:48:35 +0100 |
| 26 |
-Subject: [PATCH] USe separate libpsx.pc file instead of libcap.pc |
| 27 |
+Subject: [PATCH] Use separate libpsx.pc file instead of libcap.pc |
| 28 |
|
| 29 |
pkgconfig fails to parse current libcap.pc file but pkgconf succeeds |
| 30 |
|
| 31 |
Gentoo-bug: https://bugs.gentoo.org/703932 |
| 32 |
--- |
| 33 |
libcap/Makefile | 12 +++++++++++- |
| 34 |
- libcap/libcap.pc.in | 7 ------- |
| 35 |
- libcap/libpsx.pc.in | 12 ++++++++++++ |
| 36 |
+ libcap/libcap.pc.in | 8 +------- |
| 37 |
+ libcap/libpsx.pc.in | 11 +++++++++++ |
| 38 |
3 files changed, 23 insertions(+), 8 deletions(-) |
| 39 |
create mode 100644 libcap/libpsx.pc.in |
| 40 |
|
| 41 |
@@ -51,10 +51,10 @@ index 949cfad..5795458 100644 |
| 42 |
mkdir -p -m 0755 $(FAKEROOT)$(GOPKGDIR)/libcap/cap |
| 43 |
install -m 0644 src/libcap/cap/* $(FAKEROOT)$(GOPKGDIR)/libcap/cap/ |
| 44 |
diff --git a/libcap/libcap.pc.in b/libcap/libcap.pc.in |
| 45 |
-index 3d6b273..69cd231 100644 |
| 46 |
+index 3d6b273..8358274 100644 |
| 47 |
--- a/libcap/libcap.pc.in |
| 48 |
+++ b/libcap/libcap.pc.in |
| 49 |
-@@ -9,10 +9,3 @@ Version: @VERSION@ |
| 50 |
+@@ -9,10 +9,4 @@ Version: @VERSION@ |
| 51 |
Libs: -L${libdir} -lcap |
| 52 |
Libs.private: @deps@ |
| 53 |
Cflags: -I${includedir} |
| 54 |
@@ -65,12 +65,13 @@ index 3d6b273..69cd231 100644 |
| 55 |
-Libs: -L${libdir} -lpsx -lpthread -Wl,-wrap,pthread_create |
| 56 |
-Libs.private: @deps@ |
| 57 |
-Cflags: -I${includedir} |
| 58 |
++Requires: libpsx |
| 59 |
diff --git a/libcap/libpsx.pc.in b/libcap/libpsx.pc.in |
| 60 |
new file mode 100644 |
| 61 |
-index 0000000..8677a86 |
| 62 |
+index 0000000..d032b9f |
| 63 |
--- /dev/null |
| 64 |
+++ b/libcap/libpsx.pc.in |
| 65 |
-@@ -0,0 +1,12 @@ |
| 66 |
+@@ -0,0 +1,11 @@ |
| 67 |
+prefix=@prefix@ |
| 68 |
+exec_prefix=@exec_prefix@ |
| 69 |
+libdir=@libdir@ |
| 70 |
@@ -82,7 +83,6 @@ index 0000000..8677a86 |
| 71 |
+Libs: -L${libdir} -lpsx -lpthread -Wl,-wrap,pthread_create |
| 72 |
+Libs.private: @deps@ |
| 73 |
+Cflags: -I${includedir} |
| 74 |
-+Requires: libcap |
| 75 |
-- |
| 76 |
2.24.1 |
| 77 |
|
| 78 |
|
| 79 |
diff --git a/sys-libs/libcap/libcap-2.29-r2.ebuild b/sys-libs/libcap/libcap-2.29-r3.ebuild |
| 80 |
similarity index 100% |
| 81 |
rename from sys-libs/libcap/libcap-2.29-r2.ebuild |
| 82 |
rename to sys-libs/libcap/libcap-2.29-r3.ebuild |
Archives