From ce85536b82dbd61a3d00430c60897574dadf07ab Mon Sep 17 00:00:00 2001 From: Markus Dittrich Date: Tue, 14 Feb 2006 15:12:14 +0000 Subject: Depend on virtual/[x]emacs rather than a specific [x]emacs ebuild. This fixes bug #122546. Package-Manager: portage-2.1_pre4-r1 --- sci-mathematics/singular/ChangeLog | 8 +++++++- sci-mathematics/singular/Manifest | 12 ++++++------ sci-mathematics/singular/singular-3.0.1.2.ebuild | 9 +++++---- 3 files changed, 18 insertions(+), 11 deletions(-) (limited to 'sci-mathematics/singular') diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog index dcb7c4b3ab74..7ce5bf811078 100644 --- a/sci-mathematics/singular/ChangeLog +++ b/sci-mathematics/singular/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-mathematics/singular # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.7 2006/02/09 15:28:50 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.8 2006/02/14 15:12:14 markusle Exp $ + + 14 Feb 2006; Markus Dittrich + singular-3.0.1.2.ebuild: + Depend on virtual/[x]emacs rather than a specific [x]emacs ebuild. + Thanks to MATSUI Tetsushi for pointing this + out and this fixes bug #122546. 09 Feb 2006; Markus Dittrich ChangeLog: Removed singular-3.x ebuilds from package.mask. diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest index 14893125976d..ff28e8d95d44 100644 --- a/sci-mathematics/singular/Manifest +++ b/sci-mathematics/singular/Manifest @@ -1,6 +1,6 @@ -MD5 61e0540c4523c640eeb2b9101275be72 ChangeLog 3923 -RMD160 cdc74818cade7302f222755c36da5efbd78a3e14 ChangeLog 3923 -SHA256 b5fe6e320ca49d2a732e809a0f597981a0c98bd9ed6eb6bd5bb4eab46a300df0 ChangeLog 3923 +MD5 238de0335eae75c2fac4b5e5b148b75b ChangeLog 4176 +RMD160 6e8cedef21c36e874983283cd1ea361cf2ec6a2b ChangeLog 4176 +SHA256 badf7a9005a009ee6e257080b8ef04ed31979505f0971299bb98b2677013e9b2 ChangeLog 4176 MD5 673cd925126b07ea0e78cf91269b7d66 files/digest-singular-2.0.5-r4 859 RMD160 e8e8f57f50a91e84a4af63e3222011e9a696636f files/digest-singular-2.0.5-r4 859 SHA256 643ada8e366c859a02d6dec1bf58cc0510a3462c833a347fa4ab95cf5b6e91c1 files/digest-singular-2.0.5-r4 859 @@ -28,6 +28,6 @@ SHA256 8bde53cf79771c990cc0114f85720a769c5c585502136960284f948c396395bb singular MD5 cd39e5ab8e6b0bb7d73746b86607dfb4 singular-3.0.1.1.ebuild 2869 RMD160 39e95e631ac2328bfde4cba8ab2b696ad73169ed singular-3.0.1.1.ebuild 2869 SHA256 28779526fa856c762b921896bc49fd89c2f06e57fc29390dd4121d980d0024cc singular-3.0.1.1.ebuild 2869 -MD5 172a8359836d837d0543dd7e8a0fd24d singular-3.0.1.2.ebuild 2869 -RMD160 a0cfac646a69421806090cf4dc82767b7e43474a singular-3.0.1.2.ebuild 2869 -SHA256 80df6e361ddcb48b5df0b50c9c7d6e4f15055519fafc74f211d4d981a608a834 singular-3.0.1.2.ebuild 2869 +MD5 0cc00fbfb8e44484f55f0f1523ea3633 singular-3.0.1.2.ebuild 2885 +RMD160 26572c21997012141a6a05bf9f9db2620309355f singular-3.0.1.2.ebuild 2885 +SHA256 e155918178a2eb383588cde551dd7c8ece19dcc85ee19911125cd7c41b2965f8 singular-3.0.1.2.ebuild 2885 diff --git a/sci-mathematics/singular/singular-3.0.1.2.ebuild b/sci-mathematics/singular/singular-3.0.1.2.ebuild index 89e72e937420..e9339c050e13 100644 --- a/sci-mathematics/singular/singular-3.0.1.2.ebuild +++ b/sci-mathematics/singular/singular-3.0.1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.1.2.ebuild,v 1.1 2006/01/15 06:04:28 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.1.2.ebuild,v 1.2 2006/02/14 15:12:14 markusle Exp $ inherit eutils @@ -21,8 +21,8 @@ IUSE="doc emacs" DEPEND=">=dev-lang/perl-5.6 >=dev-libs/gmp-4.1-r1 - emacs? ( || ( app-editors/xemacs - app-editors/emacs ) )" + emacs? ( || ( virtual/xemacs + virtual/emacs ) )" S="${WORKDIR}"/${MY_PN}-${MY_PV_MAJOR} @@ -36,7 +36,8 @@ src_unpack () { src_compile() { local myconf="${myconf} --disable-doc --without-MP --with-factory --with-libfac --prefix=${S}" - econf ${myconf} || die "econf failed" + econf $(use_enable emacs) \ + ${myconf} || die "econf failed" emake || die "make failed" } -- cgit v1.2.3-65-gdbad