summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-07-26 09:09:48 +0000
committerMichał Górny <mgorny@gentoo.org>2015-07-26 09:09:48 +0000
commit52ba61c08601c8874f4b942cede4ec602a633924 (patch)
treea90bc8a1ec9597b390a15579043aa389ea4ffa92 /dev-libs/libappindicator
parentarm stable, bug #555838 (diff)
downloadhistorical-52ba61c08601c8874f4b942cede4ec602a633924.tar.gz
historical-52ba61c08601c8874f4b942cede4ec602a633924.tar.bz2
historical-52ba61c08601c8874f4b942cede4ec602a633924.zip
Fix the build system in order to properly enable Python support. Fix introspection flag. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/168 by anyc.
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'dev-libs/libappindicator')
-rw-r--r--dev-libs/libappindicator/ChangeLog14
-rw-r--r--dev-libs/libappindicator/Manifest42
-rw-r--r--dev-libs/libappindicator/files/libappindicator-12.10.0-conditional-py-bindings.patch72
-rw-r--r--dev-libs/libappindicator/files/libappindicator-12.10.0-disable-python.patch50
-rw-r--r--dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild24
-rw-r--r--dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild9
6 files changed, 128 insertions, 83 deletions
diff --git a/dev-libs/libappindicator/ChangeLog b/dev-libs/libappindicator/ChangeLog
index 1099875f38ae..b87217bc1522 100644
--- a/dev-libs/libappindicator/ChangeLog
+++ b/dev-libs/libappindicator/ChangeLog
@@ -1,6 +1,18 @@
# ChangeLog for dev-libs/libappindicator
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/ChangeLog,v 1.18 2015/06/09 14:19:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/ChangeLog,v 1.19 2015/07/26 09:09:41 mgorny Exp $
+
+*libappindicator-12.10.0-r301 (26 Jul 2015)
+*libappindicator-12.10.0-r201 (26 Jul 2015)
+
+ 26 Jul 2015; Michał Górny <mgorny@gentoo.org>
+ +files/libappindicator-12.10.0-conditional-py-bindings.patch,
+ +libappindicator-12.10.0-r201.ebuild, +libappindicator-12.10.0-r301.ebuild,
+ -files/libappindicator-12.10.0-disable-python.patch,
+ libappindicator-12.10.0-r200.ebuild, libappindicator-12.10.0-r300.ebuild:
+ Fix the build system in order to properly enable Python support. Fix
+ introspection flag. https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/168 by anyc.
09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
Updating remote-id in metadata.xml
diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index 8a5271d0ef48..480c3d809a67 100644
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -1,29 +1,29 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
-AUX libappindicator-12.10.0-disable-python.patch 1289 SHA256 173a1c52d41e37f6add45d1aac0471be3722e2a7ec509bca64040c2a5ebba692 SHA512 13a39f4a56f3e1c89d3dfb24ebe7cb077bd42bfd0c50b2ea87ba55a1a88dfc000fe248fc321fff8fbdeb2f101ef523772b5cb31cf8a32f39346e9ef27129ad8b WHIRLPOOL ff28c9afe02cbb16de2bfa593db5ca5cb80d6c7798976767f6f0cd1e643642a35f6931146a75d530b7bc17b18745384477b2ac8591b3eda1cd96bb681e62ac17
+AUX libappindicator-12.10.0-conditional-py-bindings.patch 2011 SHA256 6f7ef0ec2d84eddbe3a9e6e5a9bbfbf9c1c13dc927e2da47bc1f1535ee31fc09 SHA512 2fc00f056d84e6589838fef89c48c8756fbe802568373d5a56693a879427c5dc88f218dc4def4e7cd4f8667172442fe69afe8cb48c3801e8834951ab58f217b4 WHIRLPOOL 6dac3b2ddefeef35bc2c929ff37012f6b9f9bcbd213f517de1b8e1ac0282ec91cd428938fa968e22e0941f660a83c6f543b444996a008c01de68451245f69991
DIST libappindicator-12.10.0.tar.gz 535562 SHA256 d5907c1f98084acf28fd19593cb70672caa0ca1cf82d747ba6f4830d4cc3b49f SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a WHIRLPOOL fdf1d3afbe82d287da688295e6f999656a4dd8e0a1c75aeffa9fd83c69b97cfd37e682f0ca4aff42d30e99b0add8a9e75f870d8a6a72e5337e1afd67ffe618eb
EBUILD libappindicator-12.10.0-r1.ebuild 1525 SHA256 6b711ae455ca55c8c1af62a155025675014858f694a08b4f0dcba26b5f7e252a SHA512 f178e9a8015a0851eedfa4f7109f820ce2e62e211ca96043651090f7d47a5de50d7bd1e30e118ebddbc77dddefd87e81cfd4ee1038c5c0e219f9f0b4d9647bbd WHIRLPOOL db7984fddcc9da14d752c1d5ba70ee251b44c91edf95e0ee2906835da8a3d657f4b49f54a878d118449ea762c608b3abbfd342e6b99b550c308ffcacf5d8702e
-EBUILD libappindicator-12.10.0-r200.ebuild 1801 SHA256 cdbe866fe33649cc90a789213571cdf1cc4dcbdfcf19359a50cf7ad6a94dca5d SHA512 6a0de41cb92d413b229cfa42fa7f31643b802b7242fbe07787026aeb7564065aff791c3b00a78d52e41a9d2794607a95e20b076781d0e445d4078d7fca17e454 WHIRLPOOL fe60d5dd380f672d5eaad9458df280e808bcd4a094ca8b4d231b6ea8bd9ee695cf6022cd01cc99825ed75c66a7d01673c5df3ca2ecb830d9578230f0a6fb782e
-EBUILD libappindicator-12.10.0-r300.ebuild 1738 SHA256 e4bbd46bebae4cbdf254e549a9ee452af6fc0223ea0539964ccd3245b458368d SHA512 7c7e15f39bf131773f36d11b2647a14eef7b8ec5038b0e7044904c0608bc37b25ce4d674764517a706124d2b90804ebaae276c957caca5f8f3043e6ab8aab81f WHIRLPOOL 50b92f928d8f99f1e753f40a41d58c1c35672c735b9d05407593f18de482a73d54cb85c653e909635b82c7e6182eb82b6e3f93304764c08a81dbd1356608a6d7
-MISC ChangeLog 3638 SHA256 e54ee53a357b7a3599f8ab17d7d42d90ba7684f84964dd1de08351d36ee2d390 SHA512 f44ceb50082ab64741e0aa41274c15bfbe00d0341aa5808d85396fa3816d0565feb8063f5261c9a86238decf998657ccc6505867db266ed6b495684ed16af7c0 WHIRLPOOL 1da66c25e89d9da38fda3f98b6e29c5f8a685db726da253ad720eacb4393ea5aec3411c8294f642fd229322f2291993dc1b7be28b5cc6054580f9bb79c6d8e4a
+EBUILD libappindicator-12.10.0-r200.ebuild 2114 SHA256 590a12d54eee9df7e96a9bce3bc39db0b06d500dbdd2b701904c1269d59e8d30 SHA512 9543e28438231ea380a4aaf629f090a6fb70678d9a84b6ad40366cd209e273a41e27989ac5039b94ca390f40e432cea7f38c2daa9fd6c1b5c0bf5c8735ff22fd WHIRLPOOL 5b2cbe4bcaf8ff5669a80bb0b13a872e0fdd2adb101ab6f64831749314cd49204d8c7708d9a510bb4a88d8cfa5f6b4c2cb62433931d0ca51b241ffe13cb479e7
+EBUILD libappindicator-12.10.0-r300.ebuild 1810 SHA256 98cb31cb150929549f0b7b057ddf14dba7f44aaa4de5c88a22ee27f0433a6fc7 SHA512 da7309189a5d21ff29048a184acf6aa8ed8cc58ad00110f68e2c141345c079dc0e89497c4bd40b2da4ee44988c5db382217df4e6fffe58d30ba77fbcf4ba50bd WHIRLPOOL 2d8447acfee2a89c6d5de71eddfbed798da4a958fa1d3f1584efaceebe82611b81146f82a19cfc84b54da49badeaecfd82ac88016808bf3f6f6eafe49a94f376
+MISC ChangeLog 4221 SHA256 7723dea79768bd308537e12022dfcc4f7f91352a4ecadfe2c6065fb4dd5f6a42 SHA512 6bb70e687ec1432555922d0bc793bd8bb18c8026e13964f6e4d966d554f0db320645926a030e8ee0ef7050ffaa3ef9ed079a339cb2df63804123ed26179e474c WHIRLPOOL b13916b04c0c12d9033d64be4465d2043db488456b09bcb9058354260a80c9e4c1ca40f9384cad64527834524225d2e24681a90eeb0d846245e1d2cfb6012cb8
MISC metadata.xml 314 SHA256 c6a4cb21811d787d1d3a2d671441fba56ea7a5c77bfcf70dc7d7c7302618e987 SHA512 564ffb5096a3fbad67891dc2b8dabffdd58f870051c33ebb8f52032516d5294edd56364cd98a7bd40f8f340a7c20b875dfad976107ae5639291b40328e58e043 WHIRLPOOL 71b1e8205abcb7f4a09802aac4f6e44bb463fb783d5ea57cf0101f70a7064d3aa1de2ebcedf50e2ec125f84bc88ba6219d9b5b1e4a5b63c0757737d5824af798
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
-iQJ8BAEBCgBmBQJVdvXyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmioJQQALHCgn6vWqstWIHUzNjBvz3T
-FyABH1rLL3JnIaWVCDCWT+MFcWltkm3rLi99bNOC+47NxinJVu3O26ryca132eFD
-KZIQd6rjBZ0fvCy8VHCKY6JJU5oYWjDjbldL80FyQiuD0zaK4dJmD2sBQZv6r7hc
-ZAUF2UwIFq1Fab8ODxROFv2k/PZVctd2jkkqV8b2/Cy1Mx+7Kn5kF1LjMnMORG7A
-bmHrGk0f7HB+PpXO1i8P3pVx3nfaITgJBOWI+PLxg6nQlwwy28D1n8WsZRRQD8fM
-IFT3PEEMKArt2fHmdoeJEasLZ+uBA/i+0q02Jn6tGex2F8saPtJYKrQMw3G1CwFq
-d7QCvlSVInwlQ43ISv59slK7C6rMuQRrxJ8CECQRJwt6D7tAQhHJDF1woVZM5SQd
-kYW9317qqHYlpnHQWLP1lwclPfytrODZF2tytHGl1dvv3Q6fFE73QMuchndxBDdu
-xhm5anfepvaA/rth+bQuPlPnh3g6wLMy/OWL24H0Wvn2mE0MQF9BtTjT0nHATlN+
-yW5w3PyvnlM6vT/6pCHjHdpcuk4mElpLkN+bRNYpr/TjNOelCp0v+5b6/c8ZSf24
-P7R7RBK7WPLAmOvC9nAB7EMCFGsP003PIIfz8nLF2r6APU99ZEWwXUIeDytWZtQG
-vQSZ5by2j+y0qUr4hOoA
-=zM3l
+iQJ8BAEBCABmBQJVtKPYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOk68P/A4Zv3SLW3h14P43FxBS5UNL
+3aNHbijCM7ltp3L9kVt79MVHM9hsedipuJA2XnzThGa8oCkTayIltC3WhDtApDeK
+T+Tttc/SIIoinZzKWOfwtTwq9QFgUnyvprmhEhdijwpsCyjVTB07bo7AjWCWc84D
+PN1mVPjCjhapUf2Sr4JJscUbco32LOLQDpgHAtPvmJwweUM4mOFloCR4znDMsgN3
+ZwOQxC7YCBNl+DdEfa27MXf2XIV3hIvO9spv/ZqLc3AYVr+F98DBZOalARr5J6Hk
+zK1Tae0u32N4AYXL47GQBBdngIUFNmfPpnXU7mq/A1J3wYiw4pYjWgX/i0g4lHg9
+VL0b2nLsTcOp95XnnrTCYYdg76IE283CxY1jb4tWitBVAgoBS0GZCxNjEOfw40Lr
+Vi6DUcCejRpD3EMLvfJhqyVLlI+csoR8zLUabHDA3+VX8ivmqRX59XrrEB7ReTQA
+nVhZmdUgQH7S9E/Ma5NyugGSMX0DwLofzau8zOfogBwNYI5lABlu1Ovg2E2mdIB7
+0j+LqIa82f+S0TRrO4vqA+nGwtVOe/DcR32/BEo/hwmamo1keuEat6wWNlwETLtt
+KW8IxLDDRa8vu8i6VDlA/ji0MuHow9WWaztSgKdis7XlVepggM2cmeN+Q/UvCSI/
+MJ1Cr00+CpWvosM8s28a
+=Kuht
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libappindicator/files/libappindicator-12.10.0-conditional-py-bindings.patch b/dev-libs/libappindicator/files/libappindicator-12.10.0-conditional-py-bindings.patch
new file mode 100644
index 000000000000..6a5e15f3c0b1
--- /dev/null
+++ b/dev-libs/libappindicator/files/libappindicator-12.10.0-conditional-py-bindings.patch
@@ -0,0 +1,72 @@
+--- bindings/Makefile.am 2015-07-10 10:04:18.091199191 +0200
++++ bindings/Makefile.am 2015-07-10 10:19:47.047974439 +0200
+@@ -3,8 +3,10 @@
+ vala
+ else
+ SUBDIRS = \
+- python \
+ vala
++if HAS_PYTHON
++SUBDIRS += python
++endif
+ endif
+
+ if HAS_MONO
+--- configure.ac 2015-07-16 13:28:41.007502838 +0200
++++ configure.ac_new 2015-07-16 13:53:18.118602877 +0200
+@@ -188,25 +188,37 @@
+ PYGTK_REQUIRED=2.14.0
+ PYGOBJECT_REQUIRED=0.22
+
+-AM_PATH_PYTHON(2.3.5)
+-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
++AC_ARG_ENABLE([python],
++ AC_HELP_STRING([--enable-python], [Enable python for GTK2 build]),,
++ [enable_python=yes])
+
+-PKG_CHECK_MODULES(APPINDICATOR_PYTHON,
++if test x"$with_gtk" = x"3" ; then
++ enable_python=no
++fi
++
++AM_CONDITIONAL(HAS_PYTHON, test x"${enable_python}" != x"no")
++
++if test x"$enable_python" != x"no" ; then
++ AM_PATH_PYTHON(2.3.5)
++ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
++
++ PKG_CHECK_MODULES(APPINDICATOR_PYTHON,
+ [
+ pygtk-2.0 >= $PYGTK_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ pygobject-2.0 >= $PYGOBJECT_REQUIRED
+ ])
+
+-AC_MSG_CHECKING(for pygtk defs)
+-PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
+-AC_SUBST(PYGTK_DEFSDIR)
+-AC_MSG_RESULT($PYGTK_DEFSDIR)
+-
+-AC_MSG_CHECKING(for pygtk codegen)
+-PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
+-AC_SUBST(PYGTK_CODEGEN)
+-AC_MSG_RESULT($PYGTK_CODEGEN)
++ AC_MSG_CHECKING(for pygtk defs)
++ PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
++ AC_SUBST(PYGTK_DEFSDIR)
++ AC_MSG_RESULT($PYGTK_DEFSDIR)
++
++ AC_MSG_CHECKING(for pygtk codegen)
++ PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
++ AC_SUBST(PYGTK_CODEGEN)
++ AC_MSG_RESULT($PYGTK_CODEGEN)
++fi
+
+ #########################
+ # Check if build tests
+@@ -278,4 +290,5 @@
+ Tests: $enable_tests
+ Mono tests: $have_nunit
+ gcov: $use_gcov
++ Python: $enable_python
+ ])
diff --git a/dev-libs/libappindicator/files/libappindicator-12.10.0-disable-python.patch b/dev-libs/libappindicator/files/libappindicator-12.10.0-disable-python.patch
deleted file mode 100644
index aeb0758caeb5..000000000000
--- a/dev-libs/libappindicator/files/libappindicator-12.10.0-disable-python.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 67b08b7e1e315120e295ba9dc7191b85f9c12bb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 7 May 2015 21:10:45 +0200
-Subject: [PATCH] Disable Python completely
-
-Python bindings are only meaningful for GTK+2 and are going to cause
-issues for multilib, so since we really don't need them, it's easier to
-kill them completely.
----
- bindings/Makefile.am | 1 -
- configure.ac | 4 ++++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/bindings/Makefile.am b/bindings/Makefile.am
-index d1f6d73..dccca6c 100644
---- a/bindings/Makefile.am
-+++ b/bindings/Makefile.am
-@@ -3,7 +3,6 @@ SUBDIRS = \
- vala
- else
- SUBDIRS = \
-- python \
- vala
- endif
-
-diff --git a/configure.ac b/configure.ac
-index ee03390..6d16e2f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -185,6 +185,8 @@ AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all
- # Python
- ###########################
-
-+if false ; then
-+
- PYGTK_REQUIRED=2.14.0
- PYGOBJECT_REQUIRED=0.22
-
-@@ -208,6 +210,8 @@ PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
- AC_SUBST(PYGTK_CODEGEN)
- AC_MSG_RESULT($PYGTK_CODEGEN)
-
-+fi
-+
- #########################
- # Check if build tests
- #########################
---
-2.4.0
-
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild
index 15ef476e7d42..c09b04144dab 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild
@@ -1,12 +1,14 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild,v 1.2 2015/05/11 14:05:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild,v 1.3 2015/07/26 09:09:41 mgorny Exp $
EAPI=5
VALA_MIN_API_VERSION="0.16"
VALA_USE_DEPEND="vapigen"
-inherit autotools eutils multilib-minimal vala
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib-minimal python-single-r1 vala
DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar"
HOMEPAGE="http://launchpad.net/libappindicator"
@@ -15,26 +17,32 @@ SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
LICENSE="LGPL-2.1 LGPL-3"
SLOT="2"
KEYWORDS="~amd64 ~x86"
-IUSE="+introspection"
+IUSE="+introspection python"
RDEPEND="
>=dev-libs/dbus-glib-0.98[${MULTILIB_USEDEP}]
>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
>=dev-libs/libdbusmenu-0.6.2[gtk,${MULTILIB_USEDEP}]
>=dev-libs/libindicator-12.10.0:0[${MULTILIB_USEDEP}]
- x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:2[${MULTILIB_USEDEP},introspection?]
introspection? ( >=dev-libs/gobject-introspection-1 )
+ python? ( ${PYTHON_DEPS} )
"
DEPEND="${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
introspection? ( $(vala_depend) )
"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
src_prepare() {
# Don't use -Werror
sed -i -e 's/ -Werror//' {src,tests}/Makefile.{am,in} || die
- epatch "${FILESDIR}"/${P}-disable-python.patch
+ epatch "${FILESDIR}"/${P}-conditional-py-bindings.patch
eautoreconf
# Disable MONO for now because of http://bugs.gentoo.org/382491
@@ -51,7 +59,9 @@ multilib_src_configure() {
econf \
--disable-silent-rules \
--disable-static \
- --with-gtk=2
+ --with-gtk=2 \
+ $(multilib_native_use_enable introspection) \
+ $(multilib_native_use_enable python)
}
multilib_src_install() {
@@ -61,7 +71,7 @@ multilib_src_install() {
multilib_src_install_all() {
dodoc AUTHORS ChangeLog
- prune_libtool_files
+ prune_libtool_files --modules
# installed by slot 3 as well
rm -r "${D}"usr/share/gtk-doc || die
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild
index 1ffaf8c0ca50..b876ec6461ab 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild,v 1.1 2015/05/07 19:49:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild,v 1.2 2015/07/26 09:09:41 mgorny Exp $
EAPI=5
VALA_MIN_API_VERSION="0.16"
@@ -22,7 +22,7 @@ RDEPEND="
>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
>=dev-libs/libdbusmenu-0.6.2[gtk3,${MULTILIB_USEDEP}]
>=dev-libs/libindicator-12.10.0:3[${MULTILIB_USEDEP}]
- >=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]
+ >=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP},introspection?]
introspection? ( >=dev-libs/gobject-introspection-1 )
"
DEPEND="${RDEPEND}
@@ -34,7 +34,7 @@ src_prepare() {
# Don't use -Werror
sed -i -e 's/ -Werror//' {src,tests}/Makefile.{am,in} || die
- epatch "${FILESDIR}"/${P}-disable-python.patch
+ epatch "${FILESDIR}"/${P}-conditional-py-bindings.patch
eautoreconf
# Disable MONO for now because of http://bugs.gentoo.org/382491
@@ -51,7 +51,8 @@ multilib_src_configure() {
econf \
--disable-silent-rules \
--disable-static \
- --with-gtk=3
+ --with-gtk=3 \
+ $(multilib_native_use_enable introspection)
}
multilib_src_install() {