From: Steve Dibb <beandog@gentoo.org>
Date: Fri, 2 Dec 2011 20:04:33 +0000 (+0000)
Subject: Version bump, bug 392661
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ffe91e6706e5793a00ec65c6e87087370c7a105f;p=gentoo.git

Version bump, bug 392661

Package-Manager: portage-2.1.10.11/cvs/Linux i686
---

diff --git a/media-libs/libbluray-xine/ChangeLog b/media-libs/libbluray-xine/ChangeLog
index 9d2b73b65ae3..77c537dcde71 100644
--- a/media-libs/libbluray-xine/ChangeLog
+++ b/media-libs/libbluray-xine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libbluray-xine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray-xine/ChangeLog,v 1.7 2011/10/09 16:34:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray-xine/ChangeLog,v 1.8 2011/12/02 20:04:33 beandog Exp $
+
+*libbluray-xine-0.2.1 (02 Dec 2011)
+
+  02 Dec 2011; Steve Dibb <beandog@gentoo.org> +libbluray-xine-0.2.1.ebuild:
+  Version bump, bug 392661
 
   09 Oct 2011; Markus Meier <maekke@gentoo.org>
   libbluray-xine-0.0.1_pre20110210.ebuild:
diff --git a/media-libs/libbluray-xine/libbluray-xine-0.2.1.ebuild b/media-libs/libbluray-xine/libbluray-xine-0.2.1.ebuild
new file mode 100644
index 000000000000..f2bc3a69df50
--- /dev/null
+++ b/media-libs/libbluray-xine/libbluray-xine-0.2.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray-xine/libbluray-xine-0.2.1.ebuild,v 1.1 2011/12/02 20:04:33 beandog Exp $
+
+EAPI=4
+
+inherit toolchain-funcs
+
+MY_P="libbluray-${PV}"
+DESCRIPTION="Xine plugin for blu-ray playback libraries"
+HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
+SRC_URI="ftp://ftp.videolan.org/pub/videolan/libbluray/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	~media-libs/libbluray-${PV}
+	media-libs/xine-lib
+"
+RDEPEND="
+	${COMMON_DEPEND}
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/pkgconfig
+"
+
+DOCS=( HOWTO )
+
+S="${WORKDIR}/${MY_P}/player_wrappers/xine"
+
+src_prepare() {
+	sed -i -e "s:-O2 ::" Makefile || die
+	tc-export CC
+}
diff --git a/media-libs/libbluray/ChangeLog b/media-libs/libbluray/ChangeLog
index ad832d4beedb..32f37d8295f1 100644
--- a/media-libs/libbluray/ChangeLog
+++ b/media-libs/libbluray/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libbluray
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.13 2011/10/09 16:33:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.14 2011/12/02 20:03:08 beandog Exp $
+
+*libbluray-0.2.1 (02 Dec 2011)
+
+  02 Dec 2011; Steve Dibb <beandog@gentoo.org> +libbluray-0.2.1.ebuild:
+  Version bump, bug 392661
 
   09 Oct 2011; Markus Meier <maekke@gentoo.org>
   libbluray-0.0.1_pre20110210-r1.ebuild:
diff --git a/media-libs/libbluray/libbluray-0.2.1.ebuild b/media-libs/libbluray/libbluray-0.2.1.ebuild
new file mode 100644
index 000000000000..9abecb771bae
--- /dev/null
+++ b/media-libs/libbluray/libbluray-0.2.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-0.2.1.ebuild,v 1.1 2011/12/02 20:03:08 beandog Exp $
+
+EAPI=4
+
+inherit autotools java-pkg-opt-2 flag-o-matic
+
+DESCRIPTION="Blu-ray playback libraries"
+HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
+SRC_URI="ftp://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aacs java static-libs utils xine +xml"
+
+COMMON_DEPEND="
+	xml? ( dev-libs/libxml2 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	aacs? ( media-video/aacskeys )
+	java? ( >=virtual/jre-1.6 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	java? (
+		>=virtual/jdk-1.6
+		dev-java/ant-core
+	)
+	dev-util/pkgconfig
+"
+PDEPEND="
+	xine? ( ~media-libs/libbluray-xine-${PV} )
+"
+REQUIRED_USE="utils? ( static-libs )"
+
+DOCS=( README.txt )
+
+src_prepare() {
+	use java && export JDK_HOME="$(java-config -g JAVA_HOME)"
+	eautoreconf
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+	if use java; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		append-cflags "$(java-pkg_get-jni-cflags)"
+		myconf="--with-jdk=${JDK_HOME}"
+	fi
+
+	use xml && myconf+="--enable-libxml2"
+
+	econf \
+		--disable-debug \
+		--disable-optimizations \
+		$(use_enable java bdjava) \
+		$(use_enable static-libs static) \
+		$(use_enable utils examples) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	if use utils; then
+		cd src/examples/
+		dobin clpi_dump index_dump mobj_dump mpls_dump sound_dump
+		cd .libs/
+		dobin bd_info bdsplice hdmv_test libbluray_test list_titles
+		if use java; then
+			dobin bdj_test
+		fi
+	fi
+
+	if use java; then
+		java-pkg_dojar "${S}/src/.libs/${PN}.jar"
+		doenvd "${FILESDIR}"/90${PN}
+	fi
+
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f '{}' +
+}