diff options
| author |   Tavis Ormandy <taviso@gentoo.org> | 2003-11-28 19:15:04 +0000 |
|---|---|---|
| committer | Tavis Ormandy <taviso@gentoo.org> | 2003-11-28 19:15:04 +0000 |
| commit | 4f67d45721bff9bf8c78d1d030d6467cf5f39b9d (patch) | |
| tree | a05b0895382655a226cfbb1dbf905fcd889eea83 /x11-wm/fvwm | |
| parent | added logic for false positives hitting gcc library with guard in it (diff) | |
| download | historical-4f67d45721bff9bf8c78d1d030d6467cf5f39b9d.tar.gz historical-4f67d45721bff9bf8c78d1d030d6467cf5f39b9d.tar.bz2 historical-4f67d45721bff9bf8c78d1d030d6467cf5f39b9d.zip | |
clean up -icc.
Diffstat (limited to 'x11-wm/fvwm')
| -rw-r--r-- | x11-wm/fvwm/ChangeLog | 4 | ||||
| -rw-r--r-- | x11-wm/fvwm/Manifest | 4 | ||||
| -rw-r--r-- | x11-wm/fvwm/fvwm-2.5.8-r2.ebuild | 20 |
3 files changed, 6 insertions, 22 deletions
diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog index 548d8e5597bc..943f9ac65d7c 100644 --- a/x11-wm/fvwm/ChangeLog +++ b/x11-wm/fvwm/ChangeLog @@ -1,9 +1,9 @@ # ChangeLog for x11-wm/fvwm # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.48 2003/11/28 18:52:59 taviso Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.49 2003/11/28 19:14:59 taviso Exp $ 28 Nov 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8-r2.ebuild: - optionally compile fvwm with icc. + remove icc, clean DEPEND. *fvwm-2.5.8-r2 (27 Nov 2003) diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index 06e0f835ade1..94c569a52d40 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -1,8 +1,8 @@ MD5 e79bd2fa2e46e650aabaa16754e25583 fvwm-2.5.7-r5.ebuild 8757 MD5 b893f78193652b275ce5d276ac38af29 fvwm-2.4.17.ebuild 3961 -MD5 90da0216de371ab937c87b5aea3d982a ChangeLog 9614 +MD5 3eed24123275aaef0aafeb052e96c0a5 ChangeLog 9606 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527 -MD5 8321c9e2742d4b9fc66892f028cb78b6 fvwm-2.5.8-r2.ebuild 9939 +MD5 087f3d238d195997b3bdc28f31a49cd1 fvwm-2.5.8-r2.ebuild 9547 MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788 MD5 e5701841190ad529d5577c8da69d5006 files/fvwmtabs-insecure-tmp-handling.diff 2350 MD5 b2af3c1c8fe4f142e2b8debbb5c59a94 files/digest-fvwm-2.4.17 65 diff --git a/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild b/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild index 47d13eb95a5b..56da3a9b3674 100644 --- a/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild +++ b/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild,v 1.3 2003/11/28 18:52:59 taviso Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild,v 1.4 2003/11/28 19:14:59 taviso Exp $ inherit eutils flag-o-matic -IUSE="readline truetype ncurses gtk stroke gnome rplay xinerama perl nls png bidi imlib tcltk debug gtk2 icc" +IUSE="readline truetype ncurses gtk stroke gnome rplay xinerama perl nls png bidi imlib tcltk debug gtk2" DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager" SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2 @@ -41,7 +41,6 @@ RDEPEND="readline? ( >=sys-libs/readline-4.1 # XXX: netpbm is used by FvwmScript-ScreenDump...im assuming anyone with # `use noxpm` will not want them. DEPEND="${RDEPEND} - icc? ( dev-lang/icc ) >=sys-apps/sed-4 dev-util/pkgconfig" @@ -196,21 +195,6 @@ src_compile() { myconf="${myconf} --without-xpm-library" fi - # use intel's C compiler to compile fvwm? - if use icc; then - export CC="icc" - - # test if any icc specific flags have been requested - if test "${ICCFLAGS}"; then - einfo "Setting CFLAGS for the Intel Compiler..." - - # ipo refuses to link libfvwm.a - export CFLAGS="${ICCFLAGS/-ipo/-ip}" - else - einfo "ICCFLAGS Not set, continuing with CFLAGS..." - fi - fi - # set the local maintainer for fvwm-bug. export FVWM_BUGADDR="taviso@gentoo.org" |