diff options
Diffstat (limited to 'media-libs/exempi')
| -rw-r--r-- | media-libs/exempi/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/exempi/exempi-2.1.1.ebuild | 15 | ||||
| -rw-r--r-- | media-libs/exempi/files/exempi-2.1.1-iconv.patch | 22 |
3 files changed, 35 insertions, 8 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/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@ |