diff options
-rw-r--r-- | app-editors/kvim/ChangeLog | 5 | ||||
-rw-r--r-- | app-editors/kvim/kvim-6.2.14.ebuild | 13 | ||||
-rw-r--r-- | app-misc/tdl/ChangeLog | 6 | ||||
-rw-r--r-- | app-misc/tdl/tdl-1.4.1.ebuild | 11 | ||||
-rw-r--r-- | app-misc/tdl/tdl-1.5.2.ebuild | 18 | ||||
-rw-r--r-- | app-text/rhyme/ChangeLog | 5 | ||||
-rw-r--r-- | app-text/rhyme/rhyme-0.9.ebuild | 18 |
7 files changed, 30 insertions, 46 deletions
diff --git a/app-editors/kvim/ChangeLog b/app-editors/kvim/ChangeLog index 59b9584b7e64..fd993350ac51 100644 --- a/app-editors/kvim/ChangeLog +++ b/app-editors/kvim/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-editors/kvim # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/kvim/ChangeLog,v 1.24 2004/10/05 12:19:43 pvdabeel Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/kvim/ChangeLog,v 1.25 2004/10/16 19:27:44 vapier Exp $ + + 16 Oct 2004; Mike Frysinger <vapier@gentoo.org> kvim-6.2.14.ebuild: + Fix stupid dependency on sys-libs/libtermcap-compat (i.e. remove it) #64212. 05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> kvim-6.2.14.ebuild: Masked kvim-6.2.14.ebuild stable for ppc diff --git a/app-editors/kvim/kvim-6.2.14.ebuild b/app-editors/kvim/kvim-6.2.14.ebuild index 82c939a728ac..dcd13414a5e1 100644 --- a/app-editors/kvim/kvim-6.2.14.ebuild +++ b/app-editors/kvim/kvim-6.2.14.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/app-editors/kvim/kvim-6.2.14.ebuild,v 1.14 2004/10/05 12:19:43 pvdabeel Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/kvim/kvim-6.2.14.ebuild,v 1.15 2004/10/16 19:27:44 vapier Exp $ inherit kde eutils @@ -13,8 +13,7 @@ KEYWORDS="alpha x86 sparc ppc ~amd64" IUSE="python gpm nls ruby perl cscope ncurses" DEPEND=">=app-editors/vim-core-6.2 - ncurses? ( >=sys-libs/ncurses-5.2-r2 ) - !ncurses? ( sys-libs/libtermcap-compat ) + >=sys-libs/ncurses-5.2-r2 cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) @@ -37,7 +36,8 @@ src_compile() { --enable-multibyte \ --enable-gui=kde \ --with-vim-name=kvim \ - --enable-kde-toolbar" + --enable-kde-toolbar \ + --with-tlib=ncurses" myconf="${myconf} `use_enable cscope`" myconf="${myconf} `use_enable gpm`" myconf="${myconf} `use_enable perl perlinterp`" @@ -45,11 +45,6 @@ src_compile() { myconf="${myconf} `use_enable ruby rubyinterp`" myconf="${myconf} `use_enable nls`" - # Note: If USE=gpm, then ncurses will still be required - use ncurses \ - && myconf="${myconf} --with-tlib=ncurses" \ - || myconf="${myconf} --with-tlib=termcap" - # Let kde.eclass handle the configuration kde_src_compile myconf configure make || die # emake does not work diff --git a/app-misc/tdl/ChangeLog b/app-misc/tdl/ChangeLog index e1a7abff7d85..87301c622883 100644 --- a/app-misc/tdl/ChangeLog +++ b/app-misc/tdl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/tdl # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/tdl/ChangeLog,v 1.12 2004/10/05 13:34:52 pvdabeel Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/tdl/ChangeLog,v 1.13 2004/10/16 19:30:08 vapier Exp $ + + 16 Oct 2004; Mike Frysinger <vapier@gentoo.org> tdl-1.4.1.ebuild, + tdl-1.5.2.ebuild: + Fix stupid dependency on sys-libs/libtermcap-compat (i.e. remove it) #64212. 05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> tdl-1.4.1.ebuild, tdl-1.5.2.ebuild: diff --git a/app-misc/tdl/tdl-1.4.1.ebuild b/app-misc/tdl/tdl-1.4.1.ebuild index 232d5455df09..606a62a730e5 100644 --- a/app-misc/tdl/tdl-1.4.1.ebuild +++ b/app-misc/tdl/tdl-1.4.1.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/app-misc/tdl/tdl-1.4.1.ebuild,v 1.10 2004/10/05 13:34:52 pvdabeel Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/tdl/tdl-1.4.1.ebuild,v 1.11 2004/10/16 19:30:08 vapier Exp $ DESCRIPTION="Command line To Do List manager" HOMEPAGE="http://www.rc0.org.uk/tdl/" @@ -14,8 +14,7 @@ IUSE="readline ncurses doc" RDEPEND=" readline? ( >=sys-libs/readline-4.3 - ncurses? ( sys-libs/ncurses ) - !ncurses? ( sys-libs/libtermcap-compat ) + sys-libs/ncurses )" DEPEND="${RDEPEND} sys-apps/texinfo @@ -28,11 +27,7 @@ src_compile() { if ! use readline; then myconf="${myconf} --without-readline" else - if use ncurses; then - sed -i 's#-ltermcap#-lncurses#g' ${S}/configure - else - sed -i 's#-lncurses##g' ${S}/configure - fi + sed -i 's#-ltermcap#-lncurses#g' ${S}/configure fi ./configure ${myconf} || die "configure failed, sorry!" diff --git a/app-misc/tdl/tdl-1.5.2.ebuild b/app-misc/tdl/tdl-1.5.2.ebuild index 2648baaf95b8..8f2548a57877 100644 --- a/app-misc/tdl/tdl-1.5.2.ebuild +++ b/app-misc/tdl/tdl-1.5.2.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/app-misc/tdl/tdl-1.5.2.ebuild,v 1.10 2004/10/13 20:14:27 taviso Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/tdl/tdl-1.5.2.ebuild,v 1.11 2004/10/16 19:30:08 vapier Exp $ inherit eutils flag-o-matic @@ -14,8 +14,7 @@ KEYWORDS="x86 alpha ppc ~amd64" IUSE="readline ncurses doc" RDEPEND=">=sys-libs/readline-4.3 - ncurses? ( sys-libs/ncurses ) - !ncurses? ( sys-libs/libtermcap-compat )" + sys-libs/ncurses" DEPEND="${RDEPEND} sys-apps/texinfo >=sys-apps/sed-4 @@ -27,18 +26,9 @@ src_compile() { if ! use readline; then myconf="${myconf} --without-readline" - if use ncurses; then - sed -i 's#\($(LIB_READLINE)\)#\1 -lncurses##g' ${S}/Makefile.in - else - sed -i 's#\($(LIB_READLINE)\)#\1 -ltermcap##g' ${S}/Makefile.in - fi - fi - - if use ncurses; then - sed -i 's#-ltermcap#-lncurses#g' ${S}/configure - else - sed -i 's#-lncurses##g' ${S}/configure + sed -i 's#\($(LIB_READLINE)\)#\1 -lncurses##g' ${S}/Makefile.in fi + sed -i 's#-ltermcap#-lncurses#g' ${S}/configure # XXX: do not replace with econf. ${S}/configure ${myconf} || die "configure failed, sorry!" diff --git a/app-text/rhyme/ChangeLog b/app-text/rhyme/ChangeLog index 60d751205dd6..10577a260c11 100644 --- a/app-text/rhyme/ChangeLog +++ b/app-text/rhyme/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/rhyme # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/rhyme/ChangeLog,v 1.4 2004/06/24 22:50:35 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/rhyme/ChangeLog,v 1.5 2004/10/16 19:31:06 vapier Exp $ + + 16 Oct 2004; Mike Frysinger <vapier@gentoo.org> rhyme-0.9.ebuild: + Fix stupid dependency on sys-libs/libtermcap-compat (i.e. remove it) #64212. 25 Mar 2004; Martin Holzer <mholzer@gentoo.org> rhyme-0.9.ebuild: fixing depend. see 45343 diff --git a/app-text/rhyme/rhyme-0.9.ebuild b/app-text/rhyme/rhyme-0.9.ebuild index 3f41ddc9d98c..d1337a3a98c3 100644 --- a/app-text/rhyme/rhyme-0.9.ebuild +++ b/app-text/rhyme/rhyme-0.9.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/app-text/rhyme/rhyme-0.9.ebuild,v 1.5 2004/06/24 22:50:35 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/rhyme/rhyme-0.9.ebuild,v 1.6 2004/10/16 19:31:06 vapier Exp $ inherit ccc DESCRIPTION="Console based Rhyming Dictionary" HOMEPAGE="http://rhyme.sourceforge.net/" SRC_URI="mirror://sourceforge/rhyme/${P}.tar.gz" -RESTRICT="nomirror" LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 alpha" +IUSE="" -IUSE="ncurses" - -DEPEND="ncurses? ( >=sys-libs/ncurses-5.3 ) - !ncurses? ( >=sys-libs/libtermcap-compat-1.2.3 ) +DEPEND=">=sys-libs/ncurses-5.3 >=sys-libs/readline-4.3 >=sys-libs/gdbm-1.8.0" @@ -27,10 +24,8 @@ src_compile() { # CFLAGS are hardcoded, replace with user specified flags sed -i "s#\(^FLAGS =\).*#\1 ${CFLAGS}#g" ${S}/Makefile - # termcap is used by default, switch to ncurses if requested. - if use ncurses; then - sed -i 's/-ltermcap/-lncurses/g' ${S}/Makefile - fi + # termcap is used by default, switch to ncurses + sed -i 's/-ltermcap/-lncurses/g' ${S}/Makefile # works fine with parallel build emake || die @@ -44,8 +39,7 @@ src_install() { MANPATH=${D}/usr/share/man/man1 \ RHYMEPATH=${D}/usr/share/rhyme - dodoc INSTALL COPYING + dodoc INSTALL prepallman } - |