summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2007-02-24 11:10:03 +0000
committerSamuli Suominen <drac@gentoo.org>2007-02-24 11:10:03 +0000
commit97bcbd52071113d911e4de90c706eb2847cfdc16 (patch)
treeefe06b510cbdba278b01c107cdb2e23acea5892c /x11-misc
parentx86 stable wrt bug 165555 (diff)
downloadgentoo-2-97bcbd52071113d911e4de90c706eb2847cfdc16.tar.gz
gentoo-2-97bcbd52071113d911e4de90c706eb2847cfdc16.tar.bz2
gentoo-2-97bcbd52071113d911e4de90c706eb2847cfdc16.zip
Force -j1 to emake for bug 155049.
(Portage version: 2.1.2-r11)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xscreensaver/ChangeLog6
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.01-r2.ebuild15
2 files changed, 9 insertions, 12 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 44e6eb591ed7..070e07cc8e5a 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/xscreensaver
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.164 2007/02/21 12:31:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.165 2007/02/24 11:10:03 drac Exp $
+
+ 24 Feb 2007; Samuli Suominen <drac@gentoo.org>
+ xscreensaver-5.01-r2.ebuild:
+ Force -j1 to emake for bug 155049.
21 Feb 2007; Jeroen Roovers <jer@gentoo.org> xscreensaver-5.01-r2.ebuild:
Stable for HPPA (bug #167688).
diff --git a/x11-misc/xscreensaver/xscreensaver-5.01-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.01-r2.ebuild
index 151b7ce518b0..5df368b2c879 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.01-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.01-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.01-r2.ebuild,v 1.8 2007/02/21 12:31:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.01-r2.ebuild,v 1.9 2007/02/24 11:10:03 drac Exp $
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="1.4"
@@ -43,7 +43,6 @@ DEPEND="${RDEPEND}
xinerama? ( x11-proto/xineramaproto )"
src_unpack() {
-
unpack ${A}
cd "${S}"
@@ -64,7 +63,6 @@ src_unpack() {
}
src_compile() {
-
# simple workaround for the flurry screensaver
filter-flags -mabi=altivec
filter-flags -maltivec
@@ -93,15 +91,13 @@ src_compile() {
$(use_with xinerama xinerama-ext) \
$(use_with pam) \
$(use_with opengl gl) $(use_with opengl gle) \
- $(use_with jpeg) \
- || die "econf failed"
-
- emake || die "emake failed"
+ $(use_with jpeg)
+ # bug 155049
+ emake -j1 || die "emake failed."
}
src_install() {
-
[[ -n "${KDEDIR}" ]] && dodir "${KDEDIR}/bin"
make install_prefix="${D}" install || die "make install failed"
@@ -140,11 +136,9 @@ src_install() {
dodir "/usr/share/X11/app-defaults"
mv "${D}/usr/lib/X11/app-defaults/XScreenSaver" \
"${D}/usr/share/X11/app-defaults/XScreenSaver" || die "mv failed"
-
}
pkg_postinst() {
-
if ! use new-login; then
einfo
einfo "You have chosen to not use the new-login USE flag."
@@ -171,5 +165,4 @@ pkg_postinst() {
ewarn "need to be ported to the new API. Until then they will not work."
ewarn
epause
-
}