media-libs/libbluray: sync release & live ebuild, bug #553780

Package-Manager: portage-2.2.26
Signed-off-by: Alexis Ballier <aballier@gentoo.org>

2 files changed, 30 insertions, 11 deletions

diff --git a/media-libs/libbluray/libbluray-0.9.1.ebuild b/media-libs/libbluray/libbluray-0.9.1.ebuild
index 805d248c84dc..7c96b472df2b 100644
--- a/media-libs/libbluray/libbluray-0.9.1.ebuild
+++ b/media-libs/libbluray/libbluray-0.9.1.ebuild
@@ -4,15 +4,24 @@
 
 EAPI=5
 
-inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal
+if [ "${PV#9999}" != "${PV}" ] ; then
+	VCSECLASS="git-r3"
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.videolan.org/libbluray.git"
+	SRC_URI=""
+else
+	VCSECLASS=""
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+fi
+
+inherit autotools ${VCSECLASS} java-pkg-opt-2 flag-o-matic eutils multilib-minimal
 
 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 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
 
 COMMON_DEPEND="
@@ -76,7 +85,7 @@ multilib_src_install() {
 	if multilib_is_native_abi && use utils; then
 		dobin index_dump mobj_dump mpls_dump
 		cd .libs/
-		dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
+		dobin index_dump mobj_dump mpls_dump bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
 		if use java; then
 			dobin bdj_test
 		fi
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index 5aae52ef6068..7c96b472df2b 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.ebuild
@@ -3,15 +3,25 @@
 # $Id$
 
 EAPI=5
-inherit autotools java-pkg-opt-2 git-r3 flag-o-matic eutils multilib-minimal
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	VCSECLASS="git-r3"
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.videolan.org/libbluray.git"
+	SRC_URI=""
+else
+	VCSECLASS=""
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+fi
+
+inherit autotools ${VCSECLASS} java-pkg-opt-2 flag-o-matic eutils multilib-minimal
 
 DESCRIPTION="Blu-ray playback libraries"
 HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-EGIT_REPO_URI="git://git.videolan.org/libbluray.git"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
 
 COMMON_DEPEND="
@@ -41,10 +51,11 @@ src_prepare() {
 		export JDK_HOME="$(java-config -g JAVA_HOME)"
 
 		# don't install a duplicate jar file
-		sed -i '/^jar_DATA/d' src/Makefile.am || die
+		sed -i '/^jar_DATA/d' Makefile.am || die
 
 		java-pkg-opt-2_src_prepare
 	fi
+
 	eautoreconf
 }
 
@@ -72,17 +83,16 @@ multilib_src_install() {
 	emake DESTDIR="${D}" install
 
 	if multilib_is_native_abi && use utils; then
-		cd src
 		dobin index_dump mobj_dump mpls_dump
 		cd .libs/
-		dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
+		dobin index_dump mobj_dump mpls_dump bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
 		if use java; then
 			dobin bdj_test
 		fi
 	fi
 
 	if multilib_is_native_abi && use java; then
-		java-pkg_dojar "${BUILD_DIR}"/src/.libs/${PN}-j2se-${PV}.jar
+		java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}-j2se-${PV}.jar
 		doenvd "${FILESDIR}"/90${PN}
 	fi
 }