commit: 546744d86e6160b65fe19e7453e46389945721af Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon Oct 17 08:53:56 2016 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon Oct 17 09:04:55 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=546744d8
x11-misc/lightdm: Bump to versions 1.18.3 and 1.20.0 Package-Manager: portage-2.3.2 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> x11-misc/lightdm/Manifest | 2 + x11-misc/lightdm/lightdm-1.18.3.ebuild | 137 +++++++++++++++++++++++++++++++++ x11-misc/lightdm/lightdm-1.20.0.ebuild | 137 +++++++++++++++++++++++++++++++++ 3 files changed, 276 insertions(+) diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest index 19ca436..3a11f2c 100644 --- a/x11-misc/lightdm/Manifest +++ b/x11-misc/lightdm/Manifest @@ -4,5 +4,7 @@ DIST lightdm-1.16.7.tar.xz 486692 SHA256 67b72a5dadf823ebc7df1bb523da59342271fcf DIST lightdm-1.17.6.tar.xz 499652 SHA256 fcfd5e7c8a4bbd6d6691ce1fb96f96fccad38eb8d4043b8d97a0b284c9c2db43 SHA512 80241009df119ee6d3ee87150b287341f0fdae199d63f020767dda824b4f934631674b28950c5bef48dc2b658f3e8f2f3d147740a7d49fdd84dd5dfb2c84d82a WHIRLPOOL 0feb976bc37c0593ea6d6d504ab0667c097077a75b6311a60f3028937812d90875639054880bf5fe9268cf34a3ef8ce8a3c1601bca7a6b97b1f346d408cf2126 DIST lightdm-1.18.1.tar.xz 498944 SHA256 85488565e42089ec025a2f330cff97fa615b02777dbab86a916b209a2cfc89fa SHA512 6b7c4900a91d033fdd679d2e14f4ed38016d91b57c0b2d288d7d655943352caa8b6484aae2d4e99445de7829fbebc0c869a5c2f7023e0198c9b66943bb601375 WHIRLPOOL 1bd6a92f3301561753e2abab10a755ecfa570e37fe36b9c9ae2519a33d012d00a0d8a2fb76a6c5fed3187d815f95cc641ba707276b95932705ce81c0af24d098 DIST lightdm-1.18.2.tar.xz 500240 SHA256 fd97dfc8af9c6e14c9919d1c13a4a8a68a046621ad5f404ca4e3c84895ab0e5c SHA512 e904ce9459128bf5918d9ff3df5bda33ccbae854339daa19fddf679af17826a3d5e45ab6a811bd36b66324ee1ecbb34edf9fd00bf2d389010d8820f0f8a5303e WHIRLPOOL 52acb2b4e9c0e02bd22a316269225ff69dcb59054574cf401e887c33acd4c55d7ac6b39150fb740c203e4a6bb227a64917eac190632ec7c6796a8378a46c0ccb +DIST lightdm-1.18.3.tar.xz 503968 SHA256 d99215aeca38db2da84eede2ac3b9e875a746b3bc81bb3a30e0b8d89b87e1494 SHA512 dde34e4969d2f04e6729eb1b30d38bac9a89ff42c46f8a21e94b76beadbde450ffaa377201bd3a56e0d8d95d0640eb312ed11ecf94efb9a5a66777b944d4f234 WHIRLPOOL 5b06581c56188ada75a196d0663b041b7507f0923a8a8ceec2531926a034675ac592df356c7840568492f5af9ca0d6058ad477904147ece66568f59517cde8cb DIST lightdm-1.19.3.tar.xz 503856 SHA256 09c245cfe1f111f9590f135a2b1eeef9c72df8fcaca44ba9758376d2be80e5a4 SHA512 16a191ce24221ee1bddc53851ceb30541fbe0ba588c3f4a76234be264598bad72ae22898646f9e0c9ec3cefead37e5892d8982009ffdbac50418802d1a11b0fd WHIRLPOOL 9e2321988816721044327acfe9b6674cadbd951fec8c3f03a0669c44b8026774a2957d9247a76b49f003562db4e6e96d8b73b6ca881b4b2d25296908bc34092f DIST lightdm-1.19.4.tar.xz 506032 SHA256 0eaf6d2725c2d8d15a067cf293a4f3f3526720467a41c9806c894e7e802f20d0 SHA512 1c2ad4a75305e288f466f4635f45521e16a44ef373cfed62d491e5f720d1a981fe3bf6630769b8569aaf4c4ef73770eef390fb59715d2e255936202bfc73ecd1 WHIRLPOOL 703232583ccd8544276ac0bdbac6e2810e7e7e56d6c1f3b022128188da697c69ffd57f597135e7ad0aa9245bebe02b2dd9e3e848ec1a2cf57bbcabd66b8dede7 +DIST lightdm-1.20.0.tar.xz 506488 SHA256 f03b7804a4902d189849a060292e4987d1e4f8272a1edb3e681e6f3cdfaa5ba4 SHA512 7d1d8379bc59f0326f486fe4a618c4939aadd6795ff92f9cd983997ad41e5fed5690eb6cbd81de30f4384ede6f5f88b2fff1781e13b51b5fe8f389379e8d2335 WHIRLPOOL e6345a1b66afb05aefe52664d33274df316b43d17808404cd7337dff284cb41106e191ffaf24e9805a02ac2b650d784fe988592a460a81302022386b2aadb674 diff --git a/x11-misc/lightdm/lightdm-1.18.3.ebuild b/x11-misc/lightdm/lightdm-1.18.3.ebuild new file mode 100644 index 00000000..22ff7e2 --- /dev/null +++ b/x11-misc/lightdm/lightdm-1.18.3.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit autotools eutils flag-o-matic pam qmake-utils readme.gentoo-r1 systemd versionator xdg-utils + +TRUNK_VERSION="$(get_version_component_range 1-2)" +DESCRIPTION="A lightweight display manager" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM"; +SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz + mirror://gentoo/introspection-20110205.m4.tar.bz2" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="audit +gtk +introspection kde qt4 qt5 +gnome" +REQUIRED_USE="|| ( gtk kde )" + +COMMON_DEPEND="audit? ( sys-process/audit ) + >=dev-libs/glib-2.32.3:2 + dev-libs/libxml2 + gnome? ( sys-apps/accountsservice ) + virtual/pam + x11-libs/libX11 + >=x11-libs/libxklavier-5 + introspection? ( >=dev-libs/gobject-introspection-1 ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtdbus:4 + dev-qt/qtgui:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + )" +RDEPEND="${COMMON_DEPEND} + >=sys-auth/pambase-20101024-r2" +DEPEND="${COMMON_DEPEND} + dev-util/gtk-doc-am + dev-util/intltool + gnome? ( gnome-base/gnome-common ) + sys-devel/gettext + virtual/pkgconfig" +PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter ) + kde? ( x11-misc/lightdm-kde )" + +DOCS=( NEWS ) +RESTRICT="test" + +src_prepare() { + xdg_environment_reset + + sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369 + sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die + + einfo "Fixing the session-wrapper variable in lightdm.conf" + sed -i -e \ + "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ + data/lightdm.conf || die "Failed to fix lightdm.conf" + + # use correct version of qmake. bug #566950 + sed -i -e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" configure.ac || die + sed -i -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" configure.ac || die + + default + + # Remove bogus Makefile statement. This needs to go upstream + sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die + if has_version dev-libs/gobject-introspection; then + eautoreconf + else + AT_M4DIR=${WORKDIR} eautoreconf + fi +} + +src_configure() { + # Set default values if global vars unset + local _greeter _session _user + _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} + _session=${LIGHTDM_SESSION:=gnome} + _user=${LIGHTDM_USER:=root} + # Let user know how lightdm is configured + einfo "Gentoo configuration" + einfo "Default greeter: ${_greeter}" + einfo "Default session: ${_session}" + einfo "Greeter user: ${_user}" + + use qt5 && append-cxxflags -std=c++11 + + # also disable tests because libsystem.c does not build. Tests are + # restricted so it does not matter anyway. + econf \ + --localstatedir=/var \ + --disable-static \ + --disable-tests \ + $(use_enable audit libaudit) \ + $(use_enable introspection) \ + $(use_enable qt4 liblightdm-qt) \ + $(use_enable qt5 liblightdm-qt5) \ + --with-user-session=${_session} \ + --with-greeter-session=${_greeter} \ + --with-greeter-user=${_user} \ + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html +} + +src_install() { + default + + # Delete apparmor profiles because they only work with Ubuntu's + # apparmor package. Bug #494426 + if [[ -d ${D}/etc/apparmor.d ]]; then + rm -r "${D}/etc/apparmor.d" || die \ + "Failed to remove apparmor profiles" + fi + + insinto /etc/${PN} + doins data/{${PN},keys}.conf + doins "${FILESDIR}"/Xsession + fperms +x /etc/${PN}/Xsession + # /var/lib/lightdm-data could be useful. Bug #522228 + dodir /var/lib/lightdm-data + + prune_libtool_files --all + rm -rf "${ED}"/etc/init + + # Remove existing pam file. We will build a new one. Bug #524792 + rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter} + pamd_mimic system-local-login ${PN} auth account password session #372229 + pamd_mimic system-local-login ${PN}-greeter auth account password session #372229 + dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163 + + readme.gentoo_create_doc + + systemd_dounit "${FILESDIR}/${PN}.service" +} diff --git a/x11-misc/lightdm/lightdm-1.20.0.ebuild b/x11-misc/lightdm/lightdm-1.20.0.ebuild new file mode 100644 index 00000000..22ff7e2 --- /dev/null +++ b/x11-misc/lightdm/lightdm-1.20.0.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit autotools eutils flag-o-matic pam qmake-utils readme.gentoo-r1 systemd versionator xdg-utils + +TRUNK_VERSION="$(get_version_component_range 1-2)" +DESCRIPTION="A lightweight display manager" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM"; +SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz + mirror://gentoo/introspection-20110205.m4.tar.bz2" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="audit +gtk +introspection kde qt4 qt5 +gnome" +REQUIRED_USE="|| ( gtk kde )" + +COMMON_DEPEND="audit? ( sys-process/audit ) + >=dev-libs/glib-2.32.3:2 + dev-libs/libxml2 + gnome? ( sys-apps/accountsservice ) + virtual/pam + x11-libs/libX11 + >=x11-libs/libxklavier-5 + introspection? ( >=dev-libs/gobject-introspection-1 ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtdbus:4 + dev-qt/qtgui:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + )" +RDEPEND="${COMMON_DEPEND} + >=sys-auth/pambase-20101024-r2" +DEPEND="${COMMON_DEPEND} + dev-util/gtk-doc-am + dev-util/intltool + gnome? ( gnome-base/gnome-common ) + sys-devel/gettext + virtual/pkgconfig" +PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter ) + kde? ( x11-misc/lightdm-kde )" + +DOCS=( NEWS ) +RESTRICT="test" + +src_prepare() { + xdg_environment_reset + + sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369 + sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die + + einfo "Fixing the session-wrapper variable in lightdm.conf" + sed -i -e \ + "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ + data/lightdm.conf || die "Failed to fix lightdm.conf" + + # use correct version of qmake. bug #566950 + sed -i -e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" configure.ac || die + sed -i -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" configure.ac || die + + default + + # Remove bogus Makefile statement. This needs to go upstream + sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die + if has_version dev-libs/gobject-introspection; then + eautoreconf + else + AT_M4DIR=${WORKDIR} eautoreconf + fi +} + +src_configure() { + # Set default values if global vars unset + local _greeter _session _user + _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} + _session=${LIGHTDM_SESSION:=gnome} + _user=${LIGHTDM_USER:=root} + # Let user know how lightdm is configured + einfo "Gentoo configuration" + einfo "Default greeter: ${_greeter}" + einfo "Default session: ${_session}" + einfo "Greeter user: ${_user}" + + use qt5 && append-cxxflags -std=c++11 + + # also disable tests because libsystem.c does not build. Tests are + # restricted so it does not matter anyway. + econf \ + --localstatedir=/var \ + --disable-static \ + --disable-tests \ + $(use_enable audit libaudit) \ + $(use_enable introspection) \ + $(use_enable qt4 liblightdm-qt) \ + $(use_enable qt5 liblightdm-qt5) \ + --with-user-session=${_session} \ + --with-greeter-session=${_greeter} \ + --with-greeter-user=${_user} \ + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html +} + +src_install() { + default + + # Delete apparmor profiles because they only work with Ubuntu's + # apparmor package. Bug #494426 + if [[ -d ${D}/etc/apparmor.d ]]; then + rm -r "${D}/etc/apparmor.d" || die \ + "Failed to remove apparmor profiles" + fi + + insinto /etc/${PN} + doins data/{${PN},keys}.conf + doins "${FILESDIR}"/Xsession + fperms +x /etc/${PN}/Xsession + # /var/lib/lightdm-data could be useful. Bug #522228 + dodir /var/lib/lightdm-data + + prune_libtool_files --all + rm -rf "${ED}"/etc/init + + # Remove existing pam file. We will build a new one. Bug #524792 + rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter} + pamd_mimic system-local-login ${PN} auth account password session #372229 + pamd_mimic system-local-login ${PN}-greeter auth account password session #372229 + dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163 + + readme.gentoo_create_doc + + systemd_dounit "${FILESDIR}/${PN}.service" +}
