diff options
| author |   Daniel Black <dragonheart@gentoo.org> | 2008-05-02 07:49:33 +0000 |
|---|---|---|
| committer | Daniel Black <dragonheart@gentoo.org> | 2008-05-02 07:49:33 +0000 |
| commit | 9110ad69de9fac16872f1601d775870bcf2c33bc (patch) | |
| tree | b8f87037e33e5e92d9b3fb40e8f8c9274248de66 /app-editors | |
| parent | Fix bug#219896, thanks to Nickolay Kolchin-Semyonov and Jack Lloyd, also fix ... (diff) | |
| download | gentoo-2-9110ad69de9fac16872f1601d775870bcf2c33bc.tar.gz gentoo-2-9110ad69de9fac16872f1601d775870bcf2c33bc.tar.bz2 gentoo-2-9110ad69de9fac16872f1601d775870bcf2c33bc.zip | |
dependency fix as per bug #217197
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/lfhex/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/lfhex/lfhex-0.4-r1.ebuild | 9 | ||||
| -rw-r--r-- | app-editors/lfhex/lfhex-0.4.ebuild | 32 |
3 files changed, 11 insertions, 36 deletions
diff --git a/app-editors/lfhex/ChangeLog b/app-editors/lfhex/ChangeLog index 9bd6662109ae..a91adb5849ef 100644 --- a/app-editors/lfhex/ChangeLog +++ b/app-editors/lfhex/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/lfhex # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/lfhex/ChangeLog,v 1.20 2008/04/01 15:38:03 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/lfhex/ChangeLog,v 1.21 2008/05/02 07:49:33 dragonheart Exp $ + + 01 May 2008; Daniel Black <dragonheart@gentoo.org> -lfhex-0.4.ebuild, + lfhex-0.4-r1.ebuild: + dependency fix as per bug #217197 *lfhex-0.4-r1 (01 Apr 2008) diff --git a/app-editors/lfhex/lfhex-0.4-r1.ebuild b/app-editors/lfhex/lfhex-0.4-r1.ebuild index 449b9b9e6c87..b243b8822786 100644 --- a/app-editors/lfhex/lfhex-0.4-r1.ebuild +++ b/app-editors/lfhex/lfhex-0.4-r1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/lfhex/lfhex-0.4-r1.ebuild,v 1.1 2008/04/01 15:38:03 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/lfhex/lfhex-0.4-r1.ebuild,v 1.2 2008/05/02 07:49:33 dragonheart Exp $ + +EAPI="1" inherit qt4 toolchain-funcs @@ -13,8 +15,9 @@ KEYWORDS="~amd64 ~ppc ~x86" IUSE="" -RDEPEND="$(qt4_min_version 4) - >=x11-libs/libXt-1.0.0" +RDEPEND="|| ( x11-libs/qt-gui:4 + >=x11-libs/qt-4.2:4 ) + >=x11-libs/libXt-1.0.0" DEPEND="sys-devel/flex sys-devel/bison diff --git a/app-editors/lfhex/lfhex-0.4.ebuild b/app-editors/lfhex/lfhex-0.4.ebuild deleted file mode 100644 index 4168ada465d9..000000000000 --- a/app-editors/lfhex/lfhex-0.4.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/lfhex/lfhex-0.4.ebuild,v 1.3 2007/07/22 08:56:15 omp Exp $ - -inherit qt4 toolchain-funcs - -DESCRIPTION="A fast, efficient hex-editor with support for large files and comparing binary files" -HOMEPAGE="http://stoopidsimple.com/lfhex" -SRC_URI="http://stoopidsimple.com/files/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="" - -RDEPEND="$(qt4_min_version 4) - >=x11-libs/libXt-1.0.0" - -DEPEND="sys-devel/flex - sys-devel/bison - ${RDEPEND}" - -src_compile() { - export QTDIR=/usr QTLIBDIR=/usr/lib/qt4 QTINCLUDEDIR=/usr/include/qt4 QTPLUGINDIR=/usr/lib/qt4/plugins - ${QTDIR}/bin/qmake lfhex.pro || die - emake CXX=$(tc-getCXX) LINK=$(tc-getCXX) LFLAGS="${LDFLAGS}" || die -} - -src_install() { - dobin lfhex - dodoc README -} |