summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdegames/ChangeLog7
-rw-r--r--kde-base/kdegames/files/kdegames-3.1-alpha.diff11
-rw-r--r--kde-base/kdegames/kdegames-3.1.ebuild26
3 files changed, 28 insertions, 16 deletions
diff --git a/kde-base/kdegames/ChangeLog b/kde-base/kdegames/ChangeLog
index b47c17c8b3a5..6920d745daf7 100644
--- a/kde-base/kdegames/ChangeLog
+++ b/kde-base/kdegames/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/kdegames
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.25 2003/02/15 20:56:25 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.26 2003/02/28 16:15:27 wwoods Exp $
+
+ 28 Feb 2003; Will Woods <wwoods@gentoo.org> kdegames-3.1.ebuild:
+ Hack to build without kmines on alpha, due to linker problems.
+ Removed previous patch which tried to fix this.
+ Added ~alpha keyword.
15 Feb 2003; Jason Wever <weeve@gentoo.org> kdegames-3.1.ebuild:
Changed ~sparc keyword to sparc.
diff --git a/kde-base/kdegames/files/kdegames-3.1-alpha.diff b/kde-base/kdegames/files/kdegames-3.1-alpha.diff
deleted file mode 100644
index 493c3500ec5d..000000000000
--- a/kde-base/kdegames/files/kdegames-3.1-alpha.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmines/Makefile.in~ 2003-01-28 10:28:07.000000000 +0100
-+++ kmines/Makefile.in 2003-01-28 10:28:22.000000000 +0100
-@@ -246,7 +246,7 @@
- qt_libraries = @qt_libraries@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
--SUBDIRS = generic data bitmaps solver
-+SUBDIRS = generic
- INCLUDES = -I$(top_srcdir)/libkdegames $(all_includes)
-
- bin_PROGRAMS = kmines
diff --git a/kde-base/kdegames/kdegames-3.1.ebuild b/kde-base/kdegames/kdegames-3.1.ebuild
index 8775a7bc9517..5f766667bc53 100644
--- a/kde-base/kdegames/kdegames-3.1.ebuild
+++ b/kde-base/kdegames/kdegames-3.1.ebuild
@@ -1,14 +1,32 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.1.ebuild,v 1.9 2003/02/15 20:56:25 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.1.ebuild,v 1.10 2003/02/28 16:15:27 wwoods Exp $
inherit kde-dist eutils
DESCRIPTION="KDE games (solitaire :-)"
IUSE=""
-KEYWORDS="x86 ppc sparc"
+KEYWORDS="x86 ppc sparc ~alpha"
src_unpack() {
- kde_src_unpack
+ kde_src_unpack
+ if [ ${ARCH} == "alpha" ] ; then
+ einfo "Not building kmines due to linking problems on alpha"
cd ${S}
- use alpha && epatch ${FILESDIR}/${P}-alpha.diff
+ cp subdirs subdirs.orig
+ grep -v kmines subdirs.orig > subdirs
+ fi
+}
+
+src_compile() {
+ kde_src_compile myconf configure
+ if [ ${ARCH} == "alpha" ] ; then
+ # ksirtet dies without kmines' libkdehighscores, so we have to build it
+ # manually if we want ksirtet. Which we do. Everyone loves tetris!
+ # But first, build libkdegames, since libkdehighscores depends on it.
+ cd ${S}/libkdegames
+ emake || die "died trying to build libkdegames"
+ cd ../kmines/generic
+ emake || die "died trying to build kmines/generic/libkdehighscores.la"
+ fi
+ kde_src_compile make
}