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

Package-Manager: portage-2.1.2_pre1-r4

6 files changed, 186 insertions, 8 deletions

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index 1f5d32c25173..1083780d76dc 100644
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/pkgcore
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.4 2006/10/03 01:11:27 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.5 2006/10/03 14:28:52 marienz Exp $
+
+*pkgcore-0.1.1-r1 (03 Oct 2006)
+
+  03 Oct 2006; Marien Zwart <marienz@gentoo.org>
+  +files/pkgcore-0.1.1-curses-errors.patch,
+  +files/pkgcore-0.1.1-filter-env-cflags.patch, +pkgcore-0.1.1-r1.ebuild:
+  Make filter-env building not use the python CFLAGS, deal with curses errors.
 
 *pkgcore-0.1.1 (03 Oct 2006)
 
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 75181178585c..55320b4d1589 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -5,12 +5,24 @@ AUX pkgcore-0.1-sandbox-in-deleted-dir.patch 6747 RMD160 aab59bac96ff0a2e2e7c982
 MD5 503da3fe97ae47740175bc658c5d3a33 files/pkgcore-0.1-sandbox-in-deleted-dir.patch 6747
 RMD160 aab59bac96ff0a2e2e7c9826c171c8c6e9c54089 files/pkgcore-0.1-sandbox-in-deleted-dir.patch 6747
 SHA256 efc257eb43f4fa6b3a3c3b05ab13178c561d4566b84bd212cceb4d04247b2711 files/pkgcore-0.1-sandbox-in-deleted-dir.patch 6747
+AUX pkgcore-0.1.1-curses-errors.patch 1170 RMD160 d985c2ac5261faafeb9b2bf8bee670b91743e455 SHA1 294caa0fdc6b9c3e4e62e9dbb840546892901d48 SHA256 6a091bbf877128416210e05d49092cafdb30c81a4fd9a4f07e501e27d5bcc3af
+MD5 ceab699cb28ba1ee348713afccebade6 files/pkgcore-0.1.1-curses-errors.patch 1170
+RMD160 d985c2ac5261faafeb9b2bf8bee670b91743e455 files/pkgcore-0.1.1-curses-errors.patch 1170
+SHA256 6a091bbf877128416210e05d49092cafdb30c81a4fd9a4f07e501e27d5bcc3af files/pkgcore-0.1.1-curses-errors.patch 1170
+AUX pkgcore-0.1.1-filter-env-cflags.patch 1662 RMD160 91a273f4271f45a1ae7b6ce5387e261a5be8b1ef SHA1 af79babf8da81574bc833b5cd1726038d5181883 SHA256 4e2698695c0c7432a3c2bbabe746ab91c98c1705d20e6bf418b52bf800cdcadf
+MD5 f7e76584b05811612be4f7e7bab9f9b0 files/pkgcore-0.1.1-filter-env-cflags.patch 1662
+RMD160 91a273f4271f45a1ae7b6ce5387e261a5be8b1ef files/pkgcore-0.1.1-filter-env-cflags.patch 1662
+SHA256 4e2698695c0c7432a3c2bbabe746ab91c98c1705d20e6bf418b52bf800cdcadf files/pkgcore-0.1.1-filter-env-cflags.patch 1662
 DIST pkgcore-0.1.1.tar.bz2 388021 RMD160 2f9e9dad56d7391789e3f74d26b6df241d62239d SHA1 4e8b278613f0b587c0bf63fed6dc160dd9ec0aa4 SHA256 b7a3732a4bc72074e585b8e8da4c28b4af89b39bd0bc3111319f660446a1961e
 DIST pkgcore-0.1.tar.bz2 386019 RMD160 49907cac4b83a0d00afaf41773e457886c1e054f SHA1 7852e3d90c8b0eaa2a9f4f069cdcbd0d3b3022eb SHA256 66f88ae7d181d182a02f1a99db222bd82d583c2de06a9ad6d5e6bc4701a3ec30
 EBUILD pkgcore-0.1-r1.ebuild 1938 RMD160 2a7ae0cdc91dde7de5bbd6ad6eca1409ebbb147b SHA1 fa7c764a644ae9f717e897ccf60847226405d600 SHA256 07ab11018be8825a7aaa27ae13aa97dcf6f1ccbd1802eaa12a9592613a7f11e7
 MD5 e0b95525fb5c08b78c26a06fc236bd97 pkgcore-0.1-r1.ebuild 1938
 RMD160 2a7ae0cdc91dde7de5bbd6ad6eca1409ebbb147b pkgcore-0.1-r1.ebuild 1938
 SHA256 07ab11018be8825a7aaa27ae13aa97dcf6f1ccbd1802eaa12a9592613a7f11e7 pkgcore-0.1-r1.ebuild 1938
