Fix missing -liconv with ~x86-fbsd and keyword wrt #242812.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 38 insertions, 10 deletions

diff --git a/media-libs/exempi/ChangeLog b/media-libs/exempi/ChangeLog
index 6fb6fe8b4cbe..5c8e0c9181d6 100644
--- a/media-libs/exempi/ChangeLog
+++ b/media-libs/exempi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/exempi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/exempi/ChangeLog,v 1.18 2010/02/17 08:29:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exempi/ChangeLog,v 1.19 2010/02/17 08:45:54 ssuominen Exp $
+
+  17 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> exempi-2.1.1.ebuild,
+  +files/exempi-2.1.1-iconv.patch:
+  Fix missing -liconv with ~x86-fbsd and keyword wrt #242812.
 
 *exempi-2.1.1 (17 Feb 2010)
 
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index 92475c85c3eb..786e7703f9e9 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -1,8 +1,9 @@
 AUX exempi-1.99.9-boost.m4.BOOST_FIND_LIB.patch 1581 RMD160 db616ca5350ea5797ca5b2d2d87fcaf873d55c0a SHA1 e6c390e51e05edc791cae8c452b35c70bbbebf12 SHA256 07814bd41c67f7860080b8fc55fbed804359de2c4fbbacccd8238ee6a900e4a5
 AUX exempi-2.0.2-gcc44.patch 665 RMD160 4c2fc738732cc4a9aee84976759015e96ced0ee8 SHA1 705e6ac6cf2249570b3880c41b15037573911462 SHA256 094c18c6937842da4df0fd609533686af7852ef65211421e3ee23297dcb3ade9
+AUX exempi-2.1.1-iconv.patch 660 RMD160 f014eb227453c7e2d4a605926bbd5b7a3d372a3d SHA1 fe24ad0d9ccc3a6a21260e7d7afc0f208bdc238d SHA256 683cfc8032808e28cabb3dff3b8f4dba0d1229e8884924ddfb55ef7a01fd3316
 DIST exempi-2.0.2.tar.gz 3072078 RMD160 f8e97ae152ee8ad69ccbccdea071fa590cd73e1b SHA1 46432ccefcbf6d842afcedff22a1c24a823cb4e2 SHA256 394c90599fc2f402ce77cbff9d16da4ae284ae0070c13a37543ade68752d7975
 DIST exempi-2.1.1.tar.gz 3401564 RMD160 e79500f804e162df340e669deea620408e4926b4 SHA1 f05a4c1d609c0e3cafdf839c16ec46afae1b160d SHA256 b06b67472ff673e2d4257ae0b687ba421af1f9952428e7caead870868c2a4dd3
 EBUILD exempi-2.0.2.ebuild 1341 RMD160 6f1d2d49b24592fd1d1ef3ac1e4e651ec5871717 SHA1 b12d524fe079f5f8ae552dc5ce3d65a230ff02c1 SHA256 74ba45403fb48ca9ddb31f786d08e09dde0e48d06bd6b97b6a4586668d74d9dc
-EBUILD exempi-2.1.1.ebuild 1172 RMD160 0c199f2c3ae0d75dbfd988eb40fa8102bd03008f SHA1 45ec8c6565eaddc37d9b6e133f72291c6abc8552 SHA256 680c733559909deb0afb00718bd53e179c35051c1ff006804a375f2fc3939d27
-MISC ChangeLog 2525 RMD160 ef081c2cc121aee3be6c046cb88a9e1f058898d2 SHA1 77a5343a1dd471dd676da2b0c35c54efb8a78f9d SHA256 ed54998c7505a24cac888a39b0ebf1b8bdd4320c0c7b21c31142e1d4b95eb8c4
+EBUILD exempi-2.1.1.ebuild 1230 RMD160 c3e7baff7e839044da3430379d60a15ba18e54d5 SHA1 e662c0f2334e4a27d2d8ba396ea168754c2712e0 SHA256 667edd8e06fdc21d20fc97e2a2fc869a21d415d914c77ba584d2e29c5ad11c3f
+MISC ChangeLog 2698 RMD160 dd2b80d84d76b82c19e6e03a533c64321a8faa49 SHA1 f3e72f8e33bf45daac43794637c2f53d759a6d1f SHA256 5b0449524c75782b178e4bcc24304ea06cd5bfc429dbfdba45baf9ecadd88bea
 MISC metadata.xml 244 RMD160 244bfcdb5c3c5eab051189d8adf5e572866b8c64 SHA1 580ce8a447f3237ea98b1d289b440bc89245e89b SHA256 552982cb042dce6d0051aef928f3cca7553e6d7327e0556f97f9e6e52e651b6c
diff --git a/media-libs/exempi/exempi-2.1.1.ebuild b/media-libs/exempi/exempi-2.1.1.ebuild
index e5a28af41926..2e3944fdc565 100644
--- a/media-libs/exempi/exempi-2.1.1.ebuild
+++ b/media-libs/exempi/exempi-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/exempi/exempi-2.1.1.ebuild,v 1.1 2010/02/17 08:29:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exempi/exempi-2.1.1.ebuild,v 1.2 2010/02/17 08:45:54 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -11,20 +11,21 @@ SRC_URI="http://libopenraw.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="examples test"
 
 RDEPEND="dev-libs/expat
 	virtual/libiconv
-	sys-libs/zlib"
+	sys-libs/zlib
+	virtual/libiconv"
 DEPEND="${RDEPEND}
 	test? ( >=dev-libs/boost-1.37 )"
 
 src_prepare() {
-	if use test; then
-		epatch "${FILESDIR}/${PN}-1.99.9-boost.m4.BOOST_FIND_LIB.patch"
-		eautoreconf
-	fi
+	epatch "${FILESDIR}"/${PN}-1.99.9-boost.m4.BOOST_FIND_LIB.patch \
+		"${FILESDIR}"/${P}-iconv.patch
+	touch config.rpath
+	eautoreconf
 }
 
 src_configure() {
diff --git a/media-libs/exempi/files/exempi-2.1.1-iconv.patch b/media-libs/exempi/files/exempi-2.1.1-iconv.patch
new file mode 100644
index 000000000000..69c8196b6922
--- /dev/null
+++ b/media-libs/exempi/files/exempi-2.1.1-iconv.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/show_bug.cgi?id=242812
+
+--- configure.ac
++++ configure.ac
+@@ -104,6 +104,8 @@
+ AC_CHECK_HEADER(zlib.h, ,
+ 	 AC_MSG_ERROR([zlib headers missing]))
+ 
++AM_ICONV_LINK
++
+ dnl Blatently copied from iconv.m4 to remove the crack about libtool
+ dnl But check for constness of the iconv parameters.
+ AC_MSG_CHECKING([for iconv declaration])
+--- source/XMPFiles/Makefile.am
++++ source/XMPFiles/Makefile.am
+@@ -62,5 +62,5 @@
+ 
+ 
+ libXMPFiles_la_LIBADD = ./FileHandlers/libxmpfilehandlers.la \
+-	./FormatSupport/libformatsupport.la
++	./FormatSupport/libformatsupport.la @LTLIBICONV@
+ #libXMPFiles_la_LDFLAGS = -version-info @LIBXMPCORE_VERSION_INFO@