Add new USE flag Xaw. Set REQUIRED_USE to select one of possible toolkit. #372473

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 126 insertions, 7 deletions

diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog
index 7cd5b44896da..8ba5575d47ae 100644
--- a/app-text/xdvik/ChangeLog
+++ b/app-text/xdvik/ChangeLog
@@ -1,6 +1,13 @@
 # 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.83 2012/05/09 15:07:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.84 2012/05/16 08:49:22 naota Exp $
+
+*xdvik-22.85-r1 (16 May 2012)
+
+  16 May 2012; Naohiro Aota <naota@gentoo.org> +xdvik-22.85-r1.ebuild,
+  metadata.xml:
+  Add new USE flag Xaw. Set REQUIRED_USE to select one of possible toolkit.
+  #372473
 
   09 May 2012; Alexis Ballier <aballier@gentoo.org> xdvik-22.85.ebuild:
   keyword ~amd64-fbsd
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 0d2ba880d7e3..8b6de85f7fd4 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX xdvik-22.84.16-cvararg.patch 2454 RMD160 a77819156d692965ab62f91d278e0a84bde37247 SHA1 3d3e83a58034cdde9d3c5caac0b2569d3085c79d SHA256 7d2ebfa1abd871bf2bfb48a32c0c6df28fcfd3dfa6d21bc8cf77bd8d61639891
 AUX xdvik-22.84.16-kpathsea_version.patch 669 RMD160 2db5b4a97ea80e2a112e3d895f32d9f207bc3262 SHA1 881c39c53f1d295058fc2181d373a1cb723774aa SHA256 064ac9b1d935f7985c7ba11bb5570a2fcc6026a5396acf6f1ce97f38b6aebc90
@@ -11,13 +11,24 @@ 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 2846 RMD160 f1d4b8b780791596c456fa902a9f90e9e977b551 SHA1 3520aa8d89147eaa9b83772a741b1a368e5de999 SHA256 baa73289b236d55a99a126c6af9419e05e7705c616c1a7741538a4e8745ce09f
 EBUILD xdvik-22.85.ebuild 2700 RMD160 7dc413c3dd118f5b695aa508d87e1e09daeb4111 SHA1 2b0949a29a47082c180597b50ae31aae8963c247 SHA256 63e6943cd6375bb3eed7622ced0195c1ce00dd9347518647b4a76e2ce6e6e3b7
-MISC ChangeLog 11385 RMD160 507e7e561a699ed3a67ae94a3be4e8b6afb84e80 SHA1 8e9ac202865a60ba2acd9bfaecf8b94514a6aa4a SHA256 ba930f9cc013b6bd49547a6e86df82b48f8b297590ed0ed762ad5afa08ee82a7
-MISC metadata.xml 351 RMD160 e0236b45acbcf41ef7883fd7e6779730e7850912 SHA1 7265aefd4237e321a3b5ae216e9bd79a7f20f156 SHA256 1348cd17584c52004c3d87ad5f2af2a6f87d921ffdeb1675827d8cb978ebad55
+MISC ChangeLog 11587 RMD160 8c5b9af517d434221bf217cc2207d08eff48e736 SHA1 cfcb861eaf48164a5d1f1f95f6af699ab55995b0 SHA256 842a2f254dd15a9d03976905454b2d338bf25e383598acd34489f4580583de22
+MISC metadata.xml 409 RMD160 a45711b7ba219c8a3fd0d2ea4b1bd05cab3562c6 SHA1 2743a0782be581ff71d1c06fbc0bf479ff43b558 SHA256 a419b5f957481b80fdfb220e9888182fdd55c9d7dbe1f4d126f509c0bd199a46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+qiCAACgkQvFcC4BYPU0ormgCfdQ3oZnqXdthT/gI9mxwXjF37
-D+0AoK7rxwDNXN2xIeoyLLalKPjjnKxJ
-=eolk
+iQIcBAEBCAAGBQJPs2n6AAoJEDYO1FT4VRUUFeIQAKLl6PYxuAsk80+DGFLO9t+v
+G54Ki3XyBOhPP/kWzmfOsz8NcsiE/qMNH6Jhy7IvBo3LYv+sAFEvdb5XwW/MRh2r
+axMEZMoqU3E7zNiBBtZU669jYVtXUd+lvp6Nk/5KY0ifgo+KeX09VQNMv7XN3OgG
+x9YKi35y2ZyXNktZIqK7S8ZrRIpXc6wRh+EOSEADbrijs8QBi5I1xExeV43CTbBg
+1tGLMB71NN52vEQT8VH7SMuo5tcadlbJBY5qGzrcmzZLOTw5b0QNwA/Jv1FJYIQg
+T4Ay3Lq28wmIBYM9fPDmwAu/1HA0tycw8ksax1bYTxIOPFL3BSYHY2yeotxg0awX
+0YJH1qOgjmH5Q+OT+yQNMwd0siucUFsaRRoFM2Nm9/WvPn2imEmtWwWvTRMdUD7U
+RmWiVwJ9F8gcpbO+5H84HQVmGltYBigPeqBScVUt5Yn77LN8QRLWLvNbuh1+L5X4
+iT+qB3FZMXj/4jmExhWZmJANOaD1jnSWWOiCnf02G/nW9caruSTYjcpNU8BrVuuG
+AT22n6bOuRy87qsiFHILVh+ydXI5tolZ7y7nnHz6GU9Gd3baLkhA956o3s1WVixb
+8NeYbaR3lbtNAHrI50W10RjUwBx1rkAYlBro8h5kVHFLFLIXNGgyH7k02F6NciUU
+KS791lK/mupKFv5lsfeY
+=qeHS
 -----END PGP SIGNATURE-----
diff --git a/app-text/xdvik/metadata.xml b/app-text/xdvik/metadata.xml
index 7cea18becba8..92ba90a0abfd 100644
--- a/app-text/xdvik/metadata.xml
+++ b/app-text/xdvik/metadata.xml
@@ -7,4 +7,7 @@
 		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
new file mode 100644
index 000000000000..f4a13ab9e9f0
--- /dev/null
+++ b/app-text/xdvik/xdvik-22.85-r1.ebuild
@@ -0,0 +1,98 @@
+# 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.1 2012/05/16 08:49:22 naota 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 Xaw Xaw3d emacs"
+REQUIRED_USE="^^ ( motif neXt Xaw Xaw3d )"
+
+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 )
+	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"
+	elif use Xaw ; then
+		toolkit="xaw"
+	else
+		die "Please specify one of motif, neXtaw, Xaw3d or Xaw to your USE flag."
+	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
+}