* [gentoo-commits] repo/gentoo:master commit in: app-text/xdvik/, app-text/xdvik/files/
@ 2017-08-28 9:03 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2017-08-28 9:03 UTC (permalink / raw
To: gentoo-commits
commit: d2a9c4964bc2daa20086105db3dfcf22b79725a6
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 09:02:01 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 09:02:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a9c496
app-text/xdvik: Remove old
Package-Manager: Portage-2.3.8, Repoman-2.3.3
app-text/xdvik/Manifest | 1 -
app-text/xdvik/files/xdvik-22.85-mksedscript.patch | 15 ---
.../files/xdvik-22.85-mksedscript_gentoo.patch | 20 ----
app-text/xdvik/xdvik-22.85-r1.ebuild | 103 ---------------------
4 files changed, 139 deletions(-)
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index b942f28d165..3b47e5d725b 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,2 +1 @@
-DIST xdvik-22.85.tar.gz 4128828 SHA256 91f08103e53ab46efc83053e648bdd07aa100043233dadcb7384efc83fa2dde8 SHA512 9220bac0dea21d617b4ea7129ca8133fd447fb1adc26c699970cae7d3e168e32f4745b0936d18d8f769f3926c526e085f0c92a4d99d5faff8301e3c4ebc297b5 WHIRLPOOL 57ffc2d6a326b754b63aed54836c05b2e9431b01faba6d9bdc347b07094a62a7569d7746f556366b282808cc93a41a81cbda4fd82cdf4972133f8addc74e4e75
DIST xdvik-22.87.03.tar.gz 4760306 SHA256 a1b8631b6650c534cf8dc584a9f106b5df0771613743139c8a644a19f14611fc SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88 WHIRLPOOL da8227daa34ac69b60c447e3c929aaf353697add104245b64815b2f42ad03c189c353c7b4d34359f5897a26e5dd811fa3ef21254ee18c243d557860f697bfba6
diff --git a/app-text/xdvik/files/xdvik-22.85-mksedscript.patch b/app-text/xdvik/files/xdvik-22.85-mksedscript.patch
deleted file mode 100644
index 356b2f1246e..00000000000
--- a/app-text/xdvik/files/xdvik-22.85-mksedscript.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: texk/xdvik/mksedscript
-===================================================================
---- texk/xdvik/mksedscript (revision 25824)
-+++ texk/xdvik/mksedscript (revision 25826)
-@@ -43,7 +43,9 @@
-
- # Get arguments from c-auto.h
-
--eval "`awk '/^#define/ { print "mk_"$2"="$3 }' c-auto.h`"
-+eval "`awk '/^#define/ { printf "mk_%s=%s", $2, $3
-+ for (i = 4; i <= NF; i++) printf " %s", $i
-+ print "" }' c-auto.h`"
-
- # eval "`cat c-auto.h \
- # | grep '^[ ]*#[ ]*define[ ]' \
diff --git a/app-text/xdvik/files/xdvik-22.85-mksedscript_gentoo.patch b/app-text/xdvik/files/xdvik-22.85-mksedscript_gentoo.patch
deleted file mode 100644
index 69873731dd4..00000000000
--- a/app-text/xdvik/files/xdvik-22.85-mksedscript_gentoo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This used to eval something like:
-foo=char **
-so, the first match to * would be executed
-causing: https://bugs.gentoo.org/show_bug.cgi?id=410695
-
-remove the quotes and quote again so that we always get foo="char **"
-
-Index: xdvik-22.85/texk/xdvik/mksedscript
-===================================================================
---- xdvik-22.85.orig/texk/xdvik/mksedscript
-+++ xdvik-22.85/texk/xdvik/mksedscript
-@@ -45,7 +45,7 @@ done
-
- eval "`awk '/^#define/ { printf "mk_%s=%s", $2, $3
- for (i = 4; i <= NF; i++) printf " %s", $i
-- print "" }' c-auto.h`"
-+ print "" }' c-auto.h | tr -d '"' |sed -e 's/\(.*\)=\(.*\)$/\1="\2"/'`"
-
- # eval "`cat c-auto.h \
- # | grep '^[ ]*#[ ]*define[ ]' \
diff --git a/app-text/xdvik/xdvik-22.85-r1.ebuild b/app-text/xdvik/xdvik-22.85-r1.ebuild
deleted file mode 100644
index 7825855b076..00000000000
--- a/app-text/xdvik/xdvik-22.85-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils flag-o-matic elisp-common toolchain-funcs multilib
-
-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 ~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"
-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 )
- )
- )
- dev-libs/kpathsea"
-DEPEND="sys-devel/flex
- virtual/yacc
- ${RDEPEND}"
-RDEPEND="${RDEPEND}
- virtual/latex-base
- !<app-text/texlive-2007"
-TEXMF_PATH=/usr/share/texmf
-S=${WORKDIR}/${P}/texk/xdvik
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-mksedscript.patch" \
- "${FILESDIR}/${P}-mksedscript_gentoo.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() {
- 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 \
- --with-system-t1lib \
- --with-system-kpathsea \
- --with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
- --with-xdvi-x-toolkit="${toolkit}" \
- --x-includes="${EPREFIX}"/usr/include \
- --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea" texmf="${EPREFIX}${TEXMF_PATH}"
- use emacs && elisp-compile xdvi-search.el
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodir /etc/texmf/xdvi /usr/share/X11/app-defaults
- mv "${ED}${TEXMF_PATH}/xdvi/XDvi" "${ED}usr/share/X11/app-defaults" || die "failed to move config file"
- dosym {/usr/share/X11/app-defaults,"${TEXMF_PATH}/xdvi"}/XDvi
- 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})
- done
-
- dodoc BUGS FAQ README.*
-
- 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/xdvik/, app-text/xdvik/files/
@ 2023-02-15 1:59 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-02-15 1:59 UTC (permalink / raw
To: gentoo-commits
commit: e7a43cae248406d2c069e09f0cb83bcd1bf7b397
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 01:58:46 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 01:58:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7a43cae
app-text/xdvik: add 22.87.06
Closes: https://bugs.gentoo.org/882733
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/xdvik/Manifest | 1 +
.../files/xdvik-22.87.06-configure-clang16.patch | 51 +++++++++
app-text/xdvik/xdvik-22.87.06.ebuild | 114 +++++++++++++++++++++
3 files changed, 166 insertions(+)
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 5f476a71daf7..df2f7b7bf9c2 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1 +1,2 @@
DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d07b090279440117f869c9a623bcade8745d7a4d3c108c4eafbdeaadefb8d5ba1ea00bdf77d350cbf83c49c2ca0fb SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88
+DIST xdvik-22.87.06.tar.gz 5922131 BLAKE2B 88821b7642d2d79158f5b49a7d23dad2209750a44d2b75f131d77a5ee326670d2a9cf09246ea9226a386bce429890459625d87df697599529de1bfc32438bf64 SHA512 93fb231f20ef76e170ae954d076ac5421669b3db71e3a96561626736d516f639227e3e502012ba4612fd238172b82f512985c571702d6c0ce078e60a67e5b19f
diff --git a/app-text/xdvik/files/xdvik-22.87.06-configure-clang16.patch b/app-text/xdvik/files/xdvik-22.87.06-configure-clang16.patch
new file mode 100644
index 000000000000..c3b3f0b98bdb
--- /dev/null
+++ b/app-text/xdvik/files/xdvik-22.87.06-configure-clang16.patch
@@ -0,0 +1,51 @@
+https://github.com/TeX-Live/texlive-source/commit/bb307f8bd91c5ea4f191b9c788056470626893b7
+
+From bb307f8bd91c5ea4f191b9c788056470626893b7 Mon Sep 17 00:00:00 2001
+From: Karl Berry <karl@freefriends.org>
+Date: Thu, 2 Feb 2023 22:57:47 +0000
+Subject: [PATCH] avoid implicit wait and exit declarations for C99
+
+git-svn-id: svn://tug.org/texlive/trunk/Build/source@65717 c570f23f-e606-0410-a88d-b1316a301751
+--- a/configure
++++ b/configure
+@@ -16406,6 +16406,9 @@ else $as_nop
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#ifdef HAVE_SYS_WAIT_H
++#include <sys/wait.h>
++#endif
+ #ifdef HAVE_VFORK_H
+ #include <vfork.h>
+ #endif
+@@ -16427,7 +16430,7 @@ main (void)
+
+ while (wait(&status) != child)
+ ;
+- exit(
++ _exit(
+ /* Was there some problem with vforking? */
+ child < 0
+
+--- a/m4/xdvi-func-setsid-in-fork.m4
++++ b/m4/xdvi-func-setsid-in-fork.m4
+@@ -22,6 +22,9 @@ AC_DEFUN([XDVI_FUNC_SETSID_IN_VFORK],
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#ifdef HAVE_SYS_WAIT_H
++#include <sys/wait.h>
++#endif
+ #ifdef HAVE_VFORK_H
+ #include <vfork.h>
+ #endif]],
+@@ -40,7 +43,7 @@ AC_DEFUN([XDVI_FUNC_SETSID_IN_VFORK],
+
+ while (wait(&status) != child)
+ ;
+- exit(
++ _exit(
+ /* Was there some problem with vforking? */
+ child < 0
+
+
diff --git a/app-text/xdvik/xdvik-22.87.06.ebuild b/app-text/xdvik/xdvik-22.87.06.ebuild
new file mode 100644
index 000000000000..37263ea0b5f1
--- /dev/null
+++ b/app-text/xdvik/xdvik-22.87.06.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop elisp-common flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="DVI previewer for X Window System"
+HOMEPAGE="http://xdvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
+S="${WORKDIR}"/${P}/texk/xdvik
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="motif neXt Xaw3d emacs"
+
+DEPEND=">=media-libs/freetype-2.9.1-r2:2
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/libXt
+ emacs? ( >=app-editors/emacs-23.1:* )
+ motif? ( >=x11-libs/motif-2.3:0 )
+ !motif? (
+ neXt? ( x11-libs/neXtaw )
+ !neXt? (
+ Xaw3d? ( x11-libs/libXaw3d )
+ !Xaw3d? ( x11-libs/libXaw )
+ )
+ )
+ dev-libs/kpathsea:="
+RDEPEND="${DEPEND}
+ virtual/latex-base
+ !<app-text/texlive-2007"
+BDEPEND="sys-devel/flex
+ app-alternatives/yacc
+ virtual/pkgconfig"
+
+src_prepare() {
+ default
+
+ # Make sure system kpathsea headers are used
+ cd "${WORKDIR}/${P}/texk/kpathsea" || die
+ local i
+ for i in *.h ; do
+ echo "#include_next \"$i\"" > ${i} || die
+ done
+
+ cd "${WORKDIR}/${P}" || die
+ cd "${S}" || die
+ eapply "${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch
+ eautoreconf
+}
+
+src_configure() {
+ has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+
+ 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 \
+ --with-system-freetype2 \
+ --with-system-kpathsea \
+ --with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
+ --with-xdvi-x-toolkit="${toolkit}" \
+ --x-includes="${ESYSROOT}"/usr/include \
+ --x-libraries="${ESYSROOT}"/usr/$(get_libdir)
+}
+
+src_compile() {
+ emake kpathsea_dir="${EPREFIX}"/usr/include/kpathsea
+
+ use emacs && elisp-compile xdvi-search.el
+}
+
+src_install() {
+ dodir /usr/share/texmf-dist/dvips/config
+
+ emake DESTDIR="${D}" install
+
+ dosym ../../texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi
+
+ dodoc BUGS FAQ README.*
+
+ 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() {
+ xdg_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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-15 1:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-15 1:59 [gentoo-commits] repo/gentoo:master commit in: app-text/xdvik/, app-text/xdvik/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2017-08-28 9:03 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox