summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-07-01 11:39:16 +0000
committerJustin Lecher <jlec@gentoo.org>2012-07-01 11:39:16 +0000
commitefa0d45c635713a3abaaf11379f48f7e87a67f61 (patch)
tree39497afe0e72af4675d80a1c94a66a4f6b190ea3 /media-gfx
parentFix up dependencies for tuprolog unit tests (diff)
downloadgentoo-2-efa0d45c635713a3abaaf11379f48f7e87a67f61.tar.gz
gentoo-2-efa0d45c635713a3abaaf11379f48f7e87a67f61.tar.bz2
gentoo-2-efa0d45c635713a3abaaf11379f48f7e87a67f61.zip
media-gfx/w3mimgfb: Respect LDFALGS, #336561; bumped to EAPI=4; drop support of w3m-m17n
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/w3mimgfb/ChangeLog7
-rw-r--r--media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild50
2 files changed, 22 insertions, 35 deletions
diff --git a/media-gfx/w3mimgfb/ChangeLog b/media-gfx/w3mimgfb/ChangeLog
index 502c799fb402..54c7330178ca 100644
--- a/media-gfx/w3mimgfb/ChangeLog
+++ b/media-gfx/w3mimgfb/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-gfx/w3mimgfb
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/w3mimgfb/ChangeLog,v 1.10 2007/12/25 17:09:39 phreak Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/w3mimgfb/ChangeLog,v 1.11 2012/07/01 11:39:16 jlec Exp $
+
+ 01 Jul 2012; Justin Lecher <jlec@gentoo.org> w3mimgfb-0.9.1.ebuild:
+ Respect LDFALGS, #336561; bumped to EAPI=4; drop support of w3m-m17n
25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
Removing usata from metadata.xml as per #22931. Assigning to maintainer-needed.
diff --git a/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild b/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
index 2440adcca7b1..4b8df6b4bf9e 100644
--- a/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
+++ b/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild,v 1.8 2005/05/16 04:30:10 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild,v 1.9 2012/07/01 11:39:16 jlec Exp $
+
+EAPI=4
inherit toolchain-funcs
@@ -10,43 +12,25 @@ SRC_URI="http://homepage3.nifty.com/slokar/fb/${P}.tar.gz"
LICENSE="w3m BSD"
SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="~amd64 x86 ppc"
IUSE=""
-DEPEND=">=media-libs/stimg-0.1.0
+DEPEND="media-libs/stimg"
+RDEPEND="${DEPEND}
virtual/w3m"
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+src_prepare() {
+ sed \
+ -e '/^CC/d' \
+ -e '/^CFLAGS/d' \
+ -e '/^LDFLAGS/d' \
+ -i Makefile || die
+ tc-export CC
}
src_install() {
+ exeinto /usr/libexec/w3m
+ doexe w3mimgdisplayfb
- local realbin
-
- if has_version '<www-client/w3m-0.4.2' ; then
- exeinto /usr/lib/w3m
- doexe w3mimgdisplayfb
- elif has_version '>=www-client/w3m-0.4.2-r1' ; then
- exeinto /usr/libexec/w3m
- doexe w3mimgdisplayfb
- fi
- if has_version '<www-client/w3m-m17n-0.4.2' ; then
- exeinto /usr/lib/w3m-m17n
- doexe w3mimgdisplayfb
- elif has_version '>=www-client/w3m-m17n-0.4.2' ; then
- exeinto /usr/libexec/w3m-m17n
- doexe w3mimgdisplayfb
- fi
-
- for exe in /usr/lib{,exec}/w3m{,-m17n}/w3mimgdisplayfb ; do
- if [ -n "$realexe" ] ; then
- rm ${D}$exe
- dohard $realexe $exe
- elif [ -x ${D}$exe ] ; then
- realexe=$exe
- fi
- done
-
- dodoc COPYING readme.txt
+ dodoc readme.txt
}