diff options
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/xdvik/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/xdvik/Manifest | 15 | ||||
| -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 | 7 |
4 files changed, 54 insertions, 16 deletions
diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog index b72f03d4591b..dbb6aee2383c 100644 --- a/app-text/xdvik/ChangeLog +++ b/app-text/xdvik/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/xdvik # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.66 2010/02/22 20:48:29 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.67 2010/04/26 09:55:10 ssuominen Exp $ + + 26 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> xdvik-22.84.16.ebuild, + +files/xdvik-22.84.16-parallel_make.patch: + Fix parallel make failure wrt #293541 by Ed Catmur. 22 Feb 2010; Jonathan Callen <abcd@gentoo.org> xdvik-22.84.16.ebuild: Add prefix keywords, support; bump EAPI diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest index 2d962529f872..35e9a708eea8 100644 --- a/app-text/xdvik/Manifest +++ b/app-text/xdvik/Manifest @@ -1,21 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX xdvik-22.84.16-cvararg.patch 2454 RMD160 a77819156d692965ab62f91d278e0a84bde37247 SHA1 3d3e83a58034cdde9d3c5caac0b2569d3085c79d SHA256 7d2ebfa1abd871bf2bfb48a32c0c6df28fcfd3dfa6d21bc8cf77bd8d61639891 AUX xdvik-22.84.16-open-mode.patch 497 RMD160 0a996bc83a9101b7a89f4f47c762083604ffc07f SHA1 d7a8a26e5d46d4784564452c1b9879a2c3a81829 SHA256 f557f52d401a9a5ad7791593d08da619e824387b4aa32be608ae46700d71bdcd +AUX xdvik-22.84.16-parallel_make.patch 1031 RMD160 5cf3278cbad496333889ad5fdabd04718aa6c3f1 SHA1 e17080a333b52064249e91811ca006bfeec189b4 SHA256 63f1f3ed5a0dcd270a3a5e2512d0a62cbfecd77f1c6aa2684cfcbbded3e1681c AUX xdvik.png 798 RMD160 b037217ce158c280019eac65aee6fe699f4c111b SHA1 e60a01c232b3b13bcf52e8118295bbc292bd6ae2 SHA256 87fc7b3f9623f613617b6f9157773029508714a56d1fd806805741ab93b2d3c9 DIST xdvik-22.84.14-j1.40.patch.gz 128380 RMD160 2ca532aa61f98485b71b49f2875df8be340b79a4 SHA1 dad05ea6e4c527b30d7f60a78e2197f9e9dbaafc SHA256 d5f18effe55bc920983728af225e53759167538db78757b811b8ed3e08ddf07a DIST xdvik-22.84.14.tar.gz 2016256 RMD160 a19920fcc9e4e5d2878b16e65fa95bab5f034b74 SHA1 1ca7f0c7930d24c3e10cc1d7115abed7dd39e95e SHA256 2f09905989b3b4365e6778eedb8fa0cbc278abecc3188f5419f108e580dd9dcf DIST xdvik-22.84.16.tar.gz 2185822 RMD160 39448303e8df19e4ee34e01861ff188c30416d32 SHA1 12d15e63cdc936dd2d3706ce27a96edffde6e131 SHA256 3e41620f1783bd8265620c93d2597b82a155833f93639add8e877f8eb5f47dbf EBUILD xdvik-22.84.14-r1.ebuild 4008 RMD160 70629a0ae66701fd922c1b7abc48e50ce8b50c1b SHA1 6c041abb138b204f26b912c64c67b4cb436eab22 SHA256 3d9b80f863ecb25d9c548caa4dca89a7bdedd9257054839dd8e3bbc338a0b82d EBUILD xdvik-22.84.14.ebuild 3818 RMD160 0f1d4feca064d32c88a2c90b1e882c0b7233a6fb SHA1 4e4b387cde3b10b27b94245b5c12ec8c7b3410af SHA256 6ddced84087eac18982ed8ae6df0c8bb5e0f7bb03c0e76e13ddb33f767c522ca -EBUILD xdvik-22.84.16.ebuild 2870 RMD160 bbe278ad8078580ace001fed4962d4cf9af54b36 SHA1 78ee83928c27e5b77157001ea744047598794830 SHA256 b9ed2d09092cf661c77808885aa14c4ef049ccfb2878d25a038e6a81c753ce7a -MISC ChangeLog 9056 RMD160 fb0ca4293461cf7e57b2373bc3ee9363f52c7a6f SHA1 bf67f88c0cf384716301c533349b96ed44076932 SHA256 79911d7261af25b2cfd03db7af4047ae84da91e0fa73572c8838d3283eba2f1e +EBUILD xdvik-22.84.16.ebuild 2914 RMD160 9b51dc2a6102cce5765635d73ea2bbda816db9d4 SHA1 65125af1e698892ed9dcb1c9e2131da5ba44b6f1 SHA256 11c853a871f0542c7d8348d1a630431c93d84255b3de0f74e69df9842913fbe2 +MISC ChangeLog 9238 RMD160 42bec365d520a9581af3cc629d51a951db7cdf15 SHA1 4e0e6da0f45a1406c2e73e5d57c8697e5c837e14 SHA256 67d26708de354641dee7766e7c36f831f575e12a6bbc888623a42a0458ecd59e MISC metadata.xml 351 RMD160 e0236b45acbcf41ef7883fd7e6779730e7850912 SHA1 7265aefd4237e321a3b5ae216e9bd79a7f20f156 SHA256 1348cd17584c52004c3d87ad5f2af2a6f87d921ffdeb1675827d8cb978ebad55 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkuC7aMACgkQOypDUo0oQOrVNwCfZc5PLgTQ1Hiu8fLA4xHfZ16F -xk4AnAxMACkFmk5riv/nkNonUYpVawWZ -=+Uf8 ------END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..af80fb38cd09 --- /dev/null +++ b/app-text/xdvik/files/xdvik-22.84.16-parallel_make.patch @@ -0,0 +1,42 @@ +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 index 57e3f9203ef7..9b3dd6f46cba 100644 --- a/app-text/xdvik/xdvik-22.84.16.ebuild +++ b/app-text/xdvik/xdvik-22.84.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.3 2010/02/22 20:48:29 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.16.ebuild,v 1.4 2010/04/26 09:55:10 ssuominen Exp $ EAPI=3 @@ -29,8 +29,9 @@ TEXMF_PATH=/usr/share/texmf S=${WORKDIR}/${P}/texk/xdvik src_prepare() { - epatch "${FILESDIR}/${P}-open-mode.patch" - epatch "${FILESDIR}/${P}-cvararg.patch" + epatch "${FILESDIR}"/${P}-open-mode.patch \ + "${FILESDIR}"/${P}-cvararg.patch \ + "${FILESDIR}"/${P}-parallel_make.patch # Make sure system kpathsea headers are used cd "${WORKDIR}/${P}/texk/kpathsea" for i in *.h ; do echo "#include_next \"$i\"" > $i; done |