summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2009-04-01 11:56:42 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2009-04-01 11:56:42 +0000
commit739a0da7ca24676a8188b91d025213f41eef235e (patch)
tree466eb858dc21fc2c2b289df9ca71df3cfb6d468e /sci-mathematics
parentFixing turbojson dep, fixes #264484 (diff)
downloadgentoo-2-739a0da7ca24676a8188b91d025213f41eef235e.tar.gz
gentoo-2-739a0da7ca24676a8188b91d025213f41eef235e.tar.bz2
gentoo-2-739a0da7ca24676a8188b91d025213f41eef235e.zip
Version bump and set all to SLOT=0 with blockers because of collisions.
Thanks Michel Lang for his work, closing bug #264334. (Portage version: 2.2_rc27/cvs/Linux x86_64)
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/rkward/ChangeLog9
-rw-r--r--sci-mathematics/rkward/rkward-0.4.9a.ebuild9
-rw-r--r--sci-mathematics/rkward/rkward-0.5.0c.ebuild (renamed from sci-mathematics/rkward/rkward-0.5.0b.ebuild)20
3 files changed, 19 insertions, 19 deletions
diff --git a/sci-mathematics/rkward/ChangeLog b/sci-mathematics/rkward/ChangeLog
index 09c20bb6ce0f..e6eae0de78f1 100644
--- a/sci-mathematics/rkward/ChangeLog
+++ b/sci-mathematics/rkward/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sci-mathematics/rkward
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rkward/ChangeLog,v 1.15 2009/01/29 13:37:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rkward/ChangeLog,v 1.16 2009/04/01 11:56:42 bicatali Exp $
+
+*rkward-0.5.0c (01 Apr 2009)
+
+ 01 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
+ -rkward-0.5.0b.ebuild, +rkward-0.5.0c.ebuild:
+ Version bump and set all to SLOT=0 with blockers because of collisions.
+ Thanks Michel Lang for his work, closing bug #264334.
29 Jan 2009; Tomas Chvatal <scarabeus@gentoo.org> rkward-0.5.0b.ebuild:
Update deps correctly (dont be so strict).
diff --git a/sci-mathematics/rkward/rkward-0.4.9a.ebuild b/sci-mathematics/rkward/rkward-0.4.9a.ebuild
index bdcb92397b29..16693ea3d0fe 100644
--- a/sci-mathematics/rkward/rkward-0.4.9a.ebuild
+++ b/sci-mathematics/rkward/rkward-0.4.9a.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rkward/rkward-0.4.9a.ebuild,v 1.3 2008/09/06 15:24:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rkward/rkward-0.4.9a.ebuild,v 1.4 2009/04/01 11:56:42 bicatali Exp $
ARTS_REQUIRED="never"
-inherit kde
+inherit eutils kde
DESCRIPTION="An IDE/GUI for the R-project"
HOMEPAGE="http://rkward.sourceforge.net/"
@@ -17,7 +17,8 @@ IUSE=""
DEPEND="dev-lang/R"
RDEPEND="${DEPEND}
- dev-lang/php"
+ dev-lang/php
+ !>=sci-mathematics/rkward-0.5"
need-kde 3
diff --git a/sci-mathematics/rkward/rkward-0.5.0b.ebuild b/sci-mathematics/rkward/rkward-0.5.0c.ebuild
index ffc7385dd1e1..3f40260f8f83 100644
--- a/sci-mathematics/rkward/rkward-0.5.0b.ebuild
+++ b/sci-mathematics/rkward/rkward-0.5.0c.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rkward/rkward-0.5.0b.ebuild,v 1.3 2009/01/29 13:37:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rkward/rkward-0.5.0c.ebuild,v 1.1 2009/04/01 11:56:42 bicatali Exp $
EAPI="2"
-
KDE_MINIMAL="4.1"
+
inherit kde4-base
DESCRIPTION="An IDE/GUI for the R-project"
@@ -12,25 +12,17 @@ HOMEPAGE="http://rkward.sourceforge.net/"
SRC_URI="mirror://sourceforge/rkward/${P}.tar.gz"
LICENSE="GPL-2"
-SLOT="4.1"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug"
DEPEND=">=dev-lang/R-2.7.0
- dev-lang/php"
-RDEPEND="${DEPEND}"
-
-src_prepare(){
- kde4-base_src_prepare
- # fixing Rdevices.h missing header
- sed -i \
- -e '/#include "Rdevices.h"/d' \
- "${S}"/rkward/rbackend/rembedinternal.cpp || die
-}
+ dev-lang/php[cli]"
+RDEPEND="${DEPEND}
+ !<=sci-mathematics/rkward-0.5.0b"
src_install() {
kde4-base_src_install
-
# avoid file collisions
rm -f "${D}"/usr/$(get_libdir)/R/library/R.css
rm -f "${D}"/usr/share/apps/katepart/syntax/r.xml