Version bump and update live ebuild.

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 137 insertions, 18 deletions

diff --git a/media-libs/libbluray/ChangeLog b/media-libs/libbluray/ChangeLog
index d179c1ac2708..cd9c8eea2218 100644
--- a/media-libs/libbluray/ChangeLog
+++ b/media-libs/libbluray/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libbluray
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.51 2013/09/22 13:59:37 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.52 2013/09/23 20:00:32 radhermit Exp $
+
+*libbluray-0.4.0 (23 Sep 2013)
+
+  23 Sep 2013; Tim Harder <radhermit@gentoo.org> +libbluray-0.4.0.ebuild,
+  libbluray-9999.ebuild:
+  Version bump and update live ebuild.
 
   22 Sep 2013; Luca Barbato <lu_zero@gentoo.org> libbluray-0.3.0-r1.ebuild,
   libbluray-9999.ebuild:
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index a8a1d4805d6e..679dd6972dbd 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,11 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 90libbluray 54 SHA256 6ecc4c3b7d343184f498e029f64ab77c6b779eda4934adef01ba6e00aa1e67bd SHA512 25b06f37e4ffc103eb28ebe26644cc9111f6dffed89e12488761e05e83a0c1719b4ffc1919f7b318d91b3797a9708b207c87b6c59dc7f77d1035b72a2b9fef7c WHIRLPOOL 3d1965aaabb3ae3cc7550d17849d94246ed9ec9706ef84ba2d44a88d390192b778911cb96b178963dc26c03be3112670167aecb476cc086961144b56d22fc368
 DIST libbluray-0.2.2.tar.bz2 456025 SHA256 46fa6ff8b18b66cb478a081981a61230fd3909e1a867eaf81325569224da7173 SHA512 a27eaa929ef05c544beb966a24dfc5425546d6035bfb3e86dc60987b8a4761031ce27c3836a64f71cc76b5308c3cd75efb3bc1f238185819385477e64883888a WHIRLPOOL 76d4b8956559d588558bb0fe68cbbbd2db3161204ebd290edaa843942dcf155fd5ccbac20acb584ccd7577ac708db9f7d47251c45d1146d0d2955ffb8a0a8d8d
 DIST libbluray-0.2.3.tar.bz2 465239 SHA256 2c65cfb02aeec31721f9ea65ee2c085a9bfe163e99dd01b52ccb3f53ba205eea SHA512 b84fd172523facb207134bb1fee09c7f65914d22f6120fbfd6f312f0435229f3b110e8cc8ea121159929cda3760cfac4b52f84de39d0fb976f8c88d1f7e6d278 WHIRLPOOL ab73603cfdb63be9920ba6099651ed8e60d14f642dd761e6c7b712f3585cb299ab988067f7126ef164ee57b4fabf64e3ead3dedbbdc45d0dc21081cb920cb577
 DIST libbluray-0.3.0-java.patch.bz2 16613 SHA256 491d510330aa0caa4c871ca4c740a6cbb7a0dfac034a503fd4ec7ecb7d0538ea SHA512 8019f76a12d2813e96ca1b0e44a274814ec16d6ea7d921fd8aba4622b27f23d4d2fc2079b51aa7c7750fb6ef408d360c5180c74affc84511520e655f9905504a WHIRLPOOL d47dcc2893c70e49a3e4b6c45fd4915e395d803ad8ce222cf9f72a46535dea2f4e7863d385ece39b3d02aadfd6fdbf8d29b9e63d50c09521544155a34c2ec467
 DIST libbluray-0.3.0.tar.bz2 510993 SHA256 dc73ad618052ddd2d72bb847c8e5b9a1c9175db7b18d0456b21f484836c30038 SHA512 96eedf23ff756e97fa64d9624a49608daccbac169714b9b231a284ed4eb63c77ee2ecbdfc42c311781571146cfa0fe340854ac831d3fe1312131e1742a4a7b02 WHIRLPOOL 524eb047f3d1995820282b89ea1e63ff88868b3d1cfaa7904da61b544e0127d9421ee158e0f6387a0bed8f88bb82dc85e1bb4f2926ed690e074a499ce5579305
