diff options
| author |   Naohiro Aota <naota@gentoo.org> | 2012-09-15 09:36:49 +0000 |
|---|---|---|
| committer | Naohiro Aota <naota@gentoo.org> | 2012-09-15 09:36:49 +0000 |
| commit | bcafbc050754a169bfe7dba1089b1483037f42de (patch) | |
| tree | eebdd5bc4a498a320ec86901b1092e00804c5f7c /app-text | |
| parent | Version bump. (diff) | |
| download | gentoo-2-bcafbc050754a169bfe7dba1089b1483037f42de.tar.gz gentoo-2-bcafbc050754a169bfe7dba1089b1483037f42de.tar.bz2 gentoo-2-bcafbc050754a169bfe7dba1089b1483037f42de.zip | |
Import xvdvik-22.85-r1's change into -22.84.16 to add RDEPEND properly. #434638
(Portage version: 2.1.11.16/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/xdvik/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/xdvik/xdvik-22.84.16.ebuild | 16 |
2 files changed, 17 insertions, 6 deletions
diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog index c91b11bc707b..c92521e57ccb 100644 --- a/app-text/xdvik/ChangeLog +++ b/app-text/xdvik/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/xdvik # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.89 2012/07/05 11:03:09 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.90 2012/09/15 09:36:49 naota Exp $ + + 15 Sep 2012; <naota@gentoo.org> xdvik-22.84.16.ebuild: + Import xvdvik-22.85-r1's change into -22.84.16 to add RDEPEND properly. + #434638 05 Jul 2012; Anthony G. Basile <blueness@gentoo.org> xdvik-22.85-r1.ebuild: Keyword ~mips @@ -338,4 +342,3 @@ Initial import, closing bug #23130 Great thanks to Timmy Douglas <timmy+gentoo@cc.gatech.edu> for persistent tests on the ebuild - diff --git a/app-text/xdvik/xdvik-22.84.16.ebuild b/app-text/xdvik/xdvik-22.84.16.ebuild index 8f932ce8dbec..9881fae0d783 100644 --- a/app-text/xdvik/xdvik-22.84.16.ebuild +++ b/app-text/xdvik/xdvik-22.84.16.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.16.ebuild,v 1.16 2011/08/28 16:31:50 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.16.ebuild,v 1.17 2012/09/15 09:36:49 naota Exp $ EAPI=3 inherit eutils flag-o-matic elisp-common toolchain-funcs @@ -19,8 +19,13 @@ RDEPEND=">=media-libs/t1lib-5.0.2 x11-libs/libXp x11-libs/libXpm motif? ( >=x11-libs/openmotif-2.3:0 ) - !motif? ( neXt? ( x11-libs/neXtaw ) - !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) ) ) + !motif? ( + neXt? ( x11-libs/neXtaw ) + !neXt? ( + Xaw3d? ( x11-libs/libXaw3d ) + !Xaw3d? ( x11-libs/libXaw ) + ) + ) virtual/latex-base !<app-text/texlive-2007" DEPEND="sys-devel/flex @@ -48,8 +53,11 @@ src_configure() { if use motif ; then toolkit="motif" + use neXt && ewarn "neXt USE flag ignored (superseded by motif)" + use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)" elif use neXt ; then toolkit="neXtaw" + use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)" elif use Xaw3d ; then toolkit="xaw3d" else |