summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir Lamouri <volkmar@gentoo.org>2009-09-11 15:28:23 +0000
committerMounir Lamouri <volkmar@gentoo.org>2009-09-11 15:28:23 +0000
commit63043c92ff18b118858de658f92303c2648888dd (patch)
treefc030e2bc1ef5be2d882d7b8ebc5e3007bef9419 /net-libs
parentbump (diff)
downloadhistorical-63043c92ff18b118858de658f92303c2648888dd.tar.gz
historical-63043c92ff18b118858de658f92303c2648888dd.tar.bz2
historical-63043c92ff18b118858de658f92303c2648888dd.zip
Warning instead of dying when USE="-x264 x265-static"
Package-Manager: portage-14212-svn/cvs/Linux i686
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/opal/ChangeLog5
-rw-r--r--net-libs/opal/Manifest4
-rw-r--r--net-libs/opal/opal-3.6.4.ebuild6
3 files changed, 9 insertions, 6 deletions
diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index 3ebb2b445a3e..0bdeac748b5c 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-libs/opal
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.49 2009/08/25 18:50:14 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.50 2009/09/11 15:28:23 volkmar Exp $
+
+ 11 Sep 2009; Mounir Lamouri <volkmar@gentoo.org> opal-3.6.4.ebuild:
+ Warning instead of dying when USE="-x264 x265-static"
*opal-3.6.4 (25 Aug 2009)
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
index 118ec261cda9..f9f3979bb9f8 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -4,6 +4,6 @@ DIST opal-2.2.11.tar.gz 4165191 RMD160 7ef2d505cc52eca9136ca10a865c7b7f3a8dc2b5
DIST opal-3.6.4-htmldoc.tar.bz2 5844646 RMD160 0fd63fa69d443f8aa0778470d2c28d62d7351749 SHA1 42478f4ace029df1989649b3cbb9eb4a6f9baf5b SHA256 0e978f8b4175ff477491726750f615f9bfdbc05834432e88306493d2f1496c4e
DIST opal-3.6.4.tar.bz2 7059671 RMD160 c0c6aa17aef0051d0b9fb2e794c163fbabe4bac9 SHA1 65c7462a0aa58720f1c0b6a2f3347527bd9aea8d SHA256 b1fb3bad0c8581b82f0da9c69673f43ad9aed7868a7e4f2a68c6c72ed656237b
EBUILD opal-2.2.11.ebuild 2615 RMD160 5813bfa6dfec68fd1b53b0d1e27627b159b458f8 SHA1 4b3f79d487aa433eaf1eea0445cfe800fc0a0c49 SHA256 e593cb9a845b95ad728f75f0be0f906f0fad7e55fc55c061cb0dcf34f0409d80
-EBUILD opal-3.6.4.ebuild 8312 RMD160 395abceddd1c6ad1bd12a2789888aaec60db634b SHA1 07e35769cc373fa17f4eec2106d9f5207320bd93 SHA256 c7bd64490e2da8fccdfab42a770d37ff52949b1d75540d93c38595fa2760f8c2
-MISC ChangeLog 6203 RMD160 bbc1d12dea37abecac8465c890b2de0579683f4e SHA1 a20d60e940b7892bce4c3b7bb49fc7a6ed05fdbf SHA256 afa72bfc5cad09e064657489c7c2f64974ebe3bd69ec64f6843cc7c55baf21aa
+EBUILD opal-3.6.4.ebuild 8376 RMD160 8aba6b9e699cd2ec7eda3d6411ac8d22b349f257 SHA1 f03a1818ac8fb9b911c42e56e4216c43c16c1210 SHA256 527df174713a6ec1ff699b9109dcf4f2cb099b488ae1e585f88011f49a64add2
+MISC ChangeLog 6330 RMD160 633e1015177314beee87fd095a4e5d13c58d837e SHA1 5e84aad2730bb7ef71da3d76613770ebe048623b SHA256 ca28f4b8d6b3ab4f449f5e02979234bfd1acaea0334b4c6538ca2c90d9a0c9ee
MISC metadata.xml 2134 RMD160 dff91836c6fccbef35dd686578181e81968de197 SHA1 bb1bf80994438405e437af6e773cd2a3016c262a SHA256 67ed42267461216c9cc592e0629e6743f415efd20715074b170681b7404ec04b
diff --git a/net-libs/opal/opal-3.6.4.ebuild b/net-libs/opal/opal-3.6.4.ebuild
index 53018b5bf92d..969e335cc282 100644
--- a/net-libs/opal/opal-3.6.4.ebuild
+++ b/net-libs/opal/opal-3.6.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.4.ebuild,v 1.1 2009/08/25 18:50:14 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.4.ebuild,v 1.2 2009/09/11 15:28:23 volkmar Exp $
EAPI="2"
@@ -81,8 +81,8 @@ pkg_setup() {
fi
if use x264-static && ! use x264; then
- conditional_use_error_msg "x264-static" "x264"
- use_error=true
+ ewarn "You have enabled x264-static but x264 is disabled."
+ ewarn "x264-static is going to be useless if x264 is not enabled."
fi
if ${use_error}; then