Revision bump. Remove bundled tinyxml library (fixes #383123).

(Portage version: 2.2.0_alpha58/cvs/Linux x86_64)

3 files changed, 85 insertions, 1 deletions

diff --git a/media-libs/libzen/ChangeLog b/media-libs/libzen/ChangeLog
index a628592b429a..54f28de18ef0 100644
--- a/media-libs/libzen/ChangeLog
+++ b/media-libs/libzen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libzen
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/ChangeLog,v 1.17 2011/08/17 05:06:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/ChangeLog,v 1.18 2011/09/15 23:20:47 radhermit Exp $
+
+*libzen-0.4.21-r1 (15 Sep 2011)
+
+  15 Sep 2011; Tim Harder <radhermit@gentoo.org> +libzen-0.4.21-r1.ebuild,
+  +files/libzen-0.4.21-no-tinyxml.patch:
+  Revision bump. Remove bundled tinyxml library (fixes #383123).
 
   17 Aug 2011; Tim Harder <radhermit@gentoo.org> libzen-0.4.21.ebuild:
   Remove unused eutils eclass
diff --git a/media-libs/libzen/files/libzen-0.4.21-no-tinyxml.patch b/media-libs/libzen/files/libzen-0.4.21-no-tinyxml.patch
new file mode 100644
index 000000000000..c891c4b38bd1
--- /dev/null
+++ b/media-libs/libzen/files/libzen-0.4.21-no-tinyxml.patch
@@ -0,0 +1,14 @@
+--- ZenLib/Project/GNU/Library/Makefile.am.orig
++++ ZenLib/Project/GNU/Library/Makefile.am
+@@ -24,10 +24,7 @@
+                        ../../../Source/ZenLib/Format/Http/Http_Cookies.cpp \
+                        ../../../Source/ZenLib/Format/Http/Http_Handler.cpp \
+                        ../../../Source/ZenLib/Format/Http/Http_Request.cpp \
+-                       ../../../Source/ZenLib/Format/Http/Http_Utils.cpp \
+-                       ../../../Source/ZenLib/TinyXml/tinyxml.cpp \
+-                       ../../../Source/ZenLib/TinyXml/tinyxmlerror.cpp \
+-                       ../../../Source/ZenLib/TinyXml/tinyxmlparser.cpp
++                       ../../../Source/ZenLib/Format/Http/Http_Utils.cpp
+ 
+ libzen_la_LDFLAGS     = -no-undefined -version-info 0:0:0
+ 
diff --git a/media-libs/libzen/libzen-0.4.21-r1.ebuild b/media-libs/libzen/libzen-0.4.21-r1.ebuild
new file mode 100644
index 000000000000..9121cbb3fa01
--- /dev/null
+++ b/media-libs/libzen/libzen-0.4.21-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/libzen-0.4.21-r1.ebuild,v 1.1 2011/09/15 23:20:47 radhermit Exp $
+
+EAPI="4"
+
+inherit autotools multilib eutils
+
+MY_PN="ZenLib"
+DESCRIPTION="Shared library for libmediainfo and mediainfo"
+HOMEPAGE="http://sourceforge.net/projects/zenlib"
+SRC_URI="mirror://sourceforge/zenlib/${MY_PN}%20-%20Sources/${PV}/${PN}_${PV}.tar.bz2"
+
+LICENSE="as-is ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_PN}/Project/GNU/Library"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-tinyxml.patch
+	sed -i -e "s:-O2::" configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-unicode \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd "${WORKDIR}"/${MY_PN}/Source/Doc
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	default
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${S}"/${PN}.pc
+
+	for x in ./ Base64 Format/Html Format/Http HTTP_Client ; do
+		insinto /usr/include/${MY_PN}/${x}
+		doins "${WORKDIR}"/${MY_PN}/Source/${MY_PN}/${x}/*.h
+	done
+
+	dodoc "${WORKDIR}"/${MY_PN}/*.txt
+	if use doc; then
+		dohtml "${WORKDIR}"/${MY_PN}/Doc/*
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}