Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/xdvik/, app-text/xdvik/files/
Date: Mon, 28 Aug 2017 09:03:18
Message-Id: 1503910962.d2a9c4964bc2daa20086105db3dfcf22b79725a6.aballier@gentoo
1 commit: d2a9c4964bc2daa20086105db3dfcf22b79725a6
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 28 09:02:01 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 28 09:02:42 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a9c496
7
8 app-text/xdvik: Remove old
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12 app-text/xdvik/Manifest | 1 -
13 app-text/xdvik/files/xdvik-22.85-mksedscript.patch | 15 ---
14 .../files/xdvik-22.85-mksedscript_gentoo.patch | 20 ----
15 app-text/xdvik/xdvik-22.85-r1.ebuild | 103 ---------------------
16 4 files changed, 139 deletions(-)
17
18 diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
19 index b942f28d165..3b47e5d725b 100644
20 --- a/app-text/xdvik/Manifest
21 +++ b/app-text/xdvik/Manifest
22 @@ -1,2 +1 @@
23 -DIST xdvik-22.85.tar.gz 4128828 SHA256 91f08103e53ab46efc83053e648bdd07aa100043233dadcb7384efc83fa2dde8 SHA512 9220bac0dea21d617b4ea7129ca8133fd447fb1adc26c699970cae7d3e168e32f4745b0936d18d8f769f3926c526e085f0c92a4d99d5faff8301e3c4ebc297b5 WHIRLPOOL 57ffc2d6a326b754b63aed54836c05b2e9431b01faba6d9bdc347b07094a62a7569d7746f556366b282808cc93a41a81cbda4fd82cdf4972133f8addc74e4e75
24 DIST xdvik-22.87.03.tar.gz 4760306 SHA256 a1b8631b6650c534cf8dc584a9f106b5df0771613743139c8a644a19f14611fc SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88 WHIRLPOOL da8227daa34ac69b60c447e3c929aaf353697add104245b64815b2f42ad03c189c353c7b4d34359f5897a26e5dd811fa3ef21254ee18c243d557860f697bfba6
25
26 diff --git a/app-text/xdvik/files/xdvik-22.85-mksedscript.patch b/app-text/xdvik/files/xdvik-22.85-mksedscript.patch
27 deleted file mode 100644
28 index 356b2f1246e..00000000000
29 --- a/app-text/xdvik/files/xdvik-22.85-mksedscript.patch
30 +++ /dev/null
31 @@ -1,15 +0,0 @@
32 -Index: texk/xdvik/mksedscript
33 -===================================================================
34 ---- texk/xdvik/mksedscript (revision 25824)
35 -+++ texk/xdvik/mksedscript (revision 25826)
36 -@@ -43,7 +43,9 @@
37 -
38 - # Get arguments from c-auto.h
39 -
40 --eval "`awk '/^#define/ { print "mk_"$2"="$3 }' c-auto.h`"
41 -+eval "`awk '/^#define/ { printf "mk_%s=%s", $2, $3
42 -+ for (i = 4; i <= NF; i++) printf " %s", $i
43 -+ print "" }' c-auto.h`"
44 -
45 - # eval "`cat c-auto.h \
46 - # | grep '^[ ]*#[ ]*define[ ]' \
47
48 diff --git a/app-text/xdvik/files/xdvik-22.85-mksedscript_gentoo.patch b/app-text/xdvik/files/xdvik-22.85-mksedscript_gentoo.patch
49 deleted file mode 100644
50 index 69873731dd4..00000000000
51 --- a/app-text/xdvik/files/xdvik-22.85-mksedscript_gentoo.patch
52 +++ /dev/null
53 @@ -1,20 +0,0 @@
54 -This used to eval something like:
55 -foo=char **
56 -so, the first match to * would be executed
57 -causing: https://bugs.gentoo.org/show_bug.cgi?id=410695
58 -
59 -remove the quotes and quote again so that we always get foo="char **"
60 -
61 -Index: xdvik-22.85/texk/xdvik/mksedscript
62 -===================================================================
63 ---- xdvik-22.85.orig/texk/xdvik/mksedscript
64 -+++ xdvik-22.85/texk/xdvik/mksedscript
65 -@@ -45,7 +45,7 @@ done
66 -
67 - eval "`awk '/^#define/ { printf "mk_%s=%s", $2, $3
68 - for (i = 4; i <= NF; i++) printf " %s", $i
69 -- print "" }' c-auto.h`"
70 -+ print "" }' c-auto.h | tr -d '"' |sed -e 's/\(.*\)=\(.*\)$/\1="\2"/'`"
71 -
72 - # eval "`cat c-auto.h \
73 - # | grep '^[ ]*#[ ]*define[ ]' \
74
75 diff --git a/app-text/xdvik/xdvik-22.85-r1.ebuild b/app-text/xdvik/xdvik-22.85-r1.ebuild
76 deleted file mode 100644
77 index 7825855b076..00000000000
78 --- a/app-text/xdvik/xdvik-22.85-r1.ebuild
79 +++ /dev/null
80 @@ -1,103 +0,0 @@
81 -# Copyright 1999-2017 Gentoo Foundation
82 -# Distributed under the terms of the GNU General Public License v2
83 -
84 -EAPI=4
85 -inherit eutils flag-o-matic elisp-common toolchain-funcs multilib
86 -
87 -DESCRIPTION="DVI previewer for X Window System"
88 -HOMEPAGE="http://xdvi.sourceforge.net/"
89 -SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
90 -
91 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
92 -SLOT="0"
93 -LICENSE="GPL-2"
94 -IUSE="motif neXt Xaw3d emacs"
95 -
96 -RDEPEND=">=media-libs/t1lib-5.0.2
97 - x11-libs/libXmu
98 - x11-libs/libXp
99 - x11-libs/libXpm
100 - motif? ( >=x11-libs/motif-2.3:0 )
101 - !motif? (
102 - neXt? ( x11-libs/neXtaw )
103 - !neXt? (
104 - Xaw3d? ( x11-libs/libXaw3d )
105 - !Xaw3d? ( x11-libs/libXaw )
106 - )
107 - )
108 - dev-libs/kpathsea"
109 -DEPEND="sys-devel/flex
110 - virtual/yacc
111 - ${RDEPEND}"
112 -RDEPEND="${RDEPEND}
113 - virtual/latex-base
114 - !<app-text/texlive-2007"
115 -TEXMF_PATH=/usr/share/texmf
116 -S=${WORKDIR}/${P}/texk/xdvik
117 -
118 -src_prepare() {
119 - epatch "${FILESDIR}/${P}-mksedscript.patch" \
120 - "${FILESDIR}/${P}-mksedscript_gentoo.patch"
121 - # Make sure system kpathsea headers are used
122 - cd "${WORKDIR}/${P}/texk/kpathsea"
123 - for i in *.h ; do echo "#include_next \"$i\"" > $i; done
124 -}
125 -
126 -src_configure() {
127 - local toolkit
128 -
129 - if use motif ; then
130 - toolkit="motif"
131 - use neXt && ewarn "neXt USE flag ignored (superseded by motif)"
132 - use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)"
133 - elif use neXt ; then
134 - toolkit="neXtaw"
135 - use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)"
136 - elif use Xaw3d ; then
137 - toolkit="xaw3d"
138 - else
139 - toolkit="xaw"
140 - fi
141 -
142 - econf \
143 - --with-system-t1lib \
144 - --with-system-kpathsea \
145 - --with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
146 - --with-xdvi-x-toolkit="${toolkit}" \
147 - --x-includes="${EPREFIX}"/usr/include \
148 - --x-libraries="${EPREFIX}"/usr/$(get_libdir)
149 -}
150 -
151 -src_compile() {
152 - emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea" texmf="${EPREFIX}${TEXMF_PATH}"
153 - use emacs && elisp-compile xdvi-search.el
154 -}
155 -
156 -src_install() {
157 - emake DESTDIR="${D}" install
158 -
159 - dodir /etc/texmf/xdvi /usr/share/X11/app-defaults
160 - mv "${ED}${TEXMF_PATH}/xdvi/XDvi" "${ED}usr/share/X11/app-defaults" || die "failed to move config file"
161 - dosym {/usr/share/X11/app-defaults,"${TEXMF_PATH}/xdvi"}/XDvi
162 - for i in $(find "${ED}${TEXMF_PATH}/xdvi" -maxdepth 1 -type f) ; do
163 - mv ${i} "${ED}etc/texmf/xdvi" || die "failed to move $i"
164 - dosym {/etc/texmf,"${TEXMF_PATH}"}/xdvi/$(basename ${i})
165 - done
166 -
167 - dodoc BUGS FAQ README.*
168 -
169 - use emacs && elisp-install tex-utils *.el *.elc
170 -
171 - doicon "${FILESDIR}"/${PN}.xpm
172 - make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer"
173 - echo "MimeType=application/x-dvi;" >> "${ED}"usr/share/applications/xdvi-"${PN}".desktop
174 -}
175 -
176 -pkg_postinst() {
177 - if use emacs; then
178 - elog "Add"
179 - elog " (add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")"
180 - elog " (require 'xdvi-search)"
181 - elog "to your ~/.emacs file"
182 - fi
183 -}