From 1311f5514a1f3d76b6966108645dfac2b3364571 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Aug 2021 10:02:17 +0100 Subject: x11-misc/sddm : revision bump, drop l10n ECLASS, use plocale ECLASS --- metadata/md5-cache/x11-misc/sddm-0.18.1-r10 | 16 ----- metadata/md5-cache/x11-misc/sddm-0.18.1-r11 | 16 +++++ metadata/pkg_desc_index | 2 +- x11-misc/sddm/sddm-0.18.1-r10.ebuild | 107 ---------------------------- x11-misc/sddm/sddm-0.18.1-r11.ebuild | 107 ++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 124 deletions(-) delete mode 100644 metadata/md5-cache/x11-misc/sddm-0.18.1-r10 create mode 100644 metadata/md5-cache/x11-misc/sddm-0.18.1-r11 delete mode 100644 x11-misc/sddm/sddm-0.18.1-r10.ebuild create mode 100644 x11-misc/sddm/sddm-0.18.1-r11.ebuild diff --git a/metadata/md5-cache/x11-misc/sddm-0.18.1-r10 b/metadata/md5-cache/x11-misc/sddm-0.18.1-r10 deleted file mode 100644 index 860fc39e..00000000 --- a/metadata/md5-cache/x11-misc/sddm-0.18.1-r10 +++ /dev/null @@ -1,16 +0,0 @@ -BDEPEND=dev-python/docutils >=dev-qt/linguist-tools-5.9.4:5 kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/pkgconfig -DEFINED_PHASES=compile configure install postinst prepare test -DEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] branding? ( x11-themes/redcore-theme-sddm ) consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower ) test? ( >=dev-qt/qttest-5.9.4:5 ) -DESCRIPTION=Simple Desktop Display Manager -EAPI=7 -HOMEPAGE=https://github.com/sddm/sddm -IUSE=+branding consolekit elogind +pam systemd test -KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 -LICENSE=GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain -RDEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] branding? ( x11-themes/redcore-theme-sddm ) consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower ) -REQUIRED_USE=?? ( elogind systemd ) -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=https://github.com/sddm/sddm/releases/download/v0.18.1/sddm-0.18.1.tar.xz -_eclasses_=cmake 518e4c9a6a38dfd7afc54b6a7c5de3da edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic 4134b5c0fb719b9161d10bdaba9e09e5 l10n 1b1f21459e5dbbe7828bac6564158b01 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b ninja-utils a4dab848a4490e8e48cf0baab3e61bc2 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 systemd c846b9e02ac8293bfc9ca38a195c2a18 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils 27f9a2f19502b925ac117bd657aa2979 -_md5_=cf24f9fe2a961e10d623330ee6896fd0 diff --git a/metadata/md5-cache/x11-misc/sddm-0.18.1-r11 b/metadata/md5-cache/x11-misc/sddm-0.18.1-r11 new file mode 100644 index 00000000..d892ab95 --- /dev/null +++ b/metadata/md5-cache/x11-misc/sddm-0.18.1-r11 @@ -0,0 +1,16 @@ +BDEPEND=dev-python/docutils >=dev-qt/linguist-tools-5.9.4:5 kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/pkgconfig +DEFINED_PHASES=compile configure install postinst prepare test +DEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] branding? ( x11-themes/redcore-theme-sddm ) consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower ) test? ( >=dev-qt/qttest-5.9.4:5 ) +DESCRIPTION=Simple Desktop Display Manager +EAPI=7 +HOMEPAGE=https://github.com/sddm/sddm +IUSE=+branding consolekit elogind +pam systemd test +KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 +LICENSE=GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain +RDEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] branding? ( x11-themes/redcore-theme-sddm ) consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower ) +REQUIRED_USE=?? ( elogind systemd ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://github.com/sddm/sddm/releases/download/v0.18.1/sddm-0.18.1.tar.xz +_eclasses_=cmake 518e4c9a6a38dfd7afc54b6a7c5de3da edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic 4134b5c0fb719b9161d10bdaba9e09e5 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b ninja-utils a4dab848a4490e8e48cf0baab3e61bc2 plocale 89c6aac5da68423465e6fd79fb4ad5fb strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 systemd c846b9e02ac8293bfc9ca38a195c2a18 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa user 1033b6bed7cf367c4507ea9a3ff503d0 user-info 2e75eaea3582b052ec16d9d5aa74ced3 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils 27f9a2f19502b925ac117bd657aa2979 +_md5_=38906131139e92fd399ec72a61e3c492 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 2a03927b..e6e44871 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -96,7 +96,7 @@ x11-misc/nvidia-prime 314: NVIDIA Prime Render Offload configuration and utiliti x11-misc/nvidia-settings 470.63.01: NVIDIA Linux X11 Settings Utility x11-misc/nvidia-settings-legacy 390.144: NVIDIA Linux X11 Settings Utility x11-misc/pcmanfm-qt-share 1337: PCManFM-QT custom action to share folder using Samba -x11-misc/sddm 0.18.1-r10: Simple Desktop Display Manager +x11-misc/sddm 0.18.1-r11: Simple Desktop Display Manager x11-themes/material-icon-theme 1337-r2: Icon theme following the Google's material design specifications x11-themes/redcore-artwork-calamares 314-r2: Redcore Linux branding component for Calamares x11-themes/redcore-artwork-community 314-r2: Redcore Linux Community Wallpapers diff --git a/x11-misc/sddm/sddm-0.18.1-r10.ebuild b/x11-misc/sddm/sddm-0.18.1-r10.ebuild deleted file mode 100644 index bc0c5d29..00000000 --- a/x11-misc/sddm/sddm-0.18.1-r10.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW" -inherit cmake l10n systemd user - -DESCRIPTION="Simple Desktop Display Manager" -HOMEPAGE="https://github.com/sddm/sddm" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="+branding consolekit elogind +pam systemd test" -RESTRICT="!test? ( test )" - -REQUIRED_USE="?? ( elogind systemd )" - -BDEPEND=" - dev-python/docutils - >=dev-qt/linguist-tools-5.9.4:5 - kde-frameworks/extra-cmake-modules:5 - virtual/pkgconfig -" -RDEPEND=" - >=dev-qt/qtcore-5.9.4:5 - >=dev-qt/qtdbus-5.9.4:5 - >=dev-qt/qtdeclarative-5.9.4:5 - >=dev-qt/qtgui-5.9.4:5 - >=dev-qt/qtnetwork-5.9.4:5 - >=x11-base/xorg-server-1.15.1 - x11-libs/libxcb[xkb] - branding? ( x11-themes/redcore-theme-sddm ) - consolekit? ( >=sys-auth/consolekit-0.9.4 ) - elogind? ( sys-auth/elogind ) - pam? ( sys-libs/pam ) - systemd? ( sys-apps/systemd:= ) - !systemd? ( sys-power/upower ) -" -DEPEND="${RDEPEND} - test? ( >=dev-qt/qttest-5.9.4:5 ) -" - -PATCHES=( - "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" - "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210 - "${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch" - # fix for groups: https://github.com/sddm/sddm/issues/1159 - "${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch" - "${FILESDIR}/${P}-honor-PAM-supplemental-groups-v2.patch" - # fix for ReuseSession=true - "${FILESDIR}/${P}-only-reuse-online-sessions.patch" - # TODO: fix properly - "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920 - "${FILESDIR}/pam-1.4-substack.patch" -) - -src_prepare() { - cmake_src_prepare - - disable_locale() { - sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die - } - l10n_find_plocales_changes "data/translations" "" ".ts" - l10n_for_each_disabled_locale_do disable_locale - - if ! use test; then - sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die - cmake_comment_add_subdirectory test - fi -} - -src_configure() { - local mycmakeargs=( - -DENABLE_PAM=$(usex pam) - -DNO_SYSTEMD=$(usex '!systemd') - -DUSE_ELOGIND=$(usex 'elogind') - -DBUILD_MAN_PAGES=ON - -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - # since 0.18.0 sddm no longer installs a config file - # install one ourselves in gentoo's default location - local confd="usr/share/sddm/sddm.conf.d" - dodir ${confd} - insinto ${confd} - newins ${FILESDIR}/${PN}.conf 00default.conf - - # override gentoo's default location with the - # classical location which is /etc/sddm.conf - insinto etc - doins ${FILESDIR}/${PN}.conf -} - -pkg_postinst() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video - - systemd_reenable sddm.service -} diff --git a/x11-misc/sddm/sddm-0.18.1-r11.ebuild b/x11-misc/sddm/sddm-0.18.1-r11.ebuild new file mode 100644 index 00000000..a407e2dd --- /dev/null +++ b/x11-misc/sddm/sddm-0.18.1-r11.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW" +inherit cmake plocale systemd user + +DESCRIPTION="Simple Desktop Display Manager" +HOMEPAGE="https://github.com/sddm/sddm" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="+branding consolekit elogind +pam systemd test" +RESTRICT="!test? ( test )" + +REQUIRED_USE="?? ( elogind systemd )" + +BDEPEND=" + dev-python/docutils + >=dev-qt/linguist-tools-5.9.4:5 + kde-frameworks/extra-cmake-modules:5 + virtual/pkgconfig +" +RDEPEND=" + >=dev-qt/qtcore-5.9.4:5 + >=dev-qt/qtdbus-5.9.4:5 + >=dev-qt/qtdeclarative-5.9.4:5 + >=dev-qt/qtgui-5.9.4:5 + >=dev-qt/qtnetwork-5.9.4:5 + >=x11-base/xorg-server-1.15.1 + x11-libs/libxcb[xkb] + branding? ( x11-themes/redcore-theme-sddm ) + consolekit? ( >=sys-auth/consolekit-0.9.4 ) + elogind? ( sys-auth/elogind ) + pam? ( sys-libs/pam ) + systemd? ( sys-apps/systemd:= ) + !systemd? ( sys-power/upower ) +" +DEPEND="${RDEPEND} + test? ( >=dev-qt/qttest-5.9.4:5 ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" + "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210 + "${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch" + # fix for groups: https://github.com/sddm/sddm/issues/1159 + "${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch" + "${FILESDIR}/${P}-honor-PAM-supplemental-groups-v2.patch" + # fix for ReuseSession=true + "${FILESDIR}/${P}-only-reuse-online-sessions.patch" + # TODO: fix properly + "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920 + "${FILESDIR}/pam-1.4-substack.patch" +) + +src_prepare() { + cmake_src_prepare + + disable_locale() { + sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die + } + plocale_find_changes "data/translations" "" ".ts" + plocale_for_each_disabled_locale disable_locale + + if ! use test; then + sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die + cmake_comment_add_subdirectory test + fi +} + +src_configure() { + local mycmakeargs=( + -DENABLE_PAM=$(usex pam) + -DNO_SYSTEMD=$(usex '!systemd') + -DUSE_ELOGIND=$(usex 'elogind') + -DBUILD_MAN_PAGES=ON + -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + # since 0.18.0 sddm no longer installs a config file + # install one ourselves in gentoo's default location + local confd="usr/share/sddm/sddm.conf.d" + dodir ${confd} + insinto ${confd} + newins ${FILESDIR}/${PN}.conf 00default.conf + + # override gentoo's default location with the + # classical location which is /etc/sddm.conf + insinto etc + doins ${FILESDIR}/${PN}.conf +} + +pkg_postinst() { + enewgroup ${PN} + enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video + + systemd_reenable sddm.service +} -- cgit v1.2.3