summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-08-03 13:17:48 +0000
committerMike Frysinger <vapier@gentoo.org>2004-08-03 13:17:48 +0000
commit762ac05bad8923e07d3e1e70fef7e1e48ff23799 (patch)
tree4ea83cc9c079914c5b0dd3d11fb4cc20b11e3eff /kde-base
parentmake 1.1 stable, add 1.2 as latest version (Manifest recommit) (diff)
downloadgentoo-2-762ac05bad8923e07d3e1e70fef7e1e48ff23799.tar.gz
gentoo-2-762ac05bad8923e07d3e1e70fef7e1e48ff23799.tar.bz2
gentoo-2-762ac05bad8923e07d3e1e70fef7e1e48ff23799.zip
goodbye $COMPILER
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdeaddons/kdeaddons-3.1.5.ebuild36
1 files changed, 17 insertions, 19 deletions
diff --git a/kde-base/kdeaddons/kdeaddons-3.1.5.ebuild b/kde-base/kdeaddons/kdeaddons-3.1.5.ebuild
index 3f7fb9c59fbc..eebc9042aaae 100644
--- a/kde-base/kdeaddons/kdeaddons-3.1.5.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.1.5.ebuild
@@ -1,10 +1,12 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.1.5.ebuild,v 1.6 2004/06/24 22:12:06 agriffis Exp $
-inherit kde-dist flag-o-matic
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.1.5.ebuild,v 1.7 2004/08/03 13:17:48 vapier Exp $
+
+inherit kde-dist flag-o-matic gcc
-IUSE="sdl svga xmms esd"
DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
+
+IUSE="sdl svga xmms esd"
KEYWORDS="x86 ~ppc sparc hppa amd64 alpha ia64"
DEPEND="=kde-base/kdebase-${PV}*
@@ -15,27 +17,24 @@ DEPEND="=kde-base/kdebase-${PV}*
sdl? ( >=media-libs/libsdl-1.2 )
svga? ( media-libs/svgalib )
xmms? ( media-sound/xmms )"
-RDEPEND="$DEPEND"
-
-use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest"
-
-use xmms || export ac_cv_have_xmms=no
-
-# fix bug #7625
-if [ "$COMPILER" == "gcc3" ]; then
- if [ -n "`is-flag -march=pentium4`" -o -n "`is-flag -mcpu=pentium4`" ]; then
- append-flags -mno-sse2
- fi
-fi
# enable building of konqueror carsh recovery plugin. it was disabled accidentally
# in the orig kde 3.1 release and was reenabled soon after in cvs head
PATCHES="$FILESDIR/$P-enable-crashes.diff"
-need-automake 1.7
-need-autoconf 2.5
-
src_compile() {
+ use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest"
+
+ use xmms || export ac_cv_have_xmms=no
+
+ # fix bug #7625
+ if [ "`gcc-major-version`" == "3" ] ; then
+ [ "${ARCH}" == "x86" ] && append-flags -mno-sse2
+ fi
+
+ need-automake 1.7
+ need-autoconf 2.5
+
AMVERSION="`automake --version | head -n 1 | cut -d " " -f4`"
if [ "$AMVERSION" != "1.7.2" ]; then
rm -f configure configure.in
@@ -44,4 +43,3 @@ src_compile() {
kde_src_compile configure
kde_src_compile make
}
-