Non-maintainer commit: Fix build missing link to dlopen; Patch by me; wrt bug 512476

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

4 files changed, 49 insertions, 14 deletions

diff --git a/x11-wm/matchbox-desktop/ChangeLog b/x11-wm/matchbox-desktop/ChangeLog
index 05584ae45d83..acf1d5ff5311 100644
--- a/x11-wm/matchbox-desktop/ChangeLog
+++ b/x11-wm/matchbox-desktop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/matchbox-desktop
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-desktop/ChangeLog,v 1.11 2012/06/04 00:31:01 xmw Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-desktop/ChangeLog,v 1.12 2015/06/09 19:43:10 grknight Exp $
+
+  09 Jun 2015; Brian Evans <grknight@gentoo.org>
+  +files/matchbox-desktop-0.9.1-dlopen.patch, matchbox-desktop-0.9.1.ebuild:
+  Non-maintainer commit: Fix build missing link to dlopen; Patch by me; wrt bug
+  512476
 
   04 Jun 2012; Michael Weber <xmw@gentoo.org> matchbox-desktop-0.9.1.ebuild:
   ppc stable (bug 309407)
@@ -42,4 +47,3 @@
   +matchbox-desktop-0.9.1.ebuild:
   - Initial import. Original ebuild by Priit Laes, modifications by Björn
   Ruberg and Yuri Vasilevski.
-
diff --git a/x11-wm/matchbox-desktop/Manifest b/x11-wm/matchbox-desktop/Manifest
index b2b2b7e4ee3c..58ece5db4a11 100644
--- a/x11-wm/matchbox-desktop/Manifest
+++ b/x11-wm/matchbox-desktop/Manifest
@@ -1,14 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST matchbox-desktop-0.9.1.tar.bz2 231962 RMD160 75a2368a261e44b1734bcdb3efd278da479a35af SHA1 47302f2b0f6034ec5a2c6da2366a807d7d509dc8 SHA256 ecb025d3660d80a9850973111b4fdfffaa50b47cbf0c5467b508d28d65146793
-EBUILD matchbox-desktop-0.9.1.ebuild 976 RMD160 efaa343f16a24719a4612c9061ab6cbf51390849 SHA1 44029257a44b0abc7f7c78778a86540d0e29e813 SHA256 bdaa0c530058a4c10d633800e8d3bbd27c43176834fbee8a58d7de92feeb772d
-MISC ChangeLog 1550 RMD160 57c2a47d34d09b526ea4ccebf1a8edbfacb83a69 SHA1 1c8306037c63df8a14136834f421a222279a861f SHA256 e8ae5a1714623a15f420a80c3958456791f09e798df9b12c330f407ef7407a74
-MISC metadata.xml 260 RMD160 b6f6f1a87a1e9348f4feb4f0057a26c2c5349e38 SHA1 c9ec0a320136ab45118cbab699aec8136e151858 SHA256 87296765de13124d7a7433b95f0bb2c52df7964cb51cf45f9679adfce49adcd1
+AUX matchbox-desktop-0.9.1-dlopen.patch 362 SHA256 b6e3a0c65a14360f067882409b0a076b4ea8e0e8875d3f47d8c5c1578a53ec85 SHA512 2b50a41f4d557b5b6cdbfad2b9039e8b69de8fdd6be62c98044b7e1bfb886340135b151f179e4b8efb6a26c00a30c29c446c172348a2c8f583cb5cee24de1463 WHIRLPOOL 72e270e01323d43ce1e72654102fa6f88769cafad589dcfd11ea9c4a9f2fe13237e9d41177eaa989adba14c1254025967ca56ba7a6a90ed63efa3d697b5974c2
+DIST matchbox-desktop-0.9.1.tar.bz2 231962 SHA256 ecb025d3660d80a9850973111b4fdfffaa50b47cbf0c5467b508d28d65146793 SHA512 469d7c088405f627b571d0475e283e1dab2d74e10a58ab9d597cb8941a633f1993859234f9444d160257dade005ce3b325c5375fab2e5f4e30aa0048578853eb WHIRLPOOL 3ec33f322c06856d655e99a940384d5e666e1d87beab71ef8ab0a8a8aabe873de5508bb090be24a169396eaced08f9c342000997a1eb799fbbebce2b2ddfa47f
+EBUILD matchbox-desktop-0.9.1.ebuild 1156 SHA256 39db6eecae01691471f6836db37e2ba24091d27714f23fa8a27ac4c729b68d84 SHA512 9d4f859b77b69c45cd0f6194b8d584fd6caa6ca2f9c2653dbd9c8906159e2d182564e24b1799ce5b7e47863f08adb2b0a3c37ee686642f9e378a65c9839659e1 WHIRLPOOL d0e2a61038baa5314c8824a15a9c28829871d54cdf3b2ca43f5d0ed49a757c193b033a474e703cff119091367376b97986b136b66b7c616ad3e88912477bd9f4
+MISC ChangeLog 1770 SHA256 921272a195672cb5f356b50c555c076f000edbf817449b143603c369df0abe7a SHA512 d84444c986a4cc2d90e4e8bc82b6ca6a9d47857883a99362123cf61b511b90ff468d1db30a42420d7dec67fb65eda631bd532e4aaa21fc29f3b8b76c251caf21 WHIRLPOOL a7866d588f9a339547f65f75bb605c5c3c9032fcacb460ecdb70460ee6eded5f4c7915ab90359513bbf5778ce73da7607f8d7268218f88367cd57659ef12a27f
+MISC metadata.xml 260 SHA256 87296765de13124d7a7433b95f0bb2c52df7964cb51cf45f9679adfce49adcd1 SHA512 77134bb638764a0f970d2ca050b064d989c253d9cd6fd93016b98f71199de1194cb7938dbc5919545124140b1f2259530a6c03970af2e75db2f2738543f7cac2 WHIRLPOOL c46a4cb5e4e510d748037d502d6dac09c75e31f27882e2ed0b718d57719902d05df00d2f80f6e596f7e255f4a8a5ddf996f28c8090624346e6711e32a1d2f3c9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.1
 
