From: Samuli Suominen Date: Sat, 24 Feb 2007 11:10:03 +0000 (+0000) Subject: Force -j1 to emake for bug 155049. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c3379869b593b2692778575bde8b706e15c3ffc8;p=gentoo.git Force -j1 to emake for bug 155049. Package-Manager: portage-2.1.2-r11 --- 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 + xscreensaver-5.01-r2.ebuild: + Force -j1 to emake for bug 155049. 21 Feb 2007; Jeroen Roovers xscreensaver-5.01-r2.ebuild: Stable for HPPA (bug #167688). diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 739564356d48..4d84af2d5216 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -44,14 +44,14 @@ EBUILD xscreensaver-4.24.ebuild 5233 RMD160 0cbb58d41ae8364e8ce8b40366a03098fc39 MD5 c3b384b963b8a1d708942269f1913e24 xscreensaver-4.24.ebuild 5233 RMD160 0cbb58d41ae8364e8ce8b40366a03098fc399735 xscreensaver-4.24.ebuild 5233 SHA256 de2bb90e7122b9ba6d97d058b8788834e16af8d62b6d0f0592e571c14905162c xscreensaver-4.24.ebuild 5233 -EBUILD xscreensaver-5.01-r2.ebuild 4663 RMD160 1659f2c21597de77251569279cb94a284bd26dde SHA1 00bfeb6e229e189abbb731a096783eb55f95886a SHA256 6bd862c21fd73ae43f946d83f4a8a1d47e3fc6f9ed114edf91c1a51a166af73b -MD5 f99198107cbd5b6c22e3ddbe319cd92c xscreensaver-5.01-r2.ebuild 4663 -RMD160 1659f2c21597de77251569279cb94a284bd26dde xscreensaver-5.01-r2.ebuild 4663 -SHA256 6bd862c21fd73ae43f946d83f4a8a1d47e3fc6f9ed114edf91c1a51a166af73b xscreensaver-5.01-r2.ebuild 4663 -MISC ChangeLog 28000 RMD160 eb4818f3728e7014a8c3334e7d6b66c95264b030 SHA1 318e22d66877e6839fd476330719f196fb427b62 SHA256 ddbffa1154ce316e68f68c24eed02b8dacf796774d797ad8da858fc8ed290585 -MD5 78558a5fae5034a422abe7cfee917057 ChangeLog 28000 -RMD160 eb4818f3728e7014a8c3334e7d6b66c95264b030 ChangeLog 28000 -SHA256 ddbffa1154ce316e68f68c24eed02b8dacf796774d797ad8da858fc8ed290585 ChangeLog 28000 +EBUILD xscreensaver-5.01-r2.ebuild 4650 RMD160 6d0c53c5ce573faf309f3aabae1b36fdc109ba89 SHA1 08d05ee3dfabd962034de1993d2f1ef02536e7c1 SHA256 42bfc4a8d33ddb40d39502b56f6488e39b9a5a1a7c6b74c8cd0cbf0b04c1187e +MD5 f6b1864dc6f888355f8afe1bab0f28bb xscreensaver-5.01-r2.ebuild 4650 +RMD160 6d0c53c5ce573faf309f3aabae1b36fdc109ba89 xscreensaver-5.01-r2.ebuild 4650 +SHA256 42bfc4a8d33ddb40d39502b56f6488e39b9a5a1a7c6b74c8cd0cbf0b04c1187e xscreensaver-5.01-r2.ebuild 4650 +MISC ChangeLog 28119 RMD160 56ab4a55db8a700eea6627617fcf8bfca747ba73 SHA1 25409380d884a265f8d8ad0a8e36528149e6f0f6 SHA256 706eeb49d32c680b65102f4cb3ca7eff37febed797b9fb7ca16b15e41b245e93 +MD5 73b09d1561fc8fec71db24dc8d182cbb ChangeLog 28119 +RMD160 56ab4a55db8a700eea6627617fcf8bfca747ba73 ChangeLog 28119 +SHA256 706eeb49d32c680b65102f4cb3ca7eff37febed797b9fb7ca16b15e41b245e93 ChangeLog 28119 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166 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 - }