Add GTK+2 version. Fixes bug #462764.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

diff --git a/dev-libs/libappindicator/ChangeLog b/dev-libs/libappindicator/ChangeLog
index 0f75b8d0b3f2e4319b1435119f960c6a74011c6b..20d514cf6f75b796f5638af7fc5eb7063305bb1e 100644 (file)
--- a/dev-libs/libappindicator/ChangeLog
+++ b/dev-libs/libappindicator/ChangeLog
@@ -1,6 +1,14 @@
 # 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.15 2015/05/07 19:31:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/ChangeLog,v 1.16 2015/05/07 19:49:14 mgorny Exp $
+
+*libappindicator-12.10.0-r200 (07 May 2015)
+*libappindicator-12.10.0-r300 (07 May 2015)
+
+  07 May 2015; Michał Górny <mgorny@gentoo.org>
+  +libappindicator-12.10.0-r200.ebuild, +libappindicator-12.10.0-r300.ebuild,
+  -libappindicator-12.10.0-r2.ebuild:
+  Add GTK+2 version. Fixes bug #462764.
 
 *libappindicator-12.10.0-r2 (07 May 2015)
 

diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index 9d1c91c504314b53e0dd7137ec4de596c27b90ec..ddde8696568ffbd4edc66a5df4809d1ff2657974 100644 (file)
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -4,25 +4,26 @@ Hash: SHA256
 AUX libappindicator-12.10.0-disable-python.patch 1289 SHA256 173a1c52d41e37f6add45d1aac0471be3722e2a7ec509bca64040c2a5ebba692 SHA512 13a39f4a56f3e1c89d3dfb24ebe7cb077bd42bfd0c50b2ea87ba55a1a88dfc000fe248fc321fff8fbdeb2f101ef523772b5cb31cf8a32f39346e9ef27129ad8b WHIRLPOOL ff28c9afe02cbb16de2bfa593db5ca5cb80d6c7798976767f6f0cd1e643642a35f6931146a75d530b7bc17b18745384477b2ac8591b3eda1cd96bb681e62ac17
 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-r2.ebuild 1736 SHA256 04c06017241c38febb19ebff92a0c174668aed7874bc726c47ddd1ea9bcbe15f SHA512 2e72462ecd6653ba866dbb93b8936c32c097bd55f3cc4ead134f798a0406fe28ab1bf8256d01333a49cdcb94bf196aa7eb636209fedd6adb5d804666e0ceab64 WHIRLPOOL c6422da1cdfe1c632e5aea61862b7a2ff387db9729271dd323612c6851812eee125fd95607ad49cd3f6c986e6fe5baf2fdd57fe1d3ca5251574f7a1920f5e4fe
