diff options
-rw-r--r-- | dev-lang/R/ChangeLog | 6 | ||||
-rw-r--r-- | dev-lang/R/R-2.2.1.ebuild | 10 | ||||
-rw-r--r-- | dev-lang/R/R-2.4.1.ebuild | 12 | ||||
-rw-r--r-- | dev-lang/R/R-2.5.0.ebuild | 10 | ||||
-rw-r--r-- | dev-lang/R/R-2.5.1.ebuild | 10 | ||||
-rw-r--r-- | dev-lang/squeak/ChangeLog | 6 | ||||
-rw-r--r-- | dev-lang/squeak/squeak-3.4.1-r2.ebuild | 6 | ||||
-rw-r--r-- | dev-lang/squeak/squeak-3.6_p3.ebuild | 6 | ||||
-rw-r--r-- | dev-lang/squeak/squeak-3.7.7-r1.ebuild | 7 | ||||
-rw-r--r-- | dev-lang/squeak/squeak-3.9.7.ebuild | 7 | ||||
-rw-r--r-- | dev-lang/tk/ChangeLog | 6 | ||||
-rw-r--r-- | dev-lang/tk/tk-8.4.14.ebuild | 10 | ||||
-rw-r--r-- | dev-lang/tk/tk-8.4.9.ebuild | 10 | ||||
-rw-r--r-- | dev-lang/ucblogo/ChangeLog | 5 | ||||
-rw-r--r-- | dev-lang/ucblogo/ucblogo-5.5.ebuild | 4 |
15 files changed, 54 insertions, 61 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index 16f5859bb989..f6821c76015e 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/R # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.87 2007/06/30 17:14:25 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.88 2007/07/22 08:47:37 graaff Exp $ + + 22 Jul 2007; Hans de Graaff <graaff@gentoo.org> R-2.2.1.ebuild, + R-2.4.1.ebuild, R-2.5.0.ebuild, R-2.5.1.ebuild: + Drop virtual/x11 references. *R-2.5.1 (30 Jun 2007) diff --git a/dev-lang/R/R-2.2.1.ebuild b/dev-lang/R/R-2.2.1.ebuild index 8af0deb0b465..65b602e2a083 100644 --- a/dev-lang/R/R-2.2.1.ebuild +++ b/dev-lang/R/R-2.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.2.1.ebuild,v 1.14 2007/01/13 15:45:51 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.2.1.ebuild,v 1.15 2007/07/22 08:47:37 graaff Exp $ inherit fortran toolchain-funcs flag-o-matic @@ -21,13 +21,11 @@ RDEPEND=">=dev-lang/perl-5.6.1-r3 lapack? ( virtual/lapack ) tk? ( dev-lang/tk dev-lang/tcl ) - X? ( || ( ( x11-libs/libX11 ) - virtual/x11 ) )" + X? ( x11-libs/libX11 )" DEPEND="${RDEPEND} - X? ( || ( ( x11-proto/xproto + X? ( x11-proto/xproto x11-libs/libXt - x11-libs/libX11 ) - virtual/x11 ) )" + x11-libs/libX11 )" AT_M4DIR="${S}/m4" diff --git a/dev-lang/R/R-2.4.1.ebuild b/dev-lang/R/R-2.4.1.ebuild index 7bf7a260cd28..eb0f32253cfc 100644 --- a/dev-lang/R/R-2.4.1.ebuild +++ b/dev-lang/R/R-2.4.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.4.1.ebuild,v 1.1 2006/12/19 04:17:40 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.4.1.ebuild,v 1.2 2007/07/22 08:47:37 graaff Exp $ inherit fortran toolchain-funcs flag-o-matic @@ -21,13 +21,11 @@ RDEPEND=">=dev-lang/perl-5.6.1-r3 lapack? ( virtual/lapack ) tk? ( dev-lang/tk dev-lang/tcl ) - X? ( || ( ( x11-libs/libX11 ) - virtual/x11 ) )" + X? ( x11-libs/libX11 )" DEPEND="${RDEPEND} - X? ( || ( ( x11-proto/xproto + X? ( x11-proto/xproto x11-libs/libXt - x11-libs/libX11 ) - virtual/x11 ) )" + x11-libs/libX11 )" pkg_setup() { # Test for a 64 bit architecture - f2c won't work on 64 bit archs with R. diff --git a/dev-lang/R/R-2.5.0.ebuild b/dev-lang/R/R-2.5.0.ebuild index 8c169fd37247..ebaec0900d14 100644 --- a/dev-lang/R/R-2.5.0.ebuild +++ b/dev-lang/R/R-2.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.5.0.ebuild,v 1.5 2007/07/13 06:25:50 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.5.0.ebuild,v 1.6 2007/07/22 08:47:37 graaff Exp $ inherit fortran toolchain-funcs flag-o-matic @@ -22,13 +22,11 @@ RDEPEND=">=dev-lang/perl-5.6.1-r3 gd? ( >=media-libs/gd-2 ) tk? ( dev-lang/tk dev-lang/tcl ) - X? ( || ( ( x11-libs/libX11 ) - virtual/x11 ) )" + X? ( x11-libs/libX11 )" DEPEND="${RDEPEND} - X? ( || ( ( x11-proto/xproto + X? ( x11-proto/xproto x11-libs/libXt - x11-libs/libX11 ) - virtual/x11 ) )" + x11-libs/libX11 )" pkg_setup() { # Test for a 64 bit architecture - f2c won't work on 64 bit archs with R. diff --git a/dev-lang/R/R-2.5.1.ebuild b/dev-lang/R/R-2.5.1.ebuild index b40e3267a465..616570736216 100644 --- a/dev-lang/R/R-2.5.1.ebuild +++ b/dev-lang/R/R-2.5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.5.1.ebuild,v 1.2 2007/07/13 06:25:50 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.5.1.ebuild,v 1.3 2007/07/22 08:47:37 graaff Exp $ inherit fortran toolchain-funcs flag-o-matic @@ -22,13 +22,11 @@ RDEPEND=">=dev-lang/perl-5.6.1-r3 gd? ( >=media-libs/gd-2 ) tk? ( dev-lang/tk dev-lang/tcl ) - X? ( || ( ( x11-libs/libX11 ) - virtual/x11 ) )" + X? ( x11-libs/libX11 )" DEPEND="${RDEPEND} - X? ( || ( ( x11-proto/xproto + X? ( x11-proto/xproto x11-libs/libXt - x11-libs/libX11 ) - virtual/x11 ) )" + x11-libs/libX11 )" pkg_setup() { # Test for a 64 bit architecture - f2c won't work on 64 bit archs with R. diff --git a/dev-lang/squeak/ChangeLog b/dev-lang/squeak/ChangeLog index e2f7c97523f9..0aae3c16fea9 100644 --- a/dev-lang/squeak/ChangeLog +++ b/dev-lang/squeak/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/squeak # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/ChangeLog,v 1.24 2007/02/22 00:11:44 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/ChangeLog,v 1.25 2007/07/22 08:43:03 graaff Exp $ + + 22 Jul 2007; Hans de Graaff <graaff@gentoo.org> squeak-3.4.1-r2.ebuild, + squeak-3.6_p3.ebuild, squeak-3.7.7-r1.ebuild, squeak-3.9.7.ebuild: + Drop virtual/x11 references. 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog: Transition to Manifest2. diff --git a/dev-lang/squeak/squeak-3.4.1-r2.ebuild b/dev-lang/squeak/squeak-3.4.1-r2.ebuild index 54989c7558cf..e44ded21cd27 100644 --- a/dev-lang/squeak/squeak-3.4.1-r2.ebuild +++ b/dev-lang/squeak/squeak-3.4.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.4.1-r2.ebuild,v 1.12 2007/07/13 06:25:50 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.4.1-r2.ebuild,v 1.13 2007/07/22 08:43:03 graaff Exp $ inherit libtool flag-o-matic eutils @@ -18,9 +18,7 @@ KEYWORDS="~x86 ~ppc" IUSE="X oss mmx mozilla" # a ffi flag would be nice -DEPEND="X? ( || ( ( x11-libs/libX11 - x11-libs/libXext ) - virtual/x11 ) )" +DEPEND="X? ( x11-libs/libX11 x11-libs/libXext )" RDEPEND="${DEPEND} virtual/squeak-image" diff --git a/dev-lang/squeak/squeak-3.6_p3.ebuild b/dev-lang/squeak/squeak-3.6_p3.ebuild index cbdad584f868..e25b18970557 100644 --- a/dev-lang/squeak/squeak-3.6_p3.ebuild +++ b/dev-lang/squeak/squeak-3.6_p3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.6_p3.ebuild,v 1.8 2007/02/06 08:57:22 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.6_p3.ebuild,v 1.9 2007/07/22 08:43:03 graaff Exp $ inherit nsplugins libtool flag-o-matic eutils @@ -16,9 +16,7 @@ IUSE="X nas mmx mozilla" # a ffi flag would be nice DEPEND="nas? ( media-libs/nas ) - X? ( || ( ( x11-libs/libX11 - x11-libs/libXext ) - virtual/x11 ) )" + X? ( x11-libs/libX11 x11-libs/libXext )" RDEPEND="${DEPEND} virtual/squeak-image" DEPEND="${DEPEND} diff --git a/dev-lang/squeak/squeak-3.7.7-r1.ebuild b/dev-lang/squeak/squeak-3.7.7-r1.ebuild index 81bc6c274b36..824bbc7ef6bc 100644 --- a/dev-lang/squeak/squeak-3.7.7-r1.ebuild +++ b/dev-lang/squeak/squeak-3.7.7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.7.7-r1.ebuild,v 1.3 2007/02/06 08:57:22 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.7.7-r1.ebuild,v 1.4 2007/07/22 08:43:03 graaff Exp $ inherit base versionator fixheadtails eutils @@ -14,10 +14,7 @@ KEYWORDS="~x86" IUSE="X mmx threads iconv" DEPEND="dev-libs/libffi - X? ( || ( ( x11-libs/libX11 - x11-libs/libXext - x11-libs/libXt ) - virtual/x11 ) )" + X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXt )" RDEPEND="${DEPEND} virtual/squeak-image" diff --git a/dev-lang/squeak/squeak-3.9.7.ebuild b/dev-lang/squeak/squeak-3.9.7.ebuild index d5f170b83774..8ac986d5518d 100644 --- a/dev-lang/squeak/squeak-3.9.7.ebuild +++ b/dev-lang/squeak/squeak-3.9.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.9.7.ebuild,v 1.3 2007/02/06 08:57:22 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.9.7.ebuild,v 1.4 2007/07/22 08:43:03 graaff Exp $ inherit base versionator fixheadtails eutils @@ -14,10 +14,7 @@ KEYWORDS="~x86" IUSE="X mmx threads iconv" DEPEND="dev-libs/libffi - X? ( || ( ( x11-libs/libX11 - x11-libs/libXext - x11-libs/libXt ) - virtual/x11 ) )" + X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXt )" RDEPEND="${DEPEND} virtual/squeak-image" diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog index 1b368429e60b..5c125481c4b5 100644 --- a/dev-lang/tk/ChangeLog +++ b/dev-lang/tk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/tk # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.82 2007/07/20 18:39:46 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.83 2007/07/22 08:39:45 graaff Exp $ + + 22 Jul 2007; Hans de Graaff <graaff@gentoo.org> tk-8.4.9.ebuild, + tk-8.4.14.ebuild: + Drop virtual/x11 references. *tk-8.5_alpha6 (20 Jul 2007) *tk-8.4.15 (20 Jul 2007) diff --git a/dev-lang/tk/tk-8.4.14.ebuild b/dev-lang/tk/tk-8.4.14.ebuild index 76b29617436f..5dad9a64028f 100644 --- a/dev-lang/tk/tk-8.4.14.ebuild +++ b/dev-lang/tk/tk-8.4.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.14.ebuild,v 1.10 2007/06/24 21:23:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.14.ebuild,v 1.11 2007/07/22 08:39:45 graaff Exp $ WANT_AUTOCONF=latest WANT_AUTOMAKE=latest @@ -16,13 +16,11 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" IUSE="debug threads" -RDEPEND="|| ( x11-libs/libX11 virtual/x11 ) +RDEPEND="x11-libs/libX11 ~dev-lang/tcl-${PV}" DEPEND="${RDEPEND} - || ( - ( x11-libs/libXt x11-proto/xproto ) - virtual/x11 - )" + x11-libs/libXt + x11-proto/xproto" S=${WORKDIR}/${PN}${PV} diff --git a/dev-lang/tk/tk-8.4.9.ebuild b/dev-lang/tk/tk-8.4.9.ebuild index 002a79c723ab..9978f08c6826 100644 --- a/dev-lang/tk/tk-8.4.9.ebuild +++ b/dev-lang/tk/tk-8.4.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.9.ebuild,v 1.17 2007/04/27 17:54:42 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.9.ebuild,v 1.18 2007/07/22 08:39:45 graaff Exp $ inherit eutils @@ -13,13 +13,11 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86" IUSE="threads" -RDEPEND="|| ( x11-libs/libX11 virtual/x11 ) +RDEPEND="x11-libs/libX11 =dev-lang/tcl-${PV}*" DEPEND="${RDEPEND} - || ( - ( x11-libs/libXt x11-proto/xproto ) - virtual/x11 - )" + x11-libs/libXt + x11-proto/xproto" S=${WORKDIR}/${PN}${PV} diff --git a/dev-lang/ucblogo/ChangeLog b/dev-lang/ucblogo/ChangeLog index 558f184d5e89..cdfccac44a4e 100644 --- a/dev-lang/ucblogo/ChangeLog +++ b/dev-lang/ucblogo/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/ucblogo # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ucblogo/ChangeLog,v 1.5 2007/04/03 22:25:50 tomk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ucblogo/ChangeLog,v 1.6 2007/07/22 08:37:29 graaff Exp $ + + 22 Jul 2007; Hans de Graaff <graaff@gentoo.org> ucblogo-5.5.ebuild: + Drop virtual/x11 references. 03 Apr 2007; Tom Knight <tomk@gentoo.org> +files/ucblogo-5.5-no-emacs.patch, metadata.xml, ucblogo-5.5.ebuild: diff --git a/dev-lang/ucblogo/ucblogo-5.5.ebuild b/dev-lang/ucblogo/ucblogo-5.5.ebuild index 5ed0e6a189b4..3217ba35800d 100644 --- a/dev-lang/ucblogo/ucblogo-5.5.ebuild +++ b/dev-lang/ucblogo/ucblogo-5.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ucblogo/ucblogo-5.5.ebuild,v 1.6 2007/04/03 22:25:50 tomk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ucblogo/ucblogo-5.5.ebuild,v 1.7 2007/07/22 08:37:29 graaff Exp $ inherit eutils @@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86" IUSE="emacs X" DEPEND="emacs? ( virtual/emacs ) - X? ( || ( ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) virtual/x11 ) )" + X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 )" src_unpack() { unpack ${A} |