Disables setup-check.py; bug #68309.

4 files changed, 60 insertions, 5 deletions

diff --git a/app-office/pybliographer/ChangeLog b/app-office/pybliographer/ChangeLog
index 034c69d9003f..a545b2565f72 100644
--- a/app-office/pybliographer/ChangeLog
+++ b/app-office/pybliographer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/pybliographer
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/pybliographer/ChangeLog,v 1.2 2004/10/21 03:19:32 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/pybliographer/ChangeLog,v 1.3 2004/10/21 05:12:22 usata Exp $
+
+  21 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/pybliographer-1.2.4-gentoo.diff, pybliographer-1.2.4.ebuild:
+  Disables setup-check.py; bug #68309.
 
   21 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> pybliographer-1.2.4.ebuild:
   Uses gnome2.eclass.
diff --git a/app-office/pybliographer/Manifest b/app-office/pybliographer/Manifest
index ad623929e05e..71284db88fbd 100644
--- a/app-office/pybliographer/Manifest
+++ b/app-office/pybliographer/Manifest
@@ -1,4 +1,5 @@
-MD5 8f31e3c088dc206d8192013fcac57bf2 pybliographer-1.2.4.ebuild 696
+MD5 1ed42cab6909b181fa86a44db8f9321b pybliographer-1.2.4.ebuild 780
 MD5 684b7118ace06f88d4bdca2407ddc818 metadata.xml 184
-MD5 df61e29c91e34a052704055fcd4343c3 ChangeLog 623
+MD5 341dabe532d54ef0fac31e0223607e8a ChangeLog 782
 MD5 6dae340ffb9ad302fa14fc5098ca48d4 files/digest-pybliographer-1.2.4 71
+MD5 f7fc4731f103ab717d15a45fbddd01af files/pybliographer-1.2.4-gentoo.diff 1255
diff --git a/app-office/pybliographer/files/pybliographer-1.2.4-gentoo.diff b/app-office/pybliographer/files/pybliographer-1.2.4-gentoo.diff
new file mode 100644
index 000000000000..266e9d6e7e36
--- /dev/null
+++ b/app-office/pybliographer/files/pybliographer-1.2.4-gentoo.diff
@@ -0,0 +1,44 @@
+--- configure.orig	2004-07-08 05:11:54.000000000 +0900
++++ configure	2004-10-21 14:02:52.000000000 +0900
+@@ -1697,23 +1697,24 @@
+ 
+ MINIMUM_VERSION="2.2"
+ 
+-echo "$as_me:$LINENO: checking python requirements" >&5
+-echo $ECHO_N "checking python requirements... $ECHO_C" >&6
+-
+-${Python} ${srcdir}/setup-check.py ${MINIMUM_VERSION} 2>&5 1>&2
+-
+-result=$?
+-
+-if test -f conftest.out ; then
+-	. ./conftest.out
+-	rm -f conftest.out
+-else
+-	echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-	{ { echo "$as_me:$LINENO: error: unable to run the test program" >&5
+-echo "$as_me: error: unable to run the test program" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
++#echo "$as_me:$LINENO: checking python requirements" >&5
++#echo $ECHO_N "checking python requirements... $ECHO_C" >&6
++#
++#${Python} ${srcdir}/setup-check.py ${MINIMUM_VERSION} 2>&5 1>&2
++#
++#result=$?
++#
++#if test -f conftest.out ; then
++#	. ./conftest.out
++#	rm -f conftest.out
++#else
++#	echo "$as_me:$LINENO: result: no" >&5
++#echo "${ECHO_T}no" >&6
++#	{ { echo "$as_me:$LINENO: error: unable to run the test program" >&5
++#echo "$as_me: error: unable to run the test program" >&2;}
++#   { (exit 1); exit 1; }; }
++#fi
++result=0
+ 
+ if test $result = 0 ; then
+ 	if test -z "${Status}" ; then
diff --git a/app-office/pybliographer/pybliographer-1.2.4.ebuild b/app-office/pybliographer/pybliographer-1.2.4.ebuild
index d58942c50f79..14788cd15b4d 100644
--- a/app-office/pybliographer/pybliographer-1.2.4.ebuild
+++ b/app-office/pybliographer/pybliographer-1.2.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/pybliographer/pybliographer-1.2.4.ebuild,v 1.2 2004/10/21 03:19:32 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/pybliographer/pybliographer-1.2.4.ebuild,v 1.3 2004/10/21 05:12:22 usata Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Pybliographer is a tool for working with bibliographic databases"
 HOMEPAGE="http://pybliographer.org/"
@@ -23,3 +23,9 @@ DEPEND="virtual/python
 	>=app-text/recode-3.6-r1
 	>=dev-python/gnome-python-2
 	>=dev-python/python-bibtex-1.2.1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}