Fix from upstream for test failure when tex isnt installed #195313 by Ryan Hill.

Package-Manager: portage-2.2_pre5

4 files changed, 47 insertions, 6 deletions

diff --git a/sys-apps/texinfo/ChangeLog b/sys-apps/texinfo/ChangeLog
index 5b839207e30b..ed5c1951855c 100644
--- a/sys-apps/texinfo/ChangeLog
+++ b/sys-apps/texinfo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/texinfo
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.88 2007/11/12 07:25:39 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.89 2008/03/23 18:37:52 vapier Exp $
+
+  23 Mar 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/texinfo-4.11-test-tex.patch, texinfo-4.11-r1.ebuild:
+  Fix from upstream for test failure when tex isnt installed #195313 by Ryan
+  Hill.
 
 *texinfo-4.11-r1 (12 Nov 2007)
 
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index e4fd474c6819..5cf8180eedf1 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX makeinfo.patch 790 RMD160 7e55e2d176ce5b39a949df4927eb16208e3d6240 SHA1 2098b57f37d3277b3ee1abfdf95a3f400479d28f SHA256 638d84a5fe68c98801e2be0b70dd1b71241399da87139bc5826ead6c431f7ce2
 AUX mkinfodir 7318 RMD160 57fb7f4524acf84be5e805b9df6f4c435aa2e5b9 SHA1 31b41b7935f8c813536abb6e90b04e97ca10583e SHA256 2361ed35848aba949fa9af03e16f2c83ab28f1ae11d1dd97f2c58fe619406e69
 AUX texinfo-4.11-dir-entry.patch 757 RMD160 50ba502f701c7e96ed91883e925e0e45e82ebec4 SHA1 6473b3ba35d6ca642899758183a87b6866c056ce SHA256 6a71f2938779d0f1c0531a49d7b97cde814b8352c29ae94dbfcb809da531ef3d
+AUX texinfo-4.11-test-tex.patch 591 RMD160 28e2f2e8ed876b46adde21f2bc3d83c982d7062c SHA1 ad69eac850571b4a81729d05c79d11843070aadd SHA256 42d66fee204ece5fe18aa01d030a9798fe60e7578e59ff58fc8019e4817d7ce8
 AUX texinfo-4.8-bounds-check.patch 1163 RMD160 329f5f612248550ec1e3c6cc9400df2b9180ded4 SHA1 52dff66b2779b0a673fe8c4d7a15d058e7fbba06 SHA256 774e785f01b0a2976b9c050b9d55abbc9c002e2784ab42dd1061cfea13b33289
 AUX texinfo-4.8-buf-overflow-CVE-2006-4810.patch 430 RMD160 cf71be1a567927db11274bfdc0da1b80f4148752 SHA1 e49c836d9b2dfcb80cc56efd924a407b0ab82d1d SHA256 54a18d053467fdaed8d1a75cffead74817a87a73a3100ed9d219a7bd1a6150bb
 AUX texinfo-4.8-freebsd.patch 3787 RMD160 94c14ad8d022d7feb5f635d1d5d42ac2571a3549 SHA1 40a772d2bd1a7f2d280d5744dffbc0b942c8ba1a SHA256 844c228352c1d05cfdba381569bbc06bc494b5c22d391730b2da2fd2e4f47661
@@ -8,8 +12,15 @@ AUX texinfo-4.8-tempfile-owl.patch 2565 RMD160 8b54cc3942b09c8fe0eb82523be57002b
 AUX texinfo-4.8-tempfile.patch 708 RMD160 5214ae3b96e2714bba8e61c141dd32b6c0c31b66 SHA1 f0d5135123b09973fe1af8d645924bd8c5fa3efa SHA256 356935c23212eec139885d0217568c35e834a1abdd3b7fe062af0bb2da9fcd01
 DIST texinfo-4.11.tar.bz2 1659601 RMD160 d07dbc50f98dd8f9f4088b58781abdebfb7f5781 SHA1 915a42e1278860b0fa64e4ef9d5ad4488d3b23a0 SHA256 61033d48778ac7a6c80ac7cee66ca962fc4a1565fad13759618916f7f292f5f7
 DIST texinfo-4.8.tar.bz2 1521822 RMD160 5cb82cd240d1f22da813c7142df8828b4f6f1ea4 SHA1 b19e906f7220294c1e8b087d583c50f5c4d7c420 SHA256 f6bb61fb9c1d6a65523c786a4a74ab61e455420469e09a86929f2d403d9a21bb
