old, stabilize for everyone

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 8 insertions, 255 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/Manifest b/app-text/xdvik/Manifest
index f489d9767075..4aa7d8b126ba 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -2,11 +2,7 @@ AUX xdvik-22.84.16-cvararg.patch 2454 RMD160 a77819156d692965ab62f91d278e0a84bde
 AUX xdvik-22.84.16-open-mode.patch 497 RMD160 0a996bc83a9101b7a89f4f47c762083604ffc07f SHA1 d7a8a26e5d46d4784564452c1b9879a2c3a81829 SHA256 f557f52d401a9a5ad7791593d08da619e824387b4aa32be608ae46700d71bdcd
 AUX xdvik-22.84.16-parallel_make.patch 1031 RMD160 5cf3278cbad496333889ad5fdabd04718aa6c3f1 SHA1 e17080a333b52064249e91811ca006bfeec189b4 SHA256 63f1f3ed5a0dcd270a3a5e2512d0a62cbfecd77f1c6aa2684cfcbbded3e1681c
 AUX xdvik.png 798 RMD160 b037217ce158c280019eac65aee6fe699f4c111b SHA1 e60a01c232b3b13bcf52e8118295bbc292bd6ae2 SHA256 87fc7b3f9623f613617b6f9157773029508714a56d1fd806805741ab93b2d3c9
-DIST xdvik-22.84.14-j1.40.patch.gz 128380 RMD160 2ca532aa61f98485b71b49f2875df8be340b79a4 SHA1 dad05ea6e4c527b30d7f60a78e2197f9e9dbaafc SHA256 d5f18effe55bc920983728af225e53759167538db78757b811b8ed3e08ddf07a
-DIST xdvik-22.84.14.tar.gz 2016256 RMD160 a19920fcc9e4e5d2878b16e65fa95bab5f034b74 SHA1 1ca7f0c7930d24c3e10cc1d7115abed7dd39e95e SHA256 2f09905989b3b4365e6778eedb8fa0cbc278abecc3188f5419f108e580dd9dcf
 DIST xdvik-22.84.16.tar.gz 2185822 RMD160 39448303e8df19e4ee34e01861ff188c30416d32 SHA1 12d15e63cdc936dd2d3706ce27a96edffde6e131 SHA256 3e41620f1783bd8265620c93d2597b82a155833f93639add8e877f8eb5f47dbf
-EBUILD xdvik-22.84.14-r1.ebuild 4008 RMD160 70629a0ae66701fd922c1b7abc48e50ce8b50c1b SHA1 6c041abb138b204f26b912c64c67b4cb436eab22 SHA256 3d9b80f863ecb25d9c548caa4dca89a7bdedd9257054839dd8e3bbc338a0b82d
-EBUILD xdvik-22.84.14.ebuild 3818 RMD160 0f1d4feca064d32c88a2c90b1e882c0b7233a6fb SHA1 4e4b387cde3b10b27b94245b5c12ec8c7b3410af SHA256 6ddced84087eac18982ed8ae6df0c8bb5e0f7bb03c0e76e13ddb33f767c522ca
-EBUILD xdvik-22.84.16.ebuild 2912 RMD160 b4ed3364c33efd65dce24d98cec2e115e6291633 SHA1 1828b87eb75f7e31de8ab5ebd1c40a545404dcbe SHA256 c156d51593bdc9fa93f4b876b820a27c0d37cbe5a331cc7cd0cf5f66bc836c7a
-MISC ChangeLog 9562 RMD160 ddcc053d2018c59e803d4af931c9ddb16efb321f SHA1 4210bd59f9a8e8257120b806c30292dbeff43d28 SHA256 6777c72a8fdb6ba0c88a003e2163dd300be096cb7c9aca4ac0d1b0cb2f6acccc
+EBUILD xdvik-22.84.16.ebuild 2903 RMD160 a9bf9719a530b3882fdf2b7d0016ed4c71c2b370 SHA1 6183bb982235c98d3501d742fa6b8c958986c405 SHA256 99daf048dc2779e50871a7d0623b256bd6d1101de3c443104565dd1a275ed99f
+MISC ChangeLog 9676 RMD160 c80897974a1c273677a3c8c00904c435a3b8b216 SHA1 b9980a0b56bb228bbd248851a4fc1cbedb3de133 SHA256 6fa602b4facc5d50abb57322bfb2d957f9bdb0f9f74e9b92be2600362854cbc9
 MISC metadata.xml 351 RMD160 e0236b45acbcf41ef7883fd7e6779730e7850912 SHA1 7265aefd4237e321a3b5ae216e9bd79a7f20f156 SHA256 1348cd17584c52004c3d87ad5f2af2a6f87d921ffdeb1675827d8cb978ebad55
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"