[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 8c2344928db26ad95241c1ade664570a5dee7ff6 Author: Johannes Huber gentoo org> AuthorDate: Sat May 24 22:43:18 2014 + Commit: Johannes Huber gentoo org> CommitDate: Sat May 24 22:48:21 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8c234492 [kde-frameworks/kf-env] Version bump * exports Qt5 bin path Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/{kf-env-1.ebuild => kf-env-2.ebuild} | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/kf-env/kf-env-1.ebuild b/kde-frameworks/kf-env/kf-env-2.ebuild similarity index 83% rename from kde-frameworks/kf-env/kf-env-1.ebuild rename to kde-frameworks/kf-env/kf-env-2.ebuild index 616c235..ebca79b 100644 --- a/kde-frameworks/kf-env/kf-env-1.ebuild +++ b/kde-frameworks/kf-env/kf-env-2.ebuild @@ -34,8 +34,11 @@ src_install() { # higher number to be sure not to kill kde4 env local envfile="${T}/78kf" local libdir="${EPREFIX}/usr/$(get_libdir)" + local qt5bin="${libdir}/qt5/bin" - echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" > ${envfile} + echo "PATH=${qt5bin}" > ${envfile} + echo "ROOTPATH=${qt5bin}" >> ${envfile} + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile}
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: dd4a536dcdac0692789efd0370b33ac393d9e672 Author: Johannes Huber gentoo org> AuthorDate: Sun Apr 6 20:11:37 2014 + Commit: Johannes Huber gentoo org> CommitDate: Sun Apr 6 20:12:55 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dd4a536d [kde-frameworks/kf-env] New package Installs environment file for all kf based applications/window manager/desktop environments. The environment file is named 78kf and installed to /etc/env.d/. It has a higher number than KDE SC 4 based env file from kde-base/kde-env. This should guarantee that old QT_PLUGIN_PATH is not overridden. This needs to be tested. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-1.ebuild | 45 +++ kde-frameworks/kf-env/metadata.xml| 5 2 files changed, 50 insertions(+) diff --git a/kde-frameworks/kf-env/kf-env-1.ebuild b/kde-frameworks/kf-env/kf-env-1.ebuild new file mode 100644 index 000..616c235 --- /dev/null +++ b/kde-frameworks/kf-env/kf-env-1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit multilib + +DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" +HOMEPAGE="http://community.kde.org/Frameworks"; +SRC_URI="" + +LICENSE="GPL-2" +SLOT="5" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + x11-misc/xdg-utils +" + +S=${WORKDIR} + +src_unpack() { :; } + +src_prepare() { :; } + +pkg_preinst() { :; } + +src_install() { + einfo "Installing environment file..." + + # higher number to be sure not to kill kde4 env + local envfile="${T}/78kf" + local libdir="${EPREFIX}/usr/$(get_libdir)" + + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" > ${envfile} + echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} + echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} + echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile} + doenvd ${envfile} +} + +src_test() { :; } diff --git a/kde-frameworks/kf-env/metadata.xml b/kde-frameworks/kf-env/metadata.xml new file mode 100644 index 000..a23f444 --- /dev/null +++ b/kde-frameworks/kf-env/metadata.xml @@ -0,0 +1,5 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + kde +
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 7156b91e5c1a70b629430a5dc6ae551ba74597b7 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 2 12:56:40 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 2 12:56:40 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7156b91e [kde-frameworks/kf-env] Avoid adding Qt5 bin dir to PATH wrt bug #523314. The only known consumer was removed in ef689c09fe2160e891269f9644e21010d2287cc2. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 6 -- 1 file changed, 6 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index d5e6bc9..1ae7664 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -4,8 +4,6 @@ EAPI=5 -inherit multilib - DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" HOMEPAGE="http://community.kde.org/Frameworks"; SRC_URI="" @@ -33,11 +31,7 @@ src_install() { # higher number to be sure not to kill kde4 env local envfile="${T}/78kf" - local libdir="${EPREFIX}/usr/$(get_libdir)" - local qt5bin="${libdir}/qt5/bin" - echo "PATH=${qt5bin}" > ${envfile} - echo "ROOTPATH=${qt5bin}" >> ${envfile} echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} doenvd ${envfile} }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: eaca47f4e40e60b05eaba5b4a6a021feb4b2b858 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 2 13:04:22 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 2 13:04:22 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=eaca47f4 [kde-frameworks/kf-env] Don't use empty phase function overrides. pkg_preinst and src_prepare have no default implementation. src_unpack and src_test do have default implementations, but do nothing because of empty SRC_URI and missing make check/test target. They're left over from the KDE 4 environment package, where they were needed because kde4-base was inherited and exported those functions. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 8 1 file changed, 8 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index 1ae7664..65f0020 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -20,12 +20,6 @@ RDEPEND="${DEPEND} S=${WORKDIR} -src_unpack() { :; } - -src_prepare() { :; } - -pkg_preinst() { :; } - src_install() { einfo "Installing environment file..." @@ -35,5 +29,3 @@ src_install() { echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} doenvd ${envfile} } - -src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: d2d95b7f7f7ee9aeeb0fa54ab42d71c72499b344 Author: Michael Palimaka gentoo org> AuthorDate: Wed Oct 15 11:28:47 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Oct 15 11:28:47 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d2d95b7f [kde-frameworks/kf-env] Restore keywords. Package-Manager: portage-2.2.12 --- kde-frameworks/kf-env/kf-env-3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index 65f0020..21065dc 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -10,7 +10,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="5" -KEYWORDS="" +KEYWORDS="~amd64" IUSE="" DEPEND=""
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: d485197b9114bfc2bb52afd0cf27d99a8ef95e19 Author: Michael Palimaka gentoo org> AuthorDate: Wed Oct 15 11:29:19 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Oct 15 11:29:19 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d485197b [kde-frameworks/kf-env] Remove old. Package-Manager: portage-2.2.12 --- kde-frameworks/kf-env/kf-env-2.ebuild | 48 --- 1 file changed, 48 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-2.ebuild b/kde-frameworks/kf-env/kf-env-2.ebuild deleted file mode 100644 index ebca79b..000 --- a/kde-frameworks/kf-env/kf-env-2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit multilib - -DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" -HOMEPAGE="http://community.kde.org/Frameworks"; -SRC_URI="" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND} - x11-misc/xdg-utils -" - -S=${WORKDIR} - -src_unpack() { :; } - -src_prepare() { :; } - -pkg_preinst() { :; } - -src_install() { - einfo "Installing environment file..." - - # higher number to be sure not to kill kde4 env - local envfile="${T}/78kf" - local libdir="${EPREFIX}/usr/$(get_libdir)" - local qt5bin="${libdir}/qt5/bin" - - echo "PATH=${qt5bin}" > ${envfile} - echo "ROOTPATH=${qt5bin}" >> ${envfile} - echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} - echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} - echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} - echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile} - doenvd ${envfile} -} - -src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 8569d0697352240eacf1d96b017b9dcd80111bac Author: Michael Palimaka gentoo org> AuthorDate: Wed Sep 24 19:03:57 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Sep 24 19:06:53 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8569d069 [kde-frameworks/kf-env] Version bump. This removes all custom Qt paths. QT_PLUGIN_PATH is unnecessary as of ECM-1.2.0 and QML2_IMPORT_PATH as of 1.3.0. Masked for now because it requires ECM-1.3.0 to be released and then all revdeps to be rebuilt. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 45 +++ 1 file changed, 45 insertions(+) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild new file mode 100644 index 000..d5e6bc9 --- /dev/null +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit multilib + +DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" +HOMEPAGE="http://community.kde.org/Frameworks"; +SRC_URI="" + +LICENSE="GPL-2" +SLOT="5" +KEYWORDS="" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + x11-misc/xdg-utils +" + +S=${WORKDIR} + +src_unpack() { :; } + +src_prepare() { :; } + +pkg_preinst() { :; } + +src_install() { + einfo "Installing environment file..." + + # higher number to be sure not to kill kde4 env + local envfile="${T}/78kf" + local libdir="${EPREFIX}/usr/$(get_libdir)" + local qt5bin="${libdir}/qt5/bin" + + echo "PATH=${qt5bin}" > ${envfile} + echo "ROOTPATH=${qt5bin}" >> ${envfile} + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} + doenvd ${envfile} +} + +src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: d2d95b7f7f7ee9aeeb0fa54ab42d71c72499b344 Author: Michael Palimaka gentoo org> AuthorDate: Wed Oct 15 11:28:47 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Oct 15 11:28:47 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d2d95b7f [kde-frameworks/kf-env] Restore keywords. Package-Manager: portage-2.2.12 --- kde-frameworks/kf-env/kf-env-3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index 65f0020..21065dc 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -10,7 +10,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="5" -KEYWORDS="" +KEYWORDS="~amd64" IUSE="" DEPEND=""
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: d485197b9114bfc2bb52afd0cf27d99a8ef95e19 Author: Michael Palimaka gentoo org> AuthorDate: Wed Oct 15 11:29:19 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Oct 15 11:29:19 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d485197b [kde-frameworks/kf-env] Remove old. Package-Manager: portage-2.2.12 --- kde-frameworks/kf-env/kf-env-2.ebuild | 48 --- 1 file changed, 48 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-2.ebuild b/kde-frameworks/kf-env/kf-env-2.ebuild deleted file mode 100644 index ebca79b..000 --- a/kde-frameworks/kf-env/kf-env-2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit multilib - -DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" -HOMEPAGE="http://community.kde.org/Frameworks"; -SRC_URI="" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND} - x11-misc/xdg-utils -" - -S=${WORKDIR} - -src_unpack() { :; } - -src_prepare() { :; } - -pkg_preinst() { :; } - -src_install() { - einfo "Installing environment file..." - - # higher number to be sure not to kill kde4 env - local envfile="${T}/78kf" - local libdir="${EPREFIX}/usr/$(get_libdir)" - local qt5bin="${libdir}/qt5/bin" - - echo "PATH=${qt5bin}" > ${envfile} - echo "ROOTPATH=${qt5bin}" >> ${envfile} - echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} - echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} - echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} - echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile} - doenvd ${envfile} -} - -src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 8c2344928db26ad95241c1ade664570a5dee7ff6 Author: Johannes Huber gentoo org> AuthorDate: Sat May 24 22:43:18 2014 + Commit: Johannes Huber gentoo org> CommitDate: Sat May 24 22:48:21 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8c234492 [kde-frameworks/kf-env] Version bump * exports Qt5 bin path Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/{kf-env-1.ebuild => kf-env-2.ebuild} | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/kf-env/kf-env-1.ebuild b/kde-frameworks/kf-env/kf-env-2.ebuild similarity index 83% rename from kde-frameworks/kf-env/kf-env-1.ebuild rename to kde-frameworks/kf-env/kf-env-2.ebuild index 616c235..ebca79b 100644 --- a/kde-frameworks/kf-env/kf-env-1.ebuild +++ b/kde-frameworks/kf-env/kf-env-2.ebuild @@ -34,8 +34,11 @@ src_install() { # higher number to be sure not to kill kde4 env local envfile="${T}/78kf" local libdir="${EPREFIX}/usr/$(get_libdir)" + local qt5bin="${libdir}/qt5/bin" - echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" > ${envfile} + echo "PATH=${qt5bin}" > ${envfile} + echo "ROOTPATH=${qt5bin}" >> ${envfile} + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile}
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: dd4a536dcdac0692789efd0370b33ac393d9e672 Author: Johannes Huber gentoo org> AuthorDate: Sun Apr 6 20:11:37 2014 + Commit: Johannes Huber gentoo org> CommitDate: Sun Apr 6 20:12:55 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dd4a536d [kde-frameworks/kf-env] New package Installs environment file for all kf based applications/window manager/desktop environments. The environment file is named 78kf and installed to /etc/env.d/. It has a higher number than KDE SC 4 based env file from kde-base/kde-env. This should guarantee that old QT_PLUGIN_PATH is not overridden. This needs to be tested. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-1.ebuild | 45 +++ kde-frameworks/kf-env/metadata.xml| 5 2 files changed, 50 insertions(+) diff --git a/kde-frameworks/kf-env/kf-env-1.ebuild b/kde-frameworks/kf-env/kf-env-1.ebuild new file mode 100644 index 000..616c235 --- /dev/null +++ b/kde-frameworks/kf-env/kf-env-1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit multilib + +DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" +HOMEPAGE="http://community.kde.org/Frameworks"; +SRC_URI="" + +LICENSE="GPL-2" +SLOT="5" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + x11-misc/xdg-utils +" + +S=${WORKDIR} + +src_unpack() { :; } + +src_prepare() { :; } + +pkg_preinst() { :; } + +src_install() { + einfo "Installing environment file..." + + # higher number to be sure not to kill kde4 env + local envfile="${T}/78kf" + local libdir="${EPREFIX}/usr/$(get_libdir)" + + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" > ${envfile} + echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} + echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} + echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile} + doenvd ${envfile} +} + +src_test() { :; } diff --git a/kde-frameworks/kf-env/metadata.xml b/kde-frameworks/kf-env/metadata.xml new file mode 100644 index 000..a23f444 --- /dev/null +++ b/kde-frameworks/kf-env/metadata.xml @@ -0,0 +1,5 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + kde +
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 8569d0697352240eacf1d96b017b9dcd80111bac Author: Michael Palimaka gentoo org> AuthorDate: Wed Sep 24 19:03:57 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Sep 24 19:06:53 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8569d069 [kde-frameworks/kf-env] Version bump. This removes all custom Qt paths. QT_PLUGIN_PATH is unnecessary as of ECM-1.2.0 and QML2_IMPORT_PATH as of 1.3.0. Masked for now because it requires ECM-1.3.0 to be released and then all revdeps to be rebuilt. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 45 +++ 1 file changed, 45 insertions(+) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild new file mode 100644 index 000..d5e6bc9 --- /dev/null +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit multilib + +DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" +HOMEPAGE="http://community.kde.org/Frameworks"; +SRC_URI="" + +LICENSE="GPL-2" +SLOT="5" +KEYWORDS="" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + x11-misc/xdg-utils +" + +S=${WORKDIR} + +src_unpack() { :; } + +src_prepare() { :; } + +pkg_preinst() { :; } + +src_install() { + einfo "Installing environment file..." + + # higher number to be sure not to kill kde4 env + local envfile="${T}/78kf" + local libdir="${EPREFIX}/usr/$(get_libdir)" + local qt5bin="${libdir}/qt5/bin" + + echo "PATH=${qt5bin}" > ${envfile} + echo "ROOTPATH=${qt5bin}" >> ${envfile} + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} + doenvd ${envfile} +} + +src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 7156b91e5c1a70b629430a5dc6ae551ba74597b7 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 2 12:56:40 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 2 12:56:40 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7156b91e [kde-frameworks/kf-env] Avoid adding Qt5 bin dir to PATH wrt bug #523314. The only known consumer was removed in ef689c09fe2160e891269f9644e21010d2287cc2. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 6 -- 1 file changed, 6 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index d5e6bc9..1ae7664 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -4,8 +4,6 @@ EAPI=5 -inherit multilib - DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" HOMEPAGE="http://community.kde.org/Frameworks"; SRC_URI="" @@ -33,11 +31,7 @@ src_install() { # higher number to be sure not to kill kde4 env local envfile="${T}/78kf" - local libdir="${EPREFIX}/usr/$(get_libdir)" - local qt5bin="${libdir}/qt5/bin" - echo "PATH=${qt5bin}" > ${envfile} - echo "ROOTPATH=${qt5bin}" >> ${envfile} echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} doenvd ${envfile} }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: eaca47f4e40e60b05eaba5b4a6a021feb4b2b858 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 2 13:04:22 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 2 13:04:22 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=eaca47f4 [kde-frameworks/kf-env] Don't use empty phase function overrides. pkg_preinst and src_prepare have no default implementation. src_unpack and src_test do have default implementations, but do nothing because of empty SRC_URI and missing make check/test target. They're left over from the KDE 4 environment package, where they were needed because kde4-base was inherited and exported those functions. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 8 1 file changed, 8 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index 1ae7664..65f0020 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -20,12 +20,6 @@ RDEPEND="${DEPEND} S=${WORKDIR} -src_unpack() { :; } - -src_prepare() { :; } - -pkg_preinst() { :; } - src_install() { einfo "Installing environment file..." @@ -35,5 +29,3 @@ src_install() { echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} doenvd ${envfile} } - -src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 8c2344928db26ad95241c1ade664570a5dee7ff6 Author: Johannes Huber gentoo org> AuthorDate: Sat May 24 22:43:18 2014 + Commit: Johannes Huber gentoo org> CommitDate: Sat May 24 22:48:21 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8c234492 [kde-frameworks/kf-env] Version bump * exports Qt5 bin path Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/{kf-env-1.ebuild => kf-env-2.ebuild} | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/kf-env/kf-env-1.ebuild b/kde-frameworks/kf-env/kf-env-2.ebuild similarity index 83% rename from kde-frameworks/kf-env/kf-env-1.ebuild rename to kde-frameworks/kf-env/kf-env-2.ebuild index 616c235..ebca79b 100644 --- a/kde-frameworks/kf-env/kf-env-1.ebuild +++ b/kde-frameworks/kf-env/kf-env-2.ebuild @@ -34,8 +34,11 @@ src_install() { # higher number to be sure not to kill kde4 env local envfile="${T}/78kf" local libdir="${EPREFIX}/usr/$(get_libdir)" + local qt5bin="${libdir}/qt5/bin" - echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" > ${envfile} + echo "PATH=${qt5bin}" > ${envfile} + echo "ROOTPATH=${qt5bin}" >> ${envfile} + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile}
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: dd4a536dcdac0692789efd0370b33ac393d9e672 Author: Johannes Huber gentoo org> AuthorDate: Sun Apr 6 20:11:37 2014 + Commit: Johannes Huber gentoo org> CommitDate: Sun Apr 6 20:12:55 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dd4a536d [kde-frameworks/kf-env] New package Installs environment file for all kf based applications/window manager/desktop environments. The environment file is named 78kf and installed to /etc/env.d/. It has a higher number than KDE SC 4 based env file from kde-base/kde-env. This should guarantee that old QT_PLUGIN_PATH is not overridden. This needs to be tested. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-1.ebuild | 45 +++ kde-frameworks/kf-env/metadata.xml| 5 2 files changed, 50 insertions(+) diff --git a/kde-frameworks/kf-env/kf-env-1.ebuild b/kde-frameworks/kf-env/kf-env-1.ebuild new file mode 100644 index 000..616c235 --- /dev/null +++ b/kde-frameworks/kf-env/kf-env-1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit multilib + +DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" +HOMEPAGE="http://community.kde.org/Frameworks"; +SRC_URI="" + +LICENSE="GPL-2" +SLOT="5" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + x11-misc/xdg-utils +" + +S=${WORKDIR} + +src_unpack() { :; } + +src_prepare() { :; } + +pkg_preinst() { :; } + +src_install() { + einfo "Installing environment file..." + + # higher number to be sure not to kill kde4 env + local envfile="${T}/78kf" + local libdir="${EPREFIX}/usr/$(get_libdir)" + + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" > ${envfile} + echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} + echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} + echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile} + doenvd ${envfile} +} + +src_test() { :; } diff --git a/kde-frameworks/kf-env/metadata.xml b/kde-frameworks/kf-env/metadata.xml new file mode 100644 index 000..a23f444 --- /dev/null +++ b/kde-frameworks/kf-env/metadata.xml @@ -0,0 +1,5 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + kde +
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 7156b91e5c1a70b629430a5dc6ae551ba74597b7 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 2 12:56:40 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 2 12:56:40 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7156b91e [kde-frameworks/kf-env] Avoid adding Qt5 bin dir to PATH wrt bug #523314. The only known consumer was removed in ef689c09fe2160e891269f9644e21010d2287cc2. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 6 -- 1 file changed, 6 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index d5e6bc9..1ae7664 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -4,8 +4,6 @@ EAPI=5 -inherit multilib - DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" HOMEPAGE="http://community.kde.org/Frameworks"; SRC_URI="" @@ -33,11 +31,7 @@ src_install() { # higher number to be sure not to kill kde4 env local envfile="${T}/78kf" - local libdir="${EPREFIX}/usr/$(get_libdir)" - local qt5bin="${libdir}/qt5/bin" - echo "PATH=${qt5bin}" > ${envfile} - echo "ROOTPATH=${qt5bin}" >> ${envfile} echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} doenvd ${envfile} }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: eaca47f4e40e60b05eaba5b4a6a021feb4b2b858 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 2 13:04:22 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 2 13:04:22 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=eaca47f4 [kde-frameworks/kf-env] Don't use empty phase function overrides. pkg_preinst and src_prepare have no default implementation. src_unpack and src_test do have default implementations, but do nothing because of empty SRC_URI and missing make check/test target. They're left over from the KDE 4 environment package, where they were needed because kde4-base was inherited and exported those functions. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 8 1 file changed, 8 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index 1ae7664..65f0020 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -20,12 +20,6 @@ RDEPEND="${DEPEND} S=${WORKDIR} -src_unpack() { :; } - -src_prepare() { :; } - -pkg_preinst() { :; } - src_install() { einfo "Installing environment file..." @@ -35,5 +29,3 @@ src_install() { echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} doenvd ${envfile} } - -src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: d2d95b7f7f7ee9aeeb0fa54ab42d71c72499b344 Author: Michael Palimaka gentoo org> AuthorDate: Wed Oct 15 11:28:47 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Oct 15 11:28:47 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d2d95b7f [kde-frameworks/kf-env] Restore keywords. Package-Manager: portage-2.2.12 --- kde-frameworks/kf-env/kf-env-3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index 65f0020..21065dc 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -10,7 +10,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="5" -KEYWORDS="" +KEYWORDS="~amd64" IUSE="" DEPEND=""
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: d485197b9114bfc2bb52afd0cf27d99a8ef95e19 Author: Michael Palimaka gentoo org> AuthorDate: Wed Oct 15 11:29:19 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Oct 15 11:29:19 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d485197b [kde-frameworks/kf-env] Remove old. Package-Manager: portage-2.2.12 --- kde-frameworks/kf-env/kf-env-2.ebuild | 48 --- 1 file changed, 48 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-2.ebuild b/kde-frameworks/kf-env/kf-env-2.ebuild deleted file mode 100644 index ebca79b..000 --- a/kde-frameworks/kf-env/kf-env-2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit multilib - -DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" -HOMEPAGE="http://community.kde.org/Frameworks"; -SRC_URI="" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND} - x11-misc/xdg-utils -" - -S=${WORKDIR} - -src_unpack() { :; } - -src_prepare() { :; } - -pkg_preinst() { :; } - -src_install() { - einfo "Installing environment file..." - - # higher number to be sure not to kill kde4 env - local envfile="${T}/78kf" - local libdir="${EPREFIX}/usr/$(get_libdir)" - local qt5bin="${libdir}/qt5/bin" - - echo "PATH=${qt5bin}" > ${envfile} - echo "ROOTPATH=${qt5bin}" >> ${envfile} - echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} - echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} - echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} - echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile} - doenvd ${envfile} -} - -src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 8569d0697352240eacf1d96b017b9dcd80111bac Author: Michael Palimaka gentoo org> AuthorDate: Wed Sep 24 19:03:57 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Sep 24 19:06:53 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8569d069 [kde-frameworks/kf-env] Version bump. This removes all custom Qt paths. QT_PLUGIN_PATH is unnecessary as of ECM-1.2.0 and QML2_IMPORT_PATH as of 1.3.0. Masked for now because it requires ECM-1.3.0 to be released and then all revdeps to be rebuilt. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 45 +++ 1 file changed, 45 insertions(+) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild new file mode 100644 index 000..d5e6bc9 --- /dev/null +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit multilib + +DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" +HOMEPAGE="http://community.kde.org/Frameworks"; +SRC_URI="" + +LICENSE="GPL-2" +SLOT="5" +KEYWORDS="" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + x11-misc/xdg-utils +" + +S=${WORKDIR} + +src_unpack() { :; } + +src_prepare() { :; } + +pkg_preinst() { :; } + +src_install() { + einfo "Installing environment file..." + + # higher number to be sure not to kill kde4 env + local envfile="${T}/78kf" + local libdir="${EPREFIX}/usr/$(get_libdir)" + local qt5bin="${libdir}/qt5/bin" + + echo "PATH=${qt5bin}" > ${envfile} + echo "ROOTPATH=${qt5bin}" >> ${envfile} + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} + doenvd ${envfile} +} + +src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 8c2344928db26ad95241c1ade664570a5dee7ff6 Author: Johannes Huber gentoo org> AuthorDate: Sat May 24 22:43:18 2014 + Commit: Johannes Huber gentoo org> CommitDate: Sat May 24 22:48:21 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8c234492 [kde-frameworks/kf-env] Version bump * exports Qt5 bin path Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/{kf-env-1.ebuild => kf-env-2.ebuild} | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/kf-env/kf-env-1.ebuild b/kde-frameworks/kf-env/kf-env-2.ebuild similarity index 83% rename from kde-frameworks/kf-env/kf-env-1.ebuild rename to kde-frameworks/kf-env/kf-env-2.ebuild index 616c235..ebca79b 100644 --- a/kde-frameworks/kf-env/kf-env-1.ebuild +++ b/kde-frameworks/kf-env/kf-env-2.ebuild @@ -34,8 +34,11 @@ src_install() { # higher number to be sure not to kill kde4 env local envfile="${T}/78kf" local libdir="${EPREFIX}/usr/$(get_libdir)" + local qt5bin="${libdir}/qt5/bin" - echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" > ${envfile} + echo "PATH=${qt5bin}" > ${envfile} + echo "ROOTPATH=${qt5bin}" >> ${envfile} + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile}
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: dd4a536dcdac0692789efd0370b33ac393d9e672 Author: Johannes Huber gentoo org> AuthorDate: Sun Apr 6 20:11:37 2014 + Commit: Johannes Huber gentoo org> CommitDate: Sun Apr 6 20:12:55 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dd4a536d [kde-frameworks/kf-env] New package Installs environment file for all kf based applications/window manager/desktop environments. The environment file is named 78kf and installed to /etc/env.d/. It has a higher number than KDE SC 4 based env file from kde-base/kde-env. This should guarantee that old QT_PLUGIN_PATH is not overridden. This needs to be tested. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-1.ebuild | 45 +++ kde-frameworks/kf-env/metadata.xml| 5 2 files changed, 50 insertions(+) diff --git a/kde-frameworks/kf-env/kf-env-1.ebuild b/kde-frameworks/kf-env/kf-env-1.ebuild new file mode 100644 index 000..616c235 --- /dev/null +++ b/kde-frameworks/kf-env/kf-env-1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit multilib + +DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" +HOMEPAGE="http://community.kde.org/Frameworks"; +SRC_URI="" + +LICENSE="GPL-2" +SLOT="5" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + x11-misc/xdg-utils +" + +S=${WORKDIR} + +src_unpack() { :; } + +src_prepare() { :; } + +pkg_preinst() { :; } + +src_install() { + einfo "Installing environment file..." + + # higher number to be sure not to kill kde4 env + local envfile="${T}/78kf" + local libdir="${EPREFIX}/usr/$(get_libdir)" + + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" > ${envfile} + echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} + echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} + echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile} + doenvd ${envfile} +} + +src_test() { :; } diff --git a/kde-frameworks/kf-env/metadata.xml b/kde-frameworks/kf-env/metadata.xml new file mode 100644 index 000..a23f444 --- /dev/null +++ b/kde-frameworks/kf-env/metadata.xml @@ -0,0 +1,5 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + kde +
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 7156b91e5c1a70b629430a5dc6ae551ba74597b7 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 2 12:56:40 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 2 12:56:40 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7156b91e [kde-frameworks/kf-env] Avoid adding Qt5 bin dir to PATH wrt bug #523314. The only known consumer was removed in ef689c09fe2160e891269f9644e21010d2287cc2. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 6 -- 1 file changed, 6 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index d5e6bc9..1ae7664 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -4,8 +4,6 @@ EAPI=5 -inherit multilib - DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" HOMEPAGE="http://community.kde.org/Frameworks"; SRC_URI="" @@ -33,11 +31,7 @@ src_install() { # higher number to be sure not to kill kde4 env local envfile="${T}/78kf" - local libdir="${EPREFIX}/usr/$(get_libdir)" - local qt5bin="${libdir}/qt5/bin" - echo "PATH=${qt5bin}" > ${envfile} - echo "ROOTPATH=${qt5bin}" >> ${envfile} echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} doenvd ${envfile} }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: eaca47f4e40e60b05eaba5b4a6a021feb4b2b858 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 2 13:04:22 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 2 13:04:22 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=eaca47f4 [kde-frameworks/kf-env] Don't use empty phase function overrides. pkg_preinst and src_prepare have no default implementation. src_unpack and src_test do have default implementations, but do nothing because of empty SRC_URI and missing make check/test target. They're left over from the KDE 4 environment package, where they were needed because kde4-base was inherited and exported those functions. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 8 1 file changed, 8 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index 1ae7664..65f0020 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -20,12 +20,6 @@ RDEPEND="${DEPEND} S=${WORKDIR} -src_unpack() { :; } - -src_prepare() { :; } - -pkg_preinst() { :; } - src_install() { einfo "Installing environment file..." @@ -35,5 +29,3 @@ src_install() { echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} doenvd ${envfile} } - -src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: d2d95b7f7f7ee9aeeb0fa54ab42d71c72499b344 Author: Michael Palimaka gentoo org> AuthorDate: Wed Oct 15 11:28:47 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Oct 15 11:28:47 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d2d95b7f [kde-frameworks/kf-env] Restore keywords. Package-Manager: portage-2.2.12 --- kde-frameworks/kf-env/kf-env-3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index 65f0020..21065dc 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -10,7 +10,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="5" -KEYWORDS="" +KEYWORDS="~amd64" IUSE="" DEPEND=""
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: d485197b9114bfc2bb52afd0cf27d99a8ef95e19 Author: Michael Palimaka gentoo org> AuthorDate: Wed Oct 15 11:29:19 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Oct 15 11:29:19 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d485197b [kde-frameworks/kf-env] Remove old. Package-Manager: portage-2.2.12 --- kde-frameworks/kf-env/kf-env-2.ebuild | 48 --- 1 file changed, 48 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-2.ebuild b/kde-frameworks/kf-env/kf-env-2.ebuild deleted file mode 100644 index ebca79b..000 --- a/kde-frameworks/kf-env/kf-env-2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit multilib - -DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" -HOMEPAGE="http://community.kde.org/Frameworks"; -SRC_URI="" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND} - x11-misc/xdg-utils -" - -S=${WORKDIR} - -src_unpack() { :; } - -src_prepare() { :; } - -pkg_preinst() { :; } - -src_install() { - einfo "Installing environment file..." - - # higher number to be sure not to kill kde4 env - local envfile="${T}/78kf" - local libdir="${EPREFIX}/usr/$(get_libdir)" - local qt5bin="${libdir}/qt5/bin" - - echo "PATH=${qt5bin}" > ${envfile} - echo "ROOTPATH=${qt5bin}" >> ${envfile} - echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} - echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} - echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} - echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile} - doenvd ${envfile} -} - -src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 8569d0697352240eacf1d96b017b9dcd80111bac Author: Michael Palimaka gentoo org> AuthorDate: Wed Sep 24 19:03:57 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Sep 24 19:06:53 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8569d069 [kde-frameworks/kf-env] Version bump. This removes all custom Qt paths. QT_PLUGIN_PATH is unnecessary as of ECM-1.2.0 and QML2_IMPORT_PATH as of 1.3.0. Masked for now because it requires ECM-1.3.0 to be released and then all revdeps to be rebuilt. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 45 +++ 1 file changed, 45 insertions(+) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild new file mode 100644 index 000..d5e6bc9 --- /dev/null +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit multilib + +DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" +HOMEPAGE="http://community.kde.org/Frameworks"; +SRC_URI="" + +LICENSE="GPL-2" +SLOT="5" +KEYWORDS="" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + x11-misc/xdg-utils +" + +S=${WORKDIR} + +src_unpack() { :; } + +src_prepare() { :; } + +pkg_preinst() { :; } + +src_install() { + einfo "Installing environment file..." + + # higher number to be sure not to kill kde4 env + local envfile="${T}/78kf" + local libdir="${EPREFIX}/usr/$(get_libdir)" + local qt5bin="${libdir}/qt5/bin" + + echo "PATH=${qt5bin}" > ${envfile} + echo "ROOTPATH=${qt5bin}" >> ${envfile} + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} + doenvd ${envfile} +} + +src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 8c2344928db26ad95241c1ade664570a5dee7ff6 Author: Johannes Huber gentoo org> AuthorDate: Sat May 24 22:43:18 2014 + Commit: Johannes Huber gentoo org> CommitDate: Sat May 24 22:48:21 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8c234492 [kde-frameworks/kf-env] Version bump * exports Qt5 bin path Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/{kf-env-1.ebuild => kf-env-2.ebuild} | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/kf-env/kf-env-1.ebuild b/kde-frameworks/kf-env/kf-env-2.ebuild similarity index 83% rename from kde-frameworks/kf-env/kf-env-1.ebuild rename to kde-frameworks/kf-env/kf-env-2.ebuild index 616c235..ebca79b 100644 --- a/kde-frameworks/kf-env/kf-env-1.ebuild +++ b/kde-frameworks/kf-env/kf-env-2.ebuild @@ -34,8 +34,11 @@ src_install() { # higher number to be sure not to kill kde4 env local envfile="${T}/78kf" local libdir="${EPREFIX}/usr/$(get_libdir)" + local qt5bin="${libdir}/qt5/bin" - echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" > ${envfile} + echo "PATH=${qt5bin}" > ${envfile} + echo "ROOTPATH=${qt5bin}" >> ${envfile} + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile}
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: dd4a536dcdac0692789efd0370b33ac393d9e672 Author: Johannes Huber gentoo org> AuthorDate: Sun Apr 6 20:11:37 2014 + Commit: Johannes Huber gentoo org> CommitDate: Sun Apr 6 20:12:55 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dd4a536d [kde-frameworks/kf-env] New package Installs environment file for all kf based applications/window manager/desktop environments. The environment file is named 78kf and installed to /etc/env.d/. It has a higher number than KDE SC 4 based env file from kde-base/kde-env. This should guarantee that old QT_PLUGIN_PATH is not overridden. This needs to be tested. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-1.ebuild | 45 +++ kde-frameworks/kf-env/metadata.xml| 5 2 files changed, 50 insertions(+) diff --git a/kde-frameworks/kf-env/kf-env-1.ebuild b/kde-frameworks/kf-env/kf-env-1.ebuild new file mode 100644 index 000..616c235 --- /dev/null +++ b/kde-frameworks/kf-env/kf-env-1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit multilib + +DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" +HOMEPAGE="http://community.kde.org/Frameworks"; +SRC_URI="" + +LICENSE="GPL-2" +SLOT="5" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + x11-misc/xdg-utils +" + +S=${WORKDIR} + +src_unpack() { :; } + +src_prepare() { :; } + +pkg_preinst() { :; } + +src_install() { + einfo "Installing environment file..." + + # higher number to be sure not to kill kde4 env + local envfile="${T}/78kf" + local libdir="${EPREFIX}/usr/$(get_libdir)" + + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" > ${envfile} + echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} + echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} + echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile} + doenvd ${envfile} +} + +src_test() { :; } diff --git a/kde-frameworks/kf-env/metadata.xml b/kde-frameworks/kf-env/metadata.xml new file mode 100644 index 000..a23f444 --- /dev/null +++ b/kde-frameworks/kf-env/metadata.xml @@ -0,0 +1,5 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + kde +
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 7156b91e5c1a70b629430a5dc6ae551ba74597b7 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 2 12:56:40 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 2 12:56:40 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7156b91e [kde-frameworks/kf-env] Avoid adding Qt5 bin dir to PATH wrt bug #523314. The only known consumer was removed in ef689c09fe2160e891269f9644e21010d2287cc2. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 6 -- 1 file changed, 6 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index d5e6bc9..1ae7664 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -4,8 +4,6 @@ EAPI=5 -inherit multilib - DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" HOMEPAGE="http://community.kde.org/Frameworks"; SRC_URI="" @@ -33,11 +31,7 @@ src_install() { # higher number to be sure not to kill kde4 env local envfile="${T}/78kf" - local libdir="${EPREFIX}/usr/$(get_libdir)" - local qt5bin="${libdir}/qt5/bin" - echo "PATH=${qt5bin}" > ${envfile} - echo "ROOTPATH=${qt5bin}" >> ${envfile} echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} doenvd ${envfile} }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: eaca47f4e40e60b05eaba5b4a6a021feb4b2b858 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 2 13:04:22 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 2 13:04:22 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=eaca47f4 [kde-frameworks/kf-env] Don't use empty phase function overrides. pkg_preinst and src_prepare have no default implementation. src_unpack and src_test do have default implementations, but do nothing because of empty SRC_URI and missing make check/test target. They're left over from the KDE 4 environment package, where they were needed because kde4-base was inherited and exported those functions. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 8 1 file changed, 8 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index 1ae7664..65f0020 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -20,12 +20,6 @@ RDEPEND="${DEPEND} S=${WORKDIR} -src_unpack() { :; } - -src_prepare() { :; } - -pkg_preinst() { :; } - src_install() { einfo "Installing environment file..." @@ -35,5 +29,3 @@ src_install() { echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} doenvd ${envfile} } - -src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: d2d95b7f7f7ee9aeeb0fa54ab42d71c72499b344 Author: Michael Palimaka gentoo org> AuthorDate: Wed Oct 15 11:28:47 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Oct 15 11:28:47 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d2d95b7f [kde-frameworks/kf-env] Restore keywords. Package-Manager: portage-2.2.12 --- kde-frameworks/kf-env/kf-env-3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index 65f0020..21065dc 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -10,7 +10,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="5" -KEYWORDS="" +KEYWORDS="~amd64" IUSE="" DEPEND=""
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: d485197b9114bfc2bb52afd0cf27d99a8ef95e19 Author: Michael Palimaka gentoo org> AuthorDate: Wed Oct 15 11:29:19 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Oct 15 11:29:19 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d485197b [kde-frameworks/kf-env] Remove old. Package-Manager: portage-2.2.12 --- kde-frameworks/kf-env/kf-env-2.ebuild | 48 --- 1 file changed, 48 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-2.ebuild b/kde-frameworks/kf-env/kf-env-2.ebuild deleted file mode 100644 index ebca79b..000 --- a/kde-frameworks/kf-env/kf-env-2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit multilib - -DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" -HOMEPAGE="http://community.kde.org/Frameworks"; -SRC_URI="" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND} - x11-misc/xdg-utils -" - -S=${WORKDIR} - -src_unpack() { :; } - -src_prepare() { :; } - -pkg_preinst() { :; } - -src_install() { - einfo "Installing environment file..." - - # higher number to be sure not to kill kde4 env - local envfile="${T}/78kf" - local libdir="${EPREFIX}/usr/$(get_libdir)" - local qt5bin="${libdir}/qt5/bin" - - echo "PATH=${qt5bin}" > ${envfile} - echo "ROOTPATH=${qt5bin}" >> ${envfile} - echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} - echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} - echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} - echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile} - doenvd ${envfile} -} - -src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 8569d0697352240eacf1d96b017b9dcd80111bac Author: Michael Palimaka gentoo org> AuthorDate: Wed Sep 24 19:03:57 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Sep 24 19:06:53 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8569d069 [kde-frameworks/kf-env] Version bump. This removes all custom Qt paths. QT_PLUGIN_PATH is unnecessary as of ECM-1.2.0 and QML2_IMPORT_PATH as of 1.3.0. Masked for now because it requires ECM-1.3.0 to be released and then all revdeps to be rebuilt. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 45 +++ 1 file changed, 45 insertions(+) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild new file mode 100644 index 000..d5e6bc9 --- /dev/null +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit multilib + +DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" +HOMEPAGE="http://community.kde.org/Frameworks"; +SRC_URI="" + +LICENSE="GPL-2" +SLOT="5" +KEYWORDS="" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + x11-misc/xdg-utils +" + +S=${WORKDIR} + +src_unpack() { :; } + +src_prepare() { :; } + +pkg_preinst() { :; } + +src_install() { + einfo "Installing environment file..." + + # higher number to be sure not to kill kde4 env + local envfile="${T}/78kf" + local libdir="${EPREFIX}/usr/$(get_libdir)" + local qt5bin="${libdir}/qt5/bin" + + echo "PATH=${qt5bin}" > ${envfile} + echo "ROOTPATH=${qt5bin}" >> ${envfile} + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} + doenvd ${envfile} +} + +src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 8c2344928db26ad95241c1ade664570a5dee7ff6 Author: Johannes Huber gentoo org> AuthorDate: Sat May 24 22:43:18 2014 + Commit: Johannes Huber gentoo org> CommitDate: Sat May 24 22:48:21 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8c234492 [kde-frameworks/kf-env] Version bump * exports Qt5 bin path Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/{kf-env-1.ebuild => kf-env-2.ebuild} | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/kf-env/kf-env-1.ebuild b/kde-frameworks/kf-env/kf-env-2.ebuild similarity index 83% rename from kde-frameworks/kf-env/kf-env-1.ebuild rename to kde-frameworks/kf-env/kf-env-2.ebuild index 616c235..ebca79b 100644 --- a/kde-frameworks/kf-env/kf-env-1.ebuild +++ b/kde-frameworks/kf-env/kf-env-2.ebuild @@ -34,8 +34,11 @@ src_install() { # higher number to be sure not to kill kde4 env local envfile="${T}/78kf" local libdir="${EPREFIX}/usr/$(get_libdir)" + local qt5bin="${libdir}/qt5/bin" - echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" > ${envfile} + echo "PATH=${qt5bin}" > ${envfile} + echo "ROOTPATH=${qt5bin}" >> ${envfile} + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile}
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: dd4a536dcdac0692789efd0370b33ac393d9e672 Author: Johannes Huber gentoo org> AuthorDate: Sun Apr 6 20:11:37 2014 + Commit: Johannes Huber gentoo org> CommitDate: Sun Apr 6 20:12:55 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dd4a536d [kde-frameworks/kf-env] New package Installs environment file for all kf based applications/window manager/desktop environments. The environment file is named 78kf and installed to /etc/env.d/. It has a higher number than KDE SC 4 based env file from kde-base/kde-env. This should guarantee that old QT_PLUGIN_PATH is not overridden. This needs to be tested. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-1.ebuild | 45 +++ kde-frameworks/kf-env/metadata.xml| 5 2 files changed, 50 insertions(+) diff --git a/kde-frameworks/kf-env/kf-env-1.ebuild b/kde-frameworks/kf-env/kf-env-1.ebuild new file mode 100644 index 000..616c235 --- /dev/null +++ b/kde-frameworks/kf-env/kf-env-1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit multilib + +DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" +HOMEPAGE="http://community.kde.org/Frameworks"; +SRC_URI="" + +LICENSE="GPL-2" +SLOT="5" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + x11-misc/xdg-utils +" + +S=${WORKDIR} + +src_unpack() { :; } + +src_prepare() { :; } + +pkg_preinst() { :; } + +src_install() { + einfo "Installing environment file..." + + # higher number to be sure not to kill kde4 env + local envfile="${T}/78kf" + local libdir="${EPREFIX}/usr/$(get_libdir)" + + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" > ${envfile} + echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} + echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} + echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile} + doenvd ${envfile} +} + +src_test() { :; } diff --git a/kde-frameworks/kf-env/metadata.xml b/kde-frameworks/kf-env/metadata.xml new file mode 100644 index 000..a23f444 --- /dev/null +++ b/kde-frameworks/kf-env/metadata.xml @@ -0,0 +1,5 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + kde +
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 8569d0697352240eacf1d96b017b9dcd80111bac Author: Michael Palimaka gentoo org> AuthorDate: Wed Sep 24 19:03:57 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Sep 24 19:06:53 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8569d069 [kde-frameworks/kf-env] Version bump. This removes all custom Qt paths. QT_PLUGIN_PATH is unnecessary as of ECM-1.2.0 and QML2_IMPORT_PATH as of 1.3.0. Masked for now because it requires ECM-1.3.0 to be released and then all revdeps to be rebuilt. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 45 +++ 1 file changed, 45 insertions(+) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild new file mode 100644 index 000..d5e6bc9 --- /dev/null +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit multilib + +DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" +HOMEPAGE="http://community.kde.org/Frameworks"; +SRC_URI="" + +LICENSE="GPL-2" +SLOT="5" +KEYWORDS="" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + x11-misc/xdg-utils +" + +S=${WORKDIR} + +src_unpack() { :; } + +src_prepare() { :; } + +pkg_preinst() { :; } + +src_install() { + einfo "Installing environment file..." + + # higher number to be sure not to kill kde4 env + local envfile="${T}/78kf" + local libdir="${EPREFIX}/usr/$(get_libdir)" + local qt5bin="${libdir}/qt5/bin" + + echo "PATH=${qt5bin}" > ${envfile} + echo "ROOTPATH=${qt5bin}" >> ${envfile} + echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} + doenvd ${envfile} +} + +src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: 7156b91e5c1a70b629430a5dc6ae551ba74597b7 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 2 12:56:40 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 2 12:56:40 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7156b91e [kde-frameworks/kf-env] Avoid adding Qt5 bin dir to PATH wrt bug #523314. The only known consumer was removed in ef689c09fe2160e891269f9644e21010d2287cc2. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 6 -- 1 file changed, 6 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index d5e6bc9..1ae7664 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -4,8 +4,6 @@ EAPI=5 -inherit multilib - DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" HOMEPAGE="http://community.kde.org/Frameworks"; SRC_URI="" @@ -33,11 +31,7 @@ src_install() { # higher number to be sure not to kill kde4 env local envfile="${T}/78kf" - local libdir="${EPREFIX}/usr/$(get_libdir)" - local qt5bin="${libdir}/qt5/bin" - echo "PATH=${qt5bin}" > ${envfile} - echo "ROOTPATH=${qt5bin}" >> ${envfile} echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} doenvd ${envfile} }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: eaca47f4e40e60b05eaba5b4a6a021feb4b2b858 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 2 13:04:22 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 2 13:04:22 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=eaca47f4 [kde-frameworks/kf-env] Don't use empty phase function overrides. pkg_preinst and src_prepare have no default implementation. src_unpack and src_test do have default implementations, but do nothing because of empty SRC_URI and missing make check/test target. They're left over from the KDE 4 environment package, where they were needed because kde4-base was inherited and exported those functions. Package-Manager: portage-2.2.10 --- kde-frameworks/kf-env/kf-env-3.ebuild | 8 1 file changed, 8 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index 1ae7664..65f0020 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -20,12 +20,6 @@ RDEPEND="${DEPEND} S=${WORKDIR} -src_unpack() { :; } - -src_prepare() { :; } - -pkg_preinst() { :; } - src_install() { einfo "Installing environment file..." @@ -35,5 +29,3 @@ src_install() { echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} doenvd ${envfile} } - -src_test() { :; }
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: d2d95b7f7f7ee9aeeb0fa54ab42d71c72499b344 Author: Michael Palimaka gentoo org> AuthorDate: Wed Oct 15 11:28:47 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Oct 15 11:28:47 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d2d95b7f [kde-frameworks/kf-env] Restore keywords. Package-Manager: portage-2.2.12 --- kde-frameworks/kf-env/kf-env-3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild index 65f0020..21065dc 100644 --- a/kde-frameworks/kf-env/kf-env-3.ebuild +++ b/kde-frameworks/kf-env/kf-env-3.ebuild @@ -10,7 +10,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="5" -KEYWORDS="" +KEYWORDS="~amd64" IUSE="" DEPEND=""
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kf-env/
commit: d485197b9114bfc2bb52afd0cf27d99a8ef95e19 Author: Michael Palimaka gentoo org> AuthorDate: Wed Oct 15 11:29:19 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Oct 15 11:29:19 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d485197b [kde-frameworks/kf-env] Remove old. Package-Manager: portage-2.2.12 --- kde-frameworks/kf-env/kf-env-2.ebuild | 48 --- 1 file changed, 48 deletions(-) diff --git a/kde-frameworks/kf-env/kf-env-2.ebuild b/kde-frameworks/kf-env/kf-env-2.ebuild deleted file mode 100644 index ebca79b..000 --- a/kde-frameworks/kf-env/kf-env-2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit multilib - -DESCRIPTION="Environment setting required for all KDE Frameworks apps to run" -HOMEPAGE="http://community.kde.org/Frameworks"; -SRC_URI="" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND} - x11-misc/xdg-utils -" - -S=${WORKDIR} - -src_unpack() { :; } - -src_prepare() { :; } - -pkg_preinst() { :; } - -src_install() { - einfo "Installing environment file..." - - # higher number to be sure not to kill kde4 env - local envfile="${T}/78kf" - local libdir="${EPREFIX}/usr/$(get_libdir)" - local qt5bin="${libdir}/qt5/bin" - - echo "PATH=${qt5bin}" > ${envfile} - echo "ROOTPATH=${qt5bin}" >> ${envfile} - echo "CONFIG_PROTECT=${EPREFIX}/usr/share/config" >> ${envfile} - echo "COLON_SEPARATED=QT_PLUGIN_PATH" >> ${envfile} - echo "QT_PLUGIN_PATH=${libdir}/plugins:${libdir}/qt5/plugins:${QT_PLUGIN_PATH}" >> ${envfile} - echo "QML2_IMPORT_PATH=${libdir}/qml:${libdir}/qt5/qml" >> ${envfile} - doenvd ${envfile} -} - -src_test() { :; }