summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-06-26 17:04:11 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-06-26 17:04:11 +0000
commit97227841ef9e10f97bea8687aa70f8edf4a63bbc (patch)
treed1f16125f8163f5684daf417588b86fb661a8008 /x11-wm/afterstep
parentStable on amd64 wrt bug #323567 (diff)
downloadhistorical-97227841ef9e10f97bea8687aa70f8edf4a63bbc.tar.gz
historical-97227841ef9e10f97bea8687aa70f8edf4a63bbc.tar.bz2
historical-97227841ef9e10f97bea8687aa70f8edf4a63bbc.zip
Force -j1 for src_compile and remove hardcoded -O3 optimization from libAfterBase and Image.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'x11-wm/afterstep')
-rw-r--r--x11-wm/afterstep/ChangeLog7
-rw-r--r--x11-wm/afterstep/Manifest4
-rw-r--r--x11-wm/afterstep/afterstep-2.2.9.ebuild31
3 files changed, 29 insertions, 13 deletions
diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index c5a3a5fe50af..e9392bc6d92b 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-wm/afterstep
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.92 2010/06/26 16:23:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.93 2010/06/26 17:04:11 ssuominen Exp $
+
+ 26 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+ afterstep-2.2.9.ebuild:
+ Force -j1 for src_compile and remove hardcoded -O3 optimization from
+ libAfterBase and Image.
26 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
afterstep-2.2.9.ebuild, +files/afterstep-2.2.9-alpha.patch:
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 441bdaa1c6c5..9f2f2a70da4c 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -6,6 +6,6 @@ AUX no-alternatives.patch 1178 RMD160 de3efea2502d9f8f8dbe403a4cc5c2e796017afd S
DIST AfterStep-2.2.4.tar.bz2 5707951 RMD160 74ab7c74afce8d5d669a1520a3c02f04882e05b9 SHA1 592da988696a0745c4bef240e49274b3915ee277 SHA256 e1787184faaee583435730666ef3dd1c221ced493ccd9ba0a06f94ac5e5b05ec
DIST AfterStep-2.2.9.tar.bz2 6094706 RMD160 b332078efa50abde522438c825fca91f31c4d554 SHA1 dfd7dd912866316e93c3be7a8460d34b95cd54a2 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148
EBUILD afterstep-2.2.4.ebuild 3694 RMD160 75c6e61d8ea1c4ab1433f2c23f3a46f307c29952 SHA1 3ac1affaea4e59d03e5467698f391f14c3bb5f25 SHA256 4a5417a12984e0af4068c8d2e518fbced473acbe242f9008df7f038ce66789e4
-EBUILD afterstep-2.2.9.ebuild 3583 RMD160 8043229c5411c29e9e8d90a10e18e87ec890ced1 SHA1 fe2756287b9a18a186738683744b5bad499875f0 SHA256 30b2dcdc99d432aaa782bb0179e25945e6cc5b42d2bfce0c0609b4e44510143a
-MISC ChangeLog 13265 RMD160 4b0ebbffabcb372869c6c6a7c65190382c849d57 SHA1 859bb66c5a4587c6f1d95bd8d415d9172ac97e33 SHA256 9b3b2134e6f875c51bddc6e38e823a2bcf4502368bd1618b11eb44488d40e90b
+EBUILD afterstep-2.2.9.ebuild 3662 RMD160 174e05d9365bcca518cb800b360eb8ad5150ca0a SHA1 80ba50ae6eee82c348395e73f43cfda61416a219 SHA256 6a639fa1aacaebef6911bc97cdb6d52a5e44a3993dc641101ef4b5f4c346a643
+MISC ChangeLog 13443 RMD160 5e65a6185ba01cf60926275a1334c687d495fcf4 SHA1 dd50a162c0c476e6dc53224d0866cb815c13a809 SHA256 9191eb01e6b31dcb82eebb94a8a79636797285e32ba49bd7672c06dfe97c9ca7
MISC metadata.xml 350 RMD160 8a78f43601183735a3e88e99953e83fa319a2c9c SHA1 a0887e36150abf9d32d108bd1339880ca2a21449 SHA256 ffc449f67b60b79df064e7843b19ce9c16ab0ccc495de3b9cd9b1a38bf6b0c26
diff --git a/x11-wm/afterstep/afterstep-2.2.9.ebuild b/x11-wm/afterstep/afterstep-2.2.9.ebuild
index e675bbb0a47c..b799f723cf52 100644
--- a/x11-wm/afterstep/afterstep-2.2.9.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.11 2010/06/26 16:23:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.12 2010/06/26 17:04:11 ssuominen Exp $
EAPI=2
inherit autotools flag-o-matic eutils
@@ -47,17 +47,28 @@ src_prepare() {
"${FILESDIR}"/${P}-make_session_data_file.patch \
"${FILESDIR}"/${P}-alpha.patch
- # Do not strip binaries, bug #252119
- sed -e "/STRIP_BINARIES/s/-s//" \
- -i autoconf/configure.in || die "strip sed failed"
- # Do not use bundled libungif, bug #253259
- sed -e '/--with-builtin-gif/s/$with_gif/no/' \
- -i autoconf/configure.in || die "bundled gif sed failed"
+ sed -i \
+ -e '/CFLAGS="-O3"/d' \
+ libAfter{Base,Image}/configure || die
- cd "${S}"/autoconf || die "cd autoconf failed"
+ sed -i \
+ -e "/STRIP_BINARIES/s/-s//" \
+ autoconf/configure.in || die #252119
+
+ sed -i \
+ -e '/--with-builtin-gif/s/$with_gif/no/' \
+ autoconf/configure.in || die #253259
+
+ cd "${S}"/autoconf || die
eautoreconf
- cp "${S}"/autoconf/autoconf/config.h.in "${S}"/autoconf || die "cp failed"
- cp "${S}"/autoconf/configure "${S}" || die "cp failed"
+ cp "${S}"/autoconf/autoconf/config.h.in "${S}"/autoconf || die
+ cp "${S}"/autoconf/configure "${S}" || die
+}
+
+src_compile() {
+ # gcc: ../libAfterConf/libAfterConf.a: No such file or directory
+ # make[1]: *** [PrintDesktopEntries] Error 1
+ emake -j1 || die
}
src_configure() {