Move the previous change to -r0

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

4 files changed, 15 insertions, 110 deletions

diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog
index ea6faab575a8..6db9b1d2baac 100644
--- a/app-text/xdvik/ChangeLog
+++ b/app-text/xdvik/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xdvik
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.78 2011/08/25 22:29:45 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.79 2011/08/28 15:47:25 naota Exp $
+
+  28 Aug 2011; Naohiro Aota <naota@gentoo.org> xdvik-22.84.16.ebuild,
+  -xdvik-22.84.16-r1.ebuild:
+  Move the previous change to -r0
 
 *xdvik-22.84.16-r1 (25 Aug 2011)
 
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 4214a9a9a61b..f074ca7c9b01 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -7,14 +7,13 @@ AUX xdvik-22.84.16-open-mode.patch 497 RMD160 0a996bc83a9101b7a89f4f47c762083604
 AUX xdvik-22.84.16-parallel_make.patch 1031 RMD160 5cf3278cbad496333889ad5fdabd04718aa6c3f1 SHA1 e17080a333b52064249e91811ca006bfeec189b4 SHA256 63f1f3ed5a0dcd270a3a5e2512d0a62cbfecd77f1c6aa2684cfcbbded3e1681c
 AUX xdvik.xpm 3125 RMD160 1be4b30e1cbc650c37748c4d7606f2cec43bf8c5 SHA1 74c1791e6d003ecedbafd51255d83210a5740fe9 SHA256 3f9dd32d1197dcbb5a414816eea45c2f4dced24ee7726ee196b8d8d2e2e44d26
 DIST xdvik-22.84.16.tar.gz 2185822 RMD160 39448303e8df19e4ee34e01861ff188c30416d32 SHA1 12d15e63cdc936dd2d3706ce27a96edffde6e131 SHA256 3e41620f1783bd8265620c93d2597b82a155833f93639add8e877f8eb5f47dbf
-EBUILD xdvik-22.84.16-r1.ebuild 3060 RMD160 1e057e2151d0e354b344e1eca18fb06978cf100c SHA1 b565af760be9a19c1c6afbb81625f818a9f93635 SHA256 89703520f4a2be1000e36b7a4fafe8b10ad4500edb70dce7c074864132c2bd4d
-EBUILD xdvik-22.84.16.ebuild 3021 RMD160 04ee01a1292dfa921f2db0fc3303f39424bafe8e SHA1 cf2f85f395139ea8c5b5643fb0b58514b9b126a9 SHA256 624920d3bacb063865725c093671c740a7ad2ab1283ac25fff7b2f93976875d0
-MISC ChangeLog 10720 RMD160 671446ea0f84b4abee7e7bab4994550670321126 SHA1 cd72d8afcd17a749418bb00fc3f815f2939d86bc SHA256 65658e7d1d641a1cc0c934efa6464dc994e6155256eaa04ecdd079d021b25ac7
+EBUILD xdvik-22.84.16.ebuild 3058 RMD160 9f865a31688dec5a6d30e697848a532213a36127 SHA1 543a328d4a0b47dd9d07bb170562a231e2860995 SHA256 415c6062a917d2c87c8031c6a8508455736746087f579428f8e3b42bb61c6e05
+MISC ChangeLog 10854 RMD160 d9c9ead8491db6f9b38fdfde5e59b357a5a842fa SHA1 1fe41c38beaf0439e660dd7aede99ddaecb4c284 SHA256 cb9dcfcdff98e25576f3a6ddb715adf1fdc3ba5fe926bd18733fb2e0793be5de
 MISC metadata.xml 351 RMD160 e0236b45acbcf41ef7883fd7e6779730e7850912 SHA1 7265aefd4237e321a3b5ae216e9bd79a7f20f156 SHA256 1348cd17584c52004c3d87ad5f2af2a6f87d921ffdeb1675827d8cb978ebad55
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5WzO0ACgkQGpDnPLSHuMAIAQCdH5n5iQC7K0n/PczmfsPwCXT1
-f40AnRu7/3cHBbyKS3bsTQ1LggNWjC33
-=sW5a
+iEYEARECAAYFAk5aYwsACgkQGpDnPLSHuMCAPwCggxOZfD+j4AxiZq4FjtDenWiO
+5NgAniWfnnK6BohagQ62P0xsMzMO5u6L
+=UIUd
 -----END PGP SIGNATURE-----
diff --git a/app-text/xdvik/xdvik-22.84.16-r1.ebuild b/app-text/xdvik/xdvik-22.84.16-r1.ebuild
deleted file mode 100644
index 0aeeb7cd8e41..000000000000
--- a/app-text/xdvik/xdvik-22.84.16-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/08/25 22:29:45 naota 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 ~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 ) ) )
-	virtual/latex-base
-	!<app-text/texlive-2007"
-DEPEND="sys-devel/flex
-	virtual/yacc
-	${RDEPEND}"
-TEXMF_PATH=/usr/share/texmf
-S=${WORKDIR}/${P}/texk/xdvik
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-open-mode.patch \
-		"${FILESDIR}"/${P}-cvararg.patch \
-		"${FILESDIR}"/${P}-parallel_make.patch
-	has_version '>=app-text/texlive-core-2009' && epatch "${FILESDIR}"/${P}-kpathsea_version.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() {
-	cd "${WORKDIR}/${P}"
-
-	tc-export CC AR RANLIB
-
-	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 --disable-multiplatform \
-		--enable-t1lib \
-		--enable-gf \
-		--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}" || die
-	use emacs && elisp-compile xdvi-search.el
-}
-
-src_install() {
-	einstall kpathsea_dir="${EPREFIX}/usr/include/kpathsea" texmf="${ED}${TEXMF_PATH}" || die "install failed"
-
-	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 || die "failed to symlink config file"
-	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}) || die "failed	to symlink $i"
-	done
-
-	dodoc BUGS FAQ README.* || die "dodoc failed"
-
-	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
-}
diff --git a/app-text/xdvik/xdvik-22.84.16.ebuild b/app-text/xdvik/xdvik-22.84.16.ebuild
index 8603b4874633..f0cfc3fd82f3 100644
--- a/app-text/xdvik/xdvik-22.84.16.ebuild
+++ b/app-text/xdvik/xdvik-22.84.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.14 2011/08/02 05:45:55 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.16.ebuild,v 1.15 2011/08/28 15:47:25 naota Exp $
 
 EAPI=3
 inherit eutils flag-o-matic elisp-common toolchain-funcs
@@ -9,7 +9,7 @@ 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 ~x64-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 ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="motif neXt Xaw3d emacs"
@@ -23,7 +23,9 @@ RDEPEND=">=media-libs/t1lib-5.0.2
 		!neXt? ( Xaw3d? ( x11-libs/libXaw3d ) ) )
 	virtual/latex-base
 	!<app-text/texlive-2007"
-DEPEND="${RDEPEND}"
+DEPEND="sys-devel/flex
+	virtual/yacc
+	${RDEPEND}"
 TEXMF_PATH=/usr/share/texmf
 S=${WORKDIR}/${P}/texk/xdvik