+DIST libbluray-0.4.0.tar.bz2 549758 SHA256 63a3218d69f179f4834ef3b48bfa95268ad62c302ff38bfc052e2fc6916ae3f8 SHA512 7f9a7c017c400b7d4290635860a8440110a91dcf21966fd0352ecc212b9ff579d6a5c7a8adc729904540120916c249b90f58adee023416c60c210434dff73df5 WHIRLPOOL 9f3fc35a1456d82dfb238fc4751a02be5b0f98c3976676c54ac3018b25a85582a47dbea66b3478b1a2705e9d36609bf9eebe1fa5dbeccb52364794b7171b04e8
 EBUILD libbluray-0.2.2.ebuild 1818 SHA256 bbddc7d214bee10b4aaa23d5ca6eac5a67dba8f04707d1eb4eeeb8f89bc94732 SHA512 a845108d968d231bc9facf20be72385eafd9172846b66a7617ffda56fe96cacebc29cea1eea662af9f437124eddb9fd39bf2cefecf9c6ffaa9a245ec98a440ad WHIRLPOOL d9edc8e66d7623190829efa0c569792bee0a7431e8f28af5b5ad69568664fecc6e565ee1887f92a2b7acabbd8ac84d61277c049bb076a1967b361081e36249c0
 EBUILD libbluray-0.2.3.ebuild 1781 SHA256 a6345257432fd5f7c26d792ca80c3c1dc1ba69ad8ff37d15808c772088d0c9bd SHA512 ec1beb8860520451bc2f53cf54ba5673254b78eb63b409de2bab5e1b82807b953d9ceaf793c1bd3080f9afe4419117d27d6253930aa91d5ffa3ca412ca611a39 WHIRLPOOL e52d01ace947b9c1e9ce3cbe2cf5e03383fc8ff7d55afebbc690c15126fba9104da71b18c0d4dc8c04270c8097e3b370fb50919a81fd9df51faf5d096761a090
 EBUILD libbluray-0.3.0-r1.ebuild 2097 SHA256 b313d26c6714d86ddf66465ca3679d8eba593b5d6d292a042da9c2d94fd7f13b SHA512 9373427acd339e5872f5ffa8c167342b0fa59ceaa5660ee675163f3d4fceac06553cb31e3bc9c381081c63976a1d5443d2fe99971f95400a6da7a2392622fc1d WHIRLPOOL c1f0edcedae1f6094039f3256f1f257ca745f853d9f063668067afab2c01c064ae95e7b73bfb972330ac16e2fec0f232f50c529d39c2ecacbff347481ce78ad1
