quote a lot of variables, plus add a pkg_postinst message how to activate Emacs support, fixes bug 184259

Package-Manager: portage-2.1.3.9

3 files changed, 51 insertions, 27 deletions

diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog
index a5acfc87aeaf..60ac9888dd1b 100644
--- a/app-text/xdvik/ChangeLog
+++ b/app-text/xdvik/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/xdvik
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.39 2007/07/22 10:24:39 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.40 2007/10/07 08:57:51 opfer Exp $
+
+  07 Oct 2007; Christian Faulhammer <opfer@gentoo.org>
+  xdvik-22.84.10.ebuild:
+  quote a lot of variables, plus add a pkg_postinst message how to activate
+  Emacs support, fixes bug 184259
 
   22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> xdvik-22.40y-r2.ebuild,
   xdvik-22.84.5.ebuild:
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index fbb9e91de362..a7a0fef057cf 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xdvi-xorg-7.0.patch 605 RMD160 cc4f635af28d075ef0045a345c073696b1af64a0 SHA1 8639ea7574454eccde785bb6010d6c97ce4a8d70 SHA256 5a942a72a405fe1b638c69b2683e2cac8d0c9f55951e71f1f468a14578f79f6e
 MD5 7d244f102356573fea5a801509756ba6 files/xdvi-xorg-7.0.patch 605
 RMD160 cc4f635af28d075ef0045a345c073696b1af64a0 files/xdvi-xorg-7.0.patch 605
@@ -24,18 +27,18 @@ EBUILD xdvik-22.40y-r2.ebuild 2011 RMD160 05167aae4e235e1a7602c215338c46e086cf0e
 MD5 5ca48566c84e71c727b6bd134965e737 xdvik-22.40y-r2.ebuild 2011
 RMD160 05167aae4e235e1a7602c215338c46e086cf0e09 xdvik-22.40y-r2.ebuild 2011
 SHA256 ac7d879e9019e66587c7471d485773c4a8adc2b2ee879a1fa2a8cab8bd18247f xdvik-22.40y-r2.ebuild 2011
-EBUILD xdvik-22.84.10.ebuild 3601 RMD160 6545fe8e34f9d9253f0e32d0daaedc1e7bbe7028 SHA1 6c96289480872f78292981dd53928b2ca4e0d872 SHA256 ee0f9784721f1ace1d98bbec872b96e630d411d0a72d0eaf07a08f4cf27b6d6f
-MD5 300fe26f55e3068ddb5200c63688c8fc xdvik-22.84.10.ebuild 3601
-RMD160 6545fe8e34f9d9253f0e32d0daaedc1e7bbe7028 xdvik-22.84.10.ebuild 3601
-SHA256 ee0f9784721f1ace1d98bbec872b96e630d411d0a72d0eaf07a08f4cf27b6d6f xdvik-22.84.10.ebuild 3601
+EBUILD xdvik-22.84.10.ebuild 3839 RMD160 914a844aa50f4f99f78259df372624dc56a04b77 SHA1 e9932cbc9c76bea769c6d6a7d70c7b4d86d9484f SHA256 713f874dd41effe62333b037b83cce3636400806fc0ecb382627ad0efc0ffe99
+MD5 ec1df54531c6d058a1d752afd2de108e xdvik-22.84.10.ebuild 3839
+RMD160 914a844aa50f4f99f78259df372624dc56a04b77 xdvik-22.84.10.ebuild 3839
+SHA256 713f874dd41effe62333b037b83cce3636400806fc0ecb382627ad0efc0ffe99 xdvik-22.84.10.ebuild 3839
 EBUILD xdvik-22.84.5.ebuild 3598 RMD160 0bd289d8d9a5a28de043b3fa5e48acd6de14eaa2 SHA1 7a4c8666f23247709e904b3e147e4fe0441e6401 SHA256 0e085191b53a9d1b3c17ea8e080141adb39984c44edd9e8a0b1ef3edb30b017e
 MD5 fdc090a53fe10fd78bcae2e242f560a1 xdvik-22.84.5.ebuild 3598
 RMD160 0bd289d8d9a5a28de043b3fa5e48acd6de14eaa2 xdvik-22.84.5.ebuild 3598
 SHA256 0e085191b53a9d1b3c17ea8e080141adb39984c44edd9e8a0b1ef3edb30b017e xdvik-22.84.5.ebuild 3598
-MISC ChangeLog 5340 RMD160 68f1efc4ef8e6d21694cb5ee9a8738638882a594 SHA1 f51f9349eaecd0b4a5f60ae620dcad5ea1251aa2 SHA256 2080a2f9ad682a9a64b04e82a9c85a674afe8799c2d8af4f5fb25375d6df4f0a
-MD5 77b5798b6ca85bac7ec4c64192e523a3 ChangeLog 5340
-RMD160 68f1efc4ef8e6d21694cb5ee9a8738638882a594 ChangeLog 5340
-SHA256 2080a2f9ad682a9a64b04e82a9c85a674afe8799c2d8af4f5fb25375d6df4f0a ChangeLog 5340
+MISC ChangeLog 5529 RMD160 04348d5735e5674e58778a585d6bb188f82e48d0 SHA1 28022af4fddd286dd89a2a7bb7c2888b81c3ce9b SHA256 867a5c2ca5d219de7aedc92f6e1fb67dc1f076cad6b1aa50e3bb74a20e9328df
+MD5 f2ae70a4690295129f8d25f24eeb27a4 ChangeLog 5529
+RMD160 04348d5735e5674e58778a585d6bb188f82e48d0 ChangeLog 5529
+SHA256 867a5c2ca5d219de7aedc92f6e1fb67dc1f076cad6b1aa50e3bb74a20e9328df ChangeLog 5529
 MISC metadata.xml 407 RMD160 8e35df61682becc8460802429f23940b565120bf SHA1 eaea7a4d1e393780c3e672c1e3065052fa29e55c SHA256 037fb14955d7842ad7c7bfaa5fad22fe4f1fd17c54508a468c378b53f864bffd
 MD5 e35cf25c112b5830f5f2c5f968c07177 metadata.xml 407
 RMD160 8e35df61682becc8460802429f23940b565120bf metadata.xml 407