-EBUILD texinfo-4.11-r1.ebuild 1307 RMD160 c925080bf07b90ac06ea8ec5811887b423a6922e SHA1 9adb7a491df21929dcf2bd0fac2d5d4a4a2dc27f SHA256 95c45a34dda9728f2f1d9133626609ce35aede1c5699b2e0d3d54cde5d526c27
+EBUILD texinfo-4.11-r1.ebuild 1357 RMD160 7980527bdb1a05bfae44a929af8319d4b1a6bf43 SHA1 45dc8ed7c1088bf5e9201506d46e3ec224ac2be0 SHA256 5fe5dc7cd01639a0181d8dbc7358a58dd010d451f406f8f74c80dc04accdbb6f
 EBUILD texinfo-4.11.ebuild 1200 RMD160 515e8404e36883893f8d4db97b94208536eaf50e SHA1 50b1baab491b8c6ea2d64bcd2ec312dbb7e97f6e SHA256 283352115635d60248b684e94ed9ae96928325201a69bea0ce80abbeb2e7c83a
 EBUILD texinfo-4.8-r5.ebuild 2264 RMD160 a7f72c42a76925628c82da89e8a73e9934f5b47d SHA1 fd9ec02bc532789fa033875af4ee178f439add15 SHA256 6b5a9d6e35d07466094eda9fa273ad8695a49bba0d9b242ef5300823d14437ce
-MISC ChangeLog 10222 RMD160 0f58243ff7d90066b51164c34e2d803851af6bcc SHA1 652386e7f9ae3f3e3df72b480d721d23f903d46c SHA256 de1a385567d50cffea51f7cbab448ac553485fb85eb2e2aa7579cbb66a523456
+MISC ChangeLog 10420 RMD160 0126f004e4ea594f3af0f54962c74e3def917ea5 SHA1 d9fd866f8809488fa554953cb290af2a5ec010a3 SHA256 ca86865c012cb68620c91022ec7c4f58aa457d144e4e99472352ec562c0b1822
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH5qQXj9hvisErhMIRAn8WAJ94J5+7x6K0VhP6pLZ5siGulG57jQCeLQbb
+YDrrtnoPg0mOgIBWnFeNVjk=
+=1rhH
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/texinfo/files/texinfo-4.11-test-tex.patch b/sys-apps/texinfo/files/texinfo-4.11-test-tex.patch
new file mode 100644
index 000000000000..735797120281
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-4.11-test-tex.patch
@@ -0,0 +1,24 @@
+http://bugs.gentoo.org/195313
+
+--- texinfo-4.11/util/dvipdf.test
++++ texinfo-4.11/util/dvipdf.test
+@@ -16,6 +16,8 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
++required='tex'
++
+ . ./defs || exit 1
+ 
+ set -e
+--- texinfo-4.11/util/texi2dvi.test
++++ texinfo-4.11/util/texi2dvi.test
+@@ -16,6 +16,8 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
++required='tex'
++
+ . ./defs || exit 1
+ 
+ set -e
diff --git a/sys-apps/texinfo/texinfo-4.11-r1.ebuild b/sys-apps/texinfo/texinfo-4.11-r1.ebuild
index ac23106d7f4b..33b846ed44fb 100644
--- a/sys-apps/texinfo/texinfo-4.11-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-4.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.11-r1.ebuild,v 1.1 2007/11/12 07:25:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.11-r1.ebuild,v 1.2 2008/03/23 18:37:52 vapier Exp $
 
 inherit flag-o-matic
 
@@ -25,6 +25,7 @@ src_unpack() {
 	# pull in ctype.h for misc string function prototypes
 	sed -i '1i#include <ctype.h>' system.h
 	epatch "${FILESDIR}"/${P}-dir-entry.patch #198545
+	epatch "${FILESDIR}"/${P}-test-tex.patch #195313
 
 	# FreeBSD requires install-sh, but usptream don't have it marked
 	# exec, #195076