summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamoru Komachi <usata@gentoo.org>2006-11-06 16:23:10 +0000
committerMamoru Komachi <usata@gentoo.org>2006-11-06 16:23:10 +0000
commit5adb1ea5f759a8610d502fdfe71d39dbfbb7b1a4 (patch)
tree81beea3fe18a16cf2c298e6b346ed3ebd64fe4de /app-text/xdvik/xdvik-22.40y-r2.ebuild
parentVersion bump (diff)
downloadgentoo-2-5adb1ea5f759a8610d502fdfe71d39dbfbb7b1a4.tar.gz
gentoo-2-5adb1ea5f759a8610d502fdfe71d39dbfbb7b1a4.tar.bz2
gentoo-2-5adb1ea5f759a8610d502fdfe71d39dbfbb7b1a4.zip
Fixed modular X dependency. Block app-text/texlive. This closes bug #143851.
(Portage version: 2.1.1)
Diffstat (limited to 'app-text/xdvik/xdvik-22.40y-r2.ebuild')
-rw-r--r--app-text/xdvik/xdvik-22.40y-r2.ebuild19
1 files changed, 15 insertions, 4 deletions
diff --git a/app-text/xdvik/xdvik-22.40y-r2.ebuild b/app-text/xdvik/xdvik-22.40y-r2.ebuild
index 621844ad9ce5..fe88a4b8fa3a 100644
--- a/app-text/xdvik/xdvik-22.40y-r2.ebuild
+++ b/app-text/xdvik/xdvik-22.40y-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.40y-r2.ebuild,v 1.13 2005/01/01 16:42:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.40y-r2.ebuild,v 1.14 2006/11/06 16:23:10 usata Exp $
inherit eutils
@@ -20,16 +20,27 @@ SLOT="0"
LICENSE="GPL-2"
DEPEND=">=media-libs/t1lib-1.3
- virtual/x11
+ || (
+ (
+ x11-libs/libXpm
+ x11-libs/libXmu
+ )
+ virtual/x11
+ )
virtual/tetex
cjk? ( >=media-libs/freetype-2 )
- libwww? ( >=net-libs/libwww-5.3.2-r1 )"
+ libwww? ( >=net-libs/libwww-5.3.2-r1 )
+ !app-text/texlive"
src_unpack () {
unpack ${MY_P}.tar.gz
+ cd ${S}
+ epatch ${FILESDIR}/xdvi-xorg-7.0.patch
+ epatch ${FILESDIR}/xdvizilla.patch
if use cjk ; then
epatch ${DISTDIR}/${XDVIK_JP}.patch.gz
+ epatch ${FILESDIR}/${P}-dvi-draw-conflicting-types.patch
sed -i -e "/\/usr\/local/s:^:%:g" \
-e "/kochi-.*-subst/s:%::g" \
-e "s:/usr/local:/usr:g" \