summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2015-06-24 18:02:59 +0000
committerJohannes Huber <johu@gentoo.org>2015-06-24 18:02:59 +0000
commit4a480a123ff5873269417f1d72970cd0d3b9d1eb (patch)
treeb3d662f43ecf78d4cc0ee30769de9256e219ac62 /net-irc
parentStable for x86+amd64 via ALLARCHES. (diff)
downloadgentoo-2-4a480a123ff5873269417f1d72970cd0d3b9d1eb.tar.gz
gentoo-2-4a480a123ff5873269417f1d72970cd0d3b9d1eb.tar.bz2
gentoo-2-4a480a123ff5873269417f1d72970cd0d3b9d1eb.zip
Set REQUIRED_USE on phonon when kde is set, bug #553118.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xFDF4F788)
Diffstat (limited to 'net-irc')
-rw-r--r--net-irc/quassel/ChangeLog6
-rw-r--r--net-irc/quassel/quassel-0.12.2.ebuild4
-rw-r--r--net-irc/quassel/quassel-9999.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index ae485be8d99a..ded4d8a67742 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-irc/quassel
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.208 2015/06/24 07:56:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.209 2015/06/24 18:02:59 johu Exp $
+
+ 24 Jun 2015; Johannes Huber <johu@gentoo.org> quassel-0.12.2.ebuild,
+ quassel-9999.ebuild:
+ Set REQUIRED_USE on phonon when kde is set, bug #553118.
24 Jun 2015; Agostino Sarubbo <ago@gentoo.org> quassel-0.12.2.ebuild:
Stable for ppc, wrt bug #547884
diff --git a/net-irc/quassel/quassel-0.12.2.ebuild b/net-irc/quassel/quassel-0.12.2.ebuild
index 9d1ecc8f9e0d..5bc7ca93c9ea 100644
--- a/net-irc/quassel/quassel-0.12.2.ebuild
+++ b/net-irc/quassel/quassel-0.12.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.12.2.ebuild,v 1.5 2015/06/24 07:56:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.12.2.ebuild,v 1.6 2015/06/24 18:02:59 johu Exp $
EAPI=5
@@ -101,7 +101,7 @@ REQUIRED_USE="
ayatana? ( || ( X monolithic ) )
crypt? ( || ( server monolithic ) )
dbus? ( || ( X monolithic ) )
- kde? ( || ( X monolithic ) )
+ kde? ( || ( X monolithic ) phonon )
phonon? ( || ( X monolithic ) )
postgres? ( || ( server monolithic ) )
qt5? ( !ayatana )
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index a7071780a6c5..2d51d1e07369 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.83 2015/06/04 19:05:10 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.84 2015/06/24 18:02:59 johu Exp $
EAPI=5
@@ -104,7 +104,7 @@ REQUIRED_USE="
ayatana? ( || ( X monolithic ) )
crypt? ( || ( server monolithic ) )
dbus? ( || ( X monolithic ) )
- kde? ( || ( X monolithic ) )
+ kde? ( || ( X monolithic ) phonon )
phonon? ( || ( X monolithic ) )
postgres? ( || ( server monolithic ) )
qt5? ( !ayatana )