@@ -49,3 +52,10 @@ SHA256 ce8b4970c86008796c5ce67cbced4e0b3f77d3d37a56d557a04dff1556d3af01 files/di
 MD5 119e2e604c463314320df77eec6e9ed6 files/digest-xdvik-22.84.5 524
 RMD160 a44d655768bd3fba08e17cde4b644e88825bb815 files/digest-xdvik-22.84.5 524
 SHA256 0ec210cef61a9693d1ee4724b6f1f7bef013b539785dd11eeef3939eff6d6934 files/digest-xdvik-22.84.5 524
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHCJ+YNQqtfCuFneMRAmbQAJwIdV2pjbPfYRmY/UT0S5kGPMcaCQCfb0oi
+cA7ComOmiwFMHUo9ICCp/s0=
+=3T8O
+-----END PGP SIGNATURE-----
diff --git a/app-text/xdvik/xdvik-22.84.10.ebuild b/app-text/xdvik/xdvik-22.84.10.ebuild
index e39863e88f2f..dc3373d6b33b 100644
--- a/app-text/xdvik/xdvik-22.84.10.ebuild
+++ b/app-text/xdvik/xdvik-22.84.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.10.ebuild,v 1.13 2007/04/22 10:55:31 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.10.ebuild,v 1.14 2007/10/07 08:57:51 opfer Exp $
 
 WANT_AUTOCONF=2.1
 
@@ -32,21 +32,21 @@ RDEPEND=">=media-libs/t1lib-5.0.2
 	!app-text/texlive"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	if has_version virtual/tetex && built_with_use virtual/tetex X ; then
-		eerror "tetex provides xdvik when built with the X flag."
-		eerror "To install this version of xdvik re-install tetex"
-		eerror "without the X flag."
-		die "xdvik collides with tetex built with the X flag"
-	fi
-}
+# pkg_setup() {
+# 	if has_version virtual/tetex && built_with_use virtual/tetex X ; then
+# 		eerror "tetex provides xdvik when built with the X flag."
+# 		eerror "To install this version of xdvik re-install tetex"
+# 		eerror "without the X flag."
+# 		die "xdvik collides with tetex built with the X flag"
+# 	fi
+# }
 
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd "${S}"
 	if use cjk ; then
-		epatch ${DISTDIR}/${XDVIK_JP}
-		cat >>${S}/texk/xdvik/vfontmap.sample<<-EOF
+		epatch "${DISTDIR}/${XDVIK_JP}"
+		cat >>"${S}/texk/xdvik/vfontmap.sample"<<-EOF
 
 		# TrueType fonts
 		min     /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
@@ -92,7 +92,7 @@ src_compile() {
 		${myconf} || die "econf failed"
 
 	cd texk/xdvik
-	make texmf=${TEXMF_PATH} || die
+	emake texmf="${TEXMF_PATH}" || die
 	use emacs && elisp-compile xdvi-search.el
 }
 
@@ -103,13 +103,13 @@ src_install() {
 	local TEXMF_PATH=$(kpsewhich --expand-var='$TEXMFMAIN')
 
 	cd ${S}/texk/xdvik
-	einstall texmf=${D}${TEXMF_PATH} || die "install failed"
+	einstall texmf="${D}${TEXMF_PATH}" || die "install failed"
 
-	mv ${D}${TEXMF_PATH}/xdvi/XDvi ${D}etc/X11/app-defaults
-	dosym {/etc/X11/app-defaults,${TEXMF_PATH}}/XDvi
-	for i in $(find ${D}${TEXMF_PATH}/xdvi -type f -maxdepth 1) ; do
-		mv $i ${D}etc/texmf/xdvi
-		dosym {/etc/texmf,${TEXMF_PATH}}/xdvi/$(basename $i)
+	mv "${D}${TEXMF_PATH}/xdvi/XDvi" "${D}etc/X11/app-defaults"
+	dosym {/etc/X11/app-defaults,"${TEXMF_PATH}"}/XDvi
+	for i in $(find "${D}${TEXMF_PATH}/xdvi" -type f -maxdepth 1) ; do
+		mv ${i} "${D}etc/texmf/xdvi"
+		dosym {/etc/texmf,"${TEXMF_PATH}"}/xdvi/$(basename ${i})
 	done
 
 	dodoc BUGS FAQ README.*
@@ -121,3 +121,12 @@ src_install() {
 
 	use emacs && elisp-install tex-utils *.el *.elc
 }
+
+pkg_postinst() {
+	if use emacs; then
+		elog "Add"
+		elog "	(add-to-list 'load-path (\"/usr/share/emacs/site-lisp/tex-utils\"))"
+		elog "	(require 'xdvi-search)"
+		elog "to your ~/.emacs file"
+	fi
+}