-MISC ChangeLog 3100 SHA256 5acf2b092494af5520f9589bdb331116e553efac1f8d08f8d57089b7a13794cf SHA512 5d0bfa9965797a570e0cc9ca76caacc77ba77aca3a3269da426dbebd0e8f3f08911e95b5cc2455c11e3a8cb3a44d7a09b672a1cef4e4f6c64ced4439dd577988 WHIRLPOOL b751890d37060b30fededfd1dba4debfb883bbf964aaea4abc948dcbec4b0f81d7cc760ea380a6a12a222f2c60a42819b095c3dd4c024e27b62f13179eb2286b
+EBUILD libappindicator-12.10.0-r200.ebuild 1802 SHA256 9494c9041498f14c61c94e341912923de02aabc833b517674b65b32da088c332 SHA512 6978b3d28e13d0423b16d54e3e31f1ae29166ad73a2c93523fc46640e19c21763c0a3d86b1d324a9157f5a3a6e0b3d8e49961efba3106ad999637dd93e955df5 WHIRLPOOL 91e00f5a5d99c27341663dfbaf247fa5dcce39e661b9682e6af80cec7f77448a28d23031e0af1569898cf3933e19d21677c86921e1740b07064f5651f245f6b8
+EBUILD libappindicator-12.10.0-r300.ebuild 1738 SHA256 e4bbd46bebae4cbdf254e549a9ee452af6fc0223ea0539964ccd3245b458368d SHA512 7c7e15f39bf131773f36d11b2647a14eef7b8ec5038b0e7044904c0608bc37b25ce4d674764517a706124d2b90804ebaae276c957caca5f8f3043e6ab8aab81f WHIRLPOOL 50b92f928d8f99f1e753f40a41d58c1c35672c735b9d05407593f18de482a73d54cb85c653e909635b82c7e6182eb82b6e3f93304764c08a81dbd1356608a6d7
+MISC ChangeLog 3396 SHA256 b860aa9f2739b29a7e7e42ee1ad7af06f74d60bfa0f8ebc712fdde982a1e88f8 SHA512 d57bab1b7a85b7a94caf6044aca900a076fbd72e588f3b7b4b4d4fe9e3ad272043033f9833150da88e624acabfb5a60e61b81debe7dab0ccbe2807f2bc3c1bff WHIRLPOOL 8360e2869c7b18c093e971edbce1f2507a176cf3f60a269e1eec4fe42906100f6b117ab89c9a8ca59b3ff6cf5e04f662d6f21783dcd8677cc0b209d00f3d620c
 MISC metadata.xml 236 SHA256 841c7a751616fb3cc745c4e54baac7f0b57ab7214bd9b29fee2dcb9d563d68db SHA512 e5350552b5cf14c15a068ae18dfb9755ca547f27cc52ce507b78929cdaf51113a8cedeea0ea68eb7b518052105d572adb9f6d655922586234b3ed7204f48a49a WHIRLPOOL 88638c1accf1b9e8f50f638f67399baadeff5cc0646acfab1f76d894605f4102533391769f604ddd7cceab1bf3b01044265be9c1df252cc922c00e4bf0fc2d4a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVS718XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVS8G8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOKu8P/RgR7UXYixKIIGg3EaUONYtx
