summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2011-08-05 22:31:56 +0000
committerTim Harder <radhermit@gentoo.org>2011-08-05 22:31:56 +0000
commitd89f15af0e2635f4aa64ad4d428c51f43c70ae30 (patch)
treedfa18773f7d695687fb4d02effc6c588eff98ac2 /media-libs/libbluray
parentRemove old ebuild. Requested by Arfrever (diff)
downloadgentoo-2-d89f15af0e2635f4aa64ad4d428c51f43c70ae30.tar.gz
gentoo-2-d89f15af0e2635f4aa64ad4d428c51f43c70ae30.tar.bz2
gentoo-2-d89f15af0e2635f4aa64ad4d428c51f43c70ae30.zip
Update live ebuild to use the git-2 eclass and new xine plugin package.
(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libbluray')
-rw-r--r--media-libs/libbluray/ChangeLog5
-rw-r--r--media-libs/libbluray/libbluray-9999.ebuild32
2 files changed, 15 insertions, 22 deletions
diff --git a/media-libs/libbluray/ChangeLog b/media-libs/libbluray/ChangeLog
index b58022500515..a02e4f300715 100644
--- a/media-libs/libbluray/ChangeLog
+++ b/media-libs/libbluray/ChangeLog
@@ -1,6 +1,9 @@
# 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.7 2011/08/05 22:13:53 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.8 2011/08/05 22:31:56 radhermit Exp $
+
+ 05 Aug 2011; Tim Harder <radhermit@gentoo.org> libbluray-9999.ebuild:
+ Update live ebuild to use the git-2 eclass and new xine plugin package.
05 Aug 2011; Tim Harder <radhermit@gentoo.org>
libbluray-0.0.1_pre20110210-r1.ebuild:
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index 90d457a638d4..951afe823e5c 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.ebuild
@@ -1,10 +1,10 @@
# 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-9999.ebuild,v 1.4 2011/02/04 19:51:04 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild,v 1.5 2011/08/05 22:31:56 radhermit Exp $
EAPI=4
-inherit autotools java-pkg-opt-2 git flag-o-matic
+inherit autotools java-pkg-opt-2 git-2 flag-o-matic
EGIT_REPO_URI="git://git.videolan.org/libbluray.git"
@@ -18,7 +18,6 @@ IUSE="aacs java static-libs utils xine"
COMMON_DEPEND="
dev-libs/libxml2
- xine? ( media-libs/xine-lib )
"
RDEPEND="
${COMMON_DEPEND}
@@ -33,8 +32,13 @@ DEPEND="
)
dev-util/pkgconfig
"
+PDEPEND="
+ xine? ( ~media-libs/libbluray-xine-${PV} )
+"
+
+REQUIRED_USE="utils? ( static-libs )"
-DOCS="doc/README README.txt TODO.txt"
+DOCS=( doc/README README.txt TODO.txt )
src_prepare() {
use java && export JDK_HOME="$(java-config -g JAVA_HOME)"
@@ -54,22 +58,12 @@ src_configure() {
econf \
$(use_enable java bdjava) \
$(use_enable static-libs static) \
- $(use_enable utils static) \
$(use_enable utils examples) \
- $myconf
-}
-
-src_compile() {
- emake
-
- if use xine; then
- cd player_wrappers/xine
- emake
- fi
+ ${myconf}
}
src_install() {
- default_src_install
+ default
if use utils; then
cd src/examples/
@@ -86,9 +80,5 @@ src_install() {
doenvd "${FILESDIR}"/90${PN}
fi
- if use xine; then
- cd "${S}"/player_wrappers/xine
- emake DESTDIR="${D}" install
- newdoc HOWTO README.xine
- fi
+ use static-libs || find "${ED}" -name '*.la' -exec rm -f '{}' +
}