Add support for building against system expat. (bug #249625 by Diego)

(Portage version: 2.2_rc63/cvs/Linux x86_64)

3 files changed, 107 insertions, 1 deletions

diff --git a/media-libs/wxsvg/ChangeLog b/media-libs/wxsvg/ChangeLog
index 083af797b3ba..a5f2acbf242f 100644
--- a/media-libs/wxsvg/ChangeLog
+++ b/media-libs/wxsvg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/wxsvg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/ChangeLog,v 1.13 2010/02/07 09:51:24 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/ChangeLog,v 1.14 2010/02/20 05:30:58 dirtyepic Exp $
+
+*wxsvg-1.0.2-r1 (20 Feb 2010)
+
+  20 Feb 2010; Ryan Hill <dirtyepic@gentoo.org> +wxsvg-1.0.2-r1.ebuild,
+  +files/wxsvg-1.0.2-external-expat.patch:
+  Add support for building against system expat. (bug #249625 by Diego)
 
 *wxsvg-1.0.2 (07 Feb 2010)
 
diff --git a/media-libs/wxsvg/files/wxsvg-1.0.2-external-expat.patch b/media-libs/wxsvg/files/wxsvg-1.0.2-external-expat.patch
new file mode 100644
index 000000000000..22b0231f4840
--- /dev/null
+++ b/media-libs/wxsvg/files/wxsvg-1.0.2-external-expat.patch
@@ -0,0 +1,53 @@
+https://bugs.gentoo.org/249625
+https://sourceforge.net/projects/wxsvg/forums/forum/424987/topic/2875326
+
+diff --git a/configure.in b/configure.in
+index 233fc88..92a2814 100644
+--- a/configure.in
++++ b/configure.in
+@@ -17,6 +17,9 @@ AC_ARG_ENABLE(render,
+ AC_ARG_ENABLE(ffmpeg,
+  [  --enable-ffmpeg         Enable ffmpeg decoder support (default: enabled)],
+  [enable_ffmpeg=$enableval],[enable_ffmpeg=yes])
++AC_ARG_WITH(sys-expat,
++ [  --with-sys-expat        Use the system expat library (default: use bundled expat library)],
++ [], [with_sys_expat=no])
+ 
+ AC_MSG_CHECKING(for install location)
+ case "$prefix" in
+@@ -165,6 +168,15 @@ if test x$enable_ffmpeg = xyes; then
+   LIBS="$LIBS $FFMPEG_LIBS"
+ fi
+ 
++dnl check if system expat requested
++if test "x$with_sys_expat" = "xyes"; then
++  AC_CHECK_LIB([expat],[XML_ParserCreate],[SYS_EXPAT="yes"])
++  if test "x$SYS_EXPAT" = "x" ; then
++    AC_MSG_WARN([system expat library not found, will use built-in instead])
++	with_sys_expat=no
++  fi
++fi
++AM_CONDITIONAL(SYS_EXPAT, [test x$with_sys_expat = xyes])
+ 
+ dnl vars
+ AC_SUBST(LDFLAGS)
+diff --git a/src/svgxml/Makefile.am b/src/svgxml/Makefile.am
+index 28ef05c..72370ea 100644
+--- a/src/svgxml/Makefile.am
++++ b/src/svgxml/Makefile.am
+@@ -1,7 +1,15 @@
++if SYS_EXPAT
++SUBDIRS =
++else
+ SUBDIRS = expat
++endif
+ 
+ noinst_LTLIBRARIES = libwxsvgxml.la
+ libwxsvgxml_la_SOURCES = svgxml.cpp svgxmlhelpr.cpp
++if SYS_EXPAT
++libwxsvgxml_la_LIBADD = -lexpat
++else
+ libwxsvgxml_la_LIBADD = expat/libexpat.la
++endif
+ 
+ INCLUDES = -I$(top_builddir)/include/wxSVGXML
diff --git a/media-libs/wxsvg/wxsvg-1.0.2-r1.ebuild b/media-libs/wxsvg/wxsvg-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..248b07b902b4
--- /dev/null
+++ b/media-libs/wxsvg/wxsvg-1.0.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/wxsvg-1.0.2-r1.ebuild,v 1.1 2010/02/20 05:30:59 dirtyepic Exp $
+
+EAPI=2
+WX_GTK_VER="2.8"
+
+inherit autotools eutils wxwidgets
+
+MY_P=${P}_1
+
+DESCRIPTION="C++ library to create, manipulate and render SVG files."
+HOMEPAGE="http://wxsvg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="wxWinLL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND="x11-libs/wxGTK:2.8[X]
+	>=dev-libs/expat-2.0.1-r3
+	>=dev-libs/glib-2.12
+	>=dev-libs/libxml2-2.6.26
+	>=media-libs/fontconfig-2.4
+	>=media-libs/freetype-2.2.0
+	>=media-libs/libart_lgpl-2.3.17
+	>=media-video/ffmpeg-0.4.9_p20080326
+	>=x11-libs/pango-1.14.9"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-external-expat.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-sys-expat || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog TODO
+}