Remove REQUIRED_USE and Xaw USE flag again, bug 416381.

(Portage version: 2.1.10.62/cvs/Linux x86_64)

4 files changed, 18 insertions, 107 deletions

diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog
index c02e61bcbda0..8890a14ef984 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.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
diff --git a/app-text/xdvik/metadata.xml b/app-text/xdvik/metadata.xml
index 92ba90a0abfd..7cea18becba8 100644
--- a/app-text/xdvik/metadata.xml
+++ b/app-text/xdvik/metadata.xml
@@ -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>
diff --git a/app-text/xdvik/xdvik-22.85-r1.ebuild b/app-text/xdvik/xdvik-22.85-r1.ebuild
index 0c0f9d5c46a7..51df5a3bc5c3 100644
--- a/app-text/xdvik/xdvik-22.85-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.85-r1.ebuild
@@ -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 @@ SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
 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 @@ 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"
-	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 \
diff --git a/app-text/xdvik/xdvik-22.85.ebuild b/app-text/xdvik/xdvik-22.85.ebuild
deleted file mode 100644
index 94b7644a8679..000000000000
--- a/app-text/xdvik/xdvik-22.85.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.ebuild,v 1.3 2012/05/09 15:07:10 aballier Exp $
-
-EAPI=4
-inherit eutils flag-o-matic elisp-common toolchain-funcs
-
-DESCRIPTION="DVI previewer for X Window System"
-HOMEPAGE="http://xdvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
-
-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 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 )
-	!motif? ( neXt? ( x11-libs/neXtaw )
-		!neXt? ( Xaw3d? ( x11-libs/libXaw3d ) ) )
-	dev-libs/kpathsea"
-DEPEND="sys-devel/flex
-	virtual/yacc
-	${RDEPEND}"
-RDEPEND="${RDEPEND}
-	virtual/latex-base
-	!<app-text/texlive-2007"
-TEXMF_PATH=/usr/share/texmf
-S=${WORKDIR}/${P}/texk/xdvik
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-mksedscript.patch" \
-		"${FILESDIR}/${P}-mksedscript_gentoo.patch"
-	# Make sure system kpathsea headers are used
-	cd "${WORKDIR}/${P}/texk/kpathsea"
-	for i in *.h ; do echo "#include_next \"$i\"" > $i; done
-}
-
-src_configure() {
-	local toolkit
-
-	if use motif ; then
-		toolkit="motif"
-	elif use neXt ; then
-		toolkit="neXtaw"
-	elif use Xaw3d ; then
-		toolkit="xaw3d"
-	else
-		toolkit="xaw"
-	fi
-
-	econf \
-		--with-system-t1lib \
-		--with-system-kpathsea \
-		--with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
-		--with-xdvi-x-toolkit="${toolkit}"
-}
-
-src_compile() {
-	emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea" texmf="${EPREFIX}${TEXMF_PATH}"
-	use emacs && elisp-compile xdvi-search.el
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodir /etc/texmf/xdvi /etc/X11/app-defaults
-	mv "${ED}${TEXMF_PATH}/xdvi/XDvi" "${ED}etc/X11/app-defaults" || die "failed to move config file"
-	dosym {/etc/X11/app-defaults,"${TEXMF_PATH}/xdvi"}/XDvi
-	for i in $(find "${ED}${TEXMF_PATH}/xdvi" -maxdepth 1 -type f) ; do
-		mv ${i} "${ED}etc/texmf/xdvi" || die "failed to move $i"
-		dosym {/etc/texmf,"${TEXMF_PATH}"}/xdvi/$(basename ${i})
-	done
-
-	dodoc BUGS FAQ README.*
-
-	use emacs && elisp-install tex-utils *.el *.elc
-
-	doicon "${FILESDIR}"/${PN}.xpm
-	make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer"
-	echo "MimeType=application/x-dvi;" >> "${ED}"usr/share/applications/xdvi-"${PN}".desktop
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elog "Add"
-		elog "	(add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")"
-		elog "	(require 'xdvi-search)"
-		elog "to your ~/.emacs file"
-	fi
-}