Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: slim-1.3.2.ebuild ChangeLog
Date: Sat, 31 Jul 2010 03:02:11
Message-Id: 20100731025840.BADFA2CF37@corvid.gentoo.org
1 darkside 10/07/31 02:58:40
2
3 Modified: ChangeLog
4 Added: slim-1.3.2.ebuild
5 Log:
6 Upstream version bump with minor changes, bug 328447. Drop screenshot USE flag and suggest a method with comments in the conf file, bug 252241
7 (Portage version: 2.1.8.3/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.51 x11-misc/slim/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/ChangeLog?rev=1.51&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/ChangeLog?rev=1.51&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/ChangeLog?r1=1.50&r2=1.51
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v
19 retrieving revision 1.50
20 retrieving revision 1.51
21 diff -u -r1.50 -r1.51
22 --- ChangeLog 21 May 2010 22:24:38 -0000 1.50
23 +++ ChangeLog 31 Jul 2010 02:58:39 -0000 1.51
24 @@ -1,6 +1,13 @@
25 # ChangeLog for x11-misc/slim
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.50 2010/05/21 22:24:38 darkside Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.51 2010/07/31 02:58:39 darkside Exp $
29 +
30 +*slim-1.3.2 (31 Jul 2010)
31 +
32 + 31 Jul 2010; Jeremy Olexa <darkside@g.o> +slim-1.3.2.ebuild,
33 + +files/slim-1.3.2-config.diff:
34 + Upstream version bump with minor changes, bug 328447. Drop screenshot USE
35 + flag and suggest a method with comments in the conf file, bug 252241
36
37 21 May 2010; Jeremy Olexa <darkside@g.o> -slim-1.3.1-r4.ebuild,
38 -slim-1.3.1-r5.ebuild, slim-1.3.1_p20091114.ebuild:
39
40
41
42 1.1 x11-misc/slim/slim-1.3.2.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/slim-1.3.2.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/slim-1.3.2.ebuild?rev=1.1&content-type=text/plain
46
47 Index: slim-1.3.2.ebuild
48 ===================================================================
49 # Copyright 1999-2010 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2.ebuild,v 1.1 2010/07/31 02:58:39 darkside Exp $
52
53 EAPI=2
54
55 inherit toolchain-funcs pam eutils
56
57 DESCRIPTION="Simple Login Manager"
58 HOMEPAGE="http://slim.berlios.de"
59 SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
60
61 LICENSE="GPL-2"
62 SLOT="0"
63 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
64 IUSE="branding screenshot pam"
65
66 RDEPEND="x11-libs/libXmu
67 x11-libs/libX11
68 x11-libs/libXpm
69 x11-libs/libXft
70 media-libs/libpng
71 media-libs/jpeg
72 x11-apps/sessreg
73 pam? ( virtual/pam )"
74 DEPEND="${RDEPEND}
75 dev-util/pkgconfig
76 x11-proto/xproto"
77 PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
78
79 src_prepare() {
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 -e "s:-I/usr/include/libpng12:$(pkg-config --cflags-only-I libpng):" \
87 -e "s:-lpng12:$(pkg-config --libs-only-l libpng):" \
88 -r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \
89 Makefile || die "sed failed in Makefile"
90 epatch "${FILESDIR}/${PN}-1.3.2-config.diff"
91
92 if use branding; then
93 sed -i -e 's/ default/ slim-gentoo-simple/' slim.conf || die
94 fi
95
96 # Gentoo bug 297655
97 epatch "${FILESDIR}/14509-fix-keyboard-in-tty-from-which-${PN}-is-lauched.patch"
98 # Upstream bug #15287
99 epatch "${FILESDIR}/15287-fix-pam-authentication-with-pam_unix2.patch"
100 # Gentoo Bug 261713
101 epatch "${FILESDIR}/261713-restart-xserver-if-killed.patch"
102 }
103
104 src_compile() {
105 if use pam ; then
106 emake USE_PAM=1 || die "emake failed."
107 else
108 emake || die "emake failed."
109 fi
110 }
111
112 src_install() {
113 if use pam ; then
114 emake USE_PAM=1 DESTDIR="${D}" install || die "emake install failed."
115 pamd_mimic_system slim auth account password session
116 else
117 emake DESTDIR="${D}" install || die "emake install failed."
118 fi
119
120 insinto /etc/logrotate.d
121 newins "${FILESDIR}/slim.logrotate" slim || die "newins failed"
122
123 dodoc xinitrc.sample ChangeLog README TODO THEMES
124 }
125
126 pkg_postinst() {
127 elog
128 elog "The configuration file is located at /etc/slim.conf."
129 elog
130 elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
131 elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
132 elog "By default, ${PN} will use default XSESSION value set in /etc/rc.conf."
133 elog
134 elog "If you want to use .xinitrc in the user's home directory for session"
135 elog "management instead, see README and xinitrc.sample in"
136 elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
137 elog "accordingly."
138 elog
139 if ! use pam; then
140 elog "You have merged ${PN} without USE=pam, this will cause ${PN} to fall back to"
141 elog "the console when restarting your window manager. If this is not"
142 elog "desired, then please remerge ${PN} with USE=pam"
143 fi
144 }
Report Message
Find on MARC Find on Google Groups