| 1 |
darkside 08/12/26 17:49:42 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: slim-1.3.1-r4.ebuild |
| 5 |
Removed: slim-1.3.1-r3.ebuild |
| 6 |
Log: |
| 7 |
Fix config file mistake by me, reported in bug #252353 |
| 8 |
(Portage version: 2.2_rc18/cvs/Linux 2.6.27.10 x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.31 x11-misc/slim/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/slim/ChangeLog?rev=1.31&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/slim/ChangeLog?rev=1.31&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/slim/ChangeLog?r1=1.30&r2=1.31 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v |
| 20 |
retrieving revision 1.30 |
| 21 |
retrieving revision 1.31 |
| 22 |
diff -u -r1.30 -r1.31 |
| 23 |
--- ChangeLog 26 Dec 2008 07:35:00 -0000 1.30 |
| 24 |
+++ ChangeLog 26 Dec 2008 17:49:42 -0000 1.31 |
| 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.30 2008/12/26 07:35:00 darkside Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.31 2008/12/26 17:49:42 darkside Exp $ |
| 30 |
+ |
| 31 |
+*slim-1.3.1-r4 (26 Dec 2008) |
| 32 |
+ |
| 33 |
+ 26 Dec 2008; Jeremy Olexa <darkside@g.o> |
| 34 |
+ files/slim-1.3.1-config.diff, -slim-1.3.1-r3.ebuild, |
| 35 |
+ +slim-1.3.1-r4.ebuild: |
| 36 |
+ Fix config file mistake by me, reported in bug #252353 |
| 37 |
|
| 38 |
*slim-1.3.1-r3 (26 Dec 2008) |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 x11-misc/slim/slim-1.3.1-r4.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/slim/slim-1.3.1-r4.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/slim/slim-1.3.1-r4.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: slim-1.3.1-r4.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-r4.ebuild,v 1.1 2008/12/26 17:49:42 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" |
| 65 |
IUSE="branding screenshot pam" |
| 66 |
|
| 67 |
DEPEND="x11-proto/xproto |
| 68 |
x11-libs/libXmu |
| 69 |
x11-libs/libX11 |
| 70 |
x11-libs/libXpm |
| 71 |
x11-libs/libXft |
| 72 |
media-libs/libpng |
| 73 |
media-libs/jpeg |
| 74 |
pam? ( virtual/pam )" |
| 75 |
RDEPEND="${DEPEND} |
| 76 |
x11-apps/sessreg |
| 77 |
screenshot? ( media-gfx/imagemagick ) |
| 78 |
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 |
-r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \ |
| 88 |
Makefile || die "sed failed in Makefile" |
| 89 |
epatch "${FILESDIR}/${P}-config.diff" |
| 90 |
|
| 91 |
if use branding; then |
| 92 |
sed -i -e 's/ default/ slim-gentoo-simple/' slim.conf || die |
| 93 |
fi |
| 94 |
|
| 95 |
} |
| 96 |
|
| 97 |
src_compile() { |
| 98 |
if use pam ; then |
| 99 |
emake USE_PAM=1 || die "emake failed." |
| 100 |
else |
| 101 |
emake || die "emake failed." |
| 102 |
fi |
| 103 |
} |
| 104 |
|
| 105 |
src_install() { |
| 106 |
if use pam ; then |
| 107 |
emake USE_PAM=1 DESTDIR="${D}" install || die "emake install failed." |
| 108 |
pamd_mimic_system slim auth account password session |
| 109 |
else |
| 110 |
emake DESTDIR="${D}" install || die "emake install failed." |
| 111 |
fi |
| 112 |
|
| 113 |
dodoc xinitrc.sample ChangeLog README TODO THEMES |
| 114 |
} |
| 115 |
|
| 116 |
pkg_postinst() { |
| 117 |
elog |
| 118 |
elog "The configuration file is located at /etc/slim.conf." |
| 119 |
elog |
| 120 |
elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" " |
| 121 |
elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"." |
| 122 |
elog "By default, ${PN} will use default XSESSION value set in /etc/rc.conf." |
| 123 |
elog |
| 124 |
elog "If you want to use .xinitrc in the user's home directory for session" |
| 125 |
elog "management instead, see README and xinitrc.sample in" |
| 126 |
elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf" |
| 127 |
elog "accordingly." |
| 128 |
elog |
| 129 |
if ! use pam; then |
| 130 |
elog "You have merged ${PN} without USE=pam, this will cause ${PN} to fall back to" |
| 131 |
elog "the console when restarting your window manager. If this is not" |
| 132 |
elog "desired, then please remerge ${PN} with USE=pam" |
| 133 |
fi |
| 134 |
} |
Archives