old, stabilize for everyone

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 6 insertions, 249 deletions

diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog
index 33b0519b6abb..540c1850e8ea 100644
--- a/app-text/xdvik/ChangeLog
+++ b/app-text/xdvik/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/xdvik
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.70 2010/07/03 23:49:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.71 2010/07/10 13:26:59 ssuominen Exp $
+
+  10 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> xdvik-22.84.16.ebuild:
+  x86 and others stable wrt #323373
 
   03 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> xdvik-22.84.16.ebuild:
   ppc64 stable wrt #323373
diff --git a/app-text/xdvik/xdvik-22.84.14-r1.ebuild b/app-text/xdvik/xdvik-22.84.14-r1.ebuild
deleted file mode 100644
index fbc4faf37190..000000000000
--- a/app-text/xdvik/xdvik-22.84.14-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.14-r1.ebuild,v 1.1 2009/02/08 11:07:00 aballier Exp $
-
-inherit eutils flag-o-matic elisp-common toolchain-funcs
-
-XDVIK_JP="${P}-j1.40.patch.gz"
-
-DESCRIPTION="DVI previewer for X Window System"
-HOMEPAGE="http://xdvi.sourceforge.net/ http://xdvi.sourceforge.jp/"
-SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz
-	cjk? ( mirror://sourceforge.jp/xdvi/31972/${XDVIK_JP} )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="cjk motif neXt Xaw3d emacs"
-
-RDEPEND=">=media-libs/t1lib-5.0.2
-	x11-libs/libXmu
-	x11-libs/libXp
-	x11-libs/libXpm
-	motif? ( x11-libs/openmotif )
-	!motif? ( neXt? ( x11-libs/neXtaw )
-		!neXt? ( Xaw3d? ( x11-libs/Xaw3d ) ) )
-	cjk? ( || ( app-text/texlive-core app-text/ptex )
-		>=media-libs/freetype-2
-		>=media-fonts/kochi-substitute-20030809-r3 )
-	!cjk? ( virtual/latex-base )
-	!<app-text/texlive-2007"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	if use cjk ; then
-		epatch "${DISTDIR}/${XDVIK_JP}"
-		cat >>"${S}/texk/xdvik/vfontmap.sample"<<-EOF
-
-		# TrueType fonts
-		min     /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-		nmin    /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-		goth    /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-		tmin    /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-		tgoth   /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-		ngoth   /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-		jis     /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-		jisg    /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-		dm      /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-		dg      /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-		mgoth   /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-		fmin    /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-		fgoth   /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-		EOF
-	fi
-}
-
-src_compile() {
-	tc-export CC AR RANLIB
-
-	local TEXMF_PATH=$(kpsewhich --expand-var='$TEXMFMAIN')
-	local myconf toolkit
-
-	if use motif ; then
-		toolkit="motif"
-	elif use neXt ; then
-		toolkit="neXtaw"
-	elif use Xaw3d ; then
-		toolkit="xaw3d"
-	else
-		toolkit="xaw"
-	fi
-
-	econf --disable-multiplatform \
-		--enable-t1lib \
-		--enable-gf \
-		--with-system-t1lib \
-		--with-system-kpathsea \
-		--with-kpathsea-include=/usr/include/kpathsea \
-		--with-xdvi-x-toolkit="${toolkit}" \
-		${myconf} || die "econf failed"
-
-	cd texk/xdvik
-	emake kpathsea_dir="/usr/include/kpathsea" texmf="${TEXMF_PATH}" || die
-	use emacs && elisp-compile xdvi-search.el
-}
-
-src_install() {
-
-	dodir /etc/texmf/xdvi /etc/X11/app-defaults
-
-	local TEXMF_PATH=$(kpsewhich --expand-var='$TEXMFMAIN')
-
-	cd "${S}/texk/xdvik"
-	einstall kpathsea_dir="/usr/include/kpathsea" texmf="${D}${TEXMF_PATH}" || die "install failed"
-
-	mv "${D}${TEXMF_PATH}/xdvi/XDvi" "${D}etc/X11/app-defaults" || die "failed to move config file"
-	dosym {/etc/X11/app-defaults,"${TEXMF_PATH}/xdvi"}/XDvi || die "failed to symlink config file"
-	for i in $(find "${D}${TEXMF_PATH}/xdvi" -type f -maxdepth 1) ; do
-		mv ${i} "${D}etc/texmf/xdvi" || die "failed to move $i"
-		dosym {/etc/texmf,"${TEXMF_PATH}"}/xdvi/$(basename ${i}) || die "failed	to symlink $i"
-	done
-
-	dodoc BUGS FAQ README.* || die "dodoc failed"
-	if use cjk; then
-		dodoc CHANGES.xdvik-jp || die "dodoc failed"
-		docinto READMEs
-		dodoc READMEs/* || die "dodoc failed"
-	fi
-
-	use emacs && elisp-install tex-utils *.el *.elc
-	doicon "${FILESDIR}/${PN}.png"
-	make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer"
-	echo "MimeType=application/x-dvi;" >> "${D}"usr/share/applications/xdvi-"${PN}".desktop
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elog "Add"
-		elog "	(add-to-list 'load-path \"${SITELISP}/tex-utils\")"
-		elog "	(require 'xdvi-search)"
-		elog "to your ~/.emacs file"
-	fi
-}
diff --git a/app-text/xdvik/xdvik-22.84.14.ebuild b/app-text/xdvik/xdvik-22.84.14.ebuild
deleted file mode 100644
index 226c4f2a3448..000000000000
--- a/app-text/xdvik/xdvik-22.84.14.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.14.ebuild,v 1.9 2008/12/20 02:34:20 aballier Exp $
-
-inherit eutils flag-o-matic elisp-common toolchain-funcs
-
-XDVIK_JP="${P}-j1.40.patch.gz"
-
-DESCRIPTION="DVI previewer for X Window System"
-HOMEPAGE="http://xdvi.sourceforge.net/ http://xdvi.sourceforge.jp/"
-SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz
-	cjk? ( mirror://sourceforge.jp/xdvi/31972/${XDVIK_JP} )"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="cjk motif neXt Xaw3d emacs"
-
-RDEPEND=">=media-libs/t1lib-5.0.2
-	x11-libs/libXmu
-	x11-libs/libXp
-	x11-libs/libXpm
-	motif? ( x11-libs/openmotif )
-	!motif? ( neXt? ( x11-libs/neXtaw )
-		!neXt? ( Xaw3d? ( x11-libs/Xaw3d ) ) )
-	cjk? ( || ( app-text/texlive-core app-text/ptex )
-		>=media-libs/freetype-2
-		>=media-fonts/kochi-substitute-20030809-r3 )
-	!cjk? ( virtual/latex-base )
-	!<app-text/texlive-2007"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	if use cjk ; then
-		epatch "${DISTDIR}/${XDVIK_JP}"
-		cat >>"${S}/texk/xdvik/vfontmap.sample"<<-EOF
-
-		# TrueType fonts
-		min     /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-		nmin    /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-		goth    /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-		tmin    /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-		tgoth   /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-		ngoth   /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-		jis     /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-		jisg    /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-		dm      /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-		dg      /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-		mgoth   /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-		fmin    /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-		fgoth   /usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-		EOF
-	fi
-}
-
-src_compile() {
-	tc-export CC AR RANLIB
-
-	local TEXMF_PATH=$(kpsewhich --expand-var='$TEXMFMAIN')
-	local myconf toolkit
-
-	if use motif ; then
-		toolkit="motif"
-	elif use neXt ; then
-		toolkit="neXtaw"
-	elif use Xaw3d ; then
-		toolkit="xaw3d"
-	else
-		toolkit="xaw"
-	fi
-
-	econf --disable-multiplatform \
-		--enable-t1lib \
-		--enable-gf \
-		--with-system-t1lib \
-		--with-system-kpathsea \
-		--with-kpathsea-include=/usr/include/kpathsea \
-		--with-xdvi-x-toolkit="${toolkit}" \
-		${myconf} || die "econf failed"
-
-	cd texk/xdvik
-	emake kpathsea_dir="/usr/include/kpathsea" texmf="${TEXMF_PATH}" || die
-	use emacs && elisp-compile xdvi-search.el
-}
-
-src_install() {
-
-	dodir /etc/texmf/xdvi /etc/X11/app-defaults
-
-	local TEXMF_PATH=$(kpsewhich --expand-var='$TEXMFMAIN')
-
-	cd "${S}/texk/xdvik"
-	einstall kpathsea_dir="/usr/include/kpathsea" texmf="${D}${TEXMF_PATH}" || die "install failed"
-
-	mv "${D}${TEXMF_PATH}/xdvi/XDvi" "${D}etc/X11/app-defaults" || die "failed to move config file"
-	dosym {/etc/X11/app-defaults,"${TEXMF_PATH}/xdvi"}/XDvi || die "failed to symlink config file"
-	for i in $(find "${D}${TEXMF_PATH}/xdvi" -type f -maxdepth 1) ; do
-		mv ${i} "${D}etc/texmf/xdvi" || die "failed to move $i"
-		dosym {/etc/texmf,"${TEXMF_PATH}"}/xdvi/$(basename ${i}) || die "failed	to symlink $i"
-	done
-
-	dodoc BUGS FAQ README.* || die "dodoc failed"
-	if use cjk; then
-		dodoc CHANGES.xdvik-jp || die "dodoc failed"
-		docinto READMEs
-		dodoc READMEs/* || die "dodoc failed"
-	fi
-
-	use emacs && elisp-install tex-utils *.el *.elc
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elog "Add"
-		elog "	(add-to-list 'load-path \"${SITELISP}/tex-utils\")"
-		elog "	(require 'xdvi-search)"
-		elog "to your ~/.emacs file"
-	fi
-}
diff --git a/app-text/xdvik/xdvik-22.84.16.ebuild b/app-text/xdvik/xdvik-22.84.16.ebuild
index ded90798fbe8..49659920324a 100644
--- a/app-text/xdvik/xdvik-22.84.16.ebuild
+++ b/app-text/xdvik/xdvik-22.84.16.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2010 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.7 2010/07/03 23:49:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.16.ebuild,v 1.8 2010/07/10 13:26:59 ssuominen Exp $
 
 EAPI=3
-
 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 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="motif neXt Xaw3d emacs"