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 9D1AF1382C5 for ; Tue, 9 Mar 2021 09:44:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC29AE05AC; Tue, 9 Mar 2021 09:44:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 A05E8E05AC for ; Tue, 9 Mar 2021 09:44:51 +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 AC4C4340B25 for ; Tue, 9 Mar 2021 09:44:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4BF57579 for ; Tue, 9 Mar 2021 09:44:49 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1615283061.eeebb28751a2e854126a77a0a0959b6d9581f215.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libofx/files/, dev-libs/libofx/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libofx/files/libofx-0.10.1-docdir.patch dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch dev-libs/libofx/libofx-0.10.1-r1.ebuild X-VCS-Directories: dev-libs/libofx/ dev-libs/libofx/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: eeebb28751a2e854126a77a0a0959b6d9581f215 X-VCS-Branch: master Date: Tue, 9 Mar 2021 09:44:49 +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: 871ed0fb-4462-4473-ad20-92bc4d09c755 X-Archives-Hash: 3c9e79375ceb284b2b76c38f2f980565 commit: eeebb28751a2e854126a77a0a0959b6d9581f215 Author: Sam James gentoo org> AuthorDate: Tue Mar 9 09:02:33 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 9 09:44:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeebb287 dev-libs/libofx: docdir, libdir patches upstreamed Bug: https://bugs.gentoo.org/693458 Signed-off-by: Sam James gentoo.org> dev-libs/libofx/files/libofx-0.10.1-docdir.patch | 5 +---- dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch | 4 ---- dev-libs/libofx/libofx-0.10.1-r1.ebuild | 4 ++-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dev-libs/libofx/files/libofx-0.10.1-docdir.patch b/dev-libs/libofx/files/libofx-0.10.1-docdir.patch index f99730daa02..1e73e6ea104 100644 --- a/dev-libs/libofx/files/libofx-0.10.1-docdir.patch +++ b/dev-libs/libofx/files/libofx-0.10.1-docdir.patch @@ -1,6 +1,4 @@ -https://github.com/libofx/libofx/pull/40 - -From 379745ff481f2cc99f96836de0307b8074bf0788 Mon Sep 17 00:00:00 2001 +From ee296908c23a944b9b034c9b1f8b974edcb44b80 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 6 Mar 2021 06:09:11 +0000 Subject: [PATCH] Makefile.am, doc/Makefile.am: don't override docdir @@ -15,7 +13,6 @@ where ${PF} represents the upstream version combined with any internal distribution changes made. Signed-off-by: Sam James - --- a/Makefile.am +++ b/Makefile.am @@ -6,8 +6,6 @@ endif diff --git a/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch b/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch index da37a6ee49f..9dd2160f74c 100644 --- a/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch +++ b/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch @@ -1,6 +1,3 @@ -https://github.com/libofx/libofx/pull/40 -https://bugs.gentoo.org/693458 - From a647c1db417459bded7fb47af69dff375eae83c1 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 6 Mar 2021 05:57:49 +0000 @@ -22,7 +19,6 @@ search for OpenSP in the right place. Bug: https://bugs.gentoo.org/693458 Signed-off-by: Sam James - --- a/configure.ac +++ b/configure.ac @@ -112,7 +112,7 @@ AC_ARG_WITH(opensp-libs, diff --git a/dev-libs/libofx/libofx-0.10.1-r1.ebuild b/dev-libs/libofx/libofx-0.10.1-r1.ebuild index 11e25cba6dd..e2f99a67303 100644 --- a/dev-libs/libofx/libofx-0.10.1-r1.ebuild +++ b/dev-libs/libofx/libofx-0.10.1-r1.ebuild @@ -32,8 +32,8 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/libofx-0.10.1-opensp-libdir.patch - "${FILESDIR}"/libofx-0.10.1-docdir.patch + "${FILESDIR}"/${P}-opensp-libdir.patch + "${FILESDIR}"/${P}-docdir.patch ) src_prepare() {