Make filter-env building not use the python CFLAGS, deal with curses errors.

(Portage version: 2.1.2_pre1-r4)

3 files changed, 78 insertions, 0 deletions

diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.1.1-r1 b/sys-apps/pkgcore/files/digest-pkgcore-0.1.1-r1
new file mode 100644
index 000000000000..02818f034485
--- /dev/null
+++ b/sys-apps/pkgcore/files/digest-pkgcore-0.1.1-r1
@@ -0,0 +1,3 @@
+MD5 ef1a5fd527c62a36becbeb64209e8305 pkgcore-0.1.1.tar.bz2 388021
+RMD160 2f9e9dad56d7391789e3f74d26b6df241d62239d pkgcore-0.1.1.tar.bz2 388021
+SHA256 b7a3732a4bc72074e585b8e8da4c28b4af89b39bd0bc3111319f660446a1961e pkgcore-0.1.1.tar.bz2 388021
diff --git a/sys-apps/pkgcore/files/pkgcore-0.1.1-curses-errors.patch b/sys-apps/pkgcore/files/pkgcore-0.1.1-curses-errors.patch
new file mode 100644
index 000000000000..77606efccf60
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.1.1-curses-errors.patch
@@ -0,0 +1,32 @@
+# Bazaar revision bundle v0.8
+#
+# message:
+#   Deal with curses errors.
+# committer: Marien Zwart <marienz@gentoo.org>
+# date: Tue 2006-10-03 16:05:21.687999964 +0200
+
+=== modified file pkgcore/util/formatters.py
+--- pkgcore/util/formatters.py
++++ pkgcore/util/formatters.py
+@@ -339,5 +339,10 @@
+         # We do this instead of stream.isatty() because TerminfoFormatter
+         # needs an fd to pass to curses, not just a filelike talking to a tty.
+         if os.isatty(fd):
+-            return TerminfoFormatter(stream)
++            try:
++                return TerminfoFormatter(stream)
++            except curses.error:
++                # This happens if TERM is unset and possibly in more cases.
++                # Just fall back to the PlainTextFormatter.
++                pass
+     return PlainTextFormatter(stream)
+
+# revision id: marienz@gentoo.org-20061003140521-5ef755d3e51739cc
+# sha1: dc65ddb0fab2447a68349918e3f32e21caf4413e
+# inventory sha1: c2e8143bb9428dcd311d1e7e2faf2264955028d2
+# parent ids:
+#   ferringb@gentoo.org-20061003053615-60886f02617f4593
+# base id: ferringb@gentoo.org-20061003053615-60886f02617f4593
+# properties:
+#   branch-nick: trac
+
diff --git a/sys-apps/pkgcore/files/pkgcore-0.1.1-filter-env-cflags.patch b/sys-apps/pkgcore/files/pkgcore-0.1.1-filter-env-cflags.patch
new file mode 100644
index 000000000000..2bcce3451b47
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.1.1-filter-env-cflags.patch
@@ -0,0 +1,43 @@
+# Bazaar revision bundle v0.8
+#
+# message:
+#   round 3 of harring vs distutils; forego trying to use their options for setting compiler/flags, just force it directly from env access.
+#   
+# committer: Brian Harring <ferringb@gentoo.org>
+# date: Mon 2006-10-02 21:57:25.611000061 -0700
+
+=== modified file setup.py
+--- setup.py
++++ setup.py
+@@ -74,19 +74,8 @@
+     def run(self):
+         compiler = ccompiler.new_compiler(
+             compiler=self.compiler, dry_run=self.dry_run, force=self.force)
+-        sysconfig.customize_compiler(compiler)
+-        cc = ' '.join(compiler.compiler)
+-        
+-        for x in ("BASECFLAGS", "CCSHARED", "LDFLAGS"):
+-            f = sysconfig.get_config_var(x)
+-            if isinstance(f, basestring):
+-                cc = cc.replace(f, '')
+-            elif f is None:
+-                continue
+-            else:
+-                cc = cc.replace(" ".join(f), '')
+-
+-        compiler.set_executables(compiler=cc, compiler_so=cc)
++        cc = "%s %s" % (os.environ.get("CC", "cc"), os.environ.get("CFLAGS", ""))
++        compiler.set_executables(compiler=cc, compiler_so=cc, linker_exe=cc)
+         objects = compiler.compile(list(
+                 os.path.join('src', 'filter-env', name)
+                 for name in ('main.c', 'bmh_search.c')), debug=self.debug)
+
+# revision id: ferringb@gentoo.org-20061003045725-6fd8cb64a7e2d92d
+# sha1: ffca209917036154225320e5990ecc0f6f50b16d
+# inventory sha1: 80c748789eaf666c4b958c96100f3efd1004d4eb
+# parent ids:
+#   ferringb@gentoo.org-20061003002842-9919f5fcf9ae85f2
+# base id: ferringb@gentoo.org-20061003002842-9919f5fcf9ae85f2
+# properties:
+#   branch-nick: integration
+