diff options
| -rw-r--r-- | app-text/xdvik/ChangeLog | 9 | ||||
| -rw-r--r-- | app-text/xdvik/files/xdvik-22.84.16-cvararg.patch | 73 | ||||
| -rw-r--r-- | app-text/xdvik/files/xdvik-22.84.16-kpathsea_version.patch | 18 | ||||
| -rw-r--r-- | app-text/xdvik/files/xdvik-22.84.16-open-mode.patch | 12 | ||||
| -rw-r--r-- | app-text/xdvik/files/xdvik-22.84.16-parallel_make.patch | 42 | ||||
| -rw-r--r-- | app-text/xdvik/xdvik-22.84.16.ebuild | 108 |
6 files changed, 8 insertions, 254 deletions
diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog index 3acb49ea0231..873d3b478204 100644 --- a/app-text/xdvik/ChangeLog +++ b/app-text/xdvik/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-text/xdvik # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.103 2013/04/25 21:25:51 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.104 2013/05/17 23:36:28 aballier Exp $ + + 17 May 2013; Alexis Ballier <aballier@gentoo.org> -xdvik-22.84.16.ebuild, + -files/xdvik-22.84.16-cvararg.patch, + -files/xdvik-22.84.16-kpathsea_version.patch, + -files/xdvik-22.84.16-open-mode.patch, + -files/xdvik-22.84.16-parallel_make.patch: + remove old 25 Apr 2013; Agostino Sarubbo <ago@gentoo.org> xdvik-22.85-r1.ebuild: Stable for sh, wrt bug #449298 diff --git a/app-text/xdvik/files/xdvik-22.84.16-cvararg.patch b/app-text/xdvik/files/xdvik-22.84.16-cvararg.patch deleted file mode 100644 index 25efb5d51382..000000000000 --- a/app-text/xdvik/files/xdvik-22.84.16-cvararg.patch +++ /dev/null @@ -1,73 +0,0 @@ -c-vararg is an internal header of kpathsea, not installed by the system version. - -Index: xdvik-22.84.16/texk/xdvik/dvi-draw.c -=================================================================== ---- xdvik-22.84.16.orig/texk/xdvik/dvi-draw.c -+++ xdvik-22.84.16/texk/xdvik/dvi-draw.c -@@ -43,7 +43,6 @@ in xdvi.c. - #include "kpathsea/c-stat.h" - #include "kpathsea/magstep.h" - #include "kpathsea/tex-file.h" --#include "kpathsea/c-vararg.h" - - #include <string.h> - -Index: xdvik-22.84.16/texk/xdvik/gui/message-window.c -=================================================================== ---- xdvik-22.84.16.orig/texk/xdvik/gui/message-window.c -+++ xdvik-22.84.16/texk/xdvik/gui/message-window.c -@@ -78,7 +78,6 @@ by the user (as a rough guide: a delay o - # include <X11/Xaw/Dialog.h> - #endif - --#include "kpathsea/c-vararg.h" - #include "xdvi.h" - #include "util.h" - #include "string-utils.h" -Index: xdvik-22.84.16/texk/xdvik/gui/statusline.c -=================================================================== ---- xdvik-22.84.16.orig/texk/xdvik/gui/statusline.c -+++ xdvik-22.84.16/texk/xdvik/gui/statusline.c -@@ -32,7 +32,6 @@ - #include "pagehist.h" - #include "util.h" - --#include "kpathsea/c-vararg.h" - #include "my-vsnprintf.h" - - #include <ctype.h> -Index: xdvik-22.84.16/texk/xdvik/string-utils.h -=================================================================== ---- xdvik-22.84.16.orig/texk/xdvik/string-utils.h -+++ xdvik-22.84.16/texk/xdvik/string-utils.h -@@ -2,7 +2,6 @@ - #define STRING_UTILS_H_ - - #include "xdvi-config.h" --#include "kpathsea/c-vararg.h" - #include "my-vsnprintf.h" - - extern Boolean str_is_prefix(const char *, const char *, Boolean case_sensitive); -Index: xdvik-22.84.16/texk/xdvik/tests/test_string_utils.c -=================================================================== ---- xdvik-22.84.16.orig/texk/xdvik/tests/test_string_utils.c -+++ xdvik-22.84.16/texk/xdvik/tests/test_string_utils.c -@@ -1,6 +1,5 @@ - #include "xdvi-config.h" - #include "xdvi.h" --#include "kpathsea/c-vararg.h" - - #include <stdio.h> - #include <stdlib.h> -Index: xdvik-22.84.16/texk/xdvik/xdvi.h -=================================================================== ---- xdvik-22.84.16.orig/texk/xdvik/xdvi.h -+++ xdvik-22.84.16/texk/xdvik/xdvi.h -@@ -261,7 +261,6 @@ extern KPSEDLL char *kpathsea_version_st - # define NeedVarargsPrototypes NeedFunctionPrototypes - #endif - --#include "kpathsea/c-vararg.h" - #include "kpathsea/c-fopen.h" - - #ifndef _XFUNCPROTOBEGIN diff --git a/app-text/xdvik/files/xdvik-22.84.16-kpathsea_version.patch b/app-text/xdvik/files/xdvik-22.84.16-kpathsea_version.patch deleted file mode 100644 index fb69d3d1294e..000000000000 --- a/app-text/xdvik/files/xdvik-22.84.16-kpathsea_version.patch +++ /dev/null @@ -1,18 +0,0 @@ -kpathsea from TeX Live 2009 and later provides a version.h header with this -definition. Use it because it causes definition conflicts with kpathsea from TeX -Live 2010. - -Index: xdvik-22.84.16/texk/xdvik/xdvi.h -=================================================================== ---- xdvik-22.84.16.orig/texk/xdvik/xdvi.h -+++ xdvik-22.84.16/texk/xdvik/xdvi.h -@@ -242,8 +242,7 @@ typedef unsigned long xuint32; - #define LENGTH_OF_ULONG ((sizeof(unsigned long) * CHAR_BIT + 2) / 3 + 1 + 1) - - #include "kpathsea/c-dir.h" /* dirent.h, NAMLEN */ -- --extern KPSEDLL char *kpathsea_version_string; -+#include "kpathsea/version.h" - - #ifndef NeedFunctionPrototypes - # if __STDC__ diff --git a/app-text/xdvik/files/xdvik-22.84.16-open-mode.patch b/app-text/xdvik/files/xdvik-22.84.16-open-mode.patch deleted file mode 100644 index 76ee267dc1a3..000000000000 --- a/app-text/xdvik/files/xdvik-22.84.16-open-mode.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -pruN xdvik-22.84.14.orig/texk/xdvik/util.c xdvik-22.84.14/texk/xdvik/util.c ---- xdvik-22.84.14.orig/texk/xdvik/util.c 2009-09-02 21:30:39.812675433 +0200 -+++ xdvik-22.84.14/texk/xdvik/util.c 2008-05-03 21:45:10.000000000 +0200 -@@ -273,7 +273,7 @@ try_open_mode(const char *fname, int fla - int fd = open(fname, flags, mode); - if (fd < 0 && (errno == EMFILE || errno == ENFILE)) { - close_a_file(); -- fd = open(fname, flags); -+ fd = open(fname, flags, mode); - } - return fd; - } diff --git a/app-text/xdvik/files/xdvik-22.84.16-parallel_make.patch b/app-text/xdvik/files/xdvik-22.84.16-parallel_make.patch deleted file mode 100644 index af80fb38cd09..000000000000 --- a/app-text/xdvik/files/xdvik-22.84.16-parallel_make.patch +++ /dev/null @@ -1,42 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=293541 - ---- Makefile.in -+++ Makefile.in -@@ -46,11 +46,13 @@ LIBKPATHSEADEP=@LIBKPATHSEADEP@ - x_link = $(LDLIBT1) $(LDLIBKPATHSEA) $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt $(x_pre_libs) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs) - - TESTS=./tests/run_tests --TESTS_DEP=$(TESTS) -+TESTS_DEP=tests -+.PHONY: $(TESTS_DEP) - - # various xdvik GUI elements - LIBGUI=./gui/libgui.a --LIBGUIDEP=$(LIBGUI) -+LIBGUIDEP=gui -+.PHONY: $(LIBGUIDEP) - - - # Extra xdvi-specific compiler options. -@@ -106,18 +108,14 @@ objects = \ - perlprog = t1mapper - manpage = xdvi - --default all: libguibuild @final_exec_name@ $(manpage).1 -+default all: $(LIBGUIDEP) @final_exec_name@ $(manpage).1 - --$(LIBGUI): -+$(LIBGUIDEP): - cd gui; $(MAKE) $(makeargs) libgui.a - --$(TESTS): -+$(TESTS_DEP): - cd tests; $(MAKE) $(makeargs) - --### we need this additional target so that libgui is always checked to be up-to-date ... --libguibuild: -- cd gui; $(MAKE) $(makeargs) libgui.a -- - test: - cd tests; $(MAKE) $(makeargs) test - diff --git a/app-text/xdvik/xdvik-22.84.16.ebuild b/app-text/xdvik/xdvik-22.84.16.ebuild deleted file mode 100644 index fe12901d5d45..000000000000 --- a/app-text/xdvik/xdvik-22.84.16.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2013 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.19 2013/03/03 23:09:17 vapier 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 s390 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/motif-2.3:0 ) - !motif? ( - neXt? ( x11-libs/neXtaw ) - !neXt? ( - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( x11-libs/libXaw ) - ) - ) - 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" - use neXt && ewarn "neXt USE flag ignored (superseded by motif)" - use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)" - elif use neXt ; then - toolkit="neXtaw" - use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)" - 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 -} |