Version bump.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 184 insertions, 4 deletions

diff --git a/media-libs/libmediainfo/ChangeLog b/media-libs/libmediainfo/ChangeLog
index ae06cc90c6cd..92b9af0f5e1f 100644
--- a/media-libs/libmediainfo/ChangeLog
+++ b/media-libs/libmediainfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libmediainfo
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.36 2011/12/21 20:17:43 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.37 2012/02/04 23:25:35 radhermit Exp $
+
+*libmediainfo-0.7.53 (04 Feb 2012)
+
+  04 Feb 2012; Tim Harder <radhermit@gentoo.org> +libmediainfo-0.7.53.ebuild,
+  +files/libmediainfo-0.7.53-system-tinyxml.patch:
+  Version bump.
 
 *libmediainfo-0.7.52 (21 Dec 2011)
 
diff --git a/media-libs/libmediainfo/files/libmediainfo-0.7.53-system-tinyxml.patch b/media-libs/libmediainfo/files/libmediainfo-0.7.53-system-tinyxml.patch
new file mode 100644
index 000000000000..d996702d6883
--- /dev/null
+++ b/media-libs/libmediainfo/files/libmediainfo-0.7.53-system-tinyxml.patch
@@ -0,0 +1,23 @@
+--- MediaInfoLib/Project/GNU/Library/configure.ac.orig
++++ MediaInfoLib/Project/GNU/Library/configure.ac
+@@ -521,16 +521,10 @@
+ dnl libtinyxml
+ dnl
+ if test "$with_libtinyxml" = "yes"; then
+-	if pkg-config --exists tinyxml; then
+-		CXXFLAGS="$CXXFLAGS $(pkg-config --cflags tinyxml)"
+-		MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags tinyxml)"
+-		MediaInfoLib_LIBS="$MediaInfoLib_LIBS $(pkg-config --libs tinyxml)"
+-		MediaInfoLib_Requires="$MediaInfoLib_Requires tinyxml"
+-		using_libtinyxml="system"
+-		AM_CONDITIONAL(COMPILE_TINYXML, false)
+-	else
+-		AC_MSG_ERROR([libtinyxml is not found, please install development package of libtinyxml])
+-	fi
++	LIBS="$LIBS -ltinyxml"
++	MediaInfoLib_LIBS="$MediaInfoLib_LIBS -ltinyxml"
++	using_libtinyxml="system"
++	AM_CONDITIONAL(COMPILE_TINYXML, false)
+ else
+ 	CXXFLAGS="$CXXFLAGS -I../../../Source/ThirdParty/tinyxml"
+ 	using_libtinyxml="internal"
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.53.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.53.ebuild
new file mode 100644
index 000000000000..4451b8efd04a
--- /dev/null
+++ b/media-libs/libmediainfo/libmediainfo-0.7.53.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.53.ebuild,v 1.1 2012/02/04 23:25:35 radhermit Exp $
+
+EAPI="4"
+
+inherit autotools multilib flag-o-matic eutils
+
+MY_PN="MediaInfo"
+DESCRIPTION="MediaInfo libraries"
+HOMEPAGE="http://mediainfo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mediainfo/source/${PN}/${PV}/${PN}_${PV}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl doc mms static-libs"
+
+RDEPEND="sys-libs/zlib
+	>=dev-libs/tinyxml-2.6.2[stl]
+	>=media-libs/libzen-0.4.24[static-libs=]
+	curl? ( net-misc/curl )
+	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_PN}Lib/Project/GNU/Library"
+
+src_prepare() {
+	pushd "${WORKDIR}"/${MY_PN}Lib > /dev/null
+	epatch "${FILESDIR}"/${P}-system-tinyxml.patch
+	popd > /dev/null
+
+	# Don't force -O2 by default
+	sed -i -e "s:-O2::" configure.ac
+
+	append-flags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
+	append-flags -DTIXML_USE_STL
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--with-libtinyxml \
+		$(use_with curl libcurl) \
+		$(use_with mms libmms) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs staticlibs)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd "${WORKDIR}/${MY_PN}Lib/Source/Doc"
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	default
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${S}"/${PN}.pc
+
+	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
+		insinto /usr/include/${MY_PN}/${x}
+		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
+	done
+
+	insinto /usr/include/${MY_PN}DLL
+	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
+
+	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
+	if use doc; then
+		dohtml -r "${WORKDIR}"/${MY_PN}Lib/Doc/*
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/media-libs/libzen/ChangeLog b/media-libs/libzen/ChangeLog
index 1fcd37e2e52c..eab11c3fa0e0 100644
--- a/media-libs/libzen/ChangeLog
+++ b/media-libs/libzen/ChangeLog
@@ -1,6 +1,11 @@
 # 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.29 2011/12/15 13:21:44 ago Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/ChangeLog,v 1.30 2012/02/04 23:22:22 radhermit Exp $
+
+*libzen-0.4.24 (04 Feb 2012)
+
+  04 Feb 2012; Tim Harder <radhermit@gentoo.org> +libzen-0.4.24.ebuild:
+  Version bump.
 
   15 Dec 2011; Agostino Sarubbo <ago@gentoo.org> libzen-0.4.23.ebuild:
   Stable for AMD64, wrt bug #394617
diff --git a/media-libs/libzen/libzen-0.4.24.ebuild b/media-libs/libzen/libzen-0.4.24.ebuild
new file mode 100644
index 000000000000..844ded1ebde3
--- /dev/null
+++ b/media-libs/libzen/libzen-0.4.24.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/libzen-0.4.24.ebuild,v 1.1 2012/02/04 23:22:22 radhermit Exp $
+
+EAPI="4"
+
+inherit autotools-utils multilib
+
+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"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	autotools-utils_src_prepare
+	sed -i -e "s:-O2::" configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-unicode
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use doc ; then
+		cd "${WORKDIR}"/${MY_PN}/Source/Doc
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${AUTOTOOLS_BUILD_DIR}"/${PN}.pc
+
+	for x in ./ 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}/History.txt
+	if use doc ; then
+		dohtml "${WORKDIR}"/${MY_PN}/Doc/*
+	fi
+}