From 87bd2a33118b1622a2ed639e0004506517387451 Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Fri, 5 Aug 2011 21:41:10 +0000 Subject: [PATCH] Revbump and remove old. Fix build error with xine plugin (bug #355331), set REQUIRED_USE, and remove the libtool archive when not building static libs. Based on work by Martin von Gagern. Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64 --- media-libs/libbluray/ChangeLog | 10 ++++++- media-libs/libbluray/Manifest | 20 ++++++------- ... => libbluray-0.0.1_pre20110210-r1.ebuild} | 30 +++++++------------ 3 files changed, 29 insertions(+), 31 deletions(-) rename media-libs/libbluray/{libbluray-0.0.1_pre20110210.ebuild => libbluray-0.0.1_pre20110210-r1.ebuild} (78%) diff --git a/media-libs/libbluray/ChangeLog b/media-libs/libbluray/ChangeLog index f582f0562116..5f4b669fa37f 100644 --- a/media-libs/libbluray/ChangeLog +++ b/media-libs/libbluray/ChangeLog @@ -1,6 +1,14 @@ # 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.5 2011/02/10 08:01:53 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.6 2011/08/05 21:41:09 radhermit Exp $ + +*libbluray-0.0.1_pre20110210-r1 (05 Aug 2011) + + 05 Aug 2011; Tim Harder + -libbluray-0.0.1_pre20110210.ebuild, +libbluray-0.0.1_pre20110210-r1.ebuild: + Revbump and remove old. Fix build error with xine plugin (bug #355331), set + REQUIRED_USE, and remove the libtool archive when not building static libs. + Based on work by Martin von Gagern. *libbluray-0.0.1_pre20110210 (10 Feb 2011) diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest index d84cf127e351..130f236a1d40 100644 --- a/media-libs/libbluray/Manifest +++ b/media-libs/libbluray/Manifest @@ -1,20 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX 90libbluray 54 RMD160 84db53b27b75b2517fffec8a5fe90be268fd0456 SHA1 17722372416bf85efb35ce0e2879da2e94360765 SHA256 6ecc4c3b7d343184f498e029f64ab77c6b779eda4934adef01ba6e00aa1e67bd DIST libbluray-0.0.1_pre20110210.tar.bz2 191954 RMD160 e749caebd55a94f920a916f2df4d2caa930524fc SHA1 ceb97424f46b1bdc4382b6dbed2b16fa7deefaa0 SHA256 ee31df7ef817c984548dfd788d8c2f4ba24a7c5903021e61bf1503044118f3f5 -EBUILD libbluray-0.0.1_pre20110210.ebuild 1867 RMD160 fde5c03cebb5b6a269437ce859be43d7b0301c8b SHA1 6f0ef6ddd8bc4dbc6fd8fc22223e06396cc898c0 SHA256 f3a4e59982109358b8fef769823ff448e18266dbe8f352b2ae72eac28b0acafc +EBUILD libbluray-0.0.1_pre20110210-r1.ebuild 1755 RMD160 8604c53506724b5c2618b924e3365b1b3bde4075 SHA1 bed2f90796768bb065ab89f3cae5bb4de4a5c40b SHA256 fbfc387b74bb9691a2943fb6fee81a27b067f6811a632f08ec7f7f6bfae459d5 EBUILD libbluray-9999.ebuild 1835 RMD160 da86feb1f26865a68c3054969f85814f6dfb723d SHA1 62bd8562683dc4bdd5851f6ed782f6d18a831991 SHA256 e1bb811971227d0459f79fbacd7c7bfbfcc77d6f68e460ba0ac1bf099a4ab85e -MISC ChangeLog 1174 RMD160 0a88d255ad7bc230e8d76fd4a82d27d6f9b1cef3 SHA1 120e6eda7a1a88031716df821daa706bae82cebd SHA256 c535d2abf07563e55fa928fe4b85e38e19e7794252486f2a7afc1f967f9d8083 +MISC ChangeLog 1544 RMD160 89a741055b3ecd510e7a9d27437b26d5b3f6e01c SHA1 7da2cebf59b764543de053a9ebcd8c38026679cd SHA256 fdeddd00afbeaae8ef8851edd5d82ec11a5876ede62882f26f92334d097156a6 MISC metadata.xml 527 RMD160 a44ea7636da6beaf53d2a66f25d094936f4fcd58 SHA1 53a8c209f1994ff91403b4069e3c7fa454e69274 SHA256 23c85cb76c6f4e027d6a6d32d33d5f26d02bfefa80f1a1c1b5fdc3739f25dcd4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBAgAGBQJNU5uBAAoJEEqz6FtPBkyjAcEH/1Pp6DGAg1jswJqF9XpD5jZl -3Rt1gKEr/R07T9fHjW9jwYwo0DsbcpH5uQDrT2CNfodwZaHYufsS2wnIY1jcVWzu -bDu8aA/7WbPtFqPCmuKahu2e1Q+tdCwpkQoEP9KIXl89UA0bgVYncP8XOly62r5S -zZs7caVePagiHKiO8Hzc1Nfy70Sj75RY6J5BBHccJ4fgZTwBa/M4yxTbIx/NWm7p -UCFRH4jm2DrDwMmCFRpeqE3yN61Qt+2KDye35xjDDr7F9NgTRMnohKthtig1XNEV -KEcUVo9cfWafvoaauyy1Qnwcc7f50khB/OJkv6HeayrsMYUr0TuPqpKbSNR69Eo= -=pSJM +iQEcBAEBCgAGBQJOPGN7AAoJEEqz6FtPBkyjl1QIALmDsQyL+KH8JrMp+yAOBtUL +3GVX83Id49vyNwrODZjpZuU68MdAC60hVo++F7ruSxdego9qVyetL9J4sOt1Xdji +B3NmpkxKBaKyE+XmhvI3KAtcMM62R3mS7LnEDP4scTq7M9+/6yytaHxPfbT0etuI +77l6EDpXZRnz156iEYXtptsP+tpe/HCxq3TN7K+z2NjMg9kVqKqU2Geq4+wtijb2 +C1qzlxwYmslN9kaxlzhlfAMTtfmRWHi4NbNkS10eEJRJkE4lnfg/eEZ8/R9RIdis +5ocK7kSvEi5Zd16cpKlrCOZeFe40TXrcQ4HAQ42fe/jokFtILA8ZwKVILin0Ab0= +=Rawd -----END PGP SIGNATURE----- diff --git a/media-libs/libbluray/libbluray-0.0.1_pre20110210.ebuild b/media-libs/libbluray/libbluray-0.0.1_pre20110210-r1.ebuild similarity index 78% rename from media-libs/libbluray/libbluray-0.0.1_pre20110210.ebuild rename to media-libs/libbluray/libbluray-0.0.1_pre20110210-r1.ebuild index dd76c6312612..ba63bb18dbf9 100644 --- a/media-libs/libbluray/libbluray-0.0.1_pre20110210.ebuild +++ b/media-libs/libbluray/libbluray-0.0.1_pre20110210-r1.ebuild @@ -1,6 +1,6 @@ # 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-0.0.1_pre20110210.ebuild,v 1.1 2011/02/10 08:01:53 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-0.0.1_pre20110210-r1.ebuild,v 1.1 2011/08/05 21:41:10 radhermit Exp $ EAPI=4 @@ -17,7 +17,6 @@ IUSE="aacs java static-libs utils xine" COMMON_DEPEND=" dev-libs/libxml2 - xine? ( media-libs/xine-lib ) " RDEPEND=" ${COMMON_DEPEND} @@ -32,8 +31,13 @@ DEPEND=" ) dev-util/pkgconfig " +PDEPEND=" + xine? ( media-libs/libbluray-xine ) +" + +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)" @@ -53,22 +57,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/ @@ -85,9 +79,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 '{}' + } -- 2.26.2