From: Michael Sterrett Date: Mon, 24 Oct 2011 04:12:24 +0000 (+0000) Subject: Avoid building pre-built docs (bug #379633) with patch from Jared B. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d93e7b9c035900ac7cfae3be3e842345f0cdb5d;p=gentoo.git Avoid building pre-built docs (bug #379633) with patch from Jared B. Package-Manager: portage-2.1.10.11/cvs/Linux i686 --- diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog index c4fdba0be3c1..a8a53090d167 100644 --- a/app-emulation/vice/ChangeLog +++ b/app-emulation/vice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/vice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.77 2011/10/08 16:31:21 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.78 2011/10/24 04:12:24 mr_bones_ Exp $ + + 24 Oct 2011; Michael Sterrett vice-2.3.ebuild, + +files/vice-2.3-notexi.patch: + Avoid building pre-built docs (bug #379633) with patch from Jared B. 08 Oct 2011; Pawel Hajdan jr vice-2.3.ebuild: x86 stable wrt bug #385895 diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest index 228e4a4f24c6..2624b65b2ab6 100644 --- a/app-emulation/vice/Manifest +++ b/app-emulation/vice/Manifest @@ -1,17 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - AUX vice-2.2-xshm.patch 1691 RMD160 b5a99eb56e6f89404da4ac7fb72c123beb500a52 SHA1 731b29e46f30411d532cf57ea674b48acfe7cb7e SHA256 58d6aeaebec1fe4a52a434b8f6874b67aa7ebea40339796f1b164726a864e27a +AUX vice-2.3-notexi.patch 395 RMD160 7826ca7349482120daea173be5c838ff00d3776c SHA1 9fcb7442b97db56ecb16d5b0c8c11387f9434581 SHA256 15897692063aac52306082f5ce933a17ba94ecfe8a5c3b65f72db62d478cefbc DIST vice-2.2.tar.gz 9597027 RMD160 d3fb33deb776ffcae297df413849437fb4e49840 SHA1 88ec1f4fefc708957b242805a28ca9b26a3e2738 SHA256 5d581bf817c97f1887651f92e73dd1f5e3c14627fa86fc70732491be7cba1551 DIST vice-2.3.tar.gz 11602378 RMD160 056e48ffedfaecd470892c73b97af89c1e002ff9 SHA1 5e7e1a375a4ca8c4895dc1552162955fdffce296 SHA256 b1817c8dce023069d5c15234c2b4da0a152d297ee8ed01f0b361795c4beeb50e EBUILD vice-2.2.ebuild 2940 RMD160 09401e4aab6f5bc3a966f54bc638d724a1bbd796 SHA1 61e223ae61c5395829212feb177a660d98c8aba7 SHA256 ec434770e7b796271b3ae1bc3407fff99fb214b844964ad64e982bdb73a509ec -EBUILD vice-2.3.ebuild 2880 RMD160 5037478d5ede13d52cd84fa3e29edfc613c9328d SHA1 4fb934d16790bb904decb80571c5bb952a3119e2 SHA256 aa78b64f7844b9c6b4c5c80387966ed0ff6a2b0ea742627e6440b52355f8fdce -MISC ChangeLog 10033 RMD160 4cae4ddf3e9b46ef5db8cf649503dfd52d2d34aa SHA1 9bc025ca1d7290e58d360998430e92bc26898530 SHA256 3e331d41324132ed379448fe9f4220f9e093cc39d6028eab08e0069f71124aef +EBUILD vice-2.3.ebuild 2901 RMD160 fd8bfb9492bd89d4aaece9ebcdb3565b577eb7da SHA1 a3e75d11fcf615cdad3ac1ee26d0ce16d0c5fc0c SHA256 827e1ef6703108c70e35448e7d7abc98a2e39e1fa448db6350d9ef4a75f0b4c6 +MISC ChangeLog 10208 RMD160 aa27425fe669b1558dee2ee6a3f524e37906ede0 SHA1 c3528531edbc644bfc3e32e0984a13329ea0d850 SHA256 774d27084c3453cba446393c24d6252c2059b402a6f904a8ad4d8972114b64a9 MISC metadata.xml 355 RMD160 2be86be120d60193f7debc4eac5b87274ea71d0e SHA1 47edf967eca28ee36ba41788a9f2f55330b6a1b4 SHA256 74dd1a42d4949ea4d7e8f1267fb2b6d0f63b8cee0f1aa2cb9278f674192edb1f ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEAREKAAYFAk6QeuAACgkQuUQtlDBCeQI7rQCfVM/qcvXdRXE4yKY5AXGwhP4F -gm8An0gIoNBmYTXCsDCgT7c6SPhuTs4S -=k67V ------END PGP SIGNATURE----- diff --git a/app-emulation/vice/files/vice-2.3-notexi.patch b/app-emulation/vice/files/vice-2.3-notexi.patch new file mode 100644 index 000000000000..5f3b9c6de0e3 --- /dev/null +++ b/app-emulation/vice/files/vice-2.3-notexi.patch @@ -0,0 +1,17 @@ +--- doc/Makefile.am.orig ++++ doc/Makefile.am +@@ -48,14 +48,7 @@ + $(srcdir)/vice.txt: vice.texi + $(MAKEINFO) -o $(srcdir)/vice.txt --no-headers $(srcdir)/vice.texi + +-if BUILD_PDF +-$(srcdir)/vice.pdf: vice.texi +- $(TEXI2DVI) -q --clean --pdf -o $(srcdir)/vice.pdf $(srcdir)/vice.texi +- +-PDF_DEPS=$(srcdir)/vice.pdf +-else + PDF_DEPS= +-endif + + if BUILD_AMIGAGUIDE + $(srcdir)/vice.guide: vice.texi diff --git a/app-emulation/vice/vice-2.3.ebuild b/app-emulation/vice/vice-2.3.ebuild index 5f881b888c52..3f36b2bf1f2e 100644 --- a/app-emulation/vice/vice-2.3.ebuild +++ b/app-emulation/vice/vice-2.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.3.ebuild,v 1.3 2011/10/08 16:31:21 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.3.ebuild,v 1.4 2011/10/24 04:12:24 mr_bones_ Exp $ EAPI=2 inherit autotools eutils games @@ -47,7 +47,6 @@ RDEPEND=" dga? ( x11-libs/libXxf86dga ) xrandr? ( x11-libs/libXrandr )" DEPEND="${RDEPEND} - virtual/texi2dvi dev-util/pkgconfig x11-apps/bdftopcf x11-apps/mkfontdir @@ -59,6 +58,7 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" src_prepare() { + epatch "${FILESDIR}"/${P}-notexi.patch sed -i \ -e "s:/usr/local/lib/VICE:${GAMES_DATADIR}/${PN}:" \ man/vice.1 \