diff options
| author |   Emanuele Giaquinta <exg@gentoo.org> | 2006-10-13 15:51:42 +0000 |
|---|---|---|
| committer | Emanuele Giaquinta <exg@gentoo.org> | 2006-10-13 15:51:42 +0000 |
| commit | 6ea70580f82b9d9324f78525766c8c25d238e120 (patch) | |
| tree | 80c44091923d076ee5560c58456dc236968987c4 /app-text | |
| parent | Version bump. bug #149091 (diff) | |
| download | gentoo-2-6ea70580f82b9d9324f78525766c8c25d238e120.tar.gz gentoo-2-6ea70580f82b9d9324f78525766c8c25d238e120.tar.bz2 gentoo-2-6ea70580f82b9d9324f78525766c8c25d238e120.zip | |
Add a blocker on tetex built with X.
(Portage version: 2.1.2_pre2-r9)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/xdvik/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/xdvik/files/digest-xdvik-22.40y-r2 | 6 | ||||
| -rw-r--r-- | app-text/xdvik/files/digest-xdvik-22.84.5 | 6 | ||||
| -rw-r--r-- | app-text/xdvik/xdvik-22.84.10.ebuild | 17 |
4 files changed, 24 insertions, 10 deletions
diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog index 6248409e9a89..44bc231ba020 100644 --- a/app-text/xdvik/ChangeLog +++ b/app-text/xdvik/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/xdvik # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.26 2006/10/09 18:17:38 exg Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.27 2006/10/13 15:51:42 exg Exp $ + + 13 Oct 2006; Emanuele Giaquinta <exg@gentoo.org> xdvik-22.84.10.ebuild: + Add a blocker on tetex built with X. 09 Oct 2006; Emanuele Giaquinta <exg@gentoo.org> xdvik-22.84.10.ebuild: Correct X11 deps. diff --git a/app-text/xdvik/files/digest-xdvik-22.40y-r2 b/app-text/xdvik/files/digest-xdvik-22.40y-r2 index 9c66bb81b763..bb9b34878917 100644 --- a/app-text/xdvik/files/digest-xdvik-22.40y-r2 +++ b/app-text/xdvik/files/digest-xdvik-22.40y-r2 @@ -1,2 +1,6 @@ -MD5 ab9083c9580e215715dc0369db3c028b xdvik-22.40y1.tar.gz 2256174 MD5 9ce0615764079502f3b76692127a068a xdvik-22.40y1-j1.21.patch.gz 166908 +RMD160 4f84b62c418b2a7d3d07b7f9d60420ccbbfb479e xdvik-22.40y1-j1.21.patch.gz 166908 +SHA256 d7cd93e1b32e82dab39fbabdc0a67d0a06f291a854e82a29a1ee97f9f61bcf8f xdvik-22.40y1-j1.21.patch.gz 166908 +MD5 ab9083c9580e215715dc0369db3c028b xdvik-22.40y1.tar.gz 2256174 +RMD160 c87f15c4077d869c81989b6eea8170fd1560998e xdvik-22.40y1.tar.gz 2256174 +SHA256 47afcb4f45a30a6db1c03b89b0bf118a5af1c124f9f380b4312d7ccf4da95701 xdvik-22.40y1.tar.gz 2256174 diff --git a/app-text/xdvik/files/digest-xdvik-22.84.5 b/app-text/xdvik/files/digest-xdvik-22.84.5 index 800826af0935..5a468dddd914 100644 --- a/app-text/xdvik/files/digest-xdvik-22.84.5 +++ b/app-text/xdvik/files/digest-xdvik-22.84.5 @@ -1,2 +1,6 @@ -MD5 5180b6ba158f29e9880549d18fe8381d xdvik-22.84.5.tar.gz 1902252 MD5 af4869cfe65ae0b01d41a02871410223 xdvik-22.84.5-20041106-jp.diff.gz 123863 +RMD160 945c7a337a6dad8f0060ce94c8ac2f6734acc68a xdvik-22.84.5-20041106-jp.diff.gz 123863 +SHA256 b96038971f2a922d01743a2d5e4f857d22acc5d3efd32882f208b85a2dd67b72 xdvik-22.84.5-20041106-jp.diff.gz 123863 +MD5 5180b6ba158f29e9880549d18fe8381d xdvik-22.84.5.tar.gz 1902252 +RMD160 ff650febd48a39e5beab08e23853b27c12b28390 xdvik-22.84.5.tar.gz 1902252 +SHA256 bca7663ba3da4a3c866c9b62c143034295e0c56fb1ae29671b68580e9bbc367f xdvik-22.84.5.tar.gz 1902252 diff --git a/app-text/xdvik/xdvik-22.84.10.ebuild b/app-text/xdvik/xdvik-22.84.10.ebuild index b8c4cf0caa1e..6536a6fb527d 100644 --- a/app-text/xdvik/xdvik-22.84.10.ebuild +++ b/app-text/xdvik/xdvik-22.84.10.ebuild @@ -1,6 +1,6 @@ # 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.84.10.ebuild,v 1.3 2006/10/09 18:17:38 exg Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.10.ebuild,v 1.4 2006/10/13 15:51:42 exg Exp $ WANT_AUTOCONF=2.1 @@ -34,8 +34,16 @@ RDEPEND=">=media-libs/t1lib-5.0.2 !cjk? ( virtual/tetex )" DEPEND="${RDEPEND}" -src_unpack () { +pkg_setup () { + if has_version app-text/tetex && built_with_use app-text/tetex X ; then + eerror "tetex provides xdvik when built with the X flag." + eerror "To install this version of xdvik re-install tetex" + eerror "without the X flag." + die "xdvik collides with tetex built with the X flag" + fi +} +src_unpack () { unpack ${P}.tar.gz cd "${S}" if use cjk ; then @@ -68,11 +76,6 @@ src_compile () { local TEXMF_PATH=$(kpsewhich --expand-var='$TEXMFMAIN') local myconf toolkit - if use cjk ; then - export CPPFLAGS="${CPPFLAGS} -I/usr/include/freetype2" - myconf="${myconf} --with-vflib=vf2ft" - fi - if use motif ; then if use lesstif ; then append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif |