Fix linking failure (bug #430360, thanks to James).

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 70 insertions, 19 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index b14cb40b8309..454bccddb51c 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/nm-applet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.78 2012/05/05 06:25:17 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.79 2012/08/09 00:52:29 tetromino Exp $
+
+  09 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  nm-applet-0.8.4.ebuild, +files/nm-applet-0.8.4-utils-libm.patch:
+  Fix linking failure (bug #430360, thanks to James).
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> nm-applet-0.8.ebuild,
   nm-applet-0.8.4.ebuild, nm-applet-0.9.0.ebuild, nm-applet-0.9.2.0.ebuild,
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 04a6a3a3acbb..a4082c8fe89a 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,15 +1,30 @@
-AUX nm-applet-0.8.2-libnotify-0.7.patch 1111 RMD160 3a63b65cf30848b60e681ee05d63f645d8276e6a SHA1 059346b94cda77bbe2ce97c2ba90a9fe8ba54c1e SHA256 542e0c3a5f851f72e5672f982c7e86c45b79868f3d16500b930d58cf8f039b5d
-AUX nm-applet-0.9.2.0-not-show-in-kde.patch 1392 RMD160 8cf26bec49213f2ddc2773da8a2e0796356349ba SHA1 e40b8e4e81c6106a49107946d2eda5342875def0 SHA256 de8f307f9111b294c05190c0aaa449b120da71561fc82879e5d3f373c802cc98
-DIST network-manager-applet-0.8.4.tar.bz2 1153760 RMD160 eeafc3b5653ddb778317d4b2283dbc5ac9173d9d SHA1 a5af2f6920a356848d5f3578376b57d956648b81 SHA256 552bd805aa09261ff7bac6e599551439b93c26bd563a2bba6d04f1af77c434a9
-DIST network-manager-applet-0.8.tar.bz2 978462 RMD160 764d7ebf7a716a795539fdc34f0545e3134311c0 SHA1 51f684396e034064568d356f0d961aa71af574dd SHA256 6379e0acd3eadeb71e3ba2e3cf05d351caf6b794dff5777a5e86a591df603bd4
-DIST network-manager-applet-0.9.0.tar.xz 1060440 RMD160 a4c4c9c4b72c12a51e27f1df325886357b5426d7 SHA1 34b507ba506a6132faaa927f7ff487beb61c06df SHA256 0e85f7e1c0d7677f382dde08a3c9d3fa93d4d850d3801a41e5a9bd95043bfe24
-DIST network-manager-applet-0.9.2.0.tar.xz 1076760 RMD160 e82bf9a58cf27771fc0fcef46e984dd0bcf0efc1 SHA1 84b774c609345ebf84ecb5ab40f9adadb0c12a9f SHA256 ebe725d0140f658c6a3f384674c72fba7a7c417df3be0e84ee8f45e6dfc219de
-DIST network-manager-applet-0.9.4.1.tar.xz 1102856 RMD160 93779c2a5275d0adb223f5377ae816aa667d679c SHA1 d4b8fc3c11d4280b5b5a5e467fa81cf1aabb0c02 SHA256 b6b6de75e28d1fbcdfdbb51c0e40fcd6bc0ec0385bfecd16c457260491cd2ff7
-EBUILD nm-applet-0.8.4.ebuild 1121 RMD160 7e108b9e8d72d16e08501d932893a4f1ffa251b1 SHA1 47bce0d8dbe1c0fa08d8efc7834234bf96f80a72 SHA256 0e9d6787370f9a367e5e4dc6b47e9240e2a436ff78f92a2a990637550c127202
-EBUILD nm-applet-0.8.ebuild 1438 RMD160 cabf8140561a6dd754df0209ae6955f4cedd25fc SHA1 0fe893be3368819ac88bb15fc10503762d308d03 SHA256 3d1cc9561f9295677b662cea88a0edd9c8f89901a87792f9b2e74519ffc7dcae
-EBUILD nm-applet-0.9.0.ebuild 1141 RMD160 4ae5ee1d69fdf6eb2005b32b71a7f3e1adacc6e0 SHA1 28519250c06ebde1be8bc2ec594e5509ffd13aa1 SHA256 73829a5ca09f60ad47964da20038ec9bb91561860cc916dfbf4e62e827d4d633
-EBUILD nm-applet-0.9.2.0-r1.ebuild 1337 RMD160 043ccb750b89f7758ad70849f482dd125042111a SHA1 4940a4ae6772314a868bfb58f17ff2f8cf44ea3e SHA256 07c373d996300b39aaf412082a766e19db52eb9ff2f55c0f3da924f05a199179
-EBUILD nm-applet-0.9.2.0.ebuild 1163 RMD160 be121264826bb1638e669c0f36fdff221fb7a660 SHA1 917e7c48cbd29f8b8b4022b85b1c0b2a846e0538 SHA256 076ba88558df27ad0a60198d6b3cc9e57578ba26f3b2d1197086e72049c7bb52
-EBUILD nm-applet-0.9.4.1.ebuild 1170 RMD160 34b8d119ce0689d1027b0b65ff6532ec6a8e3266 SHA1 14fcfcfd71146d715b1e0f290269254ad276fb5e SHA256 1487cc0c384d2ee8a4795ef75deafa0aa5e5d7b2c672703d1a97bb9fbeef0772
-MISC ChangeLog 14132 RMD160 aea606973a6791a6f7429d25fabc5635e1e97b88 SHA1 dcb52bd8f5b53811a53471860cfa1fb93c2b086b SHA256 b34cc69eb22f2136c3d39bcf7be2d03fe9c033121d719885d204618d9cebafd8
-MISC metadata.xml 521 RMD160 3d728ae1c63b63d5d91a00beb043df7414f592c4 SHA1 4771b3b00b3b8c4262ba09ce4ae95c345741c0dd SHA256 2d06258217ea030c75f39717aebbb4d2a8812da2157bbc2cbd1492b9a063acc6
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX nm-applet-0.8.2-libnotify-0.7.patch 1111 SHA256 542e0c3a5f851f72e5672f982c7e86c45b79868f3d16500b930d58cf8f039b5d SHA512 48e4142716b1cee1a33ce2ad5cc1bdffa3ad3ce7be1f997d3d8fbac1b0f695da0cf3a907beec4af8cf8c6d358d9198c40dffc6e7dfb0c795e9aeb038d2699abd WHIRLPOOL 5316365e523fdb334a2547a0557d8aa6ad8c2d7ee42e8d92d706f272266ee32dc52ed93c116058ba18732f43ffe6707cba73a40a000a2d4802138af74304684e
+AUX nm-applet-0.8.4-utils-libm.patch 673 SHA256 c1e66a3339034a65b3248cf5072ce48e2d4a06e8a4567478a27d458ceae5553f SHA512 18df99ee85a4c0245bbc3d283ebb711c9dba1d25dee43576c18d19c7f785ae5f17a9e943df75e2141c5c69cd3ff7d58dd045e15866eea29e291699bd2085a358 WHIRLPOOL 7925a32a4491369bd8f040fd55846b4c690decd3c6c94babd7b7dc0c13e0e0deb69b9c1f50ee03afa34c56bd2294c7775ba03299472665034bba015da695f25e
+AUX nm-applet-0.9.2.0-not-show-in-kde.patch 1392 SHA256 de8f307f9111b294c05190c0aaa449b120da71561fc82879e5d3f373c802cc98 SHA512 27888d38a3619fae8741d37dea3601e0941ffde413235f34fd39842beac13b8ae01a559e23daff6094fbd7b1b6ca309b6dbf8faad4688919f704454217f4173c WHIRLPOOL 5606b58c54ae0c15c9c2e5bc6ed1c2d8d01fc14213985986bb3cbb9ee628f7ccbb4097a930d8b031771663c74a8dabfc82a80a192a5cd10445cd0c59b7b6e49d
+DIST network-manager-applet-0.8.4.tar.bz2 1153760 SHA256 552bd805aa09261ff7bac6e599551439b93c26bd563a2bba6d04f1af77c434a9 SHA512 8c180b8086484a6bd315093a70fe7c393c45dca967597777c9682c5fd0260f2e33bd0453c7f9d313cf284a912123bdc04f2456d1817550b9898f1e771c15afa7 WHIRLPOOL b73714ae09830ea5bf3104aa61d47e0c508bb67dcf1885a294cd60c327d61a948e9df28ee4e113024ad874bd718315cef763348ec9a97fd8548d19f41b2b998a
+DIST network-manager-applet-0.8.tar.bz2 978462 SHA256 6379e0acd3eadeb71e3ba2e3cf05d351caf6b794dff5777a5e86a591df603bd4 SHA512 7c181c07a90a6768797f09cdd10a6ba57ad1d62fedc4192b4b8be955ede8b8cee8f81c7d319834ab41452d7f2dd6985f285fc645415f629e73b1b7c853e82f75 WHIRLPOOL cd680b88ec135983936fa4c9d641846369568487389943579ddd4b852cbfa24fa3de297e4fef2fe8ce33b1deab96727aa2e8152ff266e0a4ffe511b6fc771807
+DIST network-manager-applet-0.9.0.tar.xz 1060440 SHA256 0e85f7e1c0d7677f382dde08a3c9d3fa93d4d850d3801a41e5a9bd95043bfe24 SHA512 ab7b939286bc79b0c055eae08da9b29493c1ca60fd4356853b8a4633f78a2389d1ec0f0bf627254e42c94b82adf1548be896accb6df16743fba428a61d12b384 WHIRLPOOL 4ea5e0c633412453863bbc9cfbb0601364b4cf8c43e7665e2739d1fe5fefe31422a727ee700fdec02ec766fe1999af9fbc96eefe27c161e04c59021b5c4c3299
+DIST network-manager-applet-0.9.2.0.tar.xz 1076760 SHA256 ebe725d0140f658c6a3f384674c72fba7a7c417df3be0e84ee8f45e6dfc219de SHA512 1f5509446d830d967cad7ec8ed92814ca7a0a4ab97cdc46ecab8abc82221fc93fa6316984c3dacd3bf0c1464b50060d2508c7a9dcc4439a8fe317b168b9fd4de WHIRLPOOL cab6c20709e629cb6206a1ce7225e519419014b7055ddf3a1020c33a4fc689d4048b9dea84af5a2af430b109f08f036b1ce81142919ea837fee3285ce617b219
+DIST network-manager-applet-0.9.4.1.tar.xz 1102856 SHA256 b6b6de75e28d1fbcdfdbb51c0e40fcd6bc0ec0385bfecd16c457260491cd2ff7 SHA512 6fc9ea8c2c30beeba2c7fca443b0d065fa2eb495af54654479f9edde7bdc008ebd41ddad4f2b31bdbea8609f10168c74b34388b4cb00616431cd1259221fb2ca WHIRLPOOL 1cd51b9d318ae20a59e19bb5c23003eff8dcbd11abb5f4a8d3b812c3fbec6891b96105279382bdeec89b18eeae74d0da468403e1924bca2a24b111c14605f239
+EBUILD nm-applet-0.8.4.ebuild 1316 SHA256 048a94869d9b20c40d46adbf38d9fefcbd539ba8fe03ecb3160d200e58932d14 SHA512 bdb38d80ff1a636ec9ca1da6e5297225cd1c4a1e7cde3f3c0a5fb4331a69b81bd85d406727f8a1f7d73034fe7661a4c36df73c2098b09c443d3ba3ca14d091c1 WHIRLPOOL 4dd92b35d176ff1a358eee0abb8300b3150a4bf9c773e1666420d3e3d777f19a62d4cc320094028472cb15d28b113307235059a16de29f8889b156ff7b1bd0f8
+EBUILD nm-applet-0.8.ebuild 1438 SHA256 3d1cc9561f9295677b662cea88a0edd9c8f89901a87792f9b2e74519ffc7dcae SHA512 34386913690b7af60e19671c8b2f03ed279e71ad583dcc71e8c5793972ff7fa1a0603fc74e46e54fadbe4524f0fdc1c75614b9e18651c151205ef0b610e75b86 WHIRLPOOL bd502d21e120fce3773e30cb0d77462ae2db85dc88d27373f3cd93ce689040bd98d6cb11cec685cbf404f0eabe41af37be89683e6f17097f3d149759f9608264
+EBUILD nm-applet-0.9.0.ebuild 1141 SHA256 73829a5ca09f60ad47964da20038ec9bb91561860cc916dfbf4e62e827d4d633 SHA512 d791adef62993bf129e10b545520aa374c45a405e0ca1a2219acbd7bf5f7db55d7fb976646f1ede8b3fce6167e7a1c9f69117e2c88c15e31a12d256389242840 WHIRLPOOL c562f1befab561e294a95dc3710c6a9293d7c988cc7b13cff4704d993d1564858d21a55015d99e567e93b8241578c88173b4bb752c547e8ffe6e5b1d14c5194c
+EBUILD nm-applet-0.9.2.0-r1.ebuild 1337 SHA256 07c373d996300b39aaf412082a766e19db52eb9ff2f55c0f3da924f05a199179 SHA512 c903bb82cb9d5c0a176347a77d51c9b67f70017b105aef65d59dbc9178c65fae5bc4a15aab93512fae2f3b56bd6eaed1362c8c5402e85a1ae18cf59ae093b1ba WHIRLPOOL bb674562ab9730c738b3ca5595c743fd143d8534722a81d223b6a0bcd149a3079c1a881c17652060456c3261bff1948e96039dc24fc89d23d6dfc3b12e46370a
+EBUILD nm-applet-0.9.2.0.ebuild 1163 SHA256 076ba88558df27ad0a60198d6b3cc9e57578ba26f3b2d1197086e72049c7bb52 SHA512 548ad79fa37c4a73e15caca65c320240d4d50f9d4086139be58d832bd090b8a26e84e2e4bc3ada3536ab3419a00995e88ea3cd1e94647f49878e7e67ea18f41d WHIRLPOOL 62e8e2c07048b05db239c92b01f57f9936a153398ae33a040191fd6fc1d34c2f9ea638b524f0d31d833e24a6c6da024a4cff53d56dc651d39a5f1cf78cce146d
+EBUILD nm-applet-0.9.4.1.ebuild 1170 SHA256 1487cc0c384d2ee8a4795ef75deafa0aa5e5d7b2c672703d1a97bb9fbeef0772 SHA512 b0e80d64a88459989ab41bf57cb24a070d035cb44b02daf718972cbbc9a85bc3a77195e58614c9a58d4b03387d14a9f860ab20787cdf36593634867fa5259232 WHIRLPOOL dc0bab1cb87737651ef1c47a8c42f221587a7846a0789ef5a343339eed9e8b1282aae60e6cf6969a275caf6edc56d9ca354b2d8a589f855eb38a526891d1c47a
+MISC ChangeLog 14316 SHA256 a63616e44e566b4135abbe841c894e0200241b7c92710f9d54eb0e38e623cab9 SHA512 5ee8f69f9453e748c05e2f6de0e4b64934d8cba63154520221cd0b6b5e7eb9353a660154c2c5f248e76212372005af35e543d2b1a08cacb9b55aef12504a1fae WHIRLPOOL fd861c712040932f20e8abb83935a62d2df447d93ba7484ada288d7458bfb956ab20b309076331ea1e5d7ed397e77bd2520b2f36985d75159dd24ea5a878af6f
+MISC metadata.xml 521 SHA256 2d06258217ea030c75f39717aebbb4d2a8812da2157bbc2cbd1492b9a063acc6 SHA512 e27ad78ff0f548054cbbff2836f9c66f8d02bc6169583ed9020a01b3cc0979ff155c47c2d2128850fec6fe5ee24c1f1347a6f96a4e93ebea5896eea88361cbaf WHIRLPOOL 1160e5cdffee4298f861711969f1b3cb6815fdb16d91b74e2c532960b4cbae0404fd75cf75a904059f13d67f11e61a5ccff440fc9a8a3363b170d6e290e8b5c7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQIwnTAAoJEJ0WA1zPCt1hP0IH+gMGJTi4EINk8OMt7tXQp9+l
+B0PEBCe8DIMoL/w3QvXMyJyQpBOIjiDz773YY4bgnSMwgXiqj5P3mv2fdj495HNy
+gHRcMMkesQxjFallKaot/ULGzZUVHL5s8fb2wkj7sab9EibZ0feNF8sGthoCz2Ps
+WWArd7p+ARh+1Aba8GwjopE3g8UaSphR4kCtJgOPgtML1WU4YEHdCIxxqzhrESWK
+3ZGniWN1Itc9WlZtbptXUj/hnaUsIj9wYZd8KDViBItDhSh3ZcShDg0xQJ3sLL9i
+L8NtDlVNz6rrqMHCPr7H8Q9qaPo/QzsyHNEIspZKOU7ht9IrktXsQp6FwLdOULE=
+=MrpU
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.8.4-utils-libm.patch b/gnome-extra/nm-applet/files/nm-applet-0.8.4-utils-libm.patch
new file mode 100644
index 000000000000..ddb5aa7411e5
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-applet-0.8.4-utils-libm.patch
@@ -0,0 +1,23 @@
+From 1c5a5eda712f004bf3266df60d36144466b5f1f2 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 8 Aug 2012 20:38:43 -0400
+Subject: [PATCH] utils: fix linking failure
+
+https://bugs.gentoo.org/show_bug.cgi?id=430360
+---
+ src/utils/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
+index e152373..da1b0cd 100644
+--- a/src/utils/Makefile.am
++++ b/src/utils/Makefile.am
+@@ -20,4 +20,4 @@ libutils_la_CPPFLAGS = \
+ 	-I${top_srcdir}/src/gconf-helpers \
+ 	-I${top_srcdir}/src
+ 
+-libutils_la_LIBADD = $(NMA_LIBS)
++libutils_la_LIBADD = $(NMA_LIBS) -lm
+-- 
+1.7.8.6
+
diff --git a/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild
index 6f39b064bb97..bb815ee1a8a5 100644
--- a/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild,v 1.9 2012/05/05 06:25:17 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild,v 1.10 2012/08/09 00:52:29 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 GNOME_ORG_MODULE="network-manager-applet"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="Gnome applet for NetworkManager."
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
@@ -33,8 +33,11 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	virtual/freedesktop-icon-theme"
 
 DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
 	virtual/pkgconfig
-	>=dev-util/intltool-0.40"
+
+	gnome-base/gnome-common"
+# eautoreconf needs gnome-base/gnome-common
 
 pkg_setup () {
 	G2CONF="${G2CONF}
@@ -45,3 +48,9 @@ pkg_setup () {
 
 	DOCS="AUTHORS ChangeLog NEWS README"
 }
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-utils-libm.patch" #430360
+	eautoreconf
+	gnome2_src_prepare
+}