| 1 |
darkside 11/09/07 17:38:56 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: slim-1.3.2-r6.ebuild |
| 5 |
Log: |
| 6 |
revision bump to fix bug 252280 by Ian Stakenvicius |
| 7 |
|
| 8 |
(Portage version: 2.1.10.11/cvs/Linux i686) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.70 x11-misc/slim/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/ChangeLog?rev=1.70&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/ChangeLog?rev=1.70&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/ChangeLog?r1=1.69&r2=1.70 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v |
| 20 |
retrieving revision 1.69 |
| 21 |
retrieving revision 1.70 |
| 22 |
diff -u -r1.69 -r1.70 |
| 23 |
--- ChangeLog 19 Aug 2011 19:55:10 -0000 1.69 |
| 24 |
+++ ChangeLog 7 Sep 2011 17:38:56 -0000 1.70 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for x11-misc/slim |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.69 2011/08/19 19:55:10 darkside Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.70 2011/09/07 17:38:56 darkside Exp $ |
| 30 |
+ |
| 31 |
+*slim-1.3.2-r6 (07 Sep 2011) |
| 32 |
+ |
| 33 |
+ 07 Sep 2011; Jeremy Olexa <darkside@g.o> |
| 34 |
+ +files/252280-fix-default_user-focus_passwd.patch, +slim-1.3.2-r6.ebuild, |
| 35 |
+ +files/slim-1.3.2-r3-config.diff: |
| 36 |
+ revision bump to fix bug 252280 by Ian Stakenvicius |
| 37 |
|
| 38 |
*slim-1.3.2-r5 (19 Aug 2011) |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 x11-misc/slim/slim-1.3.2-r6.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/slim-1.3.2-r6.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/slim-1.3.2-r6.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: slim-1.3.2-r6.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2011 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.2-r6.ebuild,v 1.1 2011/09/07 17:38:56 darkside Exp $ |
| 53 |
|
| 54 |
EAPI=2 |
| 55 |
|
| 56 |
inherit toolchain-funcs pam eutils |
| 57 |
|
| 58 |
DESCRIPTION="Simple Login Manager" |
| 59 |
HOMEPAGE="http://slim.berlios.de" |
| 60 |
SRC_URI="mirror://berlios/${PN}/${P}.tar.gz" |
| 61 |
|
| 62 |
LICENSE="GPL-2" |
| 63 |
SLOT="0" |
| 64 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 65 |
IUSE="branding pam" |
| 66 |
|
| 67 |
RDEPEND="x11-libs/libXmu |
| 68 |
x11-libs/libX11 |
| 69 |
x11-libs/libXpm |
| 70 |
x11-libs/libXft |
| 71 |
>=media-libs/libpng-1.4 |
| 72 |
virtual/jpeg |
| 73 |
x11-apps/sessreg |
| 74 |
pam? ( virtual/pam )" |
| 75 |
DEPEND="${RDEPEND} |
| 76 |
dev-util/pkgconfig |
| 77 |
x11-proto/xproto" |
| 78 |
PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" |
| 79 |
|
| 80 |
src_prepare() { |
| 81 |
# respect C[XX]FLAGS, fix crosscompile, |
| 82 |
# fix linking order for --as-needed" |
| 83 |
sed -i -e "s:^CXX=.*:CXX=$(tc-getCXX) ${CXXFLAGS}:" \ |
| 84 |
-e "s:^CC=.*:CC=$(tc-getCC) ${CFLAGS}:" \ |
| 85 |
-e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \ |
| 86 |
-e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \ |
| 87 |
-e "s:-I/usr/include/libpng12:$(pkg-config --cflags-only-I libpng):" \ |
| 88 |
-e "s:-lpng12:$(pkg-config --libs-only-l libpng):" \ |
| 89 |
-r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \ |
| 90 |
Makefile || die "sed failed in Makefile" |
| 91 |
# Our Gentoo-specific config changes |
| 92 |
epatch "${FILESDIR}"/${PN}-1.3.2-r3-config.diff |
| 93 |
|
| 94 |
if use elibc_FreeBSD; then |
| 95 |
sed -i -e "s/CUSTOM=-DHAVE_SHADOW/CUSTOM=-DNEEDS_BASENAME/" Makefile \ |
| 96 |
|| die "sed failed in Makefile" |
| 97 |
epatch "${FILESDIR}"/${PN}-1.3.2-bsd-install.patch |
| 98 |
fi |
| 99 |
|
| 100 |
if use branding; then |
| 101 |
sed -i -e 's/ default/ slim-gentoo-simple/' slim.conf || die |
| 102 |
fi |
| 103 |
|
| 104 |
# Gentoo bug 297655 |
| 105 |
epatch "${FILESDIR}"/14509-fix-keyboard-in-tty-from-which-${PN}-is-lauched.patch |
| 106 |
# Upstream bug #15287 |
| 107 |
epatch "${FILESDIR}"/15287-fix-pam-authentication-with-pam_unix2.patch |
| 108 |
# Gentoo Bug 261713 |
| 109 |
epatch "${FILESDIR}"/261713-restart-xserver-if-killed.patch |
| 110 |
# Gentoo bug 261359, upstream 15326 |
| 111 |
epatch "${FILESDIR}"/261359-fix-SIGTERM-freeze.patch |
| 112 |
# Gentoo bug 346037 |
| 113 |
epatch "${FILESDIR}"/346037-stop_setting_host_for_pam_ck_connector_so.patch |
| 114 |
# Gentoo bug 378505 |
| 115 |
epatch "${FILESDIR}"/${P}-libpng15.patch |
| 116 |
# Gentoo bug 252280 |
| 117 |
epatch "${FILESDIR}"/252280-fix-default_user-focus_passwd.patch |
| 118 |
} |
| 119 |
|
| 120 |
src_compile() { |
| 121 |
if use pam ; then |
| 122 |
emake USE_PAM=1 || die "emake failed." |
| 123 |
else |
| 124 |
emake || die "emake failed." |
| 125 |
fi |
| 126 |
} |
| 127 |
|
| 128 |
src_install() { |
| 129 |
if use pam ; then |
| 130 |
emake USE_PAM=1 DESTDIR="${D}" install || die "emake install failed." |
| 131 |
pamd_mimic system-local-login slim auth account session |
| 132 |
else |
| 133 |
emake DESTDIR="${D}" install || die "emake install failed." |
| 134 |
fi |
| 135 |
|
| 136 |
insinto /usr/share/slim |
| 137 |
newins "${FILESDIR}/Xsession-r2" Xsession || die "newins failed" |
| 138 |
|
| 139 |
insinto /etc/logrotate.d |
| 140 |
newins "${FILESDIR}/slim.logrotate" slim || die "newins failed" |
| 141 |
|
| 142 |
dodoc xinitrc.sample ChangeLog README TODO THEMES |
| 143 |
} |
| 144 |
|
| 145 |
pkg_postinst() { |
| 146 |
elog |
| 147 |
elog "The configuration file is located at /etc/slim.conf." |
| 148 |
elog |
| 149 |
elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" " |
| 150 |
elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"." |
| 151 |
elog |
| 152 |
elog "By default, ${PN} now does proper X session selection, including ~/.xsession" |
| 153 |
elog "support, as well as selection between sessions available in" |
| 154 |
elog "/etc/X11/Sessions/ at login by pressing [F1]." |
| 155 |
elog |
| 156 |
elog "The XSESSION environment variable is still supported as a default" |
| 157 |
elog "if no session has been specified by the user." |
| 158 |
elog |
| 159 |
elog "If you want to use .xinitrc in the user's home directory for session" |
| 160 |
elog "management instead, see README and xinitrc.sample in" |
| 161 |
elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf" |
| 162 |
elog "accordingly." |
| 163 |
elog |
| 164 |
ewarn "Please note that the slim session start script now supports consolekit" |
| 165 |
ewarn "directly, via xinitrc.d scripts. Please remove any existing work-arounds to" |
| 166 |
ewarn "avoid multiple calls to ck-launch-session." |
| 167 |
if has_version "<=sys-auth/pambase-20101024[consolekit]" ; then |
| 168 |
ewarn |
| 169 |
ewarn "You should also remove the 'nox11' flag from the pam_ck_connector.so module " |
| 170 |
ewarn "in /etc/pam.d/system-login if you have not already done so." |
| 171 |
ewarn "(this is safe, it will be default in the next version of pambase)" |
| 172 |
fi |
| 173 |
elog |
| 174 |
if ! use pam; then |
| 175 |
elog "You have merged ${PN} without USE=pam, this will cause ${PN} to fall back to" |
| 176 |
elog "the console when restarting your window manager. If this is not" |
| 177 |
elog "desired, then please remerge ${PN} with USE=pam" |
| 178 |
elog |
| 179 |
fi |
| 180 |
} |
Archives