# ChangeLog for x11-misc/slim
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.49 2010/05/11 06:58:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.50 2010/05/21 22:24:38 darkside Exp $
+
+ 21 May 2010; Jeremy Olexa <darkside@gentoo.org> -slim-1.3.1-r4.ebuild,
+ -slim-1.3.1-r5.ebuild, slim-1.3.1_p20091114.ebuild:
+ Solve circular dep issues with USE=branding enabled by using PDEPEND. bug
+ 320913, reported by Ed Wiget
11 May 2010; Samuli Suominen <ssuominen@gentoo.org>
slim-1.3.1_p20091114.ebuild:
AUX slim-1.3.1-config.diff 1589 RMD160 dd92d5bc0ecc507309d7d36631cde9310002dd3c SHA1 8e84e9c99fc3fbb2f0893578cebf4a76cb7a0263 SHA256 cda9414dd9586f22b6996815e368078688488a234d672ecc9f647012ae8d3889
AUX slim-1.3.1-gcc4.4.patch 380 RMD160 e2b1f057d32857239591474b5562b717a8ddab2c SHA1 60749d3357630cf54dadbc68f37d2e7831710f8f SHA256 52f6941889687a87f343f25b6aa590f0db08542bc2de65554f6e076d2033f7b1
AUX slim.logrotate 102 RMD160 ccf614eca8c0b8fc1fbc2dfb8bf71b02485a743b SHA1 d2bc9202862f0d33bb902eba3aa8fefe0797d7a3 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a
-DIST slim-1.3.1.tar.gz 219446 RMD160 dc0c7c7257dfa8c2bee47ffa5ec8ddf17fd38f70 SHA1 30152b280724daf75299a8ee16585041f253ed4f SHA256 acd7a4024bfd7c2a4f3cd5d77ffed4956d13727a8f554042126d0568defe0f77
DIST slim-1.3.1_p20091114.tar.bz2 216441 RMD160 61ede89624ed6983c08d05512c9f6458cff6425e SHA1 127aa0eb599c5bcbd87ce1ee040f8bb59bd63491 SHA256 ba68da747db4ef87329064fd3990f0402ad840ad723b03cea5e7c6c15a2c1a7b
-EBUILD slim-1.3.1-r4.ebuild 2495 RMD160 bdfc04c2227af16eafec39f51b121a6f95c31723 SHA1 6c7529ec061aa000b5e6188b5b7e3fa03b5206a1 SHA256 c6c68f8957040bccdd881895122b7750d43378a38c1a46094f46d6383161ca32
-EBUILD slim-1.3.1-r5.ebuild 2631 RMD160 73e737080d45aff3810aad0263b08f708e0ef867 SHA1 bdcea32bad18c00701059a0d33b35864f2ca9d67 SHA256 b20457bb3e60aac07ef3eb4c54bcd2f0eab53bd25b6cbbab3368da42c3ff8048
-EBUILD slim-1.3.1_p20091114.ebuild 3028 RMD160 3db09120ade45d6381384c4c5d5ee146db2d5d5a SHA1 c66d49fe030697d0a09aa93d15de6bb95ccd8d0b SHA256 fdfd63b4dc749b2ce1627fc8829ccc65e20f9cf10e5a44cbc860aabd13349b9f
-MISC ChangeLog 7444 RMD160 6e19e13c0345c1c34d5d133b0be0a26cf214a8e5 SHA1 15e59a6c81536c4a9937feef97d1950a70775c81 SHA256 6b0ba326a82cbcf615a5d572da2ac8ad9cc9ca5872c1360dc3f7c04981b2adaa
+EBUILD slim-1.3.1_p20091114.ebuild 3036 RMD160 b38e64c7ebf148737d8e67620498ef3d208786dd SHA1 2814b884d4da90a807bac643b515594ac366f756 SHA256 5d747c2261517538bced10a3672b2c840387b818b41d199ddf46106e17e0e9f5
+MISC ChangeLog 7678 RMD160 2b8d3171c845f71f1a7f7b6f7d80a226e5997649 SHA1 4d9ae8b37b687663dd2b7f6fd6e0cd690b6343d8 SHA256 024d36998b531ef57e4fbf3fcf36d1ff80d50c098d4847e27bca296f93f1f275
MISC metadata.xml 348 RMD160 22b309bfa0ee5378b0476cc4c7fe8ea3eabe8fbc SHA1 4f8c2e941ce68487614dfab204737ff51f9f8531 SHA256 821a30989eb2cad5bd636c79abffbdb600b31d67cd1b6fb219204d8aedd987bb
+++ /dev/null
-# Copyright 1999-2009 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-r4.ebuild,v 1.4 2009/03/20 13:21:07 josejx 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="branding 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 )
- branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
-
-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"
-
- if use branding; then
- sed -i -e 's/ default/ slim-gentoo-simple/' slim.conf || die
- fi
-
-}
-
-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
-}
+++ /dev/null
-# Copyright 1999-2010 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-r5.ebuild,v 1.7 2010/03/20 17:03:20 armin76 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="branding 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 )
- branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
-
-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"
-
- if use branding; then
- sed -i -e 's/ default/ slim-gentoo-simple/' slim.conf || die
- fi
-
- epatch "${FILESDIR}/${P}-gcc4.4.patch"
-
-}
-
-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
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/slim.logrotate" slim || die "newins failed"
-
- 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
-}
# Copyright 1999-2010 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_p20091114.ebuild,v 1.10 2010/05/11 13:57:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.1_p20091114.ebuild,v 1.11 2010/05/21 22:24:38 darkside Exp $
EAPI=2
media-libs/libpng
media-libs/jpeg
x11-apps/sessreg
- branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )
pam? ( virtual/pam )
screenshot? ( media-gfx/imagemagick )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
x11-proto/xproto"
+PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
src_prepare() {
# respect C[XX]FLAGS, fix crosscompile,
projects / gentoo.git / commitdiff