Remove REQUIRED_USE and Xaw USE flag again, bug 416381.

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

5 files changed, 34 insertions, 114 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/Manifest b/app-text/xdvik/Manifest
index 1ee10cf6bf8d..61fa7218c7cb 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -11,14 +11,23 @@ AUX xdvik.xpm 3125 RMD160 1be4b30e1cbc650c37748c4d7606f2cec43bf8c5 SHA1 74c1791e
 DIST xdvik-22.84.16.tar.gz 2185822 RMD160 39448303e8df19e4ee34e01861ff188c30416d32 SHA1 12d15e63cdc936dd2d3706ce27a96edffde6e131 SHA256 3e41620f1783bd8265620c93d2597b82a155833f93639add8e877f8eb5f47dbf
 DIST xdvik-22.85.tar.gz 4128828 RMD160 5d12c087a4030efefc226ad80a23d919197e9ebc SHA1 eda79e9a4cbc6d9094fc07b5236b1dc1b3c3180a SHA256 91f08103e53ab46efc83053e648bdd07aa100043233dadcb7384efc83fa2dde8
 EBUILD xdvik-22.84.16.ebuild 3048 RMD160 ad961524eb906637321d12edbd5337bebf960038 SHA1 c27ff8bf3b05a267b879813d40ea489861c77a2f SHA256 e9d0f03c24feb069b2d3ff15d919beaea524aa0f987c07a3a5a8e759860b7420
-EBUILD xdvik-22.85-r1.ebuild 2850 RMD160 2f93aae42d92d74a4ce09bdad6174ca8887202c9 SHA1 d41190ae78e642a833e58ad17518d88d831eb3e8 SHA256 6293b98441ea8b06f1c7406fc25b6472ee654262a1d71f306e744a035e4bfa76
-EBUILD xdvik-22.85.ebuild 2700 RMD160 7dc413c3dd118f5b695aa508d87e1e09daeb4111 SHA1 2b0949a29a47082c180597b50ae31aae8963c247 SHA256 63e6943cd6375bb3eed7622ced0195c1ce00dd9347518647b4a76e2ce6e6e3b7
-MISC ChangeLog 11773 RMD160 c020818f383b416e12f577ffcfb2296acac9a712 SHA1 4abacd47a6e97fde16738bb42cacac7bbe7add9c SHA256 12aa57b28c8f2121f29713cd6a529dc082c63182fa6f53823c8eb03f4a642869
-MISC metadata.xml 409 RMD160 a45711b7ba219c8a3fd0d2ea4b1bd05cab3562c6 SHA1 2743a0782be581ff71d1c06fbc0bf479ff43b558 SHA256 a419b5f957481b80fdfb220e9888182fdd55c9d7dbe1f4d126f509c0bd199a46
+EBUILD xdvik-22.85-r1.ebuild 2938 RMD160 fdf125cb7084d514db1c9bdf019072aa5d77a26e SHA1 8bfa930e7ca9fd79baf08326c0028fa6ba2fa9d3 SHA256 6fa37cda8756957c619182e2d5d63f978e5c0ff9e6f1e4f8846370e8ab352659
+MISC ChangeLog 11934 RMD160 5d3992c50695f65c0edf5214a946e96513a9aeb0 SHA1 6cb9266bd4e3fa2126a8528f9ac858da0cc5bc69 SHA256 9e5b9b058895295ef33d70fa95ea0ac7b3c92c633809e3a103fb619aa8966365
+MISC metadata.xml 351 RMD160 e0236b45acbcf41ef7883fd7e6779730e7850912 SHA1 7265aefd4237e321a3b5ae216e9bd79a7f20f156 SHA256 1348cd17584c52004c3d87ad5f2af2a6f87d921ffdeb1675827d8cb978ebad55
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+znYcACgkQvFcC4BYPU0o00QCgja8n/1kVjYIoiTYhOh3ZT6lm
-tGkAnRQMO19Q5TXioDtPzvfiLoxJ7bdH
-=o/67
+iQIcBAEBAgAGBQJPtQ2hAAoJEDxpGckxwJCB/ekP/2ZorJJBcCxGVwS7z0VVGLuu
+qFr70hog0+USvUj6AiT0IY1+u5mcLDOYOXWXZ/MswoP03QM1ROu45G4VkTAB+jR2
+tkPRz0sxqMIwufjBrUXZZ/u+4If4aULO675sqU+C7n48+Ib4gMOoG7kFyt/t1QDq
+uGIBQJc0BjzEV0N+RtReKwyIVdG6XVy8bJLZsUR2GXeo93arr5ti34LIwaaXQl8P
+lVzYVpjN4hPOv3ZucCk/f12vwq28FnMusTHp1YfjCWhTTRMFeUIoe/QiSgAW3vCp
+Mxv3OKlq1C7zWhGM5/6VjwZHyQnYSq3cprm9Fy7YDNZcvaWIaR73V14j+JxzUk7V
+/yaTa7wnyqqQIArjlW/NFk2monXWmJNvpaBiH5evNb8OfJ+P3RUZea74bG5EBP6G
+IUgMOVWYfoik7Q8YQUsqytoPPWNlR7ssHZwa6csCerObgLp3kqhkKfhzi2uMKJKY
+TNj/Z40sbIsVZ9z/H1ouAmbimYye4ivNxOV0EStuQnK6VzYCkKLoP6G6+ruxCy5F
+/6eJnEuZdrZnncElL650KDmQXCAbb4B9TjXtc5bDmTk8nbEpVBctDpNBbiC2KPB0
+544XQw5IrxSyoFXLpj3VJwhUS7X4vgjj2wXgA4BJu5Ts0UogYvYNCGA8T0yjh6Jf
+219edFz3MIOJOWjUgk4b
+=DMh9
 -----END PGP SIGNATURE-----
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
-}