+EBUILD pkgcore-0.1.1-r1.ebuild 2194 RMD160 d1993379db0ba3065e12cbe05782095265883433 SHA1 98e18a1443ad03c75b2ca168da5e05781dcac1a6 SHA256 e83bd5d1e11e3f6e196c4eb62661f9db9fb0b7443ec039839d4e21023d35bab0
+MD5 0a1da77d71daa478797d5f234af249a1 pkgcore-0.1.1-r1.ebuild 2194
+RMD160 d1993379db0ba3065e12cbe05782095265883433 pkgcore-0.1.1-r1.ebuild 2194
+SHA256 e83bd5d1e11e3f6e196c4eb62661f9db9fb0b7443ec039839d4e21023d35bab0 pkgcore-0.1.1-r1.ebuild 2194
 EBUILD pkgcore-0.1.1.ebuild 1835 RMD160 d0537a4a9c6abdb3966899bd520d6988cea7c1fd SHA1 267167800725cc525897620d1d64526198cef38f SHA256 5d20ec6e91f220f4d264848b22872df2115d1e390bd95e41af21a9938a66cd0f
 MD5 0b976d9ebdb3d53024be3bd75866c683 pkgcore-0.1.1.ebuild 1835
 RMD160 d0537a4a9c6abdb3966899bd520d6988cea7c1fd pkgcore-0.1.1.ebuild 1835
@@ -19,10 +31,10 @@ EBUILD pkgcore-0.1.ebuild 1820 RMD160 9760f51d92326a43d6afca5b3873c0d5b48729c5 S
 MD5 dc461f052464daad2b7dc7bc141ef1f2 pkgcore-0.1.ebuild 1820
 RMD160 9760f51d92326a43d6afca5b3873c0d5b48729c5 pkgcore-0.1.ebuild 1820
 SHA256 7d1e10fc11e046d72ab6af935e18707c36f4e3b3d211004518e14a2eb86b272d pkgcore-0.1.ebuild 1820
-MISC ChangeLog 793 RMD160 cba366715d434e82fe822de0f6d9090d7acff393 SHA1 35c0f8dd217e2f584b6524dc931c7aadc2ab4bec SHA256 3dfab01eb1286c75665f125770da0586251caac242179e5caf7cd9ec15384421
-MD5 2aa213d52e1ed1caf8254e4697db2858 ChangeLog 793
-RMD160 cba366715d434e82fe822de0f6d9090d7acff393 ChangeLog 793
-SHA256 3dfab01eb1286c75665f125770da0586251caac242179e5caf7cd9ec15384421 ChangeLog 793
+MISC ChangeLog 1073 RMD160 d6cb50b659e84f59a2994b15e59e1bca70d645ab SHA1 4b4e0e0523b89b5f6476bed3f9aff3c68310cc70 SHA256 867367dce9c0fe6028abb90acb0cacd7323a7ed8601a502027a9addb6e43dc56
+MD5 4a62f1c50ddcef26475180a081ad1d20 ChangeLog 1073
+RMD160 d6cb50b659e84f59a2994b15e59e1bca70d645ab ChangeLog 1073
+SHA256 867367dce9c0fe6028abb90acb0cacd7323a7ed8601a502027a9addb6e43dc56 ChangeLog 1073
 MISC metadata.xml 222 RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 SHA1 95963907e0f22bc3795213303a68a2155b1ba78a SHA256 6e5dda05386711c829057f65bfd0e3ae693232628949c1612163ce9915963a63
 MD5 5dff6cc33967055cfde969cbcb7b6d5d metadata.xml 222
 RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 metadata.xml 222