-EBUILD libbluray-9999.ebuild 1684 SHA256 04077c159f213b958fefd7e04b986889c86a10adc702a6bbffcd1a07e8f6ed4f SHA512 991893de9f76cc48bb1fe940ee1972294aa617198f8495097367586e5d966dd9e14b7395ad29c8fa1e0adb43975dccce2623bdcb8167a037856a513658fc73d7 WHIRLPOOL c9e954863dcf1b8c0f976f812c797eb9676dccee30899930c82cbe3ea9fb72f2085d2f26cd2281a3b800236c34364953a3f18c9f4e471e130f5d6d9b551120eb
-MISC ChangeLog 7967 SHA256 a09fab4f5478fbb95ff7b5c0d3062b580c61d6766f8d423aa2b724c2a2789329 SHA512 1d8456feb5b9ea4b2594ef6084b8896a76dd24735e3714f37fbffe818870a96c026750e489ab1fcef63ce19d312462086e230c09cb1719362e4d8639152007dc WHIRLPOOL 66bea6401c74348222c05eca06a746761d2554f37a7c6f562360ed0a470d9d1a0b3dacc379edbc7dcd6a02b55dd743f985511b908369865ae811244b654847a8
+EBUILD libbluray-0.4.0.ebuild 1917 SHA256 d38732575699b2ddc59791a35d03daa3c5944c211b0e206d79cfb661590b90ca SHA512 31de00df5d4c0f0cece8d34d217694b08032c8466b0d94a66ca45d09261160d8eb3451f7df2ea1d0b542ac4794dfc7492afa20cad4420d2560c4d08244f2d219 WHIRLPOOL 248f9c67cbb4aefaf94a656fb7f540510dffe0548c999bd09749e7e40560befea1a7f666e7a01982204058d0c44b265fa48f4dc4475e56365134627187735cbe
+EBUILD libbluray-9999.ebuild 1848 SHA256 10a9a0fd2accf55f4808fc08032aa301f48e02f0c9fd420222dfd08723234a5c SHA512 a6d93f9782719916593c2432efca16e91f6b11bdfdf462e710e8b7385de16f6b24387fafbccb340713b18399324fe0561eb34cd41d2d025dce02fc8c4e99d4f7 WHIRLPOOL 6aad6128a6b586a37de03cb2c2e3864fe0b7b6d2da847f4b4b4b44250c090c5750b1184542117867d97af65fb9151a05dad86e5eadb1afc60a1b5bc030448a6a
+MISC ChangeLog 8140 SHA256 935424753a65f0ef2bebf9fc8941b4ec6e02104b1e88226b32c94d3a79a8b217 SHA512 c8bd9d7cbe09d4316c489284948037feb8017148ff0cfc14c301fb7fad65a43d021733aac787391676cc149f771f6238f199c95c36171b7a70161b0611f52ae4 WHIRLPOOL 763f686f2f298c5c83e292657fc1268a05ab127d26127d718799feb064163b8417517c15e68c9d9c11c94adee8280f48ed2289bd72f28ca09ab9f225c50cd198
 MISC metadata.xml 365 SHA256 1e26491ee822ce3964caae3db5ea83b2461ac796acef0fcac546f58783ed21a4 SHA512 4328892ef4f4604340f03c55fb55aec4e4b5c1bf50f777b5746bca2ac7431d74ff387137040246f4c0f518538b7a170471e82b6673aa159fdf7f26b19f29c398 WHIRLPOOL 973b6892d3b3f16fd0c2774edd7091665c7d3574a99af6b9d7642292e4dee8fbbf100fb027613b320c8629b4b5d14190c65b3e6db2566b85d2fcad79f28d824d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJSQJ3kAAoJEEqz6FtPBkyjpWkH/jQg5M3XEzX0hJacwKzl/TkH
