| 1 |
mgorny 15/07/26 09:09:41 |
| 2 |
|
| 3 |
Modified: libappindicator-12.10.0-r300.ebuild ChangeLog |
| 4 |
libappindicator-12.10.0-r200.ebuild |
| 5 |
Log: |
| 6 |
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. |
| 7 |
|
| 8 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild?rev=1.2&view=markup |
| 14 |
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 |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: libappindicator-12.10.0-r300.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- libappindicator-12.10.0-r300.ebuild 7 May 2015 19:49:14 -0000 1.1 |
| 24 |
+++ libappindicator-12.10.0-r300.ebuild 26 Jul 2015 09:09:41 -0000 1.2 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2015 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
VALA_MIN_API_VERSION="0.16" |
| 33 |
@@ -22,7 +22,7 @@ |
| 34 |
>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}] |
| 35 |
>=dev-libs/libdbusmenu-0.6.2[gtk3,${MULTILIB_USEDEP}] |
| 36 |
>=dev-libs/libindicator-12.10.0:3[${MULTILIB_USEDEP}] |
| 37 |
- >=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}] |
| 38 |
+ >=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP},introspection?] |
| 39 |
introspection? ( >=dev-libs/gobject-introspection-1 ) |
| 40 |
" |
| 41 |
DEPEND="${RDEPEND} |
| 42 |
@@ -34,7 +34,7 @@ |
| 43 |
# Don't use -Werror |
| 44 |
sed -i -e 's/ -Werror//' {src,tests}/Makefile.{am,in} || die |
| 45 |
|
| 46 |
- epatch "${FILESDIR}"/${P}-disable-python.patch |
| 47 |
+ epatch "${FILESDIR}"/${P}-conditional-py-bindings.patch |
| 48 |
eautoreconf |
| 49 |
|
| 50 |
# Disable MONO for now because of http://bugs.gentoo.org/382491 |
| 51 |
@@ -51,7 +51,8 @@ |
| 52 |
econf \ |
| 53 |
--disable-silent-rules \ |
| 54 |
--disable-static \ |
| 55 |
- --with-gtk=3 |
| 56 |
+ --with-gtk=3 \ |
| 57 |
+ $(multilib_native_use_enable introspection) |
| 58 |
} |
| 59 |
|
| 60 |
multilib_src_install() { |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
1.19 dev-libs/libappindicator/ChangeLog |
| 65 |
|
| 66 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/ChangeLog?rev=1.19&view=markup |
| 67 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/ChangeLog?rev=1.19&content-type=text/plain |
| 68 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/ChangeLog?r1=1.18&r2=1.19 |
| 69 |
|
| 70 |
Index: ChangeLog |
| 71 |
=================================================================== |
| 72 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/ChangeLog,v |
| 73 |
retrieving revision 1.18 |
| 74 |
retrieving revision 1.19 |
| 75 |
diff -u -r1.18 -r1.19 |
| 76 |
--- ChangeLog 9 Jun 2015 14:19:29 -0000 1.18 |
| 77 |
+++ ChangeLog 26 Jul 2015 09:09:41 -0000 1.19 |
| 78 |
@@ -1,6 +1,18 @@ |
| 79 |
# ChangeLog for dev-libs/libappindicator |
| 80 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 81 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/ChangeLog,v 1.18 2015/06/09 14:19:29 jlec Exp $ |
| 82 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/ChangeLog,v 1.19 2015/07/26 09:09:41 mgorny Exp $ |
| 83 |
+ |
| 84 |
+*libappindicator-12.10.0-r301 (26 Jul 2015) |
| 85 |
+*libappindicator-12.10.0-r201 (26 Jul 2015) |
| 86 |
+ |
| 87 |
+ 26 Jul 2015; Michał Górny <mgorny@g.o> |
| 88 |
+ +files/libappindicator-12.10.0-conditional-py-bindings.patch, |
| 89 |
+ +libappindicator-12.10.0-r201.ebuild, +libappindicator-12.10.0-r301.ebuild, |
| 90 |
+ -files/libappindicator-12.10.0-disable-python.patch, |
| 91 |
+ libappindicator-12.10.0-r200.ebuild, libappindicator-12.10.0-r300.ebuild: |
| 92 |
+ Fix the build system in order to properly enable Python support. Fix |
| 93 |
+ introspection flag. https://github.com/gentoo/gentoo-portage-rsync- |
| 94 |
+ mirror/pull/168 by anyc. |
| 95 |
|
| 96 |
09 Jun 2015; Justin Lecher <jlec@g.o> metadata.xml: |
| 97 |
Updating remote-id in metadata.xml |
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
1.3 dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild |
| 102 |
|
| 103 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild?rev=1.3&view=markup |
| 104 |
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 |
| 105 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild?r1=1.2&r2=1.3 |
| 106 |
|
| 107 |
Index: libappindicator-12.10.0-r200.ebuild |
| 108 |
=================================================================== |
| 109 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild,v |
| 110 |
retrieving revision 1.2 |
| 111 |
retrieving revision 1.3 |
| 112 |
diff -u -r1.2 -r1.3 |
| 113 |
--- libappindicator-12.10.0-r200.ebuild 11 May 2015 14:05:57 -0000 1.2 |
| 114 |
+++ libappindicator-12.10.0-r200.ebuild 26 Jul 2015 09:09:41 -0000 1.3 |
| 115 |
@@ -1,12 +1,14 @@ |
| 116 |
# Copyright 1999-2015 Gentoo Foundation |
| 117 |
# Distributed under the terms of the GNU General Public License v2 |
| 118 |
-# $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 $ |
| 119 |
+# $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 $ |
| 120 |
|
| 121 |
EAPI=5 |
| 122 |
VALA_MIN_API_VERSION="0.16" |
| 123 |
VALA_USE_DEPEND="vapigen" |
| 124 |
|
| 125 |
-inherit autotools eutils multilib-minimal vala |
| 126 |
+PYTHON_COMPAT=( python2_7 ) |
| 127 |
+ |
| 128 |
+inherit autotools eutils multilib-minimal python-single-r1 vala |
| 129 |
|
| 130 |
DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar" |
| 131 |
HOMEPAGE="http://launchpad.net/libappindicator" |
| 132 |
@@ -15,26 +17,32 @@ |
| 133 |
LICENSE="LGPL-2.1 LGPL-3" |
| 134 |
SLOT="2" |
| 135 |
KEYWORDS="~amd64 ~x86" |
| 136 |
-IUSE="+introspection" |
| 137 |
+IUSE="+introspection python" |
| 138 |
|
| 139 |
RDEPEND=" |
| 140 |
>=dev-libs/dbus-glib-0.98[${MULTILIB_USEDEP}] |
| 141 |
>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}] |
| 142 |
>=dev-libs/libdbusmenu-0.6.2[gtk,${MULTILIB_USEDEP}] |
| 143 |
>=dev-libs/libindicator-12.10.0:0[${MULTILIB_USEDEP}] |
| 144 |
- x11-libs/gtk+:2[${MULTILIB_USEDEP}] |
| 145 |
+ x11-libs/gtk+:2[${MULTILIB_USEDEP},introspection?] |
| 146 |
introspection? ( >=dev-libs/gobject-introspection-1 ) |
| 147 |
+ python? ( ${PYTHON_DEPS} ) |
| 148 |
" |
| 149 |
DEPEND="${RDEPEND} |
| 150 |
virtual/pkgconfig[${MULTILIB_USEDEP}] |
| 151 |
introspection? ( $(vala_depend) ) |
| 152 |
" |
| 153 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 154 |
+ |
| 155 |
+pkg_setup() { |
| 156 |
+ use python && python-single-r1_pkg_setup |
| 157 |
+} |
| 158 |
|
| 159 |
src_prepare() { |
| 160 |
# Don't use -Werror |
| 161 |
sed -i -e 's/ -Werror//' {src,tests}/Makefile.{am,in} || die |
| 162 |
|
| 163 |
- epatch "${FILESDIR}"/${P}-disable-python.patch |
| 164 |
+ epatch "${FILESDIR}"/${P}-conditional-py-bindings.patch |
| 165 |
eautoreconf |
| 166 |
|
| 167 |
# Disable MONO for now because of http://bugs.gentoo.org/382491 |
| 168 |
@@ -51,7 +59,9 @@ |
| 169 |
econf \ |
| 170 |
--disable-silent-rules \ |
| 171 |
--disable-static \ |
| 172 |
- --with-gtk=2 |
| 173 |
+ --with-gtk=2 \ |
| 174 |
+ $(multilib_native_use_enable introspection) \ |
| 175 |
+ $(multilib_native_use_enable python) |
| 176 |
} |
| 177 |
|
| 178 |
multilib_src_install() { |
| 179 |
@@ -61,7 +71,7 @@ |
| 180 |
multilib_src_install_all() { |
| 181 |
dodoc AUTHORS ChangeLog |
| 182 |
|
| 183 |
- prune_libtool_files |
| 184 |
+ prune_libtool_files --modules |
| 185 |
|
| 186 |
# installed by slot 3 as well |
| 187 |
rm -r "${D}"usr/share/gtk-doc || die |
Archives