Ensure gtk-doc and gobject-introspection really are optional at build time (bug #454550, thanks to Cesko Voeten).

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 54 insertions, 2 deletions

diff --git a/dev-libs/libmirage/ChangeLog b/dev-libs/libmirage/ChangeLog
index 549cf15b8814..451e3fe67811 100644
--- a/dev-libs/libmirage/ChangeLog
+++ b/dev-libs/libmirage/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libmirage
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/ChangeLog,v 1.25 2013/01/28 08:11:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/ChangeLog,v 1.26 2013/01/30 05:18:24 tetromino Exp $
+
+  30 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libmirage-2.0.0.ebuild, +files/libmirage-2.0.0-gtk-doc.patch:
+  Ensure gtk-doc and gobject-introspection really are optional at build time
+  (bug #454550, thanks to Cesko Voeten).
 
 *libmirage-2.0.0 (28 Jan 2013)
 
diff --git a/dev-libs/libmirage/files/libmirage-2.0.0-gtk-doc.patch b/dev-libs/libmirage/files/libmirage-2.0.0-gtk-doc.patch
new file mode 100644
index 000000000000..8b6403177858
--- /dev/null
+++ b/dev-libs/libmirage/files/libmirage-2.0.0-gtk-doc.patch
@@ -0,0 +1,43 @@
+From 79c9b60502449b330f155c082b198dfb509c0874 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 30 Jan 2013 00:02:12 -0500
+Subject: [PATCH] libMirage: CMake: don't include GtkDoc and
+ GObjectIntrospection unconditionally
+
+Including GtkDoc.cmake and GObjectIntrospection.cmake unconditionally
+checks for gtk-doc.pc and gobject-introspection-1.0.pc respectively,
+defeating the point of the conditional pkg_check_modules() calls in the
+make CMakeLists.txt script.
+---
+ libmirage/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libmirage/CMakeLists.txt b/libmirage/CMakeLists.txt
+index ff72aab..8049a80 100644
+--- a/libmirage/CMakeLists.txt
++++ b/libmirage/CMakeLists.txt
+@@ -27,8 +27,6 @@ include (CheckCSourceCompiles)
+ include (CheckCCompilerFlag)
+ include (GNUInstallDirs)
+ 
+-include (GObjectIntrospection)
+-include (GtkDoc)
+ include (Utilities)
+ include (FileList)
+ 
+@@ -50,10 +48,12 @@ pkg_check_modules (LIBLZMA REQUIRED liblzma>=5.0.0)
+ pkg_check_modules (SNDFILE REQUIRED sndfile>=1.0.0)
+ 
+ if (INTROSPECTION_ENABLED)
++    include (GObjectIntrospection)
+     pkg_check_modules (INTROSPECTION REQUIRED gobject-introspection-1.0>=1.30.0)
+ endif ()
+ 
+ if (GTKDOC_ENABLED)
++    include (GtkDoc)
+     pkg_check_modules (GTKDOC REQUIRED gtk-doc>=1.4)
+ endif ()
+ 
+-- 
+1.8.1.1
+
diff --git a/dev-libs/libmirage/libmirage-2.0.0.ebuild b/dev-libs/libmirage/libmirage-2.0.0.ebuild
index 619dd7f6978e..b0ace8425303 100644
--- a/dev-libs/libmirage/libmirage-2.0.0.ebuild
+++ b/dev-libs/libmirage/libmirage-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/libmirage-2.0.0.ebuild,v 1.1 2013/01/28 00:21:01 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/libmirage-2.0.0.ebuild,v 1.2 2013/01/30 05:18:24 tetromino Exp $
 
 EAPI="5"
 
@@ -29,6 +29,10 @@ DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )"
 
 src_prepare() {
+	# Make sure gtk-doc and gobject-introspection are optional
+	# https://sourceforge.net/p/cdemu/patches/16/
+	epatch "${FILESDIR}/${PN}-2.0.0-gtk-doc.patch"
+
 	sed -e 's/-DG_DISABLE_DEPRECATED//' -i CMakeLists.txt || die
 }