-qNinPkrZ0KugaYRhSGWIoUNl4wyDCDX3C31FydtRPPGpQ9zOJOKjZoUB8AJiEXKe
-w6cfEOTfCL0mheDDpgfQKFn2bEfGJpQBS481uPaC8Tdbn3HWWPrUjf6iRMSX+oBj
-ENWpm28K6L3xytZ8JRm9TZ6ao3g2oRmBAi3uI/oc3AkN+Z9LWaU+nRqNEorhWQKN
-6YILDun7APrzNA3B9lY55K4bdoq5+1OwgeCtjvEMLbjY4eKh5iQ8DXQQZM0gr6U/
-9Nk99Sl6pNvADtEhQIH8okVUvx86rYM8AXH4s2KTKkX++xvwQ51BIVxn+K2XKos3
-e9HLgJbwTaoPLfSZdlK+9kerpwor/yojvu8cTewwsTubcCC3HCqr5YphZvDrOkES
-s2JlSVOp7gVLrsIh27Dcx8RLI+iBeCpRdgHkfBZncW5YRLOI8biWHRDhJIEg/TJV
-kA1mQpmbZhcR9Vdx0PwSUtni1czIeXU+4rqXKRU53tB8YnDZuASZMVJNVgRrCVsM
-qTjmTnMEqv77Nq3NXyzk7bLtRI15iuC7vd82IZAvI0KnQBo8K4puG+vSnZ77Txbr
-E6d2VMyPCCyr41eWflmycBp+tRL+Ylh5w7g1cuaF1HPGsiTLI//Px9+73SHfDcI/
-9FAQ/sUE2ZCjejZPIB6E
-=8twP
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZDIQAOCD+9RghpUxO6Ka5zgCxM7f
+yWYqrOewRFa5B7GFhsYHXeRx35HoPIEuQo5rTkD8A0rODCgbVEDJRdz3CHaFEuSA
+ewQy1gTjRHpTwQ39ekIy5zEZcEauXYuhci5cYKNbDthBWRFVmSxaBWi3S+X/D7zu
+jEzyJ/TeWD2VVm16irAze5uZaTWjEvf+uLKr1mOJotm7onNIi4HSOtZiFJ/2qdVZ
+5S7iOaw0BXgKLEcffCOvo+Cecdh5WMj05NsF68qVsvmeRTnzJ6LcnyvAyyPLgWY/
+RyxC0PnXY9Kzu3LchW/d7IENGvAwXLD7ttcTw+qmAv1QgKwulYlGcXXr4ZFYgYuT
+VjZKa6UU4uoLM8OnKxlqKDhwNKX1E730EvSX0yhi8kik8A1/EUxGfZoIUPial+hY
+W2SB0A+JDVaCrQK4zUBCqJVnA70JpxCG9wV8fnZaeXgB5EytjYwP13lj9nPVQyx4
+mDwwaAET2pKUhze/3HadRAOglo18D/0RgRQ6oVlWgw4aebmaqpDTS6uq1q2fwoaV
+OI0dYHrSC3i8lyR8wT8uRsqTp8kOVZ9OQt+fWDMzS8N2iescHhW9/noqJoyV0+6M
+ATiEtVVDRu7XNR7k1xg7kcBDNM/3b5npNDmhtPddLJNTgvyzbTk7+a09tgphQBRa
+tKt5EsLwnfdCWHaCh9F4
+=oV//
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild
new file mode 100644 (file)
index 0000000..1282d8e
--- /dev/null
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r200.ebuild
@@ -0,0 +1,68 @@
+# 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.1 2015/05/07 19:49:14 mgorny Exp $
+
+EAPI=5
+VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils multilib-minimal vala
+
+DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar"
+HOMEPAGE="http://launchpad.net/libappindicator"
+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"
+
+RDEPEND="
+       >=dev-libs/dbus-glib-0.98[${MULTILIB_USEDEP}]
+       >=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+:2[${MULTILIB_USEDEP}]
+       introspection? ( >=dev-libs/gobject-introspection-1 )
+"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig[${MULTILIB_USEDEP}]
+       introspection? ( $(vala_depend) )
+"
+
+src_prepare() {
+       # Don't use -Werror
+       sed -i -e 's/ -Werror//' {src,tests}/Makefile.{am,in} || die
+
+       epatch "${FILESDIR}"/${P}-disable-python.patch
+       eautoreconf
+
+       # Disable MONO for now because of http://bugs.gentoo.org/382491
+       sed -i -e '/^MONO_REQUIRED_VERSION/s:=.*:=9999:' configure || die
+}
+
+multilib_src_configure() {
+       if multilib_is_native_abi; then
+               local -x VALAC VAPIGEN_VAPIDIR PKG_CONFIG_PATH
+               use introspection && vala_src_prepare
+       fi
+
+       ECONF_SOURCE=${S} \
+       econf \
+               --disable-silent-rules \
+               --disable-static \
+               --with-gtk=2
+}
+
+multilib_src_install() {
+       emake -j1 DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+       dodoc AUTHORS ChangeLog
+
+       prune_libtool_files
+
+       # installed by slot 3 as well
+       rm -r "${D}"usr/share/gtk-doc || die
+}

diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r2.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild
similarity index 95%
rename from dev-libs/libappindicator/libappindicator-12.10.0-r2.ebuild
rename to dev-libs/libappindicator/libappindicator-12.10.0-r300.ebuild
index 68f96f4ab01733a5a463527af18427c562f8c7ce..1ffaf8c0ca50269bb0e7190a9d62782c2f517f3d 100644 (file)
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r2.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-r2.ebuild,v 1.1 2015/05/07 19:31:07 mgorny Exp $
+# $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 $
 
 EAPI=5
 VALA_MIN_API_VERSION="0.16"