diff options
49 files changed, 666 insertions, 558 deletions
diff --git a/dev-libs/libqtxdg/libqtxdg-9999.ebuild b/dev-libs/libqtxdg/libqtxdg-9999.ebuild index 3edc5ce7..67317650 100644 --- a/dev-libs/libqtxdg/libqtxdg-9999.ebuild +++ b/dev-libs/libqtxdg/libqtxdg-9999.ebuild @@ -1,39 +1,38 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 + inherit cmake-utils virtualx DESCRIPTION="A Qt implementation of XDG standards" HOMEPAGE="https://lxqt.org/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} == *9999 ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" SLOT="0" IUSE="test" -CDEPEND=" +RDEPEND=" dev-qt/qtcore:5 dev-qt/qtdbus:5 - dev-qt/qtgui:5 + dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 + x11-misc/xdg-utils " -DEPEND="${CDEPEND} +DEPEND="${RDEPEND} virtual/pkgconfig test? ( dev-qt/qttest:5 ) " -RDEPEND="${CDEPEND} - x11-misc/xdg-utils -" src_configure() { local mycmakeargs=( @@ -43,5 +42,6 @@ src_configure() { } src_test() { - VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake + # Tests don't work with C + LC_ALL=en_US.utf8 virtx cmake-utils_src_test } diff --git a/dev-libs/libqtxdg/metadata.xml b/dev-libs/libqtxdg/metadata.xml index 77812fec..2906ccd4 100644 --- a/dev-libs/libqtxdg/metadata.xml +++ b/dev-libs/libqtxdg/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> -<maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <maintainer type="project"> + <email>qt@gentoo.org</email> + <name>Gentoo Qt Project</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/libqtxdg</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-9999.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-9999.ebuild index a28ed1dc..da7c6f4f 100644 --- a/dev-util/lxqt-build-tools/lxqt-build-tools-9999.ebuild +++ b/dev-util/lxqt-build-tools/lxqt-build-tools-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,17 +9,17 @@ HOMEPAGE="https://lxqt.org/" if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="BSD" SLOT="0" -DEPEND="dev-qt/qtcore:5" - -src_configure() { - cmake-utils_src_configure -} +RDEPEND=" + >=dev-libs/glib-2.50.0 + dev-qt/qtcore:5 +" +DEPEND="${RDEPEND}" diff --git a/dev-util/lxqt-build-tools/metadata.xml b/dev-util/lxqt-build-tools/metadata.xml index a40a83a9..aa0b3609 100644 --- a/dev-util/lxqt-build-tools/metadata.xml +++ b/dev-util/lxqt-build-tools/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/lxqt-build-tools</remote-id> + </upstream> </pkgmetadata> diff --git a/lxqt-base/liblxqt/liblxqt-9999.ebuild b/lxqt-base/liblxqt/liblxqt-9999.ebuild index 79420a8f..589d9054 100644 --- a/lxqt-base/liblxqt/liblxqt-9999.ebuild +++ b/lxqt-base/liblxqt/liblxqt-9999.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils + +inherit cmake-utils eapi7-ver DESCRIPTION="Common base library for the LXQt desktop environment" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi -LICENSE="|| ( BSD LGPL-2.1+ )" -SLOT="0" +LICENSE="LGPL-2.1+ BSD" +SLOT="0/$(ver_cut 1-2)" IUSE="policykit" RDEPEND=" @@ -28,27 +29,22 @@ RDEPEND=" dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] + x11-libs/libX11 x11-libs/libXScrnSaver " + DEPEND="${RDEPEND} dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.4.0 + >=dev-util/lxqt-build-tools-0.5.0 policykit? ( sys-auth/polkit-qt ) " PATCHES=( "$FILESDIR/${PN}-make-polkit-optional.patch" ) -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - tc-is-gcc && [[ $(gcc-version) < 4.8 ]] && \ - die 'The active compiler needs to be gcc 4.8 (or newer)' - fi -} - src_configure() { local mycmakeargs=( - $(usex !policykit '-DBUILD_POLKIT=OFF') -DPULL_TRANSLATIONS=OFF + $(usex !policykit '-DBUILD_POLKIT=OFF') ) cmake-utils_src_configure } diff --git a/lxqt-base/liblxqt/metadata.xml b/lxqt-base/liblxqt/metadata.xml index a40a83a9..68951bb1 100644 --- a/lxqt-base/liblxqt/metadata.xml +++ b/lxqt-base/liblxqt/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/liblxqt</remote-id> + </upstream> </pkgmetadata> diff --git a/lxqt-base/libsysstat/libsysstat-9999.ebuild b/lxqt-base/libsysstat/libsysstat-9999.ebuild index d9e602ae..62ebc611 100644 --- a/lxqt-base/libsysstat/libsysstat-9999.ebuild +++ b/lxqt-base/libsysstat/libsysstat-9999.ebuild @@ -1,27 +1,25 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 + inherit cmake-utils DESCRIPTION="A Qt-based interface to system statistics" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi -LICENSE="LGPL-2.1+" +LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -RDEPEND=" - dev-qt/qtcore:5 -" +RDEPEND="dev-qt/qtcore:5" DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.4.0 + >=dev-util/lxqt-build-tools-0.5.0 " diff --git a/lxqt-base/libsysstat/metadata.xml b/lxqt-base/libsysstat/metadata.xml index a40a83a9..38582790 100644 --- a/lxqt-base/libsysstat/metadata.xml +++ b/lxqt-base/libsysstat/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/libsysstat</remote-id> + </upstream> </pkgmetadata> diff --git a/lxqt-base/lxqt-about/lxqt-about-9999.ebuild b/lxqt-base/lxqt-about/lxqt-about-9999.ebuild index ee880e46..0613a2ec 100644 --- a/lxqt-base/lxqt-about/lxqt-about-9999.ebuild +++ b/lxqt-base/lxqt-about/lxqt-about-9999.ebuild @@ -1,36 +1,38 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils + +inherit cmake-utils eapi7-ver DESCRIPTION="LXQt about dialog" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="LGPL-2.1+" SLOT="0" -DEPEND=" +RDEPEND=" + >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 - dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - >=dev-util/lxqt-build-tools-0.3.1 - lxqt-base/liblxqt + =lxqt-base/liblxqt-$(ver_cut 1-2)* +" +DEPEND="${RDEPEND} + >=dev-util/lxqt-build-tools-0.5.0 " -RDEPEND="${DEPEND}" src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) + local mycmakeargs=( + -DPULL_TRANSLATIONS=OFF + ) cmake-utils_src_configure } diff --git a/lxqt-base/lxqt-about/metadata.xml b/lxqt-base/lxqt-about/metadata.xml index a40a83a9..fb782dbf 100644 --- a/lxqt-base/lxqt-about/metadata.xml +++ b/lxqt-base/lxqt-about/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/lxqt-about</remote-id> + </upstream> </pkgmetadata> diff --git a/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild index a0eefb76..fb1930a7 100644 --- a/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild +++ b/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild @@ -1,40 +1,39 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils + +inherit cmake-utils eapi7-ver DESCRIPTION="LXQt system administration tool" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="LGPL-2.1+" SLOT="0" -DEPEND=" - dev-libs/glib:2 - >=dev-libs/libqtxdg-2.0.0 +RDEPEND=" dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - >=dev-util/lxqt-build-tools-0.3.1 - lxqt-base/liblxqt + =lxqt-base/liblxqt-$(ver_cut 1-2)* kde-frameworks/kwindowsystem:5 - x11-libs/libX11 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + >=dev-util/lxqt-build-tools-0.5.0 +" src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) + local mycmakeargs=( + -DPULL_TRANSLATIONS=OFF + ) cmake-utils_src_configure } diff --git a/lxqt-base/lxqt-admin/metadata.xml b/lxqt-base/lxqt-admin/metadata.xml index a40a83a9..7d14238c 100644 --- a/lxqt-base/lxqt-admin/metadata.xml +++ b/lxqt-base/lxqt-admin/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/lxqt-admin</remote-id> + </upstream> </pkgmetadata> diff --git a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild index 4960d23d..c206dbd1 100644 --- a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild +++ b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild @@ -1,26 +1,27 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils + +inherit cmake-utils gnome2-utils eapi7-ver DESCRIPTION="LXQt system configuration control center" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi -LICENSE="|| ( GPL-2 LGPL-2.1+ )" +LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2" SLOT="0" +IUSE="+monitor" -CDEPEND=" - >=dev-libs/libqtxdg-2.0.0 - dev-qt/qtconcurrent:5 +RDEPEND=" + >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 @@ -28,31 +29,37 @@ CDEPEND=" dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 - kde-plasma/libkscreen:5= - lxqt-base/liblxqt - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM + =lxqt-base/liblxqt-$(ver_cut 1-2)* + sys-libs/zlib:= + x11-apps/setxkbmap x11-libs/libxcb:= x11-libs/libX11 x11-libs/libXcursor - x11-libs/libXext x11-libs/libXfixes + monitor? ( kde-plasma/libkscreen:5= ) " -DEPEND="${CDEPEND} +DEPEND="${DEPEND} dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.3.1 -" -RDEPEND="${CDEPEND} - x11-apps/setxkbmap + >=dev-util/lxqt-build-tools-0.5.0 " src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) + local mycmakeargs=( + -DPULL_TRANSLATIONS=OFF + -DWITH_MONITOR="$(usex monitor)" + ) cmake-utils_src_configure } -src_install(){ +src_install() { cmake-utils_src_install doman man/*.1 liblxqt-config-cursor/man/*.1 lxqt-config-appearance/man/*.1 } + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/lxqt-base/lxqt-config/metadata.xml b/lxqt-base/lxqt-config/metadata.xml index a40a83a9..d6f2207d 100644 --- a/lxqt-base/lxqt-config/metadata.xml +++ b/lxqt-base/lxqt-config/metadata.xml @@ -1,8 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/lxqt-config</remote-id> + </upstream> + <use> + <flag name="monitor" restrict=">=lxqt-base/lxqt-config-0.13.0">Build monitor settings tool</flag> + </use> </pkgmetadata> diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild index b817adeb..4792adc6 100644 --- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild +++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils -DESCRIPTION="Daemon used to register global keyboard shortcuts" -HOMEPAGE="http://lxqt.org/" +inherit cmake-utils eapi7-ver -if [[ ${PV} == *9999* ]]; then +DESCRIPTION="Daemon and library for global keyboard shortcuts registration" +HOMEPAGE="https://lxqt.org/" + +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi @@ -19,25 +20,26 @@ LICENSE="LGPL-2.1+" SLOT="0" RDEPEND=" + >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 - lxqt-base/liblxqt - >=dev-libs/libqtxdg-2.0.0 - x11-libs/libICE - x11-libs/libSM + =lxqt-base/liblxqt-$(ver_cut 1-2)* + kde-frameworks/kwindowsystem:5 x11-libs/libX11 - x11-libs/libXext + !lxqt-base/lxqt-common " DEPEND="${RDEPEND} dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.1.0 + >=dev-util/lxqt-build-tools-0.5.0 " src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) + local mycmakeargs=( + -DPULL_TRANSLATIONS=OFF + ) cmake-utils_src_configure } diff --git a/lxqt-base/lxqt-globalkeys/metadata.xml b/lxqt-base/lxqt-globalkeys/metadata.xml index a40a83a9..d53f56a0 100644 --- a/lxqt-base/lxqt-globalkeys/metadata.xml +++ b/lxqt-base/lxqt-globalkeys/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/lxqt-globalkeys</remote-id> + </upstream> </pkgmetadata> diff --git a/lxqt-base/lxqt-l10n/lxqt-l10n-9999.ebuild b/lxqt-base/lxqt-l10n/lxqt-l10n-9999.ebuild index ed24afd9..24c39ec3 100644 --- a/lxqt-base/lxqt-l10n/lxqt-l10n-9999.ebuild +++ b/lxqt-base/lxqt-l10n/lxqt-l10n-9999.ebuild @@ -1,25 +1,26 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 + inherit cmake-utils DESCRIPTION="LXQt localisation package" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="LGPL-2.1+" SLOT="0" -DEPEND=" +RDEPEND="!~x11-misc/obconf-qt-0.9.0_p20150729" +DEPEND="${RDEPEND} dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.1.0 - >=lxqt-base/liblxqt-0.11.1 + >=dev-util/lxqt-build-tools-0.5.0 " diff --git a/lxqt-base/lxqt-l10n/metadata.xml b/lxqt-base/lxqt-l10n/metadata.xml index 3eaa3d72..36d625f5 100644 --- a/lxqt-base/lxqt-l10n/metadata.xml +++ b/lxqt-base/lxqt-l10n/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxde/lxqt-l10n</remote-id> + </upstream> </pkgmetadata> diff --git a/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild index a411b43c..657e1c17 100644 --- a/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild +++ b/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild @@ -3,48 +3,55 @@ EAPI=6 +inherit eapi7-ver + DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" + +MY_PV="$(ver_cut 1-2)*" + +if [[ ${PV} = *9999* ]]; then + KEYWORDS="-*" +else + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi LICENSE="metapackage" SLOT="0" -KEYWORDS="" -IUSE="+about admin +filemanager +icons lightdm lximage minimal +oxygen +policykit - powermanagement sddm ssh-askpass sudo" -REQUIRED_USE="oxygen? ( icons )" -RDEPEND=" - >=dev-util/lxqt-build-tools-${PV} - >=lxqt-base/liblxqt-${PV} - >=lxde-base/lxmenu-data-0.1.2 - >=lxqt-base/lxqt-config-${PV} - >=lxqt-base/lxqt-globalkeys-${PV} - >=lxqt-base/lxqt-notificationd-${PV} - >=lxqt-base/lxqt-panel-${PV} - >=lxqt-base/lxqt-qtplugin-${PV} - >=lxqt-base/lxqt-runner-${PV} - >=lxqt-base/lxqt-session-${PV} - virtual/ttf-fonts - >=x11-libs/libfm-qt-${PV} - >=x11-themes/lxqt-themes-${PV} - about? ( >=lxqt-base/lxqt-about-${PV} ) - admin? ( >=lxqt-base/lxqt-admin-${PV} ) - filemanager? ( >=x11-misc/pcmanfm-qt-${PV} ) - icons? ( oxygen? ( kde-frameworks/oxygen-icons ) - !oxygen? ( virtual/freedesktop-icon-theme ) ) - lightdm? ( x11-misc/lightdm ) - lximage? ( >=media-gfx/lximage-qt-${PV} ) - !minimal? ( x11-wm/openbox - >=x11-misc/obconf-qt-${PV} ) - policykit? ( >=lxqt-base/lxqt-policykit-${PV} - || ( sys-auth/consolekit[policykit(-)] - sys-apps/systemd[policykit(-)] ) ) - powermanagement? ( >=lxqt-base/lxqt-powermanagement-${PV} ) - sddm? ( >=x11-misc/sddm-0.14.0 ) - ssh-askpass? ( >=lxqt-base/lxqt-openssh-askpass-${PV} ) - sudo? ( >=lxqt-base/lxqt-sudo-${PV} )" +IUSE="+about admin +filemanager lightdm lximage minimal nls + +policykit powermanagement processviewer screenshot sddm + ssh-askpass sudo terminal" # Note: we prefer kde-frameworks/oxygen-icons over other icon sets, as the initial # install expects oxygen icons, until the user specifies otherwise (bug 543380) - -S="${WORKDIR}" +RDEPEND=" + kde-frameworks/oxygen-icons + >=lxde-base/lxmenu-data-0.1.5 + =lxqt-base/lxqt-config-${MY_PV} + =lxqt-base/lxqt-globalkeys-${MY_PV} + =lxqt-base/lxqt-notificationd-${MY_PV} + =lxqt-base/lxqt-panel-${MY_PV} + =lxqt-base/lxqt-qtplugin-${MY_PV} + =lxqt-base/lxqt-runner-${MY_PV} + =lxqt-base/lxqt-session-${MY_PV} + virtual/ttf-fonts + =x11-themes/lxqt-themes-${MY_PV} + about? ( =lxqt-base/lxqt-about-${MY_PV} ) + admin? ( =lxqt-base/lxqt-admin-${MY_PV} ) + filemanager? ( =x11-misc/pcmanfm-qt-${MY_PV} ) + lightdm? ( x11-misc/lightdm ) + lximage? ( media-gfx/lximage-qt ) + !minimal? ( + x11-wm/openbox + x11-misc/obconf-qt + ) + policykit? ( =lxqt-base/lxqt-policykit-${MY_PV} ) + powermanagement? ( =lxqt-base/lxqt-powermanagement-${MY_PV} ) + processviewer? ( x11-misc/qps:0 ) + screenshot? ( x11-misc/screengrab:0 ) + sddm? ( >=x11-misc/sddm-0.11.0 ) + ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-${MY_PV} ) + sudo? ( =lxqt-base/lxqt-sudo-${MY_PV} ) + terminal? ( x11-terms/qterminal:0 ) +" diff --git a/lxqt-base/lxqt-meta/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml index 08adc227..445b1aa6 100644 --- a/lxqt-base/lxqt-meta/metadata.xml +++ b/lxqt-base/lxqt-meta/metadata.xml @@ -1,29 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> - <use> - <flag name="about">Install <pkg>lxqt-base/lxqt-about</pkg></flag> - <flag name="admin">Install <pkg>lxqt-base/lxqt-admin</pkg></flag> - <flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg> - file manager</flag> - <flag name="icons">Install an icon theme</flag> - <flag name="lightdm">Install <pkg>x11-misc/lightdm</pkg> - display manager</flag> - <flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg> - image viewer</flag> - <flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg> - window manager</flag> - <flag name="oxygen">Prefer <pkg>kde-frameworks/oxygen-icons</pkg> (default)</flag> - <flag name="powermanagement">Install - <pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag> - <flag name="sddm">Install <pkg>x11-misc/sddm</pkg> - display manager</flag> - <flag name="ssh-askpass">Install <pkg>lxqt-base/lxqt-openssh-askpass</pkg> - user password prompt tool</flag> - <flag name="sudo">Install <pkg>lxqt-base/lxqt-sudo</pkg></flag> - </use> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <use> + <flag name="about">Install <pkg>lxqt-base/lxqt-about</pkg></flag> + <flag name="admin">Install <pkg>lxqt-base/lxqt-admin</pkg></flag> + <flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg> + file manager</flag> + <flag name="lightdm">Install <pkg>x11-misc/lightdm</pkg> + display manager</flag> + <flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg> + image viewer</flag> + <flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg> + window manager</flag> + <flag name="powermanagement" restrict=">=lxqt-base/lxqt-meta-0.13.0">Install + <pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag> + <flag name="processviewer">Install + <pkg>x11-misc/qps</pkg> package</flag> + <flag name="screenshot" restrict=">=lxqt-base/lxqt-meta-0.13.0">Install + <pkg>x11-misc/screengrab</pkg> package</flag> + <flag name="sddm">Install <pkg>x11-misc/sddm</pkg> + display manager</flag> + <flag name="ssh-askpass">Install <pkg>lxqt-base/lxqt-openssh-askpass</pkg> + user password prompt tool</flag> + <flag name="sudo">Install <pkg>lxqt-base/lxqt-sudo</pkg></flag> + <flag name="terminal" restrict=">=lxqt-base/lxqt-meta-0.13.0">Install + <pkg>x11-terms/qterminal</pkg> package</flag> + </use> </pkgmetadata> diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild index 74199498..7aeafddd 100644 --- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild +++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils + +inherit cmake-utils eapi7-ver DESCRIPTION="LXQt notification daemon and library" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi @@ -19,22 +20,23 @@ LICENSE="LGPL-2.1+" SLOT="0" RDEPEND=" - >=dev-libs/libqtxdg-2.0.0 + >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 - lxqt-base/liblxqt + =lxqt-base/liblxqt-$(ver_cut 1-2)* + !lxqt-base/lxqt-common " DEPEND="${RDEPEND} dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.3.2 + >=dev-util/lxqt-build-tools-0.5.0 " src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) + local mycmakeargs=( + -DPULL_TRANSLATIONS=OFF + ) cmake-utils_src_configure } diff --git a/lxqt-base/lxqt-notificationd/metadata.xml b/lxqt-base/lxqt-notificationd/metadata.xml index a40a83a9..097def32 100644 --- a/lxqt-base/lxqt-notificationd/metadata.xml +++ b/lxqt-base/lxqt-notificationd/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/lxqt-notifcationd</remote-id> + </upstream> </pkgmetadata> diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild index f1a53793..196500d2 100644 --- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild +++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils + +inherit cmake-utils eapi7-ver DESCRIPTION="LXQt OpenSSH user password prompt tool" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi @@ -19,23 +20,19 @@ LICENSE="LGPL-2.1+" SLOT="0" RDEPEND=" - >=dev-libs/libqtxdg-2.0.0 dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - lxqt-base/liblxqt - x11-libs/libX11 + =lxqt-base/liblxqt-$(ver_cut 1-2)* " DEPEND="${RDEPEND} dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.3.1 + >=dev-util/lxqt-build-tools-0.5.0 " src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) + local mycmakeargs=( + -DPULL_TRANSLATIONS=OFF + ) cmake-utils_src_configure } diff --git a/lxqt-base/lxqt-openssh-askpass/metadata.xml b/lxqt-base/lxqt-openssh-askpass/metadata.xml index a40a83a9..1d0dffcb 100644 --- a/lxqt-base/lxqt-openssh-askpass/metadata.xml +++ b/lxqt-base/lxqt-openssh-askpass/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/lxqt-openssh-askpass</remote-id> + </upstream> </pkgmetadata> diff --git a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild index 4e4f75b8..d20253a2 100644 --- a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild +++ b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild @@ -1,91 +1,105 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils + +inherit cmake-utils eapi7-ver DESCRIPTION="LXQt desktop panel and plugins" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" + +MY_PV="$(ver_cut 1-2)*" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="LGPL-2.1+" SLOT="0" -IUSE="+alsa +clock colorpicker cpuload +desktopswitch dom +kbindicator +mainmenu +IUSE="+alsa clock colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator +mainmenu +mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop - statusnotifier sysstat +taskbar +tray +volume worldclock" + +spacer statusnotifier sysstat +taskbar +tray +volume +worldclock" REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )" -CDEPEND=" - dev-libs/glib:2 - >=dev-libs/libqtxdg-3.1.0 +RDEPEND=" + >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 + dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 - kde-frameworks/kguiaddons:5 kde-frameworks/kwindowsystem:5[X] - >=lxde-base/menu-cache-0.3.3 - lxqt-base/liblxqt - lxqt-base/lxqt-globalkeys + >=lxde-base/lxmenu-data-0.1.5 + >=lxde-base/menu-cache-1.1.0 + =lxqt-base/liblxqt-${MY_PV} + =lxqt-base/lxqt-globalkeys-${MY_PV} x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) sensors? ( sys-apps/lm_sensors ) - statusnotifier? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r1 ) - sysstat? ( =lxqt-base/libsysstat-0.3* ) - tray? ( x11-libs/libXcomposite + statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) + sysstat? ( >=lxqt-base/libsysstat-0.4.1 ) + tray? ( + x11-libs/libxcb:= + x11-libs/libXcomposite x11-libs/libXdamage - x11-libs/libXrender ) - volume? ( alsa? ( media-libs/alsa-lib ) - pulseaudio? ( media-sound/pulseaudio ) ) + x11-libs/libXrender + x11-libs/xcb-util + ) + volume? ( + alsa? ( media-libs/alsa-lib ) + pulseaudio? ( + media-sound/pavucontrol-qt + media-sound/pulseaudio + ) + ) + !lxqt-base/lxqt-common " -DEPEND="${CDEPEND} +DEPEND="${RDEPEND} dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.3.1 -" -RDEPEND="${CDEPEND} - dev-qt/qtsvg:5 - >=lxde-base/lxmenu-data-0.1.2 + >=dev-util/lxqt-build-tools-0.5.0 + virtual/pkgconfig " src_configure() { local mycmakeargs=( -DPULL_TRANSLATIONS=OFF - $(usex clock '-DCLOCK_PLUGIN=ON' '-DCLOCK_PLUGIN=OFF') - $(usex colorpicker '-DCOLORPICKER_PLUGIN=ON' '-DCOLORPICKER_PLUGIN=OFF') - $(usex cpuload '-DCPULOAD_PLUGIN=ON' '-DCPULOAD_PLUGIN=OFF') - $(usex desktopswitch '-DDESKTOPSWITCH_PLUGIN=ON' '-DDESKTOPSWITCH_PLUGIN=OFF') - $(usex dom '-DDOM_PLUGIN=ON' '-DDOM_PLUGIN=OFF') - $(usex kbindicator '-DKBINDICATOR_PLUGIN=ON' '-DKBINDICATOR_PLUGIN=OFF') - $(usex mainmenu '-DMAINMENU_PLUGIN=ON' '-DMAINMENU_PLUGIN=OFF') - $(usex mount '-DMOUNT_PLUGIN=ON' '-DMOUNT_PLUGIN=OFF') - $(usex networkmonitor '-DNETWORKMONITOR_PLUGIN=ON' '-DNETWORKMONITOR_PLUGIN=OFF') - $(usex quicklaunch '-DQUICKLAUNCH_PLUGIN=ON' '-DQUICKLAUNCH_PLUGIN=OFF') - $(usex sensors '-DSENSORS_PLUGIN=ON' '-DSENSORS_PLUGIN=OFF') - $(usex showdesktop '-DSHOWDESKTOP_PLUGIN=ON' '-DSHOWDESKTOP_PLUGIN=OFF') - $(usex statusnotifier '-DSTATUSNOTIFIER_PLUGIN=ON' '-DSTATUSNOTIFIER_PLUGIN=OFF') - $(usex sysstat '-DSYSSTAT_PLUGIN=ON' '-DSYSSTAT_PLUGIN=OFF') - $(usex taskbar '-DTASKBAR_PLUGIN=ON' '-DTASKBAR_PLUGIN=OFF') - $(usex tray '-DTRAY_PLUGIN=ON' '-DTRAY_PLUGIN=OFF') - $(usex volume '-DVOLUME_PLUGIN=ON' '-DVOLUME_PLUGIN=OFF') - $(usex worldclock '-DWORLDCLOCK_PLUGIN=ON' '-DWORLDCLOCK_PLUGIN=OFF') + + # Plugins + -DCLOCK_PLUGIN=$(usex clock) + -DCOLORPICKER_PLUGIN=$(usex colorpicker) + -DCPULOAD_PLUGIN=$(usex cpuload) + -DDESKTOPSWITCH_PLUGIN=$(usex desktopswitch) + -DDIRECTORYMENU_PLUGIN=$(usex directorymenu) + -DDOM_PLUGIN=$(usex dom) + -DKBINDICATOR_PLUGIN=$(usex kbindicator) + -DMAINMENU_PLUGIN=$(usex mainmenu) + -DMOUNT_PLUGIN=$(usex mount) + -DNETWORKMONITOR_PLUGIN=$(usex networkmonitor) + -DQUICKLAUNCH_PLUGIN=$(usex quicklaunch) + -DSENSORS_PLUGIN=$(usex sensors) + -DSHOWDESKTOP_PLUGIN=$(usex showdesktop) + -DSPACER_PLUGIN=$(usex spacer) + -DSTATUSNOTIFIER_PLUGIN=$(usex statusnotifier) + -DSYSSTAT_PLUGIN=$(usex sysstat) + -DTASKBAR_PLUGIN=$(usex taskbar) + -DTRAY_PLUGIN=$(usex tray) + -DVOLUME_PLUGIN=$(usex volume) + -DWORLDCLOCK_PLUGIN=$(usex worldclock) ) if use volume; then mycmakeargs+=( - $(usex alsa '-DVOLUME_USE_ALSA=ON' '-DVOLUME_USE_ALSA=OFF') - $(usex pulseaudio '-DVOLUME_USE_PULSEAUDIO=ON' '-DVOLUME_USE_PULSEAUDIO=OFF') + -DVOLUME_USE_ALSA=$(usex alsa) + -DVOLUME_USE_PULSEAUDIO=$(usex pulseaudio) ) fi diff --git a/lxqt-base/lxqt-panel/metadata.xml b/lxqt-base/lxqt-panel/metadata.xml index 3dd1f2a7..389e2ab7 100644 --- a/lxqt-base/lxqt-panel/metadata.xml +++ b/lxqt-base/lxqt-panel/metadata.xml @@ -1,28 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> - <use> - <flag name="clock">Build clock plugin</flag> - <flag name="colorpicker">Build colorpicker plugin</flag> - <flag name="cpuload">Build cpuload plugin</flag> - <flag name="desktopswitch">Build desktopswitch plugin</flag> - <flag name="dom">Build dom plugin</flag> - <flag name="kbindicator">Build kbindicator plugin</flag> - <flag name="mainmenu">Build mainmenu plugin</flag> - <flag name="mount">Build mount plugin</flag> - <flag name="networkmonitor">Build networkmonitor plugin</flag> - <flag name="quicklaunch">Build quicklaunch plugin</flag> - <flag name="sensors">Build sensors plugin</flag> - <flag name="showdesktop">Build showdesktop plugin</flag> - <flag name="statusnotifier">Build statusnotifier plugin</flag> - <flag name="sysstat">Build sysstat plugin</flag> - <flag name="taskbar">Build taskbar plugin</flag> - <flag name="tray">Build tray plugin</flag> - <flag name="volume">Build volume plugin</flag> - <flag name="worldclock">Build worldclock plugin</flag> - </use> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <use> + <flag name="clock">Build clock plugin</flag> + <flag name="colorpicker">Build colorpicker plugin</flag> + <flag name="cpuload">Build cpuload plugin</flag> + <flag name="desktopswitch">Build desktopswitch plugin</flag> + <flag name="directorymenu" restrict=">=lxqt-base/lxqt-panel-0.13.0">Build directorymenu plugin</flag> + <flag name="dom">Build dom plugin</flag> + <flag name="kbindicator">Build kbindicator plugin</flag> + <flag name="mainmenu">Build mainmenu plugin</flag> + <flag name="mount">Build mount plugin</flag> + <flag name="networkmonitor">Build networkmonitor plugin</flag> + <flag name="quicklaunch">Build quicklaunch plugin</flag> + <flag name="sensors">Build sensors plugin</flag> + <flag name="showdesktop">Build showdesktop plugin</flag> + <flag name="statusnotifier">Build statusnotifier plugin</flag> + <flag name="spacer" restrict=">=lxqt-base/lxqt-panel-0.13.0">Build spacer plugin</flag> + <flag name="sysstat">Build sysstat plugin</flag> + <flag name="taskbar">Build taskbar plugin</flag> + <flag name="tray">Build tray plugin</flag> + <flag name="volume">Build volume plugin</flag> + <flag name="worldclock">Build worldclock plugin</flag> + </use> + <upstream> + <remote-id type="github">lxqt/lxqt-panel</remote-id> + </upstream> </pkgmetadata> diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild index dcabe098..fb71c99c 100644 --- a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild +++ b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils + +inherit cmake-utils eapi7-ver DESCRIPTION="LXQt PolKit authentication agent" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi @@ -20,24 +21,24 @@ SLOT="0" RDEPEND=" dev-libs/glib:2 + >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 - dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - lxqt-base/liblxqt - >=dev-libs/libqtxdg-2.0.0 - >=sys-auth/polkit-qt-0.112.0_p20160416-r1 + =lxqt-base/liblxqt-$(ver_cut 1-2)* + sys-auth/polkit-qt[qt5(+)] + !lxqt-base/lxqt-common " DEPEND="${RDEPEND} + >=dev-util/lxqt-build-tools-0.5.0 dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.3.1 virtual/pkgconfig " src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) + local mycmakeargs=( + -DPULL_TRANSLATIONS=OFF + ) cmake-utils_src_configure } diff --git a/lxqt-base/lxqt-policykit/metadata.xml b/lxqt-base/lxqt-policykit/metadata.xml index a40a83a9..77e942e4 100644 --- a/lxqt-base/lxqt-policykit/metadata.xml +++ b/lxqt-base/lxqt-policykit/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/lxqt-policykit</remote-id> + </upstream> </pkgmetadata> diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild index 879b1c8e..e6419f89 100644 --- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild +++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild @@ -1,25 +1,26 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils + +inherit cmake-utils eapi7-ver DESCRIPTION="LXQt daemon for power management and auto-suspend" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="LGPL-2.1+" SLOT="0" -CDEPEND=" - >=dev-libs/libqtxdg-2.0.0 +RDEPEND=" + >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 @@ -28,18 +29,22 @@ CDEPEND=" dev-qt/qtx11extras:5 kde-frameworks/kidletime:5 kde-frameworks/solid:5 - lxqt-base/liblxqt + =lxqt-base/liblxqt-$(ver_cut 1-2)* + || ( + sys-power/upower + sys-power/upower-pm-utils + ) + !lxqt-base/lxqt-common " -DEPEND="${CDEPEND} +DEPEND="${RDEPEND} dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.3.1 + >=dev-util/lxqt-build-tools-0.5.0 virtual/pkgconfig " -RDEPEND="${CDEPEND} - || ( sys-power/upower sys-power/upower-pm-utils ) -" src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) + local mycmakeargs=( + -DPULL_TRANSLATIONS=OFF + ) cmake-utils_src_configure } diff --git a/lxqt-base/lxqt-powermanagement/metadata.xml b/lxqt-base/lxqt-powermanagement/metadata.xml index a40a83a9..d2a33a0e 100644 --- a/lxqt-base/lxqt-powermanagement/metadata.xml +++ b/lxqt-base/lxqt-powermanagement/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/lxqt-powermanagement</remote-id> + </upstream> </pkgmetadata> diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild index 3415d489..28eb8933 100644 --- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild +++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils + +inherit cmake-utils eapi7-ver DESCRIPTION="LXQt system integration plugin for Qt" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi @@ -19,21 +20,16 @@ LICENSE="LGPL-2.1+" SLOT="0" RDEPEND=" - dev-libs/libdbusmenu-qt[qt5(+)] - >=dev-libs/libqtxdg-2.0.0 + dev-libs/libdbusmenu-qt:=[qt5(+)] + >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 - dev-qt/qtgui:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5= dev-qt/qtwidgets:5 - lxqt-base/liblxqt - x11-libs/libX11 + dev-qt/qtx11extras:5 + =x11-libs/libfm-qt-$(ver_cut 1-2)* " DEPEND="${RDEPEND} dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.3.1 - >=x11-libs/libfm-qt-${PV} + >=dev-util/lxqt-build-tools-0.5.0 " - -src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure -} diff --git a/lxqt-base/lxqt-qtplugin/metadata.xml b/lxqt-base/lxqt-qtplugin/metadata.xml index a40a83a9..11dbde39 100644 --- a/lxqt-base/lxqt-qtplugin/metadata.xml +++ b/lxqt-base/lxqt-qtplugin/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/lxqt-qtplugin</remote-id> + </upstream> </pkgmetadata> diff --git a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild index 49f630a2..a28eb95f 100644 --- a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild +++ b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild @@ -1,17 +1,20 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils + +inherit cmake-utils eapi7-ver DESCRIPTION="LXQt quick launcher" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" + +MY_PV="$(ver_cut 1-2)*" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi @@ -19,29 +22,28 @@ LICENSE="LGPL-2.1+" SLOT="0" RDEPEND=" - >=dev-cpp/muParser-2.2.3 - dev-libs/glib:2 - >=dev-libs/libqtxdg-2.0.0 + >=dev-cpp/muParser-2.2.3:= + >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 - dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 - >=lxde-base/menu-cache-1.1.0 - lxqt-base/liblxqt - lxqt-base/lxqt-globalkeys + >=lxde-base/menu-cache-0.5.1 + =lxqt-base/liblxqt-${MY_PV} + =lxqt-base/lxqt-globalkeys-${MY_PV} + !lxqt-base/lxqt-common " DEPEND="${RDEPEND} - >=dev-util/cmake-3.6.2 dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.3.1 + >=dev-util/lxqt-build-tools-0.5.0 virtual/pkgconfig " src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) + local mycmakeargs=( + -DPULL_TRANSLATIONS=OFF + ) cmake-utils_src_configure } diff --git a/lxqt-base/lxqt-runner/metadata.xml b/lxqt-base/lxqt-runner/metadata.xml index a40a83a9..5773e134 100644 --- a/lxqt-base/lxqt-runner/metadata.xml +++ b/lxqt-base/lxqt-runner/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/lxqt-runner</remote-id> + </upstream> </pkgmetadata> diff --git a/lxqt-base/lxqt-session/lxqt-session-9999.ebuild b/lxqt-base/lxqt-session/lxqt-session-9999.ebuild index 1a65dd68..a534e6d7 100644 --- a/lxqt-base/lxqt-session/lxqt-session-9999.ebuild +++ b/lxqt-base/lxqt-session/lxqt-session-9999.ebuild @@ -1,51 +1,60 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils + +inherit cmake-utils eapi7-ver DESCRIPTION="LXQT session manager" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" + +MY_PV="$(ver_cut 1-2)*" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi +IUSE="+themes +udev" + LICENSE="LGPL-2.1+" SLOT="0" -CDEPEND=" - >=dev-libs/libqtxdg-2.0.0 +RDEPEND=" + >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 - dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] - lxqt-base/liblxqt + =lxqt-base/liblxqt-${MY_PV} x11-libs/libX11 x11-misc/xdg-user-dirs + themes? ( =x11-themes/lxqt-themes-${MY_PV} ) + udev? ( virtual/libudev ) + !lxqt-base/lxqt-common " -DEPEND="${CDEPEND} +DEPEND="${RDEPEND} dev-qt/linguist-tools:5 - dev-util/intltool - >=dev-util/lxqt-build-tools-0.3.1 - sys-devel/gettext - virtual/pkgconfig + >=dev-util/lxqt-build-tools-0.5.0 " -RDEPEND="${CDEPEND}" src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) + local mycmakeargs=( + -DWITH_LIBUDEV=$(usex udev) + -DPULL_TRANSLATIONS=OFF + ) cmake-utils_src_configure } src_install(){ cmake-utils_src_install doman lxqt-config-session/man/*.1 lxqt-session/man/*.1 + + echo XDG_CONFIG_DIRS=\"${EPREFIX}/usr/share\" >> 91lxqt-config-dir + doenvd 91lxqt-config-dir } diff --git a/lxqt-base/lxqt-session/metadata.xml b/lxqt-base/lxqt-session/metadata.xml index a40a83a9..90404bed 100644 --- a/lxqt-base/lxqt-session/metadata.xml +++ b/lxqt-base/lxqt-session/metadata.xml @@ -1,8 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/lxqt-session</remote-id> + </upstream> + <use> + <flag name="themes">Install LXQt themes and graphics</flag> + </use> </pkgmetadata> diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild index 196bfa8e..d463b183 100644 --- a/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild +++ b/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild @@ -1,36 +1,38 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils + +inherit cmake-utils eapi7-ver DESCRIPTION="LXQt GUI frontend for sudo" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="LGPL-2.1+" SLOT="0" -DEPEND=" +RDEPEND=" app-admin/sudo - >=dev-libs/libqtxdg-2.0.0 + >=dev-libs/libqtxdg-3.0.0 dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 dev-qt/qtwidgets:5 - >=dev-util/lxqt-build-tools-0.3.1 - lxqt-base/liblxqt + =lxqt-base/liblxqt-$(ver_cut 1-2)* +" +DEPEND="${RDEPEND} + >=dev-util/lxqt-build-tools-0.5.0 " -RDEPEND="${DEPEND}" src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) + local mycmakeargs=( + -DPULL_TRANSLATIONS=OFF + ) cmake-utils_src_configure } diff --git a/lxqt-base/lxqt-sudo/metadata.xml b/lxqt-base/lxqt-sudo/metadata.xml index 3eaa3d72..34a55e64 100644 --- a/lxqt-base/lxqt-sudo/metadata.xml +++ b/lxqt-base/lxqt-sudo/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/lxqt-sudo</remote-id> + </upstream> </pkgmetadata> diff --git a/lxqt-base/metadata.xml b/lxqt-base/metadata.xml index 49b3cee9..6c47117f 100644 --- a/lxqt-base/metadata.xml +++ b/lxqt-base/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> - <longdescription lang="en"> - The lxqt-base category contains core packages for LXQt Desktop Environment. - </longdescription> + <longdescription lang="en"> + The lxqt-base category contains core packages for LXQt Desktop Environment. + </longdescription> </catmetadata> diff --git a/media-gfx/lximage-qt/lximage-qt-9999.ebuild b/media-gfx/lximage-qt/lximage-qt-9999.ebuild index 4fc151da..1fef5d10 100644 --- a/media-gfx/lximage-qt/lximage-qt-9999.ebuild +++ b/media-gfx/lximage-qt/lximage-qt-9999.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils xdg-utils -DESCRIPTION="Lightweight Qt image viewer from the LXQt Project" -HOMEPAGE="http://lxqt.org/" +inherit cmake-utils -if [[ ${PV} == *9999* ]]; then +DESCRIPTION="LXImage Image Viewer - GPicView replacement" +HOMEPAGE="https://lxqt.org/" + +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi -LICENSE="|| ( GPL-2+ LGPL-2.1+ )" +LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" RDEPEND=" @@ -23,20 +24,20 @@ RDEPEND=" dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 + dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libexif >=x11-libs/libfm-1.2:= - x11-libs/libfm-qt:= + >=x11-libs/libfm-qt-0.12.0:= x11-libs/libX11 x11-libs/libXfixes " DEPEND="${RDEPEND} dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.4.0 - lxqt-base/liblxqt + >=dev-util/lxqt-build-tools-0.5.0 virtual/pkgconfig " @@ -46,11 +47,3 @@ src_configure() { ) cmake-utils_src_configure } - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/media-gfx/lximage-qt/metadata.xml b/media-gfx/lximage-qt/metadata.xml index a40a83a9..34f02d52 100644 --- a/media-gfx/lximage-qt/metadata.xml +++ b/media-gfx/lximage-qt/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/lximage-qt</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-libs/libfm-qt/libfm-qt-9999.ebuild b/x11-libs/libfm-qt/libfm-qt-9999.ebuild index 3ea33803..03b618ca 100644 --- a/x11-libs/libfm-qt/libfm-qt-9999.ebuild +++ b/x11-libs/libfm-qt/libfm-qt-9999.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils -if [[ ${PV} == *9999* ]]; then +inherit cmake-utils eapi7-ver + +DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers" +HOMEPAGE="https://lxqt.org/" + +if [[ "${PV}" == "9999" ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi -DESCRIPTION="Core library of PCManFM-Qt" -HOMEPAGE="http://lxqt.org/" - -LICENSE="LGPL-2.1+" -SLOT="0/3" +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0/5" RDEPEND=" dev-libs/glib:2 @@ -24,23 +25,20 @@ RDEPEND=" dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 - >=lxde-base/menu-cache-0.4.1 + >=lxde-base/menu-cache-1.1.0 + media-libs/libexif:= >=x11-libs/libfm-1.2.0:= x11-libs/libxcb:= - !<x11-misc/pcmanfm-qt-0.11.0 " DEPEND="${RDEPEND} dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.4.0 - lxqt-base/liblxqt - media-libs/libexif + >=dev-util/lxqt-build-tools-0.5.0 virtual/pkgconfig " src_configure() { local mycmakeargs=( - -DPULL_TRANSLATIONS=NO + -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure } diff --git a/x11-libs/libfm-qt/metadata.xml b/x11-libs/libfm-qt/metadata.xml index 51d3a803..da013df6 100644 --- a/x11-libs/libfm-qt/metadata.xml +++ b/x11-libs/libfm-qt/metadata.xml @@ -6,6 +6,6 @@ <name>LXQt</name> </maintainer> <upstream> - <remote-id type="github">lxde/libfm-qt</remote-id> + <remote-id type="github">lxqt/libfm-qt</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/obconf-qt/metadata.xml b/x11-misc/obconf-qt/metadata.xml index a40a83a9..08d5c58e 100644 --- a/x11-misc/obconf-qt/metadata.xml +++ b/x11-misc/obconf-qt/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/obconf-qt</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/obconf-qt/obconf-qt-9999.ebuild b/x11-misc/obconf-qt/obconf-qt-9999.ebuild index 9b96b4ee..ad92050f 100644 --- a/x11-misc/obconf-qt/obconf-qt-9999.ebuild +++ b/x11-misc/obconf-qt/obconf-qt-9999.ebuild @@ -1,47 +1,53 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils + +inherit cmake-utils gnome2-utils xdg-utils DESCRIPTION="Openbox window manager configuration tool" -HOMEPAGE="http://lxqt.org/" +HOMEPAGE="https://lxqt.org/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" RDEPEND=" dev-libs/glib:2 - dev-libs/libxml2 dev-qt/qtcore:5 - dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 - media-libs/fontconfig - media-libs/freetype x11-wm/openbox:3 - x11-libs/libICE - x11-libs/libSM x11-libs/libX11 - x11-libs/libXft - x11-libs/pango " DEPEND="${RDEPEND} dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.1.0 + >=dev-util/lxqt-build-tools-0.5.0 + sys-apps/sed virtual/pkgconfig " src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) + local mycmakeargs=( + -DPULL_TRANSLATIONS=OFF + ) cmake-utils_src_configure } + +pkg_postinst() { + xdg_desktop_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + gnome2_icon_cache_update +} diff --git a/x11-misc/pcmanfm-qt/metadata.xml b/x11-misc/pcmanfm-qt/metadata.xml index 5a72fc7c..f0e3eb36 100644 --- a/x11-misc/pcmanfm-qt/metadata.xml +++ b/x11-misc/pcmanfm-qt/metadata.xml @@ -1,12 +1,11 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">pcmanfm</remote-id> - <remote-id type="github">lxde/pcmanfm-qt</remote-id> - </upstream> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/pcmanfm-qt</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild index 7438c61a..e3344d87 100644 --- a/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild +++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild @@ -1,51 +1,47 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils -if [[ ${PV} == *9999* ]]; then +inherit cmake-utils eapi7-ver + +if [[ "${PV}" == "9999" ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)" -HOMEPAGE="https://wiki.lxde.org/en/PCManFM" +HOMEPAGE="https://lxqt.org/" -LICENSE="GPL-2+" +LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -CDEPEND=" - >=dev-libs/glib-2.18:2 +RDEPEND=" + dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=x11-libs/libfm-1.2.0:= - >=x11-libs/libfm-qt-${PV}:= + =x11-libs/libfm-qt-$(ver_cut 1-2)* x11-libs/libxcb:= -" -RDEPEND="${CDEPEND} x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme + !lxqt-base/lxqt-common " -DEPEND="${CDEPEND} +DEPEND="${RDEPEND} dev-qt/linguist-tools:5 - >=dev-util/intltool-0.40 - >=dev-util/lxqt-build-tools-0.4.0 - sys-devel/gettext - virtual/pkgconfig + >=dev-util/lxqt-build-tools-0.5.0 " src_configure() { local mycmakeargs=( - -DPULL_TRANSLATIONS=NO + -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure } diff --git a/x11-themes/lxqt-themes/lxqt-themes-9999.ebuild b/x11-themes/lxqt-themes/lxqt-themes-9999.ebuild index ffeba25a..4760bcad 100644 --- a/x11-themes/lxqt-themes/lxqt-themes-9999.ebuild +++ b/x11-themes/lxqt-themes/lxqt-themes-9999.ebuild @@ -1,24 +1,25 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 + inherit cmake-utils -DESCRIPTION="Themes, graphics, and icons for LXQt" -HOMEPAGE="http://lxqt.org/" +DESCRIPTION="Themes, graphics and icons for LXQt" +HOMEPAGE="https://lxqt.org/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/lxde/${PN}.git" + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64" + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="LGPL-2.1+" SLOT="0" -DEPEND=" - >=dev-util/lxqt-build-tools-0.1.0 - !!lxqt-base/lxqt-common +RDEPEND="!lxqt-base/lxqt-common" +DEPEND="${RDEPEND} + >=dev-util/lxqt-build-tools-0.5.0 " diff --git a/x11-themes/lxqt-themes/metadata.xml b/x11-themes/lxqt-themes/metadata.xml index a40a83a9..ae8df7e8 100644 --- a/x11-themes/lxqt-themes/metadata.xml +++ b/x11-themes/lxqt-themes/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <upstream> + <remote-id type="github">lxqt/lxqt-themes</remote-id> + </upstream> </pkgmetadata> |