diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2011-02-04 19:51:04 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2011-02-04 19:51:04 +0000 |
| commit | e03a431bac7b0f34e84ccd466b91b223a8e100e5 (patch) | |
| tree | 4a2ae239286f7ba039977266d653d0a81678994b /media-libs | |
| parent | Completely remove revdep-rebuild for prefix users that are not running on AIX (diff) | |
| download | gentoo-2-e03a431bac7b0f34e84ccd466b91b223a8e100e5.tar.gz gentoo-2-e03a431bac7b0f34e84ccd466b91b223a8e100e5.tar.bz2 gentoo-2-e03a431bac7b0f34e84ccd466b91b223a8e100e5.zip | |
Add dependency on dev-java/ant-core for bug #353635. Bump to EAPI 4 and use diff friendly dependency lines.
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libbluray/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libbluray/libbluray-9999.ebuild | 49 |
2 files changed, 34 insertions, 21 deletions
diff --git a/media-libs/libbluray/ChangeLog b/media-libs/libbluray/ChangeLog index bed12ed8f554..257fef4b1546 100644 --- a/media-libs/libbluray/ChangeLog +++ b/media-libs/libbluray/ChangeLog @@ -1,6 +1,10 @@ # 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.3 2011/02/01 12:52:58 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.4 2011/02/04 19:51:04 radhermit Exp $ + + 04 Feb 2011; Tim Harder <radhermit@gentoo.org> libbluray-9999.ebuild: + Add dependency on dev-java/ant-core for bug #353635. Bump to EAPI 4 and use + diff friendly dependency lines. 01 Feb 2011; Tim Harder <radhermit@gentoo.org> +files/90libbluray, libbluray-9999.ebuild: diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild index 2346faedf870..90d457a638d4 100644 --- a/media-libs/libbluray/libbluray-9999.ebuild +++ b/media-libs/libbluray/libbluray-9999.ebuild @@ -1,8 +1,8 @@ # 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.3 2011/02/01 12:52:58 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild,v 1.4 2011/02/04 19:51:04 radhermit Exp $ -EAPI=2 +EAPI=4 inherit autotools java-pkg-opt-2 git flag-o-matic @@ -16,14 +16,25 @@ SLOT="0" KEYWORDS="" IUSE="aacs java static-libs utils xine" -COMMON_DEPEND="dev-libs/libxml2 - xine? ( media-libs/xine-lib )" -RDEPEND="${COMMON_DEPEND} +COMMON_DEPEND=" + dev-libs/libxml2 + xine? ( media-libs/xine-lib ) +" +RDEPEND=" + ${COMMON_DEPEND} aacs? ( media-video/aacskeys ) - java? ( >=virtual/jre-1.6 )" -DEPEND="${COMMON_DEPEND} - java? ( >=virtual/jdk-1.6 ) - dev-util/pkgconfig" + java? ( >=virtual/jre-1.6 ) +" +DEPEND=" + ${COMMON_DEPEND} + java? ( + >=virtual/jdk-1.6 + dev-java/ant-core + ) + dev-util/pkgconfig +" + +DOCS="doc/README README.txt TODO.txt" src_prepare() { use java && export JDK_HOME="$(java-config -g JAVA_HOME)" @@ -49,26 +60,24 @@ src_configure() { } src_compile() { - emake || die + emake if use xine; then - cd player_wrappers/xine || die - emake || die + cd player_wrappers/xine + emake fi } src_install() { - emake DESTDIR="${D}" install || die - - dodoc doc/README README.txt TODO.txt || die + default_src_install if use utils; then cd src/examples/ - dobin clpi_dump index_dump mobj_dump mpls_dump sound_dump || die + dobin clpi_dump index_dump mobj_dump mpls_dump sound_dump cd .libs/ - dobin bd_info bdsplice hdmv_test libbluray_test list_titles || die + dobin bd_info bdsplice hdmv_test libbluray_test list_titles if use java; then - dobin bdj_test || die + dobin bdj_test fi fi @@ -78,8 +87,8 @@ src_install() { fi if use xine; then - cd "${S}"/player_wrappers/xine || die - emake DESTDIR="${D}" install || die + cd "${S}"/player_wrappers/xine + emake DESTDIR="${D}" install newdoc HOWTO README.xine fi } |