Fix build for systems with external libiconv wrt #499940 by René Rhéaume, and #366885 by Leho Kraav

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 38 insertions, 11 deletions

diff --git a/x11-misc/xdg-user-dirs/ChangeLog b/x11-misc/xdg-user-dirs/ChangeLog
index 67a55581d4ab..43dcd40d1a3f 100644
--- a/x11-misc/xdg-user-dirs/ChangeLog
+++ b/x11-misc/xdg-user-dirs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xdg-user-dirs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/ChangeLog,v 1.41 2014/03/15 19:37:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/ChangeLog,v 1.42 2014/03/15 19:47:38 ssuominen Exp $
+
+  15 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/xdg-user-dirs-0.15-libiconv.patch, xdg-user-dirs-0.15.ebuild:
+  Fix build for systems with external libiconv wrt #499940 by René Rhéaume, and
+  #366885 by Leho Kraav
 
   15 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> xdg-user-dirs-0.15.ebuild:
   Add missing docbook-xml-dtd dependency wrt #492322 by Tom Nachdenk
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 910dd18acd81..945c72bb7073 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xdg-user-dirs-0.15-libiconv.patch 294 SHA256 14cab228fc00e03e87dbc0d8abaf4afb55e6b94d9b1bcb7f390552dc7ceba4d0 SHA512 7a66187e0a550b5c58695d68afd18c821e194fbd8cbf27547d13af0f4e56fe321e34b3f0c4393dd318f1709293af6529a581daf6dcfb485a646bce6b5e0cc842 WHIRLPOOL f2e68dda419d0fd3eb159667cff695b9d3c63916381c6b4c341374c656ce5eb708b3490c717959f0b0db168b32ea9816105034b651f412ee5ab3b8d38088cbd0
 DIST xdg-user-dirs-0.15.tar.gz 243747 SHA256 20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916552786 SHA512 2365003d4c116326357755dbeb462d5d7a4fd1391fe0b4ced5597db1017dff230676773aa8cd4bdd9dbb1bfb59c1c71d08ed860a047e0e9c2ab2487c814c7ca9 WHIRLPOOL 12de27ae0c386f4db740ea5104233d6782d65686fb3df74f9c516d47d253e49f41ed25b75f2bcf9667b1f8e6e6fec66030ccdc6cadb1eb6a5f1a90ab9fe12e3b