-iF4EAREIAAYFAk/MAawACgkQknrdDGLu8JCyxgD/fWkzvOryZ5+YbU2Uu92g4syH
-uR1ZQWTNsFuLjTTYlo0A/2jb4BcujTD9yKLKvGdVKI6HsgT78BbjDJdJwUPsUVpI
-=0LTb
+iQJ8BAEBCABmBQJVd0I/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2b0IP/0iiu0QvZ2aAXirTN2QCQDve
+L4Pc2KQiCie2PXtVox/5jbzmWPD4QQv6SprGZKzpR1ef9FpAVYbe8fUJfgJZ2oBT
+dbYpkiOs/GL28bEcmKnjeeSWNj3smsCRfVExg8EURmcyQEFNXQiu8Fdchb1fPO2P
+siPav+WBPiAZTNsS404c/uNCEnNGM3Nb39MxKMT4y1ZZB2N1UNih0nya+g9/MQx1
+RivQKdXmrQuyI/D1/C68+w7zyGbtzVxn/hv5wfMdZEP/yK+9E3n7gGh5qsddkdjN
+qvs6E41685uRMLD3D2xlGQ0T5Q0KdQiIYkjgh71WJr6hQtkadi5vcZ1Ta5slaaDO
+RLXxPyHf5JkOgnwNE5mB+EwVcbkvcm+NSjqZu3wr1C1nmALlfpviPYRju3LwG8QS
+TKNh+AFgOWFbjhv2uV1nvZDU8msx19EjYxVMFf8jGEKag62J0vJSr3ZoTIuKVU4O
+MrmHZiKyY24cQdnACLPz65+5mAKHAA7/KK5XrA8hUEefg4rHi1EJaXaYahKkTOpV
+mpcI5NqVeMVApLUw+0As42cmCyqY6wKjMH0NBgPj+ki1aYTLxXURQHr284/KZV2i
+6Z9cDpzFiA3IIGkWmd2E37cvfB3EkfzH+Igrsz6jt6gJcvUJK5eqZNXMqrYtk3LW
+yr3duwqdJZBqAoMwk60U
+=qbOZ
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/matchbox-desktop/files/matchbox-desktop-0.9.1-dlopen.patch b/x11-wm/matchbox-desktop/files/matchbox-desktop-0.9.1-dlopen.patch
new file mode 100644
index 000000000000..3c7c7037eedf
--- /dev/null
+++ b/x11-wm/matchbox-desktop/files/matchbox-desktop-0.9.1-dlopen.patch
@@ -0,0 +1,11 @@
+diff -uarN matchbox-desktop-0.9.1.orig/configure.ac matchbox-desktop-0.9.1/configure.ac
+--- matchbox-desktop-0.9.1.orig/configure.ac	2005-01-24 09:11:02.000000000 -0500
++++ matchbox-desktop-0.9.1/configure.ac	2014-10-29 14:08:54.882668438 -0400
+@@ -12,6 +12,7 @@
+ AC_PROG_CC
+ AC_LIBTOOL_DLOPEN
+ AC_PROG_LIBTOOL
++LT_LIB_DLLOAD
+ 
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
diff --git a/x11-wm/matchbox-desktop/matchbox-desktop-0.9.1.ebuild b/x11-wm/matchbox-desktop/matchbox-desktop-0.9.1.ebuild
index 6c536ce8e087..28ffd86a55dd 100644
--- a/x11-wm/matchbox-desktop/matchbox-desktop-0.9.1.ebuild
+++ b/x11-wm/matchbox-desktop/matchbox-desktop-0.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-desktop/matchbox-desktop-0.9.1.ebuild,v 1.9 2012/06/04 00:31:01 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-desktop/matchbox-desktop-0.9.1.ebuild,v 1.10 2015/06/09 19:43:10 grknight Exp $
 
-inherit versionator
+inherit versionator autotools eutils
 
 DESCRIPTION="The Matchbox Desktop"
 HOMEPAGE="http://matchbox-project.org/"
@@ -19,6 +19,13 @@ DEPEND=">=x11-libs/libmatchbox-1.5
 RDEPEND="${DEPEND}
 	x11-wm/matchbox-common"
 
+src_unpack() {
+	unpack ${A} || die "Failed to unpack"
+	cd "${S}" || die
+	epatch "${FILESDIR}/${P}-dlopen.patch" || die "Patch failed"
+	eautoreconf || die
+}
+
 src_compile() {
 	econf	$(use_enable debug) \
 		$(use_enable startup-notification) \