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

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

4 files changed, 113 insertions, 5 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/Manifest b/media-libs/wxsvg/Manifest
index 6d17b2affde2..aa1e6083b7ed 100644
--- a/media-libs/wxsvg/Manifest
+++ b/media-libs/wxsvg/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX wxsvg-1.0.2-external-expat.patch 1551 RMD160 42310541b19621b2f3f31f8be45337b3c0a40a97 SHA1 65725ad52b0a8cd3e514139630a639b48bd90f6e SHA256 d71709f3ac81aa26be0a3be5d12920ddec1db56037501be3306571efbc22d3ef
 DIST wxsvg-1.0.2_1.tar.bz2 544882 RMD160 87a8830938fd53d2e2cc6dea76360875a4e22ff9 SHA1 43b959f07a1c3cde2de958ad6c6fca95db13443d SHA256 f29bea2343d7be7a3dbdad6cb7372061dfed2b0dcf899c1305b120426e54b99d
 DIST wxsvg-1.0.tar.bz2 230705 RMD160 1cd43162fe3c86c63696404d4c92eea2287a370d SHA1 f1db01c964494eff9f58aab86d8ea1fdc33cf44d SHA256 77971b88ac54b47a9ab25b5615be6a29c021a495ca3e61a38d1839a2e589b34f
+EBUILD wxsvg-1.0.2-r1.ebuild 1109 RMD160 b746b0dc8de1ccea0bb658595a0921d883916a21 SHA1 e4ec3b71f9eb6c62faa8c0ad8b350b3ce35f0bc1 SHA256 3a0259967f71e9c5a9160f77a57667071ad36ebe2a275e2b13f6958aa935cee6
 EBUILD wxsvg-1.0.2.ebuild 915 RMD160 4c53cd18378045e85cfcf7132b5894f233f956aa SHA1 15788024e144339706ed70af72a7aef0a8ddcebb SHA256 5801d389dd240c85be22f396ec35386466f1d5eacd436f641983466bb3d71e38
 EBUILD wxsvg-1.0.ebuild 1010 RMD160 b565a0090f382a1c25aa3712da7b5108168ea54d SHA1 03a304646cfce23364fdf549a8a1fa5a66ce7caa SHA256 7549e24dc2aec12ba524d3e8f95ea783812cc71455d3eb7942dc35b691c087ab
-MISC ChangeLog 1759 RMD160 5a60c58dd5a31cf4a3dd804076de95bd5bf2f286 SHA1 01d4569f0f7ce22349e917a190cf3b182a9f3b7d SHA256 7d97e1d6aee6edf440054dfe7b5de9f1915eaf33c3c8a12eebff84d0541a19ba
+MISC ChangeLog 1978 RMD160 bcce1e37873d028f8db2ced1ace1aacf6d94c876 SHA1 230e1e7cece6b71174fcd3db4e1b2eb5c3bb9284 SHA256 bfd804613d5f3bd5c66b8bcd6d201fb5d914d8863b4b3d505cc1aff3a2fc8c50
 MISC metadata.xml 162 RMD160 c039a69ee8efb8cbbbf4b67df25a6e8506ae2610 SHA1 ef137d109c76b893201870840b179f4c42c0f3ff SHA256 fab42f6a31209847529447a2bea2b9dd746521fe5d59d967470736120712f093
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAktujaoACgkQiqiDRvmkBmKfPgCg3H+CgRp0V1HAlYuyQTJweUhD
-b7IAoNpDu/Y2Mkr3oI6wzrMb7vMabtMk
-=1SFU
+iEYEARECAAYFAkt/dBkACgkQiqiDRvmkBmJNhgCgrKQX6aBWKhhhHTlJpfgIfrs1
+6x4Anjl33Je7OI3gWLUaCn/D6qiwJagh
+=RRTg
 -----END PGP SIGNATURE-----
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
+}