-EBUILD xdg-user-dirs-0.15.ebuild 889 SHA256 a3a85432eea6ffb459e8a583653f775b5896b702596aff8eb1e3b37a792bff85 SHA512 d9d86a896b791bc2653c997ab49463bcaa70354934ddd543a44eeb5cf42e49adc9fb67fd1813f0521c0732a8c3e168a8c806224866a9e2071dbb7d95bd82669d WHIRLPOOL b6b3e46ec0b364d3a1477d3dfc4a0c6734cfc07c2684eca7376e458ea00c5b39fe1112a51f763a14d9bccd2c322e9586bdc530f8cabd093a218a3a326085e775
-MISC ChangeLog 5422 SHA256 d0ca512eab5a72cd3a1e50b18006ad05b485d35bdf69d1806ec27b5d824eb464 SHA512 1ab8bd461b62b15949abe4bfe166049add0166326a280854457f7cf0f1950e0534ff46ca7e997b5dcebad4c9ee872c59be3237a5142cf242d06585f681725da6 WHIRLPOOL c7ed3d8dfaa0741297f0817bb32e1dd9f7d1a8559be3917fe10c287cf0cb77fa01b37e241ab428989737a826c1ec7981a377cdcb7284fe2232b29bbe725f595a
+EBUILD xdg-user-dirs-0.15.ebuild 1089 SHA256 6e51d5c7f752f6d59479b06df3e456e1b6769184e74e5ddd3f0970005a4d895a SHA512 7143db5ef645bfb2ffbe704e5481cc107f9e6cf4ceb2c096fea4c01a363ffcd851a4e13a19bc1dde0049b58d262b042361e6aaa59525c63281b8840867f6d4fc WHIRLPOOL b4382643c23b1fe5d8ffe01c94588137f0c5c9ef65808aa63e9e5f6f0007a2fa7e6a2cf86cd279162bfd11f75bd7256e0ebb16aa3a4b0aee43ef5a94a8bc293f
+MISC ChangeLog 5654 SHA256 e7a1d691d497d2898bca4bf976bc5ecb4bc9456d868952420808298d19c60248 SHA512 d6403d7f469d02e4b6f4811f95375f3aff76a58df21501feadde1358280057314a1cad87c4cc1044585116c6e69d098e648614f539564236cf1614272fbfb12f WHIRLPOOL e28f37557bcc24f42e8d4678a2186a4b9b10cf30d80b16c123100850b3e10546e76fc8506919588e9b6a6257ebe3b66368033b2a15e3df0ba1bf13477e5f08c4
 MISC metadata.xml 244 SHA256 552982cb042dce6d0051aef928f3cca7553e6d7327e0556f97f9e6e52e651b6c SHA512 9f697206cf152d13b2a3e26645959ab3353a34e4158832139689359aad999114afb8ed80e2f82464674f358434a891d74f2e94079c2c57fc7a125d17e735ff71 WHIRLPOOL 47f92e411c189c765f6665e28402aa0411ebe898b306925cf395ed23085738120fb4075682d6c86f5818de5a3d70cfeca2fda163e3eb83764ba0b4d8dce1fb04
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTJKsCAAoJEEdUh39IaPFNoqkH/0cIzq1CMqLeeSk77A+yS7O+
-i8O+/V8SUySQoyzTu/c/5CqurnK4xOcDaU75QKyAT3j7NXVGDlkxS7/a+9cH2Wwq
-MW6b3lvD808SA6rDHPlD/YeeEDcydg5uie/q5RiRdA00E3rrI3BZjZbZ8bxtP9jO
-PYOkZbMJhkhf0qjOeIuComs1UJxx1zPsMvQSbTqr3cY3EERt0q6uCiEq++y9LPHF
-mPhZBNjwmA88ygwUOYphqvqotRhofSMVZZP/H669NHHrNwa7BKW9wAZuGGiwtbRh
-HXBS/98hnUR/Pn9HizbChpPJae0F5Ip09G2tFnTMSXwP4NNj7XtmvzHlISfQuaU=
-=h7dy
+iQEcBAEBCAAGBQJTJK1sAAoJEEdUh39IaPFNqR4IAJslq7QxOgnKrvweLG9gG2kH
+wMQQh6PaqeM/XRuz0z6IywQICBWAHMPXQ2Ntun/YE2LsMx9bacxK2RQhcuIYuhyl
+uQIhnN8OyMLJw6z1ZyxGu3662XiBTK13BWybY6yCHUZ1aQ2n0Y6zE9yjOpf6VCbs
+aoVLfUJYuTs1t+nEBK5KNvil2spW2x6coBM4Nq412vXwhUp/E49ZyJ4oR5Txu9gq
+mpkbi5OmwWHdv69j/Sp//nakCdbErlEbDwearRDirtyF4vA045HNTbcFXZJQaOGh
+DIYyGtG7jRzkWNuvpXaWzQfn7q3PRY+NW31N4Ifnbnjj+teyBHjeFjBRCCSaxag=
+=RRJB
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch
new file mode 100644
index 000000000000..c193fc83447a
--- /dev/null
+++ b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/366885
+http://bugs.gentoo.org/499940
+
+--- Makefile.am
++++ Makefile.am
+@@ -16,7 +16,7 @@
+ xdgdir=$(sysconfdir)/xdg
+ xdg_DATA=user-dirs.conf user-dirs.defaults
+ 
+-libraries = $(LIBINTL)
++libraries = $(LIBINTL) $(LIBICONV)
+ 
+ bin_PROGRAMS =					\
+ 	xdg-user-dirs-update			\
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild
index 024d625f7bcc..4190e2e77531 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild,v 1.11 2014/03/15 19:37:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild,v 1.12 2014/03/15 19:47:38 ssuominen Exp $
 
 EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="A tool to help manage 'well known' user directories"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
@@ -22,3 +23,9 @@ DEPEND="app-text/docbook-xml-dtd:4.3
 PDEPEND="gtk? ( x11-misc/xdg-user-dirs-gtk )"
 
 DOCS=( AUTHORS ChangeLog NEWS )
+
+src_prepare() {
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467032
+	epatch "${FILESDIR}"/${P}-libiconv.patch
+	eautoreconf # for the above patch
+}