Fix underlinking failure (bug #496914, thanks to d_dart).

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

4 files changed, 85 insertions, 12 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index bb4cce6276d5..619c6eda1c50 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gdm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.389 2013/12/24 16:21:56 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.390 2014/01/03 20:13:17 tetromino Exp $
+
+  03 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gdm-2.20.11-r1.ebuild, +files/gdm-2.20.11-underlinking.patch:
+  Fix underlinking failure (bug #496914, thanks to d_dart).
 
 *gdm-3.10.0.1 (24 Dec 2013)
 
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 82aa3608fc4d..5d50cea8fef0 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -17,6 +17,7 @@ AUX gdm-2.20.10-custom-session.patch 1105 SHA256 58d09e131375f993e46088078993953
 AUX gdm-2.20.10-desktop-session-dmrc-autologin.patch 873 SHA256 57f8e88acaf45b0cb84d80bb672dddf8e71a5152e9bff8216ff76d15b1e7dfcf SHA512 0dc69cf2e2ea41b4e200d681885263b596a053670a0d02b0035c4765a78e41cf776c16ce985aedd60ab76a5f5342d2cb08f1c7b401f588780e23169ca2fb9b61 WHIRLPOOL 5db6ce48d43c707ec1eaa1190e1ff46e0dd75be4633e135838647c9d6ecbf61ed3e3b5c07244b98dd51f07beb559e8a37d2b70da92d190ba45cc428c49f4223f
 AUX gdm-2.20.10-gdmsetup-24hr-combo.patch 1108 SHA256 558de681677fd631619dd90aba2b3fe99e783d051d706c536b85268eae40f19c SHA512 916ef335a7cb7121eb4c6446a85c36a6892830ae8fd3f3668e0c43b67f731830c1604046865b842d4850effcf8d1179b73b85db7420464bbda16885ff40a6751 WHIRLPOOL 3e8600a80f74b214e685aef2c0f293e61873ad04eb82060de03f5bd12a344916ab7f38fb852377ca36b87daf1b884025e3389822edd87e0239cd745fd2eb4f70
 AUX gdm-2.20.10-xinitrc-ssh-agent.patch 704 SHA256 59b0150159776a200c6041290f672f367b4a56f8adc5218d74a271a376c7cfe1 SHA512 c54fa3a3ec762290138e28b6b52f95ca765c7e279f6c3538f90e2df61dc6f7d45bc970a0f6f1a543c87404e8e094fd889a2ec6d3cd7ae0f651a5643fef1c725a WHIRLPOOL 646aa42795546b5131e56996fc38a4b49c963e4e85c76e410dd7f75b4945aade7b13d3f4200db1e57f656c78ae0c5684778f3f244c6a515571ffd1a3c8e1dc56
+AUX gdm-2.20.11-underlinking.patch 1441 SHA256 90dc3103d54789804b88a171d20353c710cb4eedc9f932590f1dbe6518a50406 SHA512 7ab638f50e9a362728f64ae0f89db4ff89145a5bb6e2fe1e57aefba7b134c6063c8c85b89441fd956510e0db4f812b215c93bbae45bd0a0e6a7228d2c11b56ab WHIRLPOOL e016b85b759e40dafa4ea86a71f1145c4d2d61a3ddeeba92306f90f1b566601d05f7cc6f5de011cd57735e3946836904869ad6385eaac1b871254d0ba2d924fd
 AUX gdm-2.20.2-gksu.patch 544 SHA256 3c7dabba9904d1ae382989099e03938c47eb2ce882f50d8fae9164a573bddb4d SHA512 6fcb5681a47f9bb0aa248e9c0dba27ccc7820ac56e8d1bb4621652a8bd759981899d24c08bd0546a1c4937c664e5d82e101da9900938198a9a0d1a9349891877 WHIRLPOOL 655d16026cf3dfe3a5e7c0007c7e80fa996b5afe6f5704a5326e40540b049c348caa70b7c4e681e5bbeafc28160142be0abb73015905e42a202a9a5f322fe06a
 AUX gdm-2.20.9-parallel-make.patch 1499 SHA256 c8d04d1cae1c2bac16bf3f41fd481eacf5f4a3962f661996f93da39d4161bb0d SHA512 3ba30cdc5c9c665dc1000923d7fe61b2a4bf1ea9b5e8b88d07ed30e4ae28afa529894177e57fb032ec37b0a8ecc426a5f6acc4a6d2b1a973abf0ace50b17a8f3 WHIRLPOOL 7bf3163f549d498ded4f36a0a7f38b48819a676c0ac314286f920ee25e056a128c843b1df683edc2ceb3e8e947ca420f3fea1eb1d43519b2147aa5d262851c06
 AUX gdm-2.32.0-fix-vt-problems.patch 6156 SHA256 12da81b8085d76ce3099f1af0ec588c07c3f020f341f825683f4855c9303731e SHA512 cc31f51c3eaa51b9ceac21c66a61e5d59b1c07e7dc2166fe4c3abfc4eccbdd4b43605c0e936d003aaf337de599d1dcbc00726c9d63d4f682636b02e111237d63 WHIRLPOOL f0bec91b5decdb784d79d3d101acfeb5adfa794da938e49f3e84d0a78134e968fcd1ed6d13d3f9889055c5afb0f5db2257d20f2af33098f2ea7cf0acf889e458
@@ -37,15 +38,19 @@ DIST gdm-3.10.0.1.tar.xz 1552460 SHA256 549a42009af9c79a4e07632e405dcb71ba2e876e
 DIST gdm-3.8.4.tar.xz 1677040 SHA256 db40fb66bf476721b6d333abe0bfed7feacdca7d492f971c86a3f1e5cccdb447 SHA512 a64df8a4b7e1000aadfe1433b1d0f5d9bd16eeca45f1fdf36adc207a9f1dd410cf8e888553205135952a6da30b8c9efd4a240fc3f454636e0c9e4f86414a3283 WHIRLPOOL 4d3fe4cbd084a169bce29481271c99a8e9523cd6b1d163e4e1dc5cd829097daf9339de538d43998109596b41bde34ff798d2eaf607f38c5c859ee3b526f7e04e
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a WHIRLPOOL bac9f9ef3e7e88401e605c34deca6e7c31e2d4456af3781252a91f7bc33084af27ecc9e4a74022767b25db23d8f70842a39225c8544f1c02229ad7f7af670d42
 DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153
-EBUILD gdm-2.20.11-r1.ebuild 7213 SHA256 71ac1e2eaaac38e36b3a11fc9bd883399e57b0bcae84458804f15611b5bf05b0 SHA512 5b78fe76b6ce79f5cab0ff027c1bc117766c234acfa58869155e56cd4fe0aae5a2e971014f2d9ea15637dbc6fcc5d5e536b5f36a6e3e664b2b2cb68779d83b04 WHIRLPOOL 7837696f0f0e54045ae4df101b89aa8ac9147ce064a406ed604ef8c7c04b30953ba35a8773c6bc404a60d62f6bca124db486c498690a561d2e8112b5f4452b5d
+EBUILD gdm-2.20.11-r1.ebuild 7373 SHA256 0a27e4a2c37ba6980cc886ddfafdbce65c88d29cd66b79c95d04832f3b993b10 SHA512 493f7d8863fda71849ea7c3385889c1bfa3fe1e95060d0b4c1842338c46aaa912474de38c8531158cdba12db0e24baff1e9b215ab9ad52d6ea8504a857398fc4 WHIRLPOOL d89f68ad7b60493bf6f0bd1cb725942da9b050a10c9cc2c955f541f9e19a1b7ca99fccee6fb2b5dcf944c074c6dde70befb81f2f15a0bff730a53f7698867af3
 EBUILD gdm-3.10.0.1.ebuild 6527 SHA256 06f227800735f9a87bc62e58c651036638169c1b13ed69bb353fe25096b6be29 SHA512 187684fa6bc28306b9e0d2e6dd29068e735ba86958114dd01142843725d85cfce5ee7e1febece399c774dd25ee7c3afed14bda3a9e6aec3555f415aa35c5953f WHIRLPOOL d545aa8f0be88e1c61c32a584b09f54581fca45dcfd3d1231628fcd8b6298ad1f75c1b53477ab24a006ba017f98e093ca9e1a62f8e364f2250205d659b8b96d3
 EBUILD gdm-3.8.4-r3.ebuild 7089 SHA256 c450865f0d09eaae7513e50b091b414e2b3eb6537b4cffe4bdff31860fc34811 SHA512 237b7bfd3b56db0df24dc1962cc0493a6b4bc460074684a96ba5416f2a8ca204b5c1b7bf483c2391608a1762808f3d210596990e91fa2326f4060a1736d6488a WHIRLPOOL a4e4c11c2a129b97436100a71693dd1f871d71ff643c3c50dea574aee79bd20138d585562bfdcf4296dbe99f13dc3b3c0fb5fe23b50de86d9c68013c73110ca3
-MISC ChangeLog 59445 SHA256 e454709a0e00978a68c8d6efad56151dc6a0206fe9fefe09d8973bc8fd5260da SHA512 06cd6bbf45760d757eb838cff1e3d06e4e2898dfec23a2aed8339a14276187babd986a7f21e3ef8ceeb878b716ca1da2594a6711009f2240019ef9eba6d915fd WHIRLPOOL 02c47740bb9ef41dc4f075fc71f575225c3753155b8734091759be65610d8cb9a7f851f3afe09e867f10b658a42ec2205ed01e637ed30ec1820efd67afc329b0
+MISC ChangeLog 59633 SHA256 b9ad9b872dd2232f3ad623e6c402b8c480880a331c2dd5cd0b3302d20995fe01 SHA512 9ee9c61b99f1b027b209886d39ce62ae82b2d1ec7f8139563ed94af2d95cab0de9aac5ccc5505f15a6b7693233002f80636fc7756529046d10e2b3178648f553 WHIRLPOOL 1b10aa14b2da325cdf6e97ba242a323bd60f31c1654d21448e465a4aee535e79033e2eeff76d1eafb46c6bd30d1a3b994542789ee1fb25876a7a0ce1f4abb8aa
 MISC metadata.xml 944 SHA256 08ee2dd40862efd5316443b8d84df4a1dafca76236e0f107240d8ccb6a0d0087 SHA512 f1ca94a651af983dd0e8b8b346be9c682011ec1c9a3293bb54fdd4a6effae14cd4a8efe2dfff7d143faad39cdcd9dab92bf7bad0244b1cca3e5e24c557963544 WHIRLPOOL dc83e5716dd4545c4daa1ee2b8aa7c6f993d0781c0518c2102c30772e683c46b56d1fe5494b6814232db434b96230c7bbd60790d158cd0f9fc24d69b91368219
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK5tKUACgkQCaWpQKGI+9SOBwCfV8uAoinb8ArSISxDQ6eJEKD6
-S2oAn0qp0REJtFsIOncnrRQx8hZ25pj1
-=ZaNt
+iQEcBAEBCAAGBQJSxxneAAoJEJ0WA1zPCt1hcCMH/AhVQYJRsZJ9poxNNtxsXSr7
+Br05kdKb7JzKAiY/G/m5E604nZKnpUxMZnalZqs3LWD3jwmQ5Ag49iETtnNSgl0X
+o+Te/h4NOpPgkHwFke6lh5vdSPKTb6PXZs6C6uhyRnBhl0BXzclSTYnmIYxO/plK
+VI8ILDtgZ17/cspFR1rENdpRHkSc43Iy+A+moRqZeUu9AkHEeeUQekR8TmMEB8em
+SgNcyQRl7QTy0nEjysDXdlQiI9p7GEhNvQPzw+sbjCzB02KK3066MUZBPIkdm1l0
+zD7/oazpORVnphgwUAXZUvac48EM827mM/73lWud9hV5lARwrS644QIuvg0ssSA=
+=Af2u
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch b/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch
new file mode 100644
index 000000000000..f7accccf3a46
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch
@@ -0,0 +1,59 @@
+See https://bugs.gentoo.org/show_bug.cgi?id=496914
+
+diff --git a/configure.ac b/configure.ac
+index 3da7f33..8a0eedf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -160,6 +160,9 @@ AC_CHECK_TYPE(socklen_t,,
+ 
+ AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv getutxent updwtmpx logwtmp login logout])
+ 
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ dnl checks needed for Darwin compatibility to linux **environ.
+ AC_CHECK_HEADERS(crt_externs.h)
+ AC_CHECK_FUNCS(_NSGetEnviron)
+diff --git a/gui/Makefile.am b/gui/Makefile.am
+index 577dc9f..3334381 100644
+--- a/gui/Makefile.am
++++ b/gui/Makefile.am
+@@ -123,6 +123,7 @@ gdmchooser_LDADD = \
+ 	$(XINERAMA_LIBS)	\
+ 	$(X_LIBS)		\
+ 	$(XDMCP_LIBS)		\
++	-lXau			\
+ 	-lX11			\
+ 	-lfontconfig		\
+ 	$(NULL)
+@@ -143,8 +144,10 @@ gdmlogin_LDADD = \
+ 	$(X_EXTRA_LIBS)		\
+ 	$(XINERAMA_LIBS)	\
+ 	$(X_LIBS)		\
++	-lXau			\
+ 	-lX11			\
+ 	-lfontconfig		\
++	$(LIBM)			\
+ 	$(NULL)
+ 
+ # LIBGNOMEUI should be removed from gdmsetup at some point.
+@@ -183,6 +186,7 @@ gdmphotosetup_LDADD = \
+ 	$(INTLLIBS)		\
+ 	$(EXTRA_SOCKET_LIB)	\
+ 	$(EXTRA_NSL_LIB)	\
++	-lXau			\
+ 	-lX11			\
+ 	-lfontconfig		\
+ 	$(top_builddir)/common/libgdmcommon.a \
+diff --git a/gui/greeter/Makefile.am b/gui/greeter/Makefile.am
+index fd0f500..7b9840d 100644
+--- a/gui/greeter/Makefile.am
++++ b/gui/greeter/Makefile.am
+@@ -91,6 +91,7 @@ gdmgreeter_LDADD = \
+ 	$(X_EXTRA_LIBS)		\
+ 	$(XINERAMA_LIBS)	\
+ 	$(X_LIBS)		\
++	-lXau			\
+ 	-lX11			\
+ 	-lfontconfig
+ 
diff --git a/gnome-base/gdm/gdm-2.20.11-r1.ebuild b/gnome-base/gdm/gdm-2.20.11-r1.ebuild
index bc237bde84d0..4e8bb36ef129 100644
--- a/gnome-base/gdm/gdm-2.20.11-r1.ebuild
+++ b/gnome-base/gdm/gdm-2.20.11-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 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/gdm/gdm-2.20.11-r1.ebuild,v 1.11 2012/09/27 08:54:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.11-r1.ebuild,v 1.12 2014/01/03 20:13:17 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 GNOME_TARBALL_SUFFIX="bz2"
 
-inherit eutils pam gnome2 user
+inherit autotools eutils pam gnome2 user
 
 DESCRIPTION="GNOME Display Manager"
 HOMEPAGE="https://live.gnome.org/GDM"
@@ -101,8 +101,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# remove unneeded linker directive for selinux (#41022)
 	epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch"
 
@@ -129,6 +127,13 @@ src_prepare() {
 	# Fix intltoolize broken file, see upstream #577133
 	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
 		|| die "sed failed"
+
+	# Underlinking for libXau, libm; bug #496914
+	epatch "${FILESDIR}/${P}-underlinking.patch"
+	rm missing || die # old version in tarball
+	eautoreconf
+
+	gnome2_src_prepare
 }
 
 src_install() {