mgorny 15/07/26 09:09:41 Modified: libappindicator-12.10.0-r300.ebuild ChangeLog libappindicator-12.10.0-r200.ebuild Log: 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. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.2 dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild?r1=1.1&r2=1.2 Index: libappindicator-12.10.0-r300.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libappindicator-12.10.0-r300.ebuild 7 May 2015 19:49:14 -0000 1.1 +++ libappindicator-12.10.0-r300.ebuild 26 Jul 2015 09:09:41 -0000 1.2 @@ -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 @@ >=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 @@ # 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 @@ econf \ --disable-silent-rules \ --disable-static \ - --with-gtk=3 + --with-gtk=3 \ + $(multilib_native_use_enable introspection) } multilib_src_install() { 1.19 dev-libs/libappindicator/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/ChangeLog?rev=1.19&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/ChangeLog?rev=1.19&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/ChangeLog?r1=1.18&r2=1.19 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/ChangeLog,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ChangeLog 9 Jun 2015 14:19:29 -0000 1.18 +++ ChangeLog 26 Jul 2015 09:09:41 -0000 1.19 @@ -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 <mgo...@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 <j...@gentoo.org> metadata.xml: Updating remote-id in metadata.xml 1.3 dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild?r1=1.2&r2=1.3 Index: libappindicator-12.10.0-r200.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libappindicator-12.10.0-r200.ebuild 11 May 2015 14:05:57 -0000 1.2 +++ libappindicator-12.10.0-r200.ebuild 26 Jul 2015 09:09:41 -0000 1.3 @@ -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 @@ 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 @@ 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_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