diff options
| -rw-r--r-- | media-gfx/kimagemapeditor/kimagemapeditor-0.9.5.1.ebuild | 19 | ||||
| -rw-r--r-- | sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r22.ebuild | 6 |
2 files changed, 11 insertions, 14 deletions
diff --git a/media-gfx/kimagemapeditor/kimagemapeditor-0.9.5.1.ebuild b/media-gfx/kimagemapeditor/kimagemapeditor-0.9.5.1.ebuild index 59bb43b5f851..5705fa06665a 100644 --- a/media-gfx/kimagemapeditor/kimagemapeditor-0.9.5.1.ebuild +++ b/media-gfx/kimagemapeditor/kimagemapeditor-0.9.5.1.ebuild @@ -1,22 +1,19 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimagemapeditor/kimagemapeditor-0.9.5.1.ebuild,v 1.11 2004/07/14 17:47:15 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimagemapeditor/kimagemapeditor-0.9.5.1.ebuild,v 1.12 2004/08/03 13:22:55 vapier Exp $ -inherit kde +inherit kde gcc +need-kde 3 DESCRIPTION="An imagemap editor for KDE" -SRC_URI="mirror://sourceforge/kimagemapeditor/${P}-kde3.tar.gz" HOMEPAGE="http://kimagemapeditor.sourceforge.net/" - -need-kde 3 +SRC_URI="mirror://sourceforge/kimagemapeditor/${P}-kde3.tar.gz" LICENSE="GPL-2" KEYWORDS="x86 ~ppc" IUSE="" -if [ "$COMPILER" == "gcc3" ] -then - PATCHES="$FILESDIR/$P-gcc3.diff" -fi -#changed from an && construct which causes this script to return a -#non-zero error code. (drobbins, 02 Dec 2002) +src_unpack() { + [ "`gcc-major-version`" == "3" ] && PATCHES="$FILESDIR/$P-gcc3.diff" + kde_src_unpack +} diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r22.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r22.ebuild index b0123093c3c8..8ef03407f50b 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r22.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r22.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r22.ebuild,v 1.1 2004/08/02 11:11:09 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r22.ebuild,v 1.2 2004/08/03 13:24:15 vapier Exp $ IUSE="aavm crypt evms2 usagi" @@ -17,7 +17,7 @@ IUSE="aavm crypt evms2 usagi" ETYPE="sources" -inherit kernel eutils +inherit kernel eutils gcc OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`" EXTRAVERSION="-${PN/-*/}" [ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}" @@ -58,7 +58,7 @@ src_unpack() { fi # If the compiler isn't gcc>3.1 drop the gcc>=3.1 patches - if [[ "${COMPILER}" == "gcc3" ]]; then + if [[ "`gcc-major-version`" == "3" ]]; then einfo "Enabling gcc > 3.1 processor optimizations..." einfo "To use them, choose the processor families labelled with (gcc>31)" einfo "in \"Processor type and features -> Processor Family\"" |