From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E169459CAF for ; Mon, 4 Apr 2016 09:41:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B378BE08A2; Mon, 4 Apr 2016 09:41:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10C18E08A2 for ; Mon, 4 Apr 2016 09:41:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC71F340C8D for ; Mon, 4 Apr 2016 09:41:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 728FECA for ; Mon, 4 Apr 2016 09:41:25 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1459762878.fb37c54c19c16770b79e74dbe7c042431628aca7.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/lightdm/Manifest x11-misc/lightdm/lightdm-1.17.6.ebuild x11-misc/lightdm/lightdm-1.18.0.ebuild X-VCS-Directories: x11-misc/lightdm/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: fb37c54c19c16770b79e74dbe7c042431628aca7 X-VCS-Branch: master Date: Mon, 4 Apr 2016 09:41:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d1bda637-9d56-4637-a0ef-4dd2338498e2 X-Archives-Hash: 33ca392a32b7872a07e1af370a726c4c commit: fb37c54c19c16770b79e74dbe7c042431628aca7 Author: Lars Wendler gentoo org> AuthorDate: Mon Apr 4 09:34:29 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Apr 4 09:41:18 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb37c54c x11-misc/lightdm: Bump to versions 1.17.5 and 1.18.0 with kind permission from hwoarang. Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler gentoo.org> x11-misc/lightdm/Manifest | 2 + x11-misc/lightdm/lightdm-1.17.6.ebuild | 129 +++++++++++++++++++++++++++++++++ x11-misc/lightdm/lightdm-1.18.0.ebuild | 129 +++++++++++++++++++++++++++++++++ 3 files changed, 260 insertions(+) diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest index d973210..aa4bda8 100644 --- a/x11-misc/lightdm/Manifest +++ b/x11-misc/lightdm/Manifest @@ -8,3 +8,5 @@ DIST lightdm-1.16.7.tar.xz 486692 SHA256 67b72a5dadf823ebc7df1bb523da59342271fcf DIST lightdm-1.17.2.tar.xz 486492 SHA256 dbdcddc8257308198bc6b4b6bd6307753c2a244ddcd6c2637368f2243b3a1a5b SHA512 07fffab17a917e6d03eac1850c205342e8fe7f627abf3820ebfe3107ef827af4fc4443bcaa7ec447760dcf0de9c2b517472854f7562bb3dc915a23c9742ccb15 WHIRLPOOL 4d4b911565be26f98d10da219e6454f013324ef78a1c9a99c97e785355c53bd8cb0f922340453c514d3e1d019581adadec36ada2c91f37b0bfed2010bb346920 DIST lightdm-1.17.3.tar.xz 487176 SHA256 a9fcfb5edaad4f8c33dcdd695095791e952720d051eef695e07469ed87fa85b3 SHA512 0624fd994dbb0052c2e6092fa9e8ee3785d541d65c3baf911eff5a4f74e5689395a1079139ed6c30e4ad8db07355d9aede859a58718c873a9684c880efdbb6b0 WHIRLPOOL 988e77d998a843d9d168380d1aa5e16f2f491c52679732442e07b8a7b90ffea45fbf3b239f0f65acaac84626e5b9c933f86981250996c6a3524802953654c892 DIST lightdm-1.17.5.tar.xz 488048 SHA256 4661ea0adb9e2fef9b447b604fc46f70821b8b1c271ac7e61ca6ba5d8f043d8d SHA512 6d3bc969978fe536d30882c26c9b5ab4fca4d8ece60d6705c5838032718b20edbeee1c87f75baeef9df4ebea99cecde1a3bfc706f56c44ee3ce94bc8ad3d7e46 WHIRLPOOL 8456bef0d972eca33f106ef177ccad765cc5ea5315866d807e31dd415f89e26b667acd3ea8b01e037429f9d0133177ca9c1b8f043b2708923cf977532cab7791 +DIST lightdm-1.17.6.tar.xz 499652 SHA256 fcfd5e7c8a4bbd6d6691ce1fb96f96fccad38eb8d4043b8d97a0b284c9c2db43 SHA512 80241009df119ee6d3ee87150b287341f0fdae199d63f020767dda824b4f934631674b28950c5bef48dc2b658f3e8f2f3d147740a7d49fdd84dd5dfb2c84d82a WHIRLPOOL 0feb976bc37c0593ea6d6d504ab0667c097077a75b6311a60f3028937812d90875639054880bf5fe9268cf34a3ef8ce8a3c1601bca7a6b97b1f346d408cf2126 +DIST lightdm-1.18.0.tar.xz 499964 SHA256 2fb92fc71bed5506bfe2635656dec5565d8adf89c15b046ce3df2d4fcc66fb1f SHA512 b0208f2fa31ddaa26ffd4eb476c2ef50938c092f0b018affc22363b602b38a8f5e42be57fa382cee1b2f51e600da9ef0592ae29e356c22de3a908128b847d597 WHIRLPOOL bca86c5b917f6c78432d0279f4b9e881c52b329f5bd1b7d4b76fd714c6c5ca571977b8ea896fb3e9fa2f43fce5f89490fe6eafaf49f52e1f65dc9d9e899e8b19 diff --git a/x11-misc/lightdm/lightdm-1.17.6.ebuild b/x11-misc/lightdm/lightdm-1.17.6.ebuild new file mode 100644 index 0000000..4b5df57 --- /dev/null +++ b/x11-misc/lightdm/lightdm-1.17.6.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit autotools eutils pam readme.gentoo-r1 systemd versionator + +TRUNK_VERSION="$(get_version_component_range 1-2)" +DESCRIPTION="A lightweight display manager" +HOMEPAGE="http://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 ~ppc ~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() { + 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" + + 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}" + + # 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.18.0.ebuild b/x11-misc/lightdm/lightdm-1.18.0.ebuild new file mode 100644 index 0000000..4b5df57 --- /dev/null +++ b/x11-misc/lightdm/lightdm-1.18.0.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit autotools eutils pam readme.gentoo-r1 systemd versionator + +TRUNK_VERSION="$(get_version_component_range 1-2)" +DESCRIPTION="A lightweight display manager" +HOMEPAGE="http://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 ~ppc ~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() { + 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" + + 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}" + + # 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" +}