@@ -36,10 +48,13 @@ SHA256 4c9dd628eebfbd9e0ae3da7f993ab3a8c52bcc6be8c060c66cb76287db20479c files/di
 MD5 2ee1a4fdd4a49a33860a6d047f379851 files/digest-pkgcore-0.1.1 244
 RMD160 2578a06dcd7672ea328e7e05191d31f35c0e1514 files/digest-pkgcore-0.1.1 244
 SHA256 cdcf430bbdf39b7fc51ea41eefe59fc518a59c6bd41d8f802799983cb4255180 files/digest-pkgcore-0.1.1 244
+MD5 2ee1a4fdd4a49a33860a6d047f379851 files/digest-pkgcore-0.1.1-r1 244
+RMD160 2578a06dcd7672ea328e7e05191d31f35c0e1514 files/digest-pkgcore-0.1.1-r1 244
+SHA256 cdcf430bbdf39b7fc51ea41eefe59fc518a59c6bd41d8f802799983cb4255180 files/digest-pkgcore-0.1.1-r1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFIbjFUElL7eJpfEQRAr8VAKCFG/7XZMp1wfE2j4Uyirb6FLSoGACfbP4X
-Ul5Q/NQY6AsMoPLVFyt56Zk=
-=Esz4
+iD8DBQFFInOrUElL7eJpfEQRAhVPAKC6GD9hJWnhLoHh7hEDhB2llJf+TgCgmJ26
+JM5AEz9A7tmEt+qB5fYktAE=
+=7IU1
 -----END PGP SIGNATURE-----
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
+
diff --git a/sys-apps/pkgcore/pkgcore-0.1.1-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..79917fa7042b
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.1.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.1.1-r1.ebuild,v 1.1 2006/10/03 14:28:52 marienz Exp $
+
+inherit distutils eutils toolchain-funcs
+
+DESCRIPTION="pkgcore package manager"
+HOMEPAGE="http://dev.gentooexperimental.org/pkgcore-trac/"
+SRC_URI="http://dev.gentooexperimental.org/~${PN}/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND=">=dev-lang/python-2.4"
+RDEPEND=">=dev-lang/python-2.4
+	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )
+	>=app-shells/bash-3.0
+	doc? ( >=dev-python/docutils-0.4 )"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# This is needed to make filter-env work on hppa (and possibly others).
+	epatch "${FILESDIR}/${P}-filter-env-cflags.patch"
+
+	# Make pkgcore (and its tests) work without TERM set.
+	epatch "${FILESDIR}/${P}-curses-errors.patch"
+}
+
+src_compile() {
+	# The CC export is used by the filter-env build
+	CC=$(tc-getCC) distutils_src_compile
+
+	if use doc; then
+		./build_docs.py || die "doc building failed"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	# This wrapper is not useful when called directly.
+	rm "${D}/usr/bin/pwrapper"
+
+	if use doc; then
+		dohtml -r doc dev-notes
+	fi
+
+	dodoc doc/*.rst
+	docinto dev-notes
+	dodoc dev-notes/*.rst
+}
+
+pkg_postinst() {
+	einfo "Registering plugins..."
+	register_plugin.py -s fs_ops copyfile 1 pkgcore.fs.ops.default_copyfile
+	register_plugin.py -s fs_ops ensure_perms 1 \
+		pkgcore.fs.ops.default_ensure_perms
+	register_plugin.py -s fs_ops mkdir 1 pkgcore.fs.ops.default_mkdir
+	register_plugin.py -s fs_ops merge_contents 1 \
+		pkgcore.fs.ops.merge_contents
+	register_plugin.py -s fs_ops unmerge_contents 1 \
+		pkgcore.fs.ops.unmerge_contents
+	register_plugin.py -s format ebuild_built 0.0 \
+		pkgcore.ebuild.ebuild_built.generate_new_factory
+	register_plugin.py -s format ebuild_src 0.0 \
+		pkgcore.ebuild.ebuild_src.generate_new_factory
+}
+
+src_test() {
+	"${python}" setup.py build_ext --force --inplace || \
+		die "failed building extensions in src dir for testing"
+	"${python}" ./sandbox/test.py || die "tested returned non zero"
+}