[gentoo-commits] gentoo-x86 commit in app-text/xdvik: xdvik-22.85-r1.ebuild ChangeLog metadata.xml xdvik-22.85.ebuild

[gentoo-commits] gentoo-x86 commit in app-text/xdvik: xdvik-22.85-r1.ebuild ChangeLog metadata.xml xdvik-22.85.ebuild

[Ulrich Mueller (ulm)]

ulm         12/05/17 14:34:39

  Modified:             xdvik-22.85-r1.ebuild ChangeLog metadata.xml
  Removed:              xdvik-22.85.ebuild
  Log:
  Remove REQUIRED_USE and Xaw USE flag again, bug 416381.
  
  (Portage version: 2.1.10.62/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  app-text/xdvik/xdvik-22.85-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xdvik/xdvik-22.85-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xdvik/xdvik-22.85-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xdvik/xdvik-22.85-r1.ebuild?r1=1.2&r2=1.3

Index: xdvik-22.85-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.85-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xdvik-22.85-r1.ebuild	16 May 2012 12:28:49 -0000	1.2
+++ xdvik-22.85-r1.ebuild	17 May 2012 14:34:38 -0000	1.3
@@ -1,6 +1,6 @@
 # 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.85-r1.ebuild,v 1.2 2012/05/16 12:28:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.85-r1.ebuild,v 1.3 2012/05/17 14:34:38 ulm Exp $
 
 EAPI=4
 inherit eutils flag-o-matic elisp-common toolchain-funcs
@@ -12,17 +12,20 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="motif neXt +Xaw Xaw3d emacs"
-REQUIRED_USE="^^ ( motif neXt Xaw Xaw3d )"
+IUSE="motif neXt Xaw3d emacs"
 
 RDEPEND=">=media-libs/t1lib-5.0.2
 	x11-libs/libXmu
 	x11-libs/libXp
 	x11-libs/libXpm
 	motif? ( >=x11-libs/openmotif-2.3:0 )
-	neXt? ( x11-libs/neXtaw )
-	Xaw3d? ( x11-libs/libXaw3d )
-	Xaw? ( x11-libs/libXaw )
+	!motif? (
+		neXt? ( x11-libs/neXtaw )
+		!neXt? (
+			Xaw3d? ( x11-libs/libXaw3d )
+			!Xaw3d? ( x11-libs/libXaw )
+		)
+	)
 	dev-libs/kpathsea"
 DEPEND="sys-devel/flex
 	virtual/yacc
@@ -46,14 +49,15 @@
 
 	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"
-	elif use Xaw ; then
-		toolkit="xaw"
 	else
-		die "Please specify one of motif, neXtaw, Xaw3d or Xaw to your USE flag."
+		toolkit="xaw"
 	fi
 
 	econf \



1.86                 app-text/xdvik/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xdvik/ChangeLog?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xdvik/ChangeLog?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xdvik/ChangeLog?r1=1.85&r2=1.86

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- ChangeLog	16 May 2012 12:28:49 -0000	1.85
+++ ChangeLog	17 May 2012 14:34:38 -0000	1.86
@@ -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.85 2012/05/16 12:28:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.86 2012/05/17 14:34:38 ulm Exp $
+
+  17 May 2012; Ulrich Müller <ulm@gentoo.org> -xdvik-22.85.ebuild,
+  xdvik-22.85-r1.ebuild, metadata.xml:
+  Remove REQUIRED_USE and Xaw USE flag again, bug 416381.
 
   16 May 2012; Alexis Ballier <aballier@gentoo.org> xdvik-22.85-r1.ebuild:
   enable Xaw by default, like before; required_use are nice but we need a



1.9                  app-text/xdvik/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xdvik/metadata.xml?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xdvik/metadata.xml?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xdvik/metadata.xml?r1=1.8&r2=1.9

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/xdvik/metadata.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- metadata.xml	16 May 2012 08:49:22 -0000	1.8
+++ metadata.xml	17 May 2012 14:34:38 -0000	1.9
@@ -7,7 +7,4 @@
 		XDVIK is a dvi previewer on X with kpathsea support.  It also supports
 		multibyte character rendering via Xft2 (or VFlib2).
 	</longdescription>
-	<use>
-		<flag name="Xaw">Use Xaw toolkit.</flag>
-	</use>
 </pkgmetadata>