summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2011-10-24 04:12:24 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2011-10-24 04:12:24 +0000
commitd0e6a2b8285015edbc07fa1a4d38f8cca83b5723 (patch)
treefc32710d374a16515ecfc37fd8d7d37f8075022b /app-emulation
parentVersion bump to new dev release. (diff)
downloadgentoo-2-d0e6a2b8285015edbc07fa1a4d38f8cca83b5723.tar.gz
gentoo-2-d0e6a2b8285015edbc07fa1a4d38f8cca83b5723.tar.bz2
gentoo-2-d0e6a2b8285015edbc07fa1a4d38f8cca83b5723.zip
Avoid building pre-built docs (bug #379633) with patch from Jared B.
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/vice/ChangeLog6
-rw-r--r--app-emulation/vice/files/vice-2.3-notexi.patch17
-rw-r--r--app-emulation/vice/vice-2.3.ebuild4
3 files changed, 24 insertions, 3 deletions
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 <mr_bones_@gentoo.org> 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 <phajdan.jr@gentoo.org> vice-2.3.ebuild:
x86 stable wrt bug #385895
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 \