Fix underlinking problem (bug #497118, thanks to d_dart).

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 49 insertions, 9 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 14d25a77be02..80b914789984 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-applets
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.375 2013/12/25 10:04:52 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.376 2014/01/05 08:40:17 tetromino Exp $
+
+  05 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-applets-2.32.1.1-r2.ebuild,
+  +files/gnome-applets-2.32.1.1-mixer-libm.patch:
+  Fix underlinking problem (bug #497118, thanks to d_dart).
 
   25 Dec 2013; Pacho Ramos <pacho@gentoo.org> -gnome-applets-2.32.1.1-r1.ebuild,
   -gnome-applets-3.6.0-r1.ebuild:
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index e53ec431cc64..785dc61b73a1 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -3,15 +3,20 @@ Hash: SHA256
 
 AUX gnome-applets-2.32.1.1-dbus-fix.patch 823 SHA256 6c79b77aa731f82d9b7c9704e5c6d3cb06252eea3c2d21fa35245d2f02ca0346 SHA512 85c7b3955629e712dd64b7783ddb63cdef0d2688ef080c9bf2a0a1137a977a3859079a92c1fec417082ede2d99e5fe1b57b357c54a2a2224687d372cf4029374 WHIRLPOOL e268e962a3a663b9478e753a31f8187e764f28bbcc1c36d614a4baf6b9f89f51073408cfc20112a0b9f7eefe39be4d5dc9b9ac1b3b706b6dfad71f9bb7dc8e46
 AUX gnome-applets-2.32.1.1-libnotify-0.7.patch 1431 SHA256 1e0b1f9545029bda0f4aadc28ef6eba34a5dbd1c3d1e5cec45627be7b0c32eda SHA512 0a4631810878acaf5b96ad0f69a9c6ac654fe987552f648cbf1c6645aa6a10fecbc798650438e2dd0922085e2eefb4e33778ea3b022be8109989efee7407f1e9 WHIRLPOOL 1d1594df38054eca24c631c616d6a72f333a4406b39e57bddf72dde2ea62bd58e1de176739254f2fabc0231dc32e8d0cc62aaab5331da1db7679a46840d39df7
+AUX gnome-applets-2.32.1.1-mixer-libm.patch 786 SHA256 77cf6402d95b0e259ff373eaac55ff81ace91253e18848901ee95dee6645dcc0 SHA512 3ba23b547711dc523c1949d65d5276c3ca4375ae3bc24570264e20164ec3ae82a68d936468c7d88ca1ca8fd1b55c4a2f409f5400b36b108a3d26fe6a954cc4c7 WHIRLPOOL 74874c5bddcecf8ed449da0cba7d03b59db0a9d81c6434d97fb332397510a0e84823cd17ad724193e2ae09b01fd09bcae75ad9bdb67abb68c50df5c23b90af89
 AUX gnome-applets-2.32.1.1-underlinking.patch 3606 SHA256 874b1b0656f6e0c94d76f255c2b7539bb123ecf72add770ce3c8ee3bbf8cbc75 SHA512 2d31b9de398d5b7beae4f0966c17deac2b5a397cfe291bfc72f85826e611af6674b615c1253130f76a5561ab89596ca1fd9deb2d442d72c3939260e06fc442e9 WHIRLPOOL bc6b85b4ca8efff564e7fdf0f38e6a6d825d7ff0bbe043af63a68b53301934872a686f901fe7a8d6258b70ee561411ce2f43907b2a478a4b4ec65305631692c2
 DIST gnome-applets-2.32.1.1.tar.bz2 10083534 SHA256 2b92fe4b3062dfbe264f45472b4db3a27d1e69e13260d37da9fb36b2cbd40327 SHA512 2fa14922d55e24187714e3fc71e8b225a64efc1c7c10d33a7058cb8912a571abf1b545028604430a1fc5c75aa9202ee35f611ead2e435c6f1c532ca912792403 WHIRLPOOL 0528accfb0fc9f94407ae2b05656a51909f7e1976a713783687809989e65715d52b1530a637c185aa37958039b4b8dec3125c553c807a6b665f78c173ecf481e
-EBUILD gnome-applets-2.32.1.1-r2.ebuild 3727 SHA256 5cd5423e4dfc1176dae53196cb67ad078a568120c909ab5fbab19a8eaf7001e5 SHA512 8fe6978ccd8c8ec7881db255e01b58351f7cc8ce94e13230866b76868f044bc8a47b799622101c4331afd075cd2d39f261f6adf274a748e846902d63ff197ae8 WHIRLPOOL 632d68e6841e3c6899680b9b6413f85da920fe48e25be7c4fa132059f760f605fd2c530222feb03236a1b853cf1d729b0f24d5b98770d213862a642ffffb7b89
-MISC ChangeLog 54782 SHA256 df9c456c2f710e6d302d6047bf157d7f99665b7ea3ea6711525143e04d77128e SHA512 2d16b647e71d0693faae525415cd7ecc6ad52b696afc23e9673e1dda6f75d1106f7852a5674e0d02660014427e160c035a04f227934e1379d6f9d8355a15ac02 WHIRLPOOL 495fbac7a5f1a46c687df7a5c55d2c1440a833b31b4708183a772862de639ac3bb129f93f710729da35957ec1fb36a9439527e3251f5b90a783a6d47b2cbb69b
+EBUILD gnome-applets-2.32.1.1-r2.ebuild 3890 SHA256 854173fff8d3299ddb7fa17b0d1a23a0d703ded29e8b6d5eeb857aa2c5790505 SHA512 f481e4e16b1c6aecf295acbe2243917f572bf2e34abb6bb89fd16986aa7992ab17f28a99622f823c5630f997cefc3bdba79ad0a056c7426e03c5e0380bf892d6 WHIRLPOOL 91b6261df78d757983806be2193016844226c8c8676a536c17d90369bf1d6ec3e6cbe2df7ac64b3a0850c1b297fa229e90f42f90b84478773850148f5fc020dc
+MISC ChangeLog 54992 SHA256 93b4f21dc618c1ac5d1421cd455f27e506dd0b578d294b0a9c35f142135c7206 SHA512 20ea0ff17955b8f9cd1ffc3b4aa6d0e63125e56b100b5cf0e978303524edac71e040299a7ccb7890f8bf8b8cb4e974e8f1e69918209ece768f9f8958a8bce37e WHIRLPOOL 5171d65ba7a210feff3330e57c1ee7290c96a3004c0b705651a819b1e8a41e715173b9d8a267e6be0101b2254065399a4f0c8202b3207191ce4e64e085b24741
 MISC metadata.xml 243 SHA256 100f028a0419128558ccb877c0fb3554ed92ca1a3925a36ce55cb9ee8081f7b0 SHA512 257865213bd5064bd3c6a4b9a67302880bb340c12c696493e3672183ea880a5ef421c4243ea1778d0ceb405968eac895934e33427e68915d50f6ee3599aa2d84 WHIRLPOOL 8338d92e76dc81f73a310ad7edaeff28b7ed38ac0f93857a6c01eaebb0ffe7a26b014b893d03d201677dbe6ee6009d96624325b9d2e961151b28f08b2012f4f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK6rcUACgkQCaWpQKGI+9TyPwCfaF0QOZqwQ3glacyCdUzV0UHD
-hvwAn1/g4MpImZzUJVeyLlNFFXmUDj11
-=YXuk
+iQEcBAEBCAAGBQJSyRpzAAoJEJ0WA1zPCt1hAO4H/RosP3KrHavE8TYSBOGJYBiw
+RmyNyww5Yn6U1hgXm6DaqQ9GQuDyPjT3tjrPVfpSOOX8zgXiCoh1Y9UlnKjDbTrX
+C/SwzLmwOTTM0RCjNO2PFgpKND1HjoQTXbnHC+cUEvstVrXJ7lg4HdGjH3nS1yVr
+P9EHf66sKUYk+lJUAS0xNdKHUWvQDaGTYBH9WToJ31Q/BdAAq3Y1ONYlD7sR1qRA
+9h+3ciZ+QgTvxuF253J8V7k//khF3D3LPTlRFXkWLOHBzE1dVXUsgdDi0/FfcZHb
+R0EMXDN9GTaMl+HpJneCwy0deE7qhNdy7QQc48ydCWqx3gw+X0EuAk+m8TTv+xU=
+=uDvc
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-mixer-libm.patch b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-mixer-libm.patch
new file mode 100644
index 000000000000..813f336853b9
--- /dev/null
+++ b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-mixer-libm.patch
@@ -0,0 +1,26 @@
+From f2a7c6548ad508c94398e10c49c962363e15d739 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Wed, 19 Sep 2012 18:27:22 -0400
+Subject: [PATCH] configure: add -lm dependency on mixer libs
+
+the mixer applet requires -lm to build.
+this commit adds that dependency.
+---
+ configure.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.in b/configure.in
+index 7c1c8fc..b318fb5 100644
+--- a/configure.in
++++ b/configure.in
+@@ -297,6 +297,7 @@ if test "x$enable_mixer" != "xno"; then
+         AC_MSG_ERROR([Mixer applet explicitly requested but a compatible gstreamer version was not found])
+     fi
+ fi
++MIXER_LIBS="$MIXER_LIBS -lm"
+ AM_CONDITIONAL(BUILD_MIXER_APPLET, test "x$enable_mixer" = "xyes")
+ AC_SUBST(MIXER_CFLAGS)
+ AC_SUBST(MIXER_LIBS)
+-- 
+1.8.5.2
+
diff --git a/gnome-base/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild
index a7c0fd54e324..df97274ea6ae 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild,v 1.8 2013/04/01 18:24:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild,v 1.9 2014/01/05 08:40:17 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -89,6 +89,9 @@ src_prepare() {
 	# gweather: fix NetworkManager support to compile, see upstream bug 636217 and bug 358043
 	epatch "${FILESDIR}"/${P}-dbus-fix.patch
 
+	# underlinking in mixer applet, bug #497118
+	epatch "${FILESDIR}/${P}-mixer-libm.patch"
+
 	# Invest applet tests need gconf/proxy/...
 	sed 's/^TESTS.*/TESTS=/g' -i invest-applet/invest/Makefile.am \
 		invest-applet/invest/Makefile.in || die "disabling invest tests failed"
@@ -96,6 +99,7 @@ src_prepare() {
 	python_clean_py-compile_files
 	python_convert_shebangs -r 2 .
 
+	rm missing || die # old missing script causes autoreconf warnings
 	eautoreconf
 	gnome2_src_prepare
 }