kensington 15/03/18 14:18:17
Modified: designer-4.8.6-r1.ebuild designer-4.8.5.ebuild
ChangeLog
Log:
Introduce kde use flag to use phonon plugin from media-libs/phonon wrt bug
#477632.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key
0x06B1F38DCA45A1EC!)
Revision Changes Path
1.2 dev-qt/designer/designer-4.8.6-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/designer/designer-4.8.6-r1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/designer/designer-4.8.6-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/designer/designer-4.8.6-r1.ebuild?r1=1.1&r2=1.2
Index: designer-4.8.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-4.8.6-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- designer-4.8.6-r1.ebuild 15 Nov 2014 02:34:35 -0000 1.1
+++ designer-4.8.6-r1.ebuild 18 Mar 2015 14:18:17 -0000 1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-4.8.6-r1.ebuild,v
1.1 2014/11/15 02:34:35 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-4.8.6-r1.ebuild,v
1.2 2015/03/18 14:18:17 kensington Exp $
EAPI=5
@@ -15,18 +15,19 @@
fi
DESIGNER_PLUGINS="declarative phonon qt3support webkit"
-IUSE="${DESIGNER_PLUGINS}"
+IUSE="${DESIGNER_PLUGINS} kde"
DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
declarative? (
~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
- phonon? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ phonon? ( !kde? (
~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) )
qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
)
webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
+PDEPEND="phonon? ( kde? ( media-libs/phonon[designer,qt4] ) )"
QT4_TARGET_DIRECTORIES="tools/designer"
@@ -35,8 +36,10 @@
local plugin
for plugin in ${DESIGNER_PLUGINS}; do
- use ${plugin} || sed -i -e "/\<${plugin}\>/d" \
- tools/designer/src/plugins/plugins.pro || die
+ if ! use ${plugin} || ( [[ ${plugin} == phonon ]] && use kde );
then
+ sed -i -e "/\<${plugin}\>/d" \
+ tools/designer/src/plugins/plugins.pro || die
+ fi
done
}
1.12 dev-qt/designer/designer-4.8.5.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/designer/designer-4.8.5.ebuild?rev=1.12&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/designer/designer-4.8.5.ebuild?rev=1.12&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/designer/designer-4.8.5.ebuild?r1=1.11&r2=1.12
Index: designer-4.8.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-4.8.5.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- designer-4.8.5.ebuild 26 Jan 2014 11:55:27 -0000 1.11
+++ designer-4.8.5.ebuild 18 Mar 2015 14:18:17 -0000 1.12
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-4.8.5.ebuild,v
1.11 2014/01/26 11:55:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-4.8.5.ebuild,v
1.12 2015/03/18 14:18:17 kensington Exp $
EAPI=5
@@ -15,18 +15,19 @@
fi
DESIGNER_PLUGINS="declarative phonon qt3support webkit"
-IUSE="${DESIGNER_PLUGINS}"
+IUSE="${DESIGNER_PLUGINS} kde"
DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=]
~dev-qt/qtgui-${PV}[aqua=,debug=]
~dev-qt/qtscript-${PV}[aqua=,debug=]
declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=] )
- phonon? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] )
+ phonon? ( !kde? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] ) )
qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )
webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
"
RDEPEND="${DEPEND}"
+PDEPEND="phonon? ( kde? ( media-libs/phonon[designer,qt4] ) )"
pkg_setup() {
QT4_TARGET_DIRECTORIES="tools/designer"
@@ -43,8 +44,10 @@
local plugin
for plugin in ${DESIGNER_PLUGINS}; do
- use ${plugin} || sed -i -e "/\<${plugin}\>/d" \
- tools/designer/src/plugins/plugins.pro || die
+ if ! use ${plugin} || ( [[ ${plugin} == phonon ]] && use kde );
then
+ sed -i -e "/\<${plugin}\>/d" \
+ tools/designer/src/plugins/plugins.pro || die
+ fi
done
}
1.28 dev-qt/designer/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/designer/ChangeLog?rev=1.28&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/designer/ChangeLog?rev=1.28&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/designer/ChangeLog?r1=1.27&r2=1.28
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/designer/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog 8 Mar 2015 13:59:07 -0000 1.27
+++ ChangeLog 18 Mar 2015 14:18:17 -0000 1.28
@@ -1,6 +1,11 @@
# ChangeLog for dev-qt/designer
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/ChangeLog,v 1.27 2015/03/08
13:59:07 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/ChangeLog,v 1.28 2015/03/18
14:18:17 kensington Exp $
+
+ 18 Mar 2015; Michael Palimaka <[email protected]> designer-4.8.5.ebuild,
+ designer-4.8.6-r1.ebuild:
+ Introduce kde use flag to use phonon plugin from media-libs/phonon wrt bug
+ #477632.
08 Mar 2015; Davide Pesavento <[email protected]> designer-5.4.1.ebuild:
Remove all keywords from "live" branch.
