commit: 0b1a7898fd955ca3615e55fd32cd9377e97a644d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Dec 21 13:49:44 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Dec 21 14:40:25 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b1a7898
x11-misc/lightdm: Drop old Package-Manager: Portage-2.3.19, Repoman-2.3.6 x11-misc/lightdm/Manifest | 1 - x11-misc/lightdm/lightdm-1.22.0.ebuild | 133 --------------------------------- x11-misc/lightdm/lightdm-1.24.0.ebuild | 133 --------------------------------- 3 files changed, 267 deletions(-) diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest index 963f0687469..baf810cba77 100644 --- a/x11-misc/lightdm/Manifest +++ b/x11-misc/lightdm/Manifest @@ -1,4 +1,3 @@ DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be DIST lightdm-1.18.3.tar.xz 503968 BLAKE2B ec1fa0a62880708d223da972b3d9c2f2961e3e8f8baf6da9012de98818b27e0bc0e37cb6f460a25821779d83e9da1cd632484ad75ba95cb26cb9d23254600024 SHA512 dde34e4969d2f04e6729eb1b30d38bac9a89ff42c46f8a21e94b76beadbde450ffaa377201bd3a56e0d8d95d0640eb312ed11ecf94efb9a5a66777b944d4f234 -DIST lightdm-1.22.0.tar.xz 517416 BLAKE2B a97ff299e15ba50cd267ccf29854595f1d36cf201bc12da1cc56bf9aeba24f75fcf237f92ac1aa5c323889eacb27825a95cd231e6a48561c01739a760125b9e3 SHA512 58be4428465dda66be8ba1cf4718ece40888af810bfd83d8ae059b3f5432ab7053373af2ecdcafd5e1fade77f0194eae7ded7d6c28e9c4be4aef56d9b432f0cc DIST lightdm-1.24.0.tar.xz 517552 BLAKE2B b4ab92b313bbb3a7bcc48a1d02b7bfb978bbc5041dbb81ceaa59c4296b2e4b069f90d9f09a4289376cb34e11331c39740f4e5370273d1315c75a9a35bd01cbb0 SHA512 30bad8887928f22bf2cc7ce8d7a323637dec669d47d69fb326cfcf1bb5ee9e52c1232cf680af94a25cf90a9de13d9b5ff73307c1dc8829422600d350401555b8 diff --git a/x11-misc/lightdm/lightdm-1.22.0.ebuild b/x11-misc/lightdm/lightdm-1.22.0.ebuild deleted file mode 100644 index 117a032bbbd..00000000000 --- a/x11-misc/lightdm/lightdm-1.22.0.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 qt4 qt5 +gnome" - -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 )" - -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} -} - -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.24.0.ebuild b/x11-misc/lightdm/lightdm-1.24.0.ebuild deleted file mode 100644 index 117a032bbbd..00000000000 --- a/x11-misc/lightdm/lightdm-1.24.0.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 qt4 qt5 +gnome" - -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 )" - -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} -} - -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" -}
