From e1200583e6b493c73d9cdc4c9b5ff5a6e2176d25 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Tue, 27 Jan 2015 12:17:49 +0000 Subject: [PATCH] Don't use -Werror (#537270 by Alexandre) Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- dev-libs/libappindicator/ChangeLog | 8 ++++++-- dev-libs/libappindicator/Manifest | 14 ++++++------- .../libappindicator-12.10.0.ebuild | 20 ++++++++++++------- dev-libs/libappindicator/metadata.xml | 3 --- 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/dev-libs/libappindicator/ChangeLog b/dev-libs/libappindicator/ChangeLog index 2c7915cd79bf..88611aa4c404 100644 --- a/dev-libs/libappindicator/ChangeLog +++ b/dev-libs/libappindicator/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libappindicator -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/ChangeLog,v 1.12 2013/05/12 14:40:30 pacho Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/ChangeLog,v 1.13 2015/01/27 12:17:48 pacho Exp $ + + 27 Jan 2015; Pacho Ramos libappindicator-12.10.0.ebuild, + metadata.xml: + Don't use -Werror (#537270 by Alexandre) 12 May 2013; Pacho Ramos libappindicator-12.10.0.ebuild: Use vala.eclass, bug #467388 diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest index a5132fc524ba..5231154a026d 100644 --- a/dev-libs/libappindicator/Manifest +++ b/dev-libs/libappindicator/Manifest @@ -2,13 +2,13 @@ Hash: SHA256 DIST libappindicator-12.10.0.tar.gz 535562 SHA256 d5907c1f98084acf28fd19593cb70672caa0ca1cf82d747ba6f4830d4cc3b49f SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a WHIRLPOOL fdf1d3afbe82d287da688295e6f999656a4dd8e0a1c75aeffa9fd83c69b97cfd37e682f0ca4aff42d30e99b0add8a9e75f870d8a6a72e5337e1afd67ffe618eb -EBUILD libappindicator-12.10.0.ebuild 1432 SHA256 99c8179ba5866cd60e1b3330af985f82bc704ccc3344c4c1660845fd87548cd8 SHA512 e09dcf1dd6a1c129feab83b9a22d4603255476055ba395a02470e600c11aed54102b38a48ee2c22439ef6a59176187eb40546471f799ea531956c73b78afce60 WHIRLPOOL 10e310e95377f17b0fb5e2d9a5d63bd39de0e5653ae3c9012d81e57562bca9f15e442689235727336d764eef166fbc3f757197a6e42e0c34d57775afaf7f3cd0 -MISC ChangeLog 2270 SHA256 9aca7bac0ec24f408d5a579ba8d3cd4a827e24ec01c54314051ea39f6fbc720a SHA512 d467deae469098a0dc934e98dc4c7bb3333caa4dae9a0dfa918d12fb9c404f93a5958cb22c67a5b9f7a77f67b9ad543102d7ed28f81da0bc8712dcd1fe2e42fb WHIRLPOOL 5cbd6d1f24dd75257c0ebe78caec2c0e59567693640d89b46e7d998fa9db82230189c2a34c6e2ad0c96dd7134f415fdf7d76f8a7c03f5c2812316e862b172a7f -MISC metadata.xml 355 SHA256 ebb4585edab710154f668295eee56405313f65735f621384a73bb6adb9ea26fa SHA512 7f42c02a3f7876ea4763c9f7666e2cb67d06a9987dead96b3cf1dd0217a6b67447d60968ed2cc65dee14265d6e039ed695d9d825fb0c909f5dee16d16e407df1 WHIRLPOOL f5f7942fc3188a5ed0fb7c4d0ba5d238cff3a8c872c5aef585c7c20d06bd2e39e1cdbac26989546d6b53cfe27d62afe827eedc9c351b4f3b8141ab7e1c24def0 +EBUILD libappindicator-12.10.0.ebuild 1522 SHA256 6ece59917ced3c08b73de2f869b9733c1a1e2a79fe95c34b80547e75aa4951bf SHA512 c454fdc494af32b6502f2173b125151742bc317b3b8b7369507f7b1267d192a063dc444d81fa642861cca2016f57ba0a7f026d9fde6c757f172edd349a8dc9fb WHIRLPOOL 4ad4989ef5f43f7ca08a6a83dbb853e47a4525ce2a530e98c2c4a5c9f771d82957da7bcede09da016da456d107f66f3e78a674aac4ca1eb265230c3c4a9a52b7 +MISC ChangeLog 2408 SHA256 9a23f8b9d144935c708e45f165fa870eb2de70784f53c20ed145049b636d9989 SHA512 0651da32e518814f940eaa69098aa1fb59fc10384496ed304e37266cac71d72a907e0e10c3df4f1d93a5788e4df1d19cef60e794c5a372ee3fa58496e69c339e WHIRLPOOL 41c43797c08a793065da7df02dd1475492cb96c4f46ecee3e75b9a58850629a9e96f4436f5ee69fd62f5eab57da9d1ae5fba59fca7934ec0873f2a4bc989b7b8 +MISC metadata.xml 236 SHA256 841c7a751616fb3cc745c4e54baac7f0b57ab7214bd9b29fee2dcb9d563d68db SHA512 e5350552b5cf14c15a068ae18dfb9755ca547f27cc52ce507b78929cdaf51113a8cedeea0ea68eb7b518052105d572adb9f6d655922586234b3ed7204f48a49a WHIRLPOOL 88638c1accf1b9e8f50f638f67399baadeff5cc0646acfab1f76d894605f4102533391769f604ddd7cceab1bf3b01044265be9c1df252cc922c00e4bf0fc2d4a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlGPqeAACgkQCaWpQKGI+9SP/QCfao6hSmHbGiaL/+UgUeIUgZpV -Ny4AnjXw/G0MSD6KE6zUq7xiQNks3PCs -=hYby +iEYEAREIAAYFAlTHge0ACgkQCaWpQKGI+9SuYwCgiKZGNZmJYw90MgLWPtO4qZr0 +GdAAnR3X5up1BhlxYG+LR39EW2UjmjC/ +=BxWo -----END PGP SIGNATURE----- diff --git a/dev-libs/libappindicator/libappindicator-12.10.0.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0.ebuild index d372a9224935..ee8f0b71c34e 100644 --- a/dev-libs/libappindicator/libappindicator-12.10.0.ebuild +++ b/dev-libs/libappindicator/libappindicator-12.10.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# 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.ebuild,v 1.3 2013/05/12 14:40:30 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0.ebuild,v 1.4 2015/01/27 12:17:48 pacho Exp $ -EAPI=4 +EAPI=5 VALA_MIN_API_VERSION="0.16" VALA_USE_DEPEND="vapigen" @@ -17,17 +17,23 @@ SLOT="3" KEYWORDS="~amd64 ~x86" IUSE="+introspection" -RDEPEND=">=dev-libs/dbus-glib-0.98 - >=dev-libs/glib-2.26 +RDEPEND=" + >=dev-libs/dbus-glib-0.98 + >=dev-libs/glib-2.26:2 >=dev-libs/libdbusmenu-0.6.2:3[gtk] >=dev-libs/libindicator-12.10.0:3 >=x11-libs/gtk+-3.2:3 - introspection? ( >=dev-libs/gobject-introspection-1 )" + introspection? ( >=dev-libs/gobject-introspection-1 ) +" DEPEND="${RDEPEND} virtual/pkgconfig - introspection? ( $(vala_depend) )" + introspection? ( $(vala_depend) ) +" src_prepare() { + # Don't use -Werror + sed -i -e 's/ -Werror//' {src,tests}/Makefile.{am,in} || die + # Disable MONO for now because of http://bugs.gentoo.org/382491 sed -i -e '/^MONO_REQUIRED_VERSION/s:=.*:=9999:' configure || die use introspection && vala_src_prepare diff --git a/dev-libs/libappindicator/metadata.xml b/dev-libs/libappindicator/metadata.xml index a38249cc7f84..99dbb45dc755 100644 --- a/dev-libs/libappindicator/metadata.xml +++ b/dev-libs/libappindicator/metadata.xml @@ -5,7 +5,4 @@ ayatana-bugs@gentoo.org - - Use dev-libs/gobject-introspection for introspection - -- 2.26.2