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

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

4 files changed, 48 insertions, 19 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 8ab7f7c7c27a..a76fc2b6ad7e 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/gedit
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.361 2013/12/24 15:28:59 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.362 2014/01/05 08:17:07 tetromino Exp $
+
+  05 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org> gedit-2.30.4.ebuild,
+  +files/gedit-2.30.4-underlinking.patch:
+  Fix underlinking failure (bug #497110, thanks to d_dart).
 
 *gedit-3.10.3 (24 Dec 2013)
 
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index aa38f99aa092..ee15c4e2df67 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -2,18 +2,23 @@
 Hash: SHA256
 
 AUX gedit-2.30.2-tests-skip.patch 1402 SHA256 faf11f3817052dd76aa9d34af938c4cd8136a71b7b7f4dc5a42e38abd90402e9 SHA512 73217d9305b4823362a0fddd28bcaca4c9be595d517eef8adbd3eb365d098d1e5b21435b642856d72862b99e53446da7a56d1555acfdafb565df432554e6d779 WHIRLPOOL b8b11c771fea405c10ba27a6814f6b290bcd48350463a78cda7c342a1b493d4ae74fa848002e1518730d59182b22c584403612fbaf50c943021a333f7a49c4a2
+AUX gedit-2.30.4-underlinking.patch 491 SHA256 88b5f78173b17e874b71cd42f2a61c82900efae5d506fe8ecf6286c50b2e0cd0 SHA512 483cd11f82697de45efca711f24c0d417d918b59d802561fecc83af8f33a4c3de6c01bc4c723a8e8363fecfed1c5c2baaa42b2e9496aa6836b1e160dc790f18f WHIRLPOOL 796bd41ed11be9d5459bb5204b0b9ecd9cd47b1861b02fb45006dfd7004bc48e422ac918ad6ed05c12317a65cf96c4e46fe5709508b4b3a947d3a2907ea23f51
 DIST gedit-2.30.4.tar.bz2 4705692 SHA256 a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c SHA512 31d96a86d4d207fe83aa1c8b8faadd82c2c6eeca019f2df4fdf75a8678233e76edf7a09f32dba6350ab9fc003029cbb585608d864632e1d13c42650d1894b5e1 WHIRLPOOL fe5183f33992d6ec1ce8365321f829828d6c9606b42a6872e323351ac4bee0c488fb5ed06dda8e1aac4a09be3dbad7196e48d9cccf5d0f1c6dd759224051eca6
 DIST gedit-3.10.3.tar.xz 3088516 SHA256 d0efec59622061389fcc06d23b88e2621d4d66b4bafe7d4461c1c7d48a54bc82 SHA512 0346671b145bb8f30aa19b85d9d5cd178f3c538f60df16bee2f9c055b707903e2c927fba4ccc0569f74e93015f4d8fea8dd29865e93ed5fc78eb6821075bfab6 WHIRLPOOL 81b6e7a347abaf279442f739f9923b58a9401adbfc26ca3847de71f4e505e8b6cc86626ce13207a1944a5ba357c3d0d8d82da1a5ea902fa68b83341a3c62233b
 DIST gedit-3.8.3.tar.xz 3074384 SHA256 dfbc2d9cf975b247c6a6b8bd1ae1b72d8e8a1f862f5f3d084a404853092cf9d3 SHA512 3a7466e6c447e2c8388b5480d1f154644c840c1d8cdd9ab2f6d4acc338282e505b721a39cd9720153669b13229d640664580219ec569b4199aa073b0131e088c WHIRLPOOL 11d25d14c3e0f98121407860237895393d88d83139a4dda5c1a00e8ae677c19879fd692c68d17a3d1193f55a298ec9d3de06a347df8a511f1d5e1baf9fe1ea56
-EBUILD gedit-2.30.4.ebuild 2170 SHA256 8ffdb9b1e5c0d153bf60bbaa7caa28bee9e36bfa976bc6c059ab47610b925300 SHA512 b49016b665412c4a87f748420160b2400cd161be91b0136cfdbbeaaae1a04d3e5a9fb96d67c49a5defcd4ba0aaacfe997f7c7fb62d72d985740cad6df0e4f7b0 WHIRLPOOL e1ca6ffe01a6de3cf915aa017846b5ee969c83d8adf8b98e6381245758ec81e2d9f775149f4e49772d0a932dec524ff53f4fbeb9e8750a80326284a0370df82e
+EBUILD gedit-2.30.4.ebuild 2223 SHA256 1c13427e6a17d98ecdedb6d68e19a3f62b047e5686a39182667548aebd6b7069 SHA512 e31b601818a97892e52e627100445d9b519147f5974da0064cb529095a0c1ba1143e1fb784e235ea7ba80a19b1b8a0aae1e7cd6e21d58b5add350e3027e6c1bf WHIRLPOOL dfa120613a46db67b7388aad05cafa538fd97e40bc24159e6b06813a70365985b6c4ea1eae0bca93081ed5aa79adedb6868e5b860d5355a7e2ea8c959ad16e2b
 EBUILD gedit-3.10.3.ebuild 2362 SHA256 d6989ca9e62891044aa8159a55b59096660fbdcd20964592aee875b4b17475b8 SHA512 45a249cedf09d351e54063963fecaaadd6354c158486c5b189858279429e805dc6b17a56a6a7f51d7b4c87e2446788da8c7f5c3257dd9196f4033013fdeefa8a WHIRLPOOL 7294e8b34873edd7c46a5d3d9e15c5c8791b8cd0431cef579ef42827ab76bb066dee3135b45a4f24715335aaa8a48158d128c2f5af90adde043955b8e8828540
 EBUILD gedit-3.8.3.ebuild 2357 SHA256 2bfed20b2364cdc03ce63876e9363bf2747eb4a11dadf543a9362ab200adf1da SHA512 c95677d88d52308dc625c98a571d1d0a1c591efe0c894393dd56c6b20eec98c73415590c7acf2e29ff2b9f3fd1077adf46a1bcda5a2baac514e6bd7b8e576775 WHIRLPOOL 8973e07b9cd20112f0c7aaf25cd320534f2b44435fa6d890439a8d7f1de227fe70b3cde96a024efe6c7843bd2652f522de6ba7dfb13c14757f79d63be878f9f3
-MISC ChangeLog 45698 SHA256 d926cfcc50af5bef189bc7e9aeb4374fb17a288309adb07eb8684a01c16a87d9 SHA512 b986071be6e86aea7ddcaa318d1b17f2108ac0fe961cddc0ca93d90496a177ac374f03bbf1919c9f2a35a0691fb48fa882db8f701db6df95181c03f9f82818cc WHIRLPOOL 96535044ae85ef71edb9e5ab78a6794279f4a30fa5ac663d3b456973de5476b403915d8cc2877c1b313bb8433569a8001e5dd2ba392d869f35aff62fcf82a393
+MISC ChangeLog 45885 SHA256 d889b05ec42efb0b7200babf9ab345221cadab10cc5ebeab70c7f1e215c34e1d SHA512 55b82cb41db3d8282bfa882a4a69ac0790ff35a5101672f8d4bbb172d702070c2988c6a148178b78696caba44f12016ab7940b054f670d33cba9a9f1a9c3fef0 WHIRLPOOL 8963bf97844fa0f9c7249666211b87b0714d36661605dd608b1729547fc2f2c0aed2a230f9936ea87deadfc76ba1e78c4f22fef173bc0f557cba71a817352507
 MISC metadata.xml 276 SHA256 8dec58657a80b4973306f2f6d5da03a819b949c3f8e93b3065eafda55f1f8465 SHA512 9c1f48389dedc905b448e4085b9fec8f37ef777aacf14e18541e39680ccf83a968c7ee8fea8b9ede61704ac174380c7cc56858182fb6f59a589ab1d70b8eea7d WHIRLPOOL 902de8d338629274e1ec7a7a6b13316e88f09847d5158a92fdc3337e33c26dcda79ff8bf425dc0de42657ba14769478335249d13cba2342f8adb247a1f40e905
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK5qD0ACgkQCaWpQKGI+9QEfwCcDVyBcuYrqzE2xJfGJvobEtmB
-ryQAmQFAvgKLByOu47u/4gNOXZrVpq3B
-=cDdF
+iQEcBAEBCAAGBQJSyRUEAAoJEJ0WA1zPCt1hbSIH/1QVFgjzNvjwDNLoi0cCl1i6
+9RE+SSS2zdmuItupCc2ZgxTrN2V29ar4p/53ctiCMsUf/RS/axZHfZJ3zXN0FFw6
+lGjGNebmeIbO+0TdxneWkuK3HY+LAT7UwSC0tW797onjyOdWN9X5QI7o5PPGUsU+
+D22by5XTwLkcw8p3DuM9jMM0XTPR/tgV2rDiMcIrqH637JBu5orsX+3a1N/17148
+6p/x6+7fxTZ+65ulh/l/kGGj+/V0kCBubaD6V8xkITOsefKIjLx/bowH2CQPzZnY
+/hPzaMMaX0rkZLI1a2IkwD1zxDTGPeAvkJzsWKV6OiVWGEFjs3xf3xeG4CZ5nFc=
+=qDtm
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gedit/files/gedit-2.30.4-underlinking.patch b/app-editors/gedit/files/gedit-2.30.4-underlinking.patch
new file mode 100644
index 000000000000..3fb2e727eb6e
--- /dev/null
+++ b/app-editors/gedit/files/gedit-2.30.4-underlinking.patch
@@ -0,0 +1,20 @@
+diff --git a/configure.ac b/configure.ac
+index 78a8055..c80651b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -272,6 +272,7 @@ PKG_CHECK_MODULES(GEDIT, [
+ 	glib-2.0 >= 2.22.0
+ 	gthread-2.0 >= 2.13.0
+ 	gio-2.0 >= 2.23.1
++	gmodule-2.0 >= 2.23.1
+ 	gtk+-2.0 >= 2.16.0
+ 	gtksourceview-2.0 >= 2.9.7
+ 	gconf-2.0 >= 1.1.11
+@@ -320,6 +321,7 @@ if test "$os_osx" = "no" &&
+    test "$os_win32" = "no"; then
+ 	PKG_CHECK_MODULES(EGG_SMCLIENT, [
+ 		sm >= 1.0.0
++		ice
+ 	])
+ else
+ 	EGG_SMCLIENT_CFLAGS=
diff --git a/app-editors/gedit/gedit-2.30.4.ebuild b/app-editors/gedit/gedit-2.30.4.ebuild
index 18f6ea34e6a4..8e2161eb42f5 100644
--- a/app-editors/gedit/gedit-2.30.4.ebuild
+++ b/app-editors/gedit/gedit-2.30.4.ebuild
@@ -1,12 +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/app-editors/gedit/gedit-2.30.4.ebuild,v 1.13 2012/05/03 18:33:00 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.30.4.ebuild,v 1.14 2014/01/05 08:17:07 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit gnome2 multilib python eutils
+inherit autotools gnome2 multilib python eutils
 
 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/Gedit"
@@ -58,23 +59,22 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Do not fail if remote mounting is not supported.
 	epatch "${FILESDIR}/${PN}-2.30.2-tests-skip.patch"
 
+	# Underlinking for gmodule and libICE, bug #497110
+	epatch "${FILESDIR}/${P}-underlinking.patch"
+
+	rm missing || die # old missing file causes autoreconf warnings
+	eautoreconf
+
+	gnome2_src_prepare
+
 	# disable pyc compiling
 	mv "${S}"/py-compile "${S}"/py-compile.orig
 	ln -s $(type -P true) "${S}"/py-compile
 }
 
-src_install() {
-	gnome2_src_install
-
-	# Installed for plugins, but they're dlopen()-ed
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	use python && python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins