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 0FD3B138334 for ; Sun, 20 Oct 2019 14:21:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CADCE0AD9; Sun, 20 Oct 2019 14:21:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 42A9FE0AD9 for ; Sun, 20 Oct 2019 14:21:06 +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 1512734C0B6 for ; Sun, 20 Oct 2019 14:21:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA75989A for ; Sun, 20 Oct 2019 14:21:01 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1571581178.f5376c03c8c65c581901c4dee29a05cf2bae2327.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/taglib/, media-libs/taglib/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild media-libs/taglib/taglib-1.11.1_p20190920.ebuild X-VCS-Directories: media-libs/taglib/files/ media-libs/taglib/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f5376c03c8c65c581901c4dee29a05cf2bae2327 X-VCS-Branch: master Date: Sun, 20 Oct 2019 14:21:01 +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: 58513a53-f86e-4e05-b540-2c3736666682 X-Archives-Hash: 7777b67340344906080c44c9eda07fbc commit: f5376c03c8c65c581901c4dee29a05cf2bae2327 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 20 14:17:09 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 20 14:19:38 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5376c03 media-libs/taglib: Fix taglib-config libdir Pending upstream PR: https://github.com/taglib/taglib/pull/935 Closes: https://bugs.gentoo.org/697742 Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/taglib-1.11.1_p20181028-libdir.patch | 25 ++++++++++++++++++++++ ...20.ebuild => taglib-1.11.1_p20190920-r1.ebuild} | 1 + 2 files changed, 26 insertions(+) diff --git a/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch b/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch new file mode 100644 index 00000000000..0ae6b1cfb9a --- /dev/null +++ b/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch @@ -0,0 +1,25 @@ +From cd9e6b750206417f155574c78d2551242a779a97 Mon Sep 17 00:00:00 2001 +From: jiblime <47689567+jiblime@users.noreply.github.com> +Date: Sat, 19 Oct 2019 15:12:03 -0700 +Subject: [PATCH] Changed libdir/includedir variables to change based on a + user's system and match syntax + +--- + taglib-config.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/taglib-config.cmake b/taglib-config.cmake +index 2a5c19f90..e613fa226 100644 +--- a/taglib-config.cmake ++++ b/taglib-config.cmake +@@ -16,8 +16,8 @@ EOH + + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/lib +-includedir=${prefix}/include ++libdir=@LIB_INSTALL_DIR@ ++includedir=@INCLUDE_INSTALL_DIR@ + + flags="" + diff --git a/media-libs/taglib/taglib-1.11.1_p20190920.ebuild b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild similarity index 96% rename from media-libs/taglib/taglib-1.11.1_p20190920.ebuild rename to media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild index b83996484d6..163dcdf23ea 100644 --- a/media-libs/taglib/taglib-1.11.1_p20190920.ebuild +++ b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild @@ -24,6 +24,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-1.11-install-examples.patch "${FILESDIR}"/${PN}-1.11.1_p20181028-version-1.11.2.patch + "${FILESDIR}"/${PN}-1.11.1_p20181028-libdir.patch ) MULTILIB_CHOST_TOOLS=(