ppc64/x86 stable wrt #405661

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

3 files changed, 12 insertions, 89 deletions

diff --git a/media-libs/libbluray/ChangeLog b/media-libs/libbluray/ChangeLog
index 7b472d62229d..606e48b3c179 100644
--- a/media-libs/libbluray/ChangeLog
+++ b/media-libs/libbluray/ChangeLog
@@ -1,9 +1,17 @@
 # ChangeLog for media-libs/libbluray
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.25 2012/02/28 22:19:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.26 2012/02/29 11:21:35 ssuominen Exp $
+
+  29 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -libbluray-0.0.1_pre20110819.ebuild:
+  old
+
+  29 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
+  libbluray-0.2.1-r1.ebuild:
+  ppc64/x86 stable wrt #405661
 
   28 Feb 2012; Brent Baude <ranger@gentoo.org> libbluray-0.2.1-r1.ebuild:
-  Marking libbluray-0.2.1-r1 ppc for bug 405659
+  Marking libbluray-0.2.1-r1 ppc for bug 405661
 
   25 Feb 2012; Agostino Sarubbo <ago@gentoo.org> libbluray-0.2.1-r1.ebuild:
   Stable for amd64, wrt bug #405661
diff --git a/media-libs/libbluray/libbluray-0.0.1_pre20110819.ebuild b/media-libs/libbluray/libbluray-0.0.1_pre20110819.ebuild
deleted file mode 100644
index 9bcb60e7b4f3..000000000000
--- a/media-libs/libbluray/libbluray-0.0.1_pre20110819.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-0.0.1_pre20110819.ebuild,v 1.5 2012/01/28 04:36:13 ssuominen 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="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aacs java static-libs utils xine"
-
-COMMON_DEPEND="
-	dev-libs/libxml2
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	aacs? ( media-libs/libaacs )
-	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=( doc/README README.txt TODO.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
-
-	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 '{}' +
-}
diff --git a/media-libs/libbluray/libbluray-0.2.1-r1.ebuild b/media-libs/libbluray/libbluray-0.2.1-r1.ebuild
index dc9d33971f61..783cdc85dbe3 100644
--- a/media-libs/libbluray/libbluray-0.2.1-r1.ebuild
+++ b/media-libs/libbluray/libbluray-0.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r1.ebuild,v 1.6 2012/02/28 22:19:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-0.2.1-r1.ebuild,v 1.7 2012/02/29 11:21:35 ssuominen Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="aacs java static-libs utils +xml"
 
 COMMON_DEPEND="