aballier 14/04/11 05:37:21 Modified: ChangeLog libbluray-9999.ebuild Added: libbluray-0.5.0-r1.ebuild Log: go multilib (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path 1.55 media-libs/libbluray/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/ChangeLog?rev=1.55&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/ChangeLog?rev=1.55&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/ChangeLog?r1=1.54&r2=1.55 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- ChangeLog 22 Dec 2013 11:03:46 -0000 1.54 +++ ChangeLog 11 Apr 2014 05:37:20 -0000 1.55 @@ -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.54 2013/12/22 11:03:46 radhermit Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.55 2014/04/11 05:37:20 aballier Exp $ + +*libbluray-0.5.0-r1 (11 Apr 2014) + + 11 Apr 2014; Alexis Ballier <aball...@gentoo.org> +libbluray-0.5.0-r1.ebuild, + libbluray-9999.ebuild: + go multilib *libbluray-0.5.0 (22 Dec 2013) 1.15 media-libs/libbluray/libbluray-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild?rev=1.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild?r1=1.14&r2=1.15 Index: libbluray-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libbluray-9999.ebuild 22 Dec 2013 11:03:46 -0000 1.14 +++ libbluray-9999.ebuild 11 Apr 2014 05:37:20 -0000 1.15 @@ -1,11 +1,10 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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.14 2013/12/22 11:03:46 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild,v 1.15 2014/04/11 05:37:20 aballier Exp $ EAPI=5 -inherit autotools java-pkg-opt-2 git-r3 flag-o-matic eutils - +inherit autotools java-pkg-opt-2 git-r3 flag-o-matic eutils multilib-minimal EGIT_REPO_URI="git://git.videolan.org/libbluray.git" DESCRIPTION="Blu-ray playback libraries" @@ -17,20 +16,17 @@ IUSE="aacs java static-libs +truetype utils +xml" COMMON_DEPEND=" - xml? ( dev-libs/libxml2 ) + xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) + truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] ) " RDEPEND=" ${COMMON_DEPEND} - aacs? ( media-libs/libaacs ) - java? ( - truetype? ( media-libs/freetype:2 ) - >=virtual/jre-1.6 - ) + aacs? ( media-libs/libaacs[${MULTILIB_USEDEP}] ) + java? ( >=virtual/jre-1.6 ) " DEPEND=" ${COMMON_DEPEND} java? ( - truetype? ( media-libs/freetype:2 ) >=virtual/jdk-1.6 dev-java/ant-core ) @@ -51,27 +47,29 @@ eautoreconf } -src_configure() { +multilib_src_configure() { local myconf - if use java; then + if multilib_is_native_abi && use java; then export JAVACFLAGS="$(java-pkg_javac-args)" append-cflags "$(java-pkg_get-jni-cflags)" - myconf="$(use_with truetype freetype)" + myconf="--enable-bdjava" + else + myconf="--disable-bdjava" fi - econf \ + ECONF_SOURCE="${S}" econf \ --disable-optimizations \ - $(use_enable utils examples) \ - $(use_enable java bdjava) \ + $(multilib_build_binaries && use_enable utils examples || echo "--disable-examples") \ + $(use_with truetype freetype) \ $(use_enable static-libs static) \ $(use_with xml libxml2) \ ${myconf} } -src_install() { - default +multilib_src_install() { + emake DESTDIR="${D}" install - if use utils; then + if multilib_build_binaries && use utils; then cd src dobin index_dump mobj_dump mpls_dump cd .libs/ @@ -81,10 +79,13 @@ fi fi - if use java; then - java-pkg_dojar "${S}"/src/.libs/${PN}.jar + if multilib_is_native_abi && use java; then + java-pkg_dojar "${BUILD_DIR}"/src/.libs/${PN}.jar doenvd "${FILESDIR}"/90${PN} fi +} +multilib_src_install_all() { + einstalldocs prune_libtool_files } 1.1 media-libs/libbluray/libbluray-0.5.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/libbluray-0.5.0-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/libbluray-0.5.0-r1.ebuild?rev=1.1&content-type=text/plain Index: libbluray-0.5.0-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-0.5.0-r1.ebuild,v 1.1 2014/04/11 05:37:20 aballier Exp $ EAPI=5 inherit autotools 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" IUSE="aacs java static-libs +truetype utils +xml" COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] ) " RDEPEND=" ${COMMON_DEPEND} aacs? ( media-libs/libaacs[${MULTILIB_USEDEP}] ) java? ( >=virtual/jre-1.6 ) " DEPEND=" ${COMMON_DEPEND} java? ( >=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 } multilib_src_configure() { local myconf if multilib_is_native_abi && use java; then export JAVACFLAGS="$(java-pkg_javac-args)" append-cflags "$(java-pkg_get-jni-cflags)" myconf="--enable-bdjava" else myconf="--disable-bdjava" fi ECONF_SOURCE="${S}" econf \ --disable-optimizations \ $(multilib_build_binaries && use_enable utils examples || echo "--disable-examples") \ $(use_with truetype freetype) \ $(use_enable static-libs static) \ $(use_with xml libxml2) \ ${myconf} } multilib_src_install() { emake DESTDIR="${D}" install if multilib_build_binaries && 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 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}.jar doenvd "${FILESDIR}"/90${PN} fi } multilib_src_install_all() { einstalldocs prune_libtool_files }
