From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 748B5138334 for ; Sun, 29 Dec 2019 09:40:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98B6CE0B65; Sun, 29 Dec 2019 09:40:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6F414E0B65 for ; Sun, 29 Dec 2019 09:40:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C91E934DC9C for ; Sun, 29 Dec 2019 09:40:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4700843 for ; Sun, 29 Dec 2019 09:40:19 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1577612328.3eb5406f9676ae7d7cd01012b1c0e2901606b19b.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/, sys-libs/libcap/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcap/files/libcap-2.29-libpsx_pkgconfig.patch sys-libs/libcap/libcap-2.29-r2.ebuild sys-libs/libcap/libcap-2.29-r3.ebuild X-VCS-Directories: sys-libs/libcap/files/ sys-libs/libcap/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 3eb5406f9676ae7d7cd01012b1c0e2901606b19b X-VCS-Branch: master Date: Sun, 29 Dec 2019 09:40:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: be8eef99-977a-4b24-9a8e-fee99233c8b8 X-Archives-Hash: 826ad33d9a7c43e10f357d2a95374da3 commit: 3eb5406f9676ae7d7cd01012b1c0e2901606b19b Author: Lars Wendler gentoo org> AuthorDate: Sun Dec 29 09:38:48 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Dec 29 09:38:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eb5406f sys-libs/libcap: Revbump to fix dependencies of pkgconfig files Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> .../libcap/files/libcap-2.29-libpsx_pkgconfig.patch | 18 +++++++++--------- .../{libcap-2.29-r2.ebuild => libcap-2.29-r3.ebuild} | 0 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys-libs/libcap/files/libcap-2.29-libpsx_pkgconfig.patch b/sys-libs/libcap/files/libcap-2.29-libpsx_pkgconfig.patch index 413b27908b4..4ebdb887aa6 100644 --- a/sys-libs/libcap/files/libcap-2.29-libpsx_pkgconfig.patch +++ b/sys-libs/libcap/files/libcap-2.29-libpsx_pkgconfig.patch @@ -1,15 +1,15 @@ -From e13e5b24fb98dc3ec2f76bc51ed0d714460e75d8 Mon Sep 17 00:00:00 2001 +From 8dbae11750ac0f85332355e6aab97005533dfb38 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Sat, 28 Dec 2019 18:48:35 +0100 -Subject: [PATCH] USe separate libpsx.pc file instead of libcap.pc +Subject: [PATCH] Use separate libpsx.pc file instead of libcap.pc pkgconfig fails to parse current libcap.pc file but pkgconf succeeds Gentoo-bug: https://bugs.gentoo.org/703932 --- libcap/Makefile | 12 +++++++++++- - libcap/libcap.pc.in | 7 ------- - libcap/libpsx.pc.in | 12 ++++++++++++ + libcap/libcap.pc.in | 8 +------- + libcap/libpsx.pc.in | 11 +++++++++++ 3 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 libcap/libpsx.pc.in @@ -51,10 +51,10 @@ index 949cfad..5795458 100644 mkdir -p -m 0755 $(FAKEROOT)$(GOPKGDIR)/libcap/cap install -m 0644 src/libcap/cap/* $(FAKEROOT)$(GOPKGDIR)/libcap/cap/ diff --git a/libcap/libcap.pc.in b/libcap/libcap.pc.in -index 3d6b273..69cd231 100644 +index 3d6b273..8358274 100644 --- a/libcap/libcap.pc.in +++ b/libcap/libcap.pc.in -@@ -9,10 +9,3 @@ Version: @VERSION@ +@@ -9,10 +9,4 @@ Version: @VERSION@ Libs: -L${libdir} -lcap Libs.private: @deps@ Cflags: -I${includedir} @@ -65,12 +65,13 @@ index 3d6b273..69cd231 100644 -Libs: -L${libdir} -lpsx -lpthread -Wl,-wrap,pthread_create -Libs.private: @deps@ -Cflags: -I${includedir} ++Requires: libpsx diff --git a/libcap/libpsx.pc.in b/libcap/libpsx.pc.in new file mode 100644 -index 0000000..8677a86 +index 0000000..d032b9f --- /dev/null +++ b/libcap/libpsx.pc.in -@@ -0,0 +1,12 @@ +@@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ @@ -82,7 +83,6 @@ index 0000000..8677a86 +Libs: -L${libdir} -lpsx -lpthread -Wl,-wrap,pthread_create +Libs.private: @deps@ +Cflags: -I${includedir} -+Requires: libcap -- 2.24.1 diff --git a/sys-libs/libcap/libcap-2.29-r2.ebuild b/sys-libs/libcap/libcap-2.29-r3.ebuild similarity index 100% rename from sys-libs/libcap/libcap-2.29-r2.ebuild rename to sys-libs/libcap/libcap-2.29-r3.ebuild