+8wsLNzrkbbglAsxVhLrTy3I1knRWcwiJwnMz6a4tMF6mc79uyFWewM1DT2Tchoo9
+UfJxTjjBezpXWuz/4Pisn/H6lfFGhHACIHg01yk59IM3TakA7RNHJ8OaOmae5xqD
+QcVG15iO9BWIwlFF9gJe43zlodKadDxKPpAUwkXOUGVRshM1sHJhAvW+51xiXX/n
+Zi3LW2l4DLrqu+GGQlIfVTADkN+ABwpRKq2icmSO4kr7WMZwzvU1KUrDv4qTqA+R
+8UNnL7UQibKMQVNBKcCUzN16FK6wAb8Uv0E+SU/pQzLX3hr9Da6EaDP3IpYjT3o=
+=iFKz
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libbluray/libbluray-0.4.0.ebuild b/media-libs/libbluray/libbluray-0.4.0.ebuild
new file mode 100644
index 000000000000..03cbbd6b1cb9
--- /dev/null
+++ b/media-libs/libbluray/libbluray-0.4.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-0.4.0.ebuild,v 1.1 2013/09/23 20:00:32 radhermit Exp $
+
+EAPI=5
+
+inherit autotools java-pkg-opt-2 flag-o-matic eutils
+
+DESCRIPTION="Blu-ray playback libraries"
+HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
+SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="aacs java static-libs +truetype utils +xml"
+
+COMMON_DEPEND="
+	xml? ( dev-libs/libxml2 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	aacs? ( media-libs/libaacs )
+	java? (
+		truetype? ( media-libs/freetype:2 )
+		>=virtual/jre-1.6
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	java? (
+		truetype? ( media-libs/freetype:2 )
+		>=virtual/jdk-1.6
+		dev-java/ant-core
+	)
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog README.txt )
+
+src_prepare() {
+	if use java ; then
+		export JDK_HOME="$(java-config -g JAVA_HOME)"
+
+		# don't install a duplicate jar file
+		sed -i '/^jar_DATA/d' src/Makefile.am || die
+
+		eautoreconf
+
+		java-pkg-opt-2_src_prepare
+	fi
+}
+
+src_configure() {
+	local myconf
+	if use java; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		append-cflags "$(java-pkg_get-jni-cflags)"
+		myconf="$(use_with truetype freetype)"
+	fi
+
+	econf \
+		--disable-optimizations \
+		$(use_enable utils examples) \
+		$(use_enable java bdjava) \
+		$(use_enable static-libs static) \
+		$(use_with xml libxml2) \
+		${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
+
+	prune_libtool_files
+}
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index 28121eeb86df..75d3636d618b 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild,v 1.12 2013/09/22 13:59:37 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild,v 1.13 2013/09/23 20:00:32 radhermit Exp $
 
-EAPI=4
+EAPI=5
 
-inherit autotools java-pkg-opt-2 git-2 flag-o-matic eutils
+inherit autotools java-pkg-opt-2 git-r3 flag-o-matic eutils
 
 EGIT_REPO_URI="git://git.videolan.org/libbluray.git"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="aacs java static-libs utils +xml"
+IUSE="aacs java static-libs +truetype utils +xml"
 
 COMMON_DEPEND="
 	xml? ( dev-libs/libxml2 )
@@ -22,11 +22,15 @@ COMMON_DEPEND="
 RDEPEND="
 	${COMMON_DEPEND}
 	aacs? ( media-libs/libaacs )
-	java? ( >=virtual/jre-1.6 )
+	java? (
+		truetype? ( media-libs/freetype:2 )
+		>=virtual/jre-1.6
+	)
 "
 DEPEND="
 	${COMMON_DEPEND}
 	java? (
+		truetype? ( media-libs/freetype:2 )
 		>=virtual/jdk-1.6
 		dev-java/ant-core
 	)
@@ -36,28 +40,31 @@ DEPEND="
 DOCS=( ChangeLog README.txt )
 
 src_prepare() {
-	use java && export JDK_HOME="$(java-config -g JAVA_HOME)"
-	eautoreconf
+	if use java ; then
+		export JDK_HOME="$(java-config -g JAVA_HOME)"
 
-	java-pkg-opt-2_src_prepare
+		# don't install a duplicate jar file
+		sed -i '/^jar_DATA/d' src/Makefile.am || die
+
+		java-pkg-opt-2_src_prepare
+	fi
+	eautoreconf
 }
 
 src_configure() {
-	local myconf=""
+	local myconf
 	if use java; then
 		export JAVACFLAGS="$(java-pkg_javac-args)"
 		append-cflags "$(java-pkg_get-jni-cflags)"
-		myconf="--with-jdk=${JDK_HOME}"
+		myconf="$(use_with truetype freetype)"
 	fi
 
-	use xml && myconf+=" --enable-libxml2"
-
 	econf \
-		--disable-debug \
 		--disable-optimizations \
+		$(use_enable utils examples) \
 		$(use_enable java bdjava) \
 		$(use_enable static-libs static) \
-		$(use_enable utils examples) \
+		$(use_with xml libxml2) \
 		${myconf}
 }
 
@@ -75,7 +82,7 @@ src_install() {
 	fi
 
 	if use java; then
-		java-pkg_dojar "${S}/src/.libs/${PN}.jar"
+		java-pkg_dojar "${S}"/src/.libs/${PN}.jar
 		doenvd "${FILESDIR}"/90${PN}
 	fi