From 7fb8dc9072b72175ea7be778d61ac711feca764a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 7 May 2015 19:31:13 +0000 Subject: [PATCH] Add multilib support. Disable Python checks completely, avoiding implicit build-time dep. Restore proper gtk-doc install location. Based on patch by Karol Herbst. Part of https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/65. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- dev-libs/libappindicator/ChangeLog | 12 +++- dev-libs/libappindicator/Manifest | 32 ++++----- ...bappindicator-12.10.0-disable-python.patch | 50 ++++++++++++++ .../libappindicator-12.10.0-r2.ebuild | 65 +++++++++++++++++++ 4 files changed, 143 insertions(+), 16 deletions(-) create mode 100644 dev-libs/libappindicator/files/libappindicator-12.10.0-disable-python.patch create mode 100644 dev-libs/libappindicator/libappindicator-12.10.0-r2.ebuild diff --git a/dev-libs/libappindicator/ChangeLog b/dev-libs/libappindicator/ChangeLog index a62159b822b0..0f75b8d0b3f2 100644 --- a/dev-libs/libappindicator/ChangeLog +++ b/dev-libs/libappindicator/ChangeLog @@ -1,6 +1,16 @@ # 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.14 2015/04/05 16:09:44 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/ChangeLog,v 1.15 2015/05/07 19:31:07 mgorny Exp $ + +*libappindicator-12.10.0-r2 (07 May 2015) + + 07 May 2015; Michał Górny + +files/libappindicator-12.10.0-disable-python.patch, + +libappindicator-12.10.0-r2.ebuild: + Add multilib support. Disable Python checks completely, avoiding implicit + build-time dep. Restore proper gtk-doc install location. Based on patch by + Karol Herbst. Part of https://github.com/gentoo/gentoo-portage-rsync- + mirror/pull/65. *libappindicator-12.10.0-r1 (05 Apr 2015) diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest index f29df34b2c5d..9d1c91c50431 100644 --- a/dev-libs/libappindicator/Manifest +++ b/dev-libs/libappindicator/Manifest @@ -1,26 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- 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 -MISC ChangeLog 2670 SHA256 382698eb968c4cdd1290629579de42dd3dd4a73377cc130761d30fc2904082a3 SHA512 a6060f45e9a75a2456478ede10ddca68661bb21fab9502195ceafbc278e3033100df14132fd7c0acb6c525fdb9552e2714e06e4fecdfbca2e197be70467ea7ce WHIRLPOOL cc3d2ad87e7f0c1a6babccaec938ba348f5b1d7c530c2d1c0239d60da59aa38c48038a2b3ac44147a495905d0c82bdccab45fd782ea956a93cd9f282ad05b6c1 +EBUILD libappindicator-12.10.0-r2.ebuild 1736 SHA256 04c06017241c38febb19ebff92a0c174668aed7874bc726c47ddd1ea9bcbe15f SHA512 2e72462ecd6653ba866dbb93b8936c32c097bd55f3cc4ead134f798a0406fe28ab1bf8256d01333a49cdcb94bf196aa7eb636209fedd6adb5d804666e0ceab64 WHIRLPOOL c6422da1cdfe1c632e5aea61862b7a2ff387db9729271dd323612c6851812eee125fd95607ad49cd3f6c986e6fe5baf2fdd57fe1d3ca5251574f7a1920f5e4fe +MISC ChangeLog 3100 SHA256 5acf2b092494af5520f9589bdb331116e553efac1f8d08f8d57089b7a13794cf SHA512 5d0bfa9965797a570e0cc9ca76caacc77ba77aca3a3269da426dbebd0e8f3f08911e95b5cc2455c11e3a8cb3a44d7a09b672a1cef4e4f6c64ced4439dd577988 WHIRLPOOL b751890d37060b30fededfd1dba4debfb883bbf964aaea4abc948dcbec4b0f81d7cc760ea380a6a12a222f2c60a42819b095c3dd4c024e27b62f13179eb2286b MISC metadata.xml 236 SHA256 841c7a751616fb3cc745c4e54baac7f0b57ab7214bd9b29fee2dcb9d563d68db SHA512 e5350552b5cf14c15a068ae18dfb9755ca547f27cc52ce507b78929cdaf51113a8cedeea0ea68eb7b518052105d572adb9f6d655922586234b3ed7204f48a49a WHIRLPOOL 88638c1accf1b9e8f50f638f67399baadeff5cc0646acfab1f76d894605f4102533391769f604ddd7cceab1bf3b01044265be9c1df252cc922c00e4bf0fc2d4a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJVIV5RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVS718XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJoIQAN4hya3kEKzdiy2M20NHWjc/ -w5oV25sHaARV71QF5SalEIJuXCCj38xAQ/ertabvRKPgTuiFt+R0AWBrMFkijjtU -bqL/l0eXOb7hzK5GoxaRj/WnEZgJg6n3YxYVogr+/cD9+TKR1GTbUgccA8NXBxYA -KUBGzdhmxNrm9qFaq5Ayrf3EkA6Qf+l3x4y5nyYV41zjjGiPBn0AOyXqxHj807Yt -NPa6vHHQsA/EbWwv8j6K9/xRaTvQBXv/VYoPSjoWvqPMKU7c1H5sAuaPYoT0Tp+n -pePLbIfrOiezA5kEcMf82nQ6yCl8A6KElp7HlOwO0sb39qS2PMKC1aq0DawsLyzy -uEn2+/l3DWmbKAkTKOzXsHWoRgJwgZyFBQRcd1dxMBS7ChWtD7slahG1Enztve/K -2/fb0nuj8ZkZx2ZpDW2qV/FJT/2xT5lcZN70Y+1RFlLmoPM1wHFVegI2FlQuSFyS -tLpJjTxxTuhLa/2PpapLJwFo/nfP6R6qy+8b7XajYMDFwVmZ/CYkxgB/QoHwVNU3 -nBq1cWR9WN7lHiCC22TR6vQxS18JkogVJECWhmcBPqkBZAVIoEszs9ajA/MlpW5/ -vOaCgsGu2C1HlMhauxfvHt7PzztmuLD/F80/N/I3+Ih4qBVrPKu42+EbrWZP28j/ -LcHnwf+tFT3uEw5aootp -=rLQV +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 -----END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..aeb0758caeb5 --- /dev/null +++ b/dev-libs/libappindicator/files/libappindicator-12.10.0-disable-python.patch @@ -0,0 +1,50 @@ +From 67b08b7e1e315120e295ba9dc7191b85f9c12bb2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +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-r2.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r2.ebuild new file mode 100644 index 000000000000..68f96f4ab017 --- /dev/null +++ b/dev-libs/libappindicator/libappindicator-12.10.0-r2.ebuild @@ -0,0 +1,65 @@ +# 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 $ + +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="3" +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+-3.2:3[${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=3 +} + +multilib_src_install() { + emake -j1 DESTDIR="${D}" install +} + +multilib_src_install_all() { + dodoc AUTHORS ChangeLog + + prune_libtool_files +} -- 2.26.2