Gentoo Archives: gentoo-commits

From: "Jonathan Callen (abcd)" <abcd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/xdvik: ChangeLog xdvik-22.84.16.ebuild
Date: Mon, 22 Feb 2010 20:48:33
Message-Id: E1NjfCg-0004Cu-DP@stork.gentoo.org
1 abcd 10/02/22 20:48:30
2
3 Modified: ChangeLog xdvik-22.84.16.ebuild
4 Log:
5 Add prefix keywords, support; bump EAPI
6 (Portage version: -svn/cvs/Linux i686)
7
8 Revision Changes Path
9 1.66 app-text/xdvik/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xdvik/ChangeLog?rev=1.66&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xdvik/ChangeLog?rev=1.66&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xdvik/ChangeLog?r1=1.65&r2=1.66
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v
18 retrieving revision 1.65
19 retrieving revision 1.66
20 diff -u -r1.65 -r1.66
21 --- ChangeLog 9 Jan 2010 13:22:12 -0000 1.65
22 +++ ChangeLog 22 Feb 2010 20:48:29 -0000 1.66
23 @@ -1,6 +1,9 @@
24 # ChangeLog for app-text/xdvik
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.65 2010/01/09 13:22:12 aballier Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.66 2010/02/22 20:48:29 abcd Exp $
28 +
29 + 22 Feb 2010; Jonathan Callen <abcd@g.o> xdvik-22.84.16.ebuild:
30 + Add prefix keywords, support; bump EAPI
31
32 09 Jan 2010; Alexis Ballier <aballier@g.o> xdvik-22.84.16.ebuild,
33 +files/xdvik-22.84.16-cvararg.patch:
34
35
36
37 1.3 app-text/xdvik/xdvik-22.84.16.ebuild
38
39 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xdvik/xdvik-22.84.16.ebuild?rev=1.3&view=markup
40 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xdvik/xdvik-22.84.16.ebuild?rev=1.3&content-type=text/plain
41 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xdvik/xdvik-22.84.16.ebuild?r1=1.2&r2=1.3
42
43 Index: xdvik-22.84.16.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.16.ebuild,v
46 retrieving revision 1.2
47 retrieving revision 1.3
48 diff -u -r1.2 -r1.3
49 --- xdvik-22.84.16.ebuild 9 Jan 2010 13:22:12 -0000 1.2
50 +++ xdvik-22.84.16.ebuild 22 Feb 2010 20:48:29 -0000 1.3
51 @@ -1,6 +1,8 @@
52 # Copyright 1999-2010 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.16.ebuild,v 1.2 2010/01/09 13:22:12 aballier Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.16.ebuild,v 1.3 2010/02/22 20:48:29 abcd Exp $
56 +
57 +EAPI=3
58
59 inherit eutils flag-o-matic elisp-common toolchain-funcs
60
61 @@ -8,7 +10,7 @@
62 HOMEPAGE="http://xdvi.sourceforge.net/"
63 SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
64
65 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
66 +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"
67 SLOT="0"
68 LICENSE="GPL-2"
69 IUSE="motif neXt Xaw3d emacs"
70 @@ -26,9 +28,7 @@
71 TEXMF_PATH=/usr/share/texmf
72 S=${WORKDIR}/${P}/texk/xdvik
73
74 -src_unpack() {
75 - unpack ${A}
76 - cd "${S}"
77 +src_prepare() {
78 epatch "${FILESDIR}/${P}-open-mode.patch"
79 epatch "${FILESDIR}/${P}-cvararg.patch"
80 # Make sure system kpathsea headers are used
81 @@ -36,7 +36,7 @@
82 for i in *.h ; do echo "#include_next \"$i\"" > $i; done
83 }
84
85 -src_compile() {
86 +src_configure() {
87 cd "${WORKDIR}/${P}"
88
89 tc-export CC AR RANLIB
90 @@ -58,22 +58,23 @@
91 --enable-gf \
92 --with-system-t1lib \
93 --with-system-kpathsea \
94 - --with-kpathsea-include=/usr/include/kpathsea \
95 + --with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
96 --with-xdvi-x-toolkit="${toolkit}"
97 +}
98
99 - cd "${S}"
100 - emake kpathsea_dir="/usr/include/kpathsea" texmf="${TEXMF_PATH}" || die
101 +src_compile() {
102 + emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea" texmf="${EPREFIX}${TEXMF_PATH}" || die
103 use emacs && elisp-compile xdvi-search.el
104 }
105
106 src_install() {
107 - einstall kpathsea_dir="/usr/include/kpathsea" texmf="${D}${TEXMF_PATH}" || die "install failed"
108 + einstall kpathsea_dir="${EPREFIX}/usr/include/kpathsea" texmf="${ED}${TEXMF_PATH}" || die "install failed"
109
110 dodir /etc/texmf/xdvi /etc/X11/app-defaults
111 - mv "${D}${TEXMF_PATH}/xdvi/XDvi" "${D}etc/X11/app-defaults" || die "failed to move config file"
112 + mv "${ED}${TEXMF_PATH}/xdvi/XDvi" "${ED}etc/X11/app-defaults" || die "failed to move config file"
113 dosym {/etc/X11/app-defaults,"${TEXMF_PATH}/xdvi"}/XDvi || die "failed to symlink config file"
114 - for i in $(find "${D}${TEXMF_PATH}/xdvi" -type f -maxdepth 1) ; do
115 - mv ${i} "${D}etc/texmf/xdvi" || die "failed to move $i"
116 + for i in $(find "${ED}${TEXMF_PATH}/xdvi" -type f -maxdepth 1) ; do
117 + mv ${i} "${ED}etc/texmf/xdvi" || die "failed to move $i"
118 dosym {/etc/texmf,"${TEXMF_PATH}"}/xdvi/$(basename ${i}) || die "failed to symlink $i"
119 done
120
121 @@ -83,13 +84,13 @@
122
123 doicon "${FILESDIR}/${PN}.png"
124 make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer"
125 - echo "MimeType=application/x-dvi;" >> "${D}"usr/share/applications/xdvi-"${PN}".desktop
126 + echo "MimeType=application/x-dvi;" >> "${ED}"usr/share/applications/xdvi-"${PN}".desktop
127 }
128
129 pkg_postinst() {
130 if use emacs; then
131 elog "Add"
132 - elog " (add-to-list 'load-path \"${SITELISP}/tex-utils\")"
133 + elog " (add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")"
134 elog " (require 'xdvi-search)"
135 elog "to your ~/.emacs file"
136 fi