From 627d2494731f933d756ebfe50d851aadbe6dcf07 Mon Sep 17 00:00:00 2001 From: Jeremy Olexa Date: Tue, 23 Dec 2008 04:50:31 +0000 Subject: New slim.conf patch (bug 250722) by Nico R. Wohlgemuth. Converted to EAPI-2 since portage-2.1.6.2 will be stable any day now. add screenshot use flag to dep on imagemagick (Portage version: 2.2_rc18/cvs/Linux 2.6.27.10 x86_64) --- x11-misc/slim/ChangeLog | 11 +++- x11-misc/slim/files/slim-1.3.1-config.diff | 38 ++++++++++++ x11-misc/slim/metadata.xml | 3 + x11-misc/slim/slim-1.3.0-r2.ebuild | 98 ------------------------------ x11-misc/slim/slim-1.3.1-r2.ebuild | 79 ++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 99 deletions(-) create mode 100644 x11-misc/slim/files/slim-1.3.1-config.diff delete mode 100644 x11-misc/slim/slim-1.3.0-r2.ebuild create mode 100644 x11-misc/slim/slim-1.3.1-r2.ebuild (limited to 'x11-misc') diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog index 0fb2d68734de..1cb14a7a4ae2 100644 --- a/x11-misc/slim/ChangeLog +++ b/x11-misc/slim/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for x11-misc/slim # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.28 2008/12/12 09:53:11 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.29 2008/12/23 04:50:31 darkside Exp $ + +*slim-1.3.1-r2 (23 Dec 2008) + + 23 Dec 2008; Jeremy Olexa + +files/slim-1.3.1-config.diff, metadata.xml, -slim-1.3.0-r2.ebuild, + +slim-1.3.1-r2.ebuild: + New slim.conf patch (bug 250722) by Nico R. Wohlgemuth. Converted to EAPI-2 + since portage-2.1.6.2 will be stable any day now. add screenshot use flag to + dep on imagemagick 12 Dec 2008; Raúl Porcel slim-1.3.1-r1.ebuild: sparc/x86 stable wrt #248448 diff --git a/x11-misc/slim/files/slim-1.3.1-config.diff b/x11-misc/slim/files/slim-1.3.1-config.diff new file mode 100644 index 000000000000..1415d3d24d77 --- /dev/null +++ b/x11-misc/slim/files/slim-1.3.1-config.diff @@ -0,0 +1,38 @@ +--- slim.conf.orig 2008-12-22 22:31:25.073293331 -0600 ++++ slim.conf 2008-12-22 22:36:14.271006503 -0600 +@@ -2,7 +2,7 @@ + # Note: -xauth $authfile is automatically appended + default_path ./:/bin:/usr/bin:/usr/local/bin + default_xserver /usr/bin/X +-#xserver_arguments -dpi 75 ++xserver_arguments -nolisten tcp -br -deferglyphs 16 + + # Commands for halt, login, etc. + halt_cmd /sbin/shutdown -h now +@@ -18,7 +18,7 @@ + + + # Activate numlock when slim starts. Valid values: on|off +-# numlock on ++numlock on + + # Hide the mouse cursor (note: does not work with some WMs). + # Valid values: true|false +@@ -33,7 +33,8 @@ + # to adjust the command according to your preferred shell, + # i.e. for freebsd use: + # login_cmd exec /bin/sh - ~/.xinitrc %session +-login_cmd exec /bin/bash -login ~/.xinitrc %session ++# login_cmd exec /bin/bash -login ~/.xinitrc %session ++login_cmd exec /bin/bash -login /etc/X11/xinit/xinitrc + + # Commands executed when starting and exiting a session. + # They can be used for registering a X11 session with +@@ -41,6 +42,7 @@ + # + # sessionstart_cmd some command + # sessionstop_cmd some command ++sessionstart_cmd /usr/bin/sessreg -a -l :0.0 %user + + # Start in daemon mode. Valid values: yes | no + # Note that this can be overriden by the command line diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml index c164cdae1bb7..8f20e7cca7da 100644 --- a/x11-misc/slim/metadata.xml +++ b/x11-misc/slim/metadata.xml @@ -5,5 +5,8 @@ darkside@gentoo.org + + Enable screenshot support (using media-gfx/imagemagick) + diff --git a/x11-misc/slim/slim-1.3.0-r2.ebuild b/x11-misc/slim/slim-1.3.0-r2.ebuild deleted file mode 100644 index 366866713bc2..000000000000 --- a/x11-misc/slim/slim-1.3.0-r2.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.0-r2.ebuild,v 1.5 2008/09/26 10:42:41 aballier Exp $ - -inherit eutils toolchain-funcs pam - -DESCRIPTION="Simple Login Manager" -HOMEPAGE="http://slim.berlios.de" -SRC_URI="mirror://berlios/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~sparc ~x86" -IUSE="pam" - -DEPEND="x11-proto/xproto - x11-libs/libXmu - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXft - media-libs/libpng - media-libs/jpeg - pam? ( virtual/pam )" -RDEPEND="${DEPEND} - media-fonts/corefonts - x11-apps/sessreg" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-gcc43.patch - - # respect C[XX]FLAGS, fix crosscompile, - # fix linking order for --as-needed" - sed -i -e "s:^CXX=.*:CXX=$(tc-getCXX) ${CXXFLAGS}:" \ - -e "s:^CC=.*:CC=$(tc-getCC) ${CFLAGS}:" \ - -e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \ - -e "s:/usr/X11R6:/usr:" \ - -e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \ - -r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \ - Makefile || die 'sed failed in Makefile' - - # Remove all X11R6 references from slim.conf - # Set slim to daemon mode as default to stop xdm runscript from throwing errors on stop - # Set the default logfile to /dev/null to avoid cluttering up the harddisk - # as slim puts a lot of garbage in its logfile - # Make slim honor XSESSION in /etc/rc.conf by default. - sed -i -e 's#X11R6/##g' -e 's#/usr/bin:##' \ - -e 's/# daemon/daemon/' \ - -e 's#/var/log/slim.log#/dev/null#g' \ - -e '/^login_cmd.*/s#exec /bin/bash.*#exec /bin/bash -login /etc/X11/xinit/xinitrc#' \ - slim.conf || die "sed failed in slim.conf" - - # This method of appending to the slim.conf file may change, but it - # works for now. - echo "# Needed so your login will show up in wtmp and utmp, etc" >> slim.conf || die - echo "sessionstart_cmd /usr/bin/sessreg -a -l $DISPLAY %user" >> slim.conf || die - echo "sessionstop_cmd /usr/bin/sessreg -d -l $DISPLAY %user" >> slim.conf || die -} - -src_compile() { - if use pam ; then - emake USE_PAM=1 || die "emake failed." - else - emake || die "emake failed." - fi -} - -src_install() { - if use pam ; then - emake USE_PAM=1 DESTDIR="${D}" install || die "emake install failed." - pamd_mimic_system slim auth account password session - else - emake DESTDIR="${D}" install || die "emake install failed." - fi - - dodoc xinitrc.sample ChangeLog README TODO THEMES -} - -pkg_postinst() { - elog - elog "The configuration file is located at /etc/slim.conf." - elog - elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" " - elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"." - elog "By default, ${PN} will use default XSESSION value set in /etc/rc.conf." - elog - elog "If you want to use .xinitrc in the user's home directory for session" - elog "management instead, see README and xinitrc.sample in" - elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf" - elog "accordingly." - elog - if ! use pam; then - elog "You have merged ${PN} without USE=pam, this will cause ${PN} to fall back to" - elog "the console when restarting your window manager. If this is not" - elog "desired, then please remerge ${PN} with USE=pam" - fi -} diff --git a/x11-misc/slim/slim-1.3.1-r2.ebuild b/x11-misc/slim/slim-1.3.1-r2.ebuild new file mode 100644 index 000000000000..107d16e244b4 --- /dev/null +++ b/x11-misc/slim/slim-1.3.1-r2.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.1-r2.ebuild,v 1.1 2008/12/23 04:50:31 darkside Exp $ + +EAPI=2 + +inherit toolchain-funcs pam eutils + +DESCRIPTION="Simple Login Manager" +HOMEPAGE="http://slim.berlios.de" +SRC_URI="mirror://berlios/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="screenshot pam" + +DEPEND="x11-proto/xproto + x11-libs/libXmu + x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXft + media-libs/libpng + media-libs/jpeg + pam? ( virtual/pam )" +RDEPEND="${DEPEND} + x11-apps/sessreg + screenshot? ( media-gfx/imagemagick )" + +src_prepare() { + # respect C[XX]FLAGS, fix crosscompile, + # fix linking order for --as-needed" + sed -i -e "s:^CXX=.*:CXX=$(tc-getCXX) ${CXXFLAGS}:" \ + -e "s:^CC=.*:CC=$(tc-getCC) ${CFLAGS}:" \ + -e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \ + -e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \ + -r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \ + Makefile || die "sed failed in Makefile" + epatch "${FILESDIR}/${P}-config.diff" +} + +src_compile() { + if use pam ; then + emake USE_PAM=1 || die "emake failed." + else + emake || die "emake failed." + fi +} + +src_install() { + if use pam ; then + emake USE_PAM=1 DESTDIR="${D}" install || die "emake install failed." + pamd_mimic_system slim auth account password session + else + emake DESTDIR="${D}" install || die "emake install failed." + fi + + dodoc xinitrc.sample ChangeLog README TODO THEMES +} + +pkg_postinst() { + elog + elog "The configuration file is located at /etc/slim.conf." + elog + elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" " + elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"." + elog "By default, ${PN} will use default XSESSION value set in /etc/rc.conf." + elog + elog "If you want to use .xinitrc in the user's home directory for session" + elog "management instead, see README and xinitrc.sample in" + elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf" + elog "accordingly." + elog + if ! use pam; then + elog "You have merged ${PN} without USE=pam, this will cause ${PN} to fall back to" + elog "the console when restarting your window manager. If this is not" + elog "desired, then please remerge ${PN} with USE=pam" + fi +} -- cgit v1.2.3-65-gdbad