Gentoo Archives: gentoo-commits

From: "Jeremy Olexa (darkside)" <darkside@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/slim: ChangeLog slim-1.3.1-r1.ebuild slim-1.3.1.ebuild
Date: Sun, 23 Nov 2008 18:11:25
Message-Id: E1L4JQZ-0000pY-IQ@stork.gentoo.org
1 darkside 08/11/23 18:11:23
2
3 Modified: ChangeLog
4 Added: slim-1.3.1-r1.ebuild
5 Removed: slim-1.3.1.ebuild
6 Log:
7 on second though, the proper fix is to rev bump slim to lose the coreutils dep, bug #215661
8 (Portage version: 2.2_rc14/cvs/Linux 2.6.27.6 x86_64)
9
10 Revision Changes Path
11 1.23 x11-misc/slim/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/slim/ChangeLog?rev=1.23&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/slim/ChangeLog?rev=1.23&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/slim/ChangeLog?r1=1.22&r2=1.23
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v
20 retrieving revision 1.22
21 retrieving revision 1.23
22 diff -u -r1.22 -r1.23
23 --- ChangeLog 23 Nov 2008 18:07:24 -0000 1.22
24 +++ ChangeLog 23 Nov 2008 18:11:23 -0000 1.23
25 @@ -1,6 +1,13 @@
26 # ChangeLog for x11-misc/slim
27 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.22 2008/11/23 18:07:24 darkside Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.23 2008/11/23 18:11:23 darkside Exp $
30 +
31 +*slim-1.3.1-r1 (23 Nov 2008)
32 +
33 + 23 Nov 2008; Jeremy Olexa <darkside@g.o> -slim-1.3.1.ebuild,
34 + +slim-1.3.1-r1.ebuild:
35 + on second though, the proper fix is to rev bump slim to lose the coreutils
36 + dep, bug #215661
37
38 23 Nov 2008; Jeremy Olexa <darkside@g.o> slim-1.3.1.ebuild:
39 remove corefonts from explicit RDEPEND, not needed as seen in bug #215661
40
41
42
43 1.1 x11-misc/slim/slim-1.3.1-r1.ebuild
44
45 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/slim/slim-1.3.1-r1.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/slim/slim-1.3.1-r1.ebuild?rev=1.1&content-type=text/plain
47
48 Index: slim-1.3.1-r1.ebuild
49 ===================================================================
50 # Copyright 1999-2008 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.1-r1.ebuild,v 1.1 2008/11/23 18:11:23 darkside Exp $
53
54 inherit toolchain-funcs pam
55
56 DESCRIPTION="Simple Login Manager"
57 HOMEPAGE="http://slim.berlios.de"
58 SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
59
60 LICENSE="GPL-2"
61 SLOT="0"
62 KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
63 IUSE="pam"
64
65 DEPEND="x11-proto/xproto
66 x11-libs/libXmu
67 x11-libs/libX11
68 x11-libs/libXpm
69 x11-libs/libXft
70 media-libs/libpng
71 media-libs/jpeg
72 pam? ( virtual/pam )"
73 RDEPEND="${DEPEND}
74 x11-apps/sessreg"
75
76 src_unpack() {
77 unpack ${A}
78 cd "${S}"
79
80 # respect C[XX]FLAGS, fix crosscompile,
81 # fix linking order for --as-needed"
82 sed -i -e "s:^CXX=.*:CXX=$(tc-getCXX) ${CXXFLAGS}:" \
83 -e "s:^CC=.*:CC=$(tc-getCC) ${CFLAGS}:" \
84 -e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \
85 -e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \
86 -r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \
87 Makefile || die 'sed failed in Makefile'
88
89 # Set slim to daemon mode as default to stop xdm runscript from throwing errors on stop
90 # Set the default logfile to /dev/null to avoid cluttering up the harddisk
91 # as slim puts a lot of garbage in its logfile
92 # Make slim honor XSESSION in /etc/rc.conf by default.
93 sed -i -e 's/# daemon/daemon/' \
94 -e 's#/var/log/slim.log#/dev/null#g' \
95 -e '/^login_cmd.*/s#exec /bin/bash.*#exec /bin/bash -login /etc/X11/xinit/xinitrc#' \
96 slim.conf || die "sed failed in slim.conf"
97
98 # This method of appending to the slim.conf file may change, but it
99 # works for now.
100 echo "# Needed so your login will show up in wtmp and utmp, etc" >> slim.conf || die
101 echo "sessionstart_cmd /usr/bin/sessreg -a -l $DISPLAY %user" >> slim.conf || die
102 echo "sessionstop_cmd /usr/bin/sessreg -d -l $DISPLAY %user" >> slim.conf || die
103 }
104
105 src_compile() {
106 if use pam ; then
107 emake USE_PAM=1 || die "emake failed."
108 else
109 emake || die "emake failed."
110 fi
111 }
112
113 src_install() {
114 if use pam ; then
115 emake USE_PAM=1 DESTDIR="${D}" install || die "emake install failed."
116 pamd_mimic_system slim auth account password session
117 else
118 emake DESTDIR="${D}" install || die "emake install failed."
119 fi
120
121 dodoc xinitrc.sample ChangeLog README TODO THEMES
122 }
123
124 pkg_postinst() {
125 elog
126 elog "The configuration file is located at /etc/slim.conf."
127 elog
128 elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
129 elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
130 elog "By default, ${PN} will use default XSESSION value set in /etc/rc.conf."
131 elog
132 elog "If you want to use .xinitrc in the user's home directory for session"
133 elog "management instead, see README and xinitrc.sample in"
134 elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
135 elog "accordingly."
136 elog
137 if ! use pam; then
138 elog "You have merged ${PN} without USE=pam, this will cause ${PN} to fall back to"
139 elog "the console when restarting your window manager. If this is not"
140 elog "desired, then please remerge ${PN} with USE=pam"
141 fi
142 }