From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-855226-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 4E9B41384B4
for <garchives@archives.gentoo.org>; Mon, 4 Jan 2016 18:42:17 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3EA53E084B;
Mon, 4 Jan 2016 18:42:15 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B609FE084B
for <gentoo-commits@lists.gentoo.org>; Mon, 4 Jan 2016 18:42:14 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 16004340871
for <gentoo-commits@lists.gentoo.org>; Mon, 4 Jan 2016 18:42:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CEFBCB0
for <gentoo-commits@lists.gentoo.org>; Mon, 4 Jan 2016 18:42:11 +0000 (UTC)
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" <kensington@gentoo.org>
Message-ID: <1451932921.0c4ee1490794daabb1a3bd59244f3a2a96b2b6cc.kensington@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/kid3/, media-sound/kid3/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch media-sound/kid3/kid3-3.2.1.ebuild
X-VCS-Directories: media-sound/kid3/ media-sound/kid3/files/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: 0c4ee1490794daabb1a3bd59244f3a2a96b2b6cc
X-VCS-Branch: master
Date: Mon, 4 Jan 2016 18:42:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: bd0c00f2-f0e7-4c5f-9a63-79c0a7c05423
X-Archives-Hash: 1b8418e725ad5adccd8889d393440f02
commit: 0c4ee1490794daabb1a3bd59244f3a2a96b2b6cc
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jan 1 19:33:46 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 18:42:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c4ee149
media-sound/kid3: Fix configure with >=kdelibs-4.14.11
Package-Manager: portage-2.2.24
media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch | 61 +++++++++++++++++++++++
media-sound/kid3/kid3-3.2.1.ebuild | 2 +
2 files changed, 63 insertions(+)
diff --git a/media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch b/media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch
new file mode 100644
index 0000000..0644690
--- /dev/null
+++ b/media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch
@@ -0,0 +1,61 @@
+commit c126ad8142c51476c4a1b78ab9e6d7409656b312
+Author: Michael Palimaka <kensington@gentoo.org>
+Date: Tue Aug 25 00:05:20 2015 +1000
+
+ Fix build with kdelibs-4.14.11.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ab5d20..99cf392 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -473,6 +473,13 @@ else (UNIX AND NOT APPLE)
+ set(KID3_EXECUTABLE kid3)
+ endif (UNIX AND NOT APPLE)
+
++if (BUILD_KDE_APP)
++ if (NOT HAVE_QT5)
++ find_package(KDE4 REQUIRED)
++ include (KDE4Defaults)
++ add_definitions(${KDE4_ENABLE_EXCEPTIONS})
++ endif (NOT HAVE_QT5)
++endif (BUILD_KDE_APP)
+
+ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
+diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt
+index 6f25b68..70f6793 100644
+--- a/doc/de/CMakeLists.txt
++++ b/doc/de/CMakeLists.txt
+@@ -2,7 +2,6 @@ if (BUILD_KDE_APP)
+ if (HAVE_QT5)
+ kf5_create_handbook(index.docbook)
+ else (HAVE_QT5)
+- find_package(KDE4 REQUIRED)
+ kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/de SUBDIR kid3)
+ endif (HAVE_QT5)
+ endif (BUILD_KDE_APP)
+diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
+index b3751b3..7cff8e1 100644
+--- a/doc/en/CMakeLists.txt
++++ b/doc/en/CMakeLists.txt
+@@ -2,7 +2,6 @@ if (BUILD_KDE_APP)
+ if (HAVE_QT5)
+ kf5_create_handbook(index.docbook)
+ else (HAVE_QT5)
+- find_package(KDE4 REQUIRED)
+ kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kid3)
+ endif (HAVE_QT5)
+ endif (BUILD_KDE_APP)
+diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
+index d19ebb5..516e3f9 100644
+--- a/src/app/CMakeLists.txt
++++ b/src/app/CMakeLists.txt
+@@ -65,8 +65,6 @@ if (BUILD_KDE_APP)
+ )
+ else (HAVE_QT5)
+ set(_cmakeInstallRpath "${CMAKE_INSTALL_RPATH}")
+- find_package(KDE4 REQUIRED)
+- include (KDE4Defaults)
+
+ if (BUILD_SHARED_LIBS)
+ # FindKDE4Internal.cmake will overwrite our RPATH if LIB_INSTALL_DIR (which
diff --git a/media-sound/kid3/kid3-3.2.1.ebuild b/media-sound/kid3/kid3-3.2.1.ebuild
index f6be3bc..3afd6e6 100644
--- a/media-sound/kid3/kid3-3.2.1.ebuild
+++ b/media-sound/kid3/kid3-3.2.1.ebuild
@@ -48,6 +48,8 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/${P}-fix-cmake.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_with acoustid CHROMAPRINT)