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 | 677f114ebbb4e202b6e70e091eba11b1dea88422 (patch) | |
tree | 9fa926989baa0e05be8a354cb7fc2339726a6403 /app-editors/lfhex | |
parent | Fix bug#219896, thanks to Nickolay Kolchin-Semyonov and Jack Lloyd, also fix ... (diff) | |
download | historical-677f114ebbb4e202b6e70e091eba11b1dea88422.tar.gz historical-677f114ebbb4e202b6e70e091eba11b1dea88422.tar.bz2 historical-677f114ebbb4e202b6e70e091eba11b1dea88422.zip |
dependency fix as per bug #217197
Package-Manager: portage-2.1.5_rc6
Diffstat (limited to 'app-editors/lfhex')
-rw-r--r-- | app-editors/lfhex/ChangeLog | 6 | ||||
-rw-r--r-- | app-editors/lfhex/Manifest | 5 | ||||
-rw-r--r-- | app-editors/lfhex/lfhex-0.4-r1.ebuild | 9 | ||||
-rw-r--r-- | app-editors/lfhex/lfhex-0.4.ebuild | 32 |
4 files changed, 13 insertions, 39 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/Manifest b/app-editors/lfhex/Manifest index 2673d382b218..08c6f411edd9 100644 --- a/app-editors/lfhex/Manifest +++ b/app-editors/lfhex/Manifest @@ -3,7 +3,6 @@ AUX ndebug.patch 778 RMD160 1e15778bf00957f068571189cdce24f5e239c8a1 SHA1 bb74a2 DIST lfhex-0.3.7.2.tar.gz 70871 RMD160 b343a22e32c6c451ad69a62bfd8c9b3f2f57cb9c SHA1 2fd4c71bf8eaf35301f1b19d93f495d747d17c22 SHA256 65c83e85012697099b09dc18db4860c03f5a0ec28e4405e85f085de1ddf46c0a DIST lfhex-0.4.tar.gz 39180 RMD160 a23cbe5b7f62b0ac1234c4caa54457d41671bf5c SHA1 c99b6434559818d26f48152607d3bd70ea930888 SHA256 97e3f481a275671395d2b500d904474dfaaf5055b42b0f230e3ac6a2478897b0 EBUILD lfhex-0.3.7.2.ebuild 693 RMD160 b953023cafae5a0eb86b721d7753ebac5f1446ce SHA1 b0f84edd05bf90df95865f12a34cb4756ceea26e SHA256 1478280be31930c26235164c13ee86969f0292ae87650b589a53162003876a48 -EBUILD lfhex-0.4-r1.ebuild 843 RMD160 b2d45c45326d706e46e5e93c79129518e64c4d0f SHA1 dd5158c9cfa476c275bb99af97a4c65e89f0ff63 SHA256 96e6568b9bea57314f00277577956cac438a944cd46369691af4c129415a8949 -EBUILD lfhex-0.4.ebuild 885 RMD160 082155bc2169699a7b7543dd23e3af47fc90b043 SHA1 0a379aa6e173b238b19229106838455705514e3c SHA256 d808272036932d452b582fe01de3384bba8738f05196915843d3223df90ede3f -MISC ChangeLog 2698 RMD160 5e5e56cf4f12d6a34b24af801075172c59edc01e SHA1 568cd537fc384bf65e6ec8d22ddca5259818691a SHA256 845dda54b6704cce5f4a08c320b0f8048af7fc6bb6fe684fa6d9c61555b21e45 +EBUILD lfhex-0.4-r1.ebuild 880 RMD160 eeabc3ef3cc4f87e2aa370a11737adae0e309fa3 SHA1 53719892fe5fdfea0d268ad6a21ba36710383442 SHA256 5f7be32751f0a098aeeff50bcb1ff1937c90db9dd56983eeac301ecd633d0e56 +MISC ChangeLog 2830 RMD160 a29de0a1404a5c0bf8385bd7f07df70899e098fa SHA1 a6e8600ab2a095da2d1cc6748aee0e2163ff2cc4 SHA256 538f14799762961c8c23b5c03023b559b49be37069aa3c149e2b07f47874eb0c MISC metadata.xml 403 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 SHA1 ec604212b5eb7dde6256c827184a228eaa8161d5 SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a 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 -} |