From: Markus Ullmann Date: Mon, 22 Jan 2007 10:26:50 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cd9213bf9469a3acbb3f456d91f3ba7431a30fcc;p=gentoo.git Version bump Package-Manager: portage-2.1.2-r1 --- diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog index 6a938ca59402..786e0cfc76f1 100644 --- a/sys-apps/pkgcore/ChangeLog +++ b/sys-apps/pkgcore/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/pkgcore # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.11 2007/01/20 12:03:01 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.12 2007/01/22 10:26:50 jokey Exp $ + + 22 Jan 2007; Markus Ullmann ChangeLog: + Version bump 20 Jan 2007; Markus Rothe pkgcore-0.1.4.ebuild: Added ~ppc64 diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.1.1-r1 b/sys-apps/pkgcore/files/digest-pkgcore-0.1.1-r1 deleted file mode 100644 index 02818f034485..000000000000 --- a/sys-apps/pkgcore/files/digest-pkgcore-0.1.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -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/digest-pkgcore-0.1.2 b/sys-apps/pkgcore/files/digest-pkgcore-0.1.2 deleted file mode 100644 index 86b00ca8648f..000000000000 --- a/sys-apps/pkgcore/files/digest-pkgcore-0.1.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 567273cd859622e1b0e71069dcca49a9 pkgcore-0.1.2.tar.bz2 389039 -RMD160 fb3ca047e704187c7ac56215422bdd2400e6b8a5 pkgcore-0.1.2.tar.bz2 389039 -SHA256 7b189ccac4eb7417d36b84b10ab25f2c4865ae629ef773498bd6b18194c38293 pkgcore-0.1.2.tar.bz2 389039 diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.1.2-r1 b/sys-apps/pkgcore/files/digest-pkgcore-0.1.2-r1 deleted file mode 100644 index 86b00ca8648f..000000000000 --- a/sys-apps/pkgcore/files/digest-pkgcore-0.1.2-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 567273cd859622e1b0e71069dcca49a9 pkgcore-0.1.2.tar.bz2 389039 -RMD160 fb3ca047e704187c7ac56215422bdd2400e6b8a5 pkgcore-0.1.2.tar.bz2 389039 -SHA256 7b189ccac4eb7417d36b84b10ab25f2c4865ae629ef773498bd6b18194c38293 pkgcore-0.1.2.tar.bz2 389039 diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.1.3 b/sys-apps/pkgcore/files/digest-pkgcore-0.1.3 deleted file mode 100644 index 57fab38f4977..000000000000 --- a/sys-apps/pkgcore/files/digest-pkgcore-0.1.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d93342a3d30ed9fe35cba7118672d32c pkgcore-0.1.3.tar.bz2 389178 -RMD160 8cee0f24f20c9801f627d80634e2c8e96b800789 pkgcore-0.1.3.tar.bz2 389178 -SHA256 14633130ee0f76471342dda95308096d84bc64b8d68efa4688cb6671581f2d06 pkgcore-0.1.3.tar.bz2 389178 diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.2 b/sys-apps/pkgcore/files/digest-pkgcore-0.2 new file mode 100644 index 000000000000..fac2f24ba862 --- /dev/null +++ b/sys-apps/pkgcore/files/digest-pkgcore-0.2 @@ -0,0 +1,3 @@ +MD5 45d54c09923a39e19282269d19f0c6f1 pkgcore-0.2.tar.bz2 495978 +RMD160 92fba2f5479459a85db72c05eac5e1398a81887c pkgcore-0.2.tar.bz2 495978 +SHA256 f960a166ad19a5f39711780aa1ac2813cdf4c4a7768c662154625dd349eb77b2 pkgcore-0.2.tar.bz2 495978 diff --git a/sys-apps/pkgcore/files/pkgcore-0.1-sandbox-in-deleted-dir.patch b/sys-apps/pkgcore/files/pkgcore-0.1-sandbox-in-deleted-dir.patch deleted file mode 100644 index e9a3600ec6f6..000000000000 --- a/sys-apps/pkgcore/files/pkgcore-0.1-sandbox-in-deleted-dir.patch +++ /dev/null @@ -1,163 +0,0 @@ -# Bazaar revision bundle v0.8 -# -# message: -# test for sandbox + nonexistant cwd. -# -# committer: Brian Harring -# date: Sat 2006-09-30 17:38:28.315999985 -0700 - -=== modified file pkgcore/ebuild/processor.py // last-changed:ferringb@gentoo.o -... rg-20061001002928-e3ad5eb445bb7f3a ---- pkgcore/ebuild/processor.py -+++ pkgcore/ebuild/processor.py -@@ -206,6 +206,9 @@ - else: - spawn_func = pkgcore.spawn.spawn - -+ # force to a neutral dir so that sandbox/fakeroot won't explode if -+ # ran from a nonexistant dir -+ spawn_opts["chdir"] = "/tmp" - # little trick. we force the pipes to be high up fd wise so - # nobody stupidly hits 'em. - max_fd = min(pkgcore.spawn.max_fd_limit, 1024) - -=== modified file pkgcore/spawn.py // last-changed:ferringb@gentoo.org-20061001 -... 002928-e3ad5eb445bb7f3a ---- pkgcore/spawn.py -+++ pkgcore/spawn.py -@@ -130,7 +130,7 @@ - - def spawn(mycommand, env=None, opt_name=None, fd_pipes=None, returnpid=False, - uid=None, gid=None, groups=None, umask=None, logfile=None, -- path_lookup=True): -+ chdir=None, path_lookup=True): - - """wrapper around execve - -@@ -195,7 +195,7 @@ - # pylint: disable-msg=W0703 - try: - _exec(binary, mycommand, opt_name, fd_pipes, env, gid, groups, -- uid, umask) -+ uid, umask, chdir) - except Exception, e: - # We need to catch _any_ exception so that it doesn't - # propogate out of this function and cause exiting -@@ -249,7 +249,8 @@ - # Everything succeeded - return 0 - --def _exec(binary, mycommand, opt_name, fd_pipes, env, gid, groups, uid, umask): -+def _exec(binary, mycommand, opt_name, fd_pipes, env, gid, groups, uid, umask, -+ chdir): - """internal function to handle exec'ing the child process. - - If it succeeds this function does not return. It might raise an -@@ -286,6 +287,9 @@ - except OSError: - pass - -+ if chdir is not None: -+ os.chdir(chdir) -+ - # Set requested process permissions. - if gid: - os.setgid(gid) - -=== modified file pkgcore/test/test_spawn.py ---- pkgcore/test/test_spawn.py -+++ pkgcore/test/test_spawn.py -@@ -76,6 +76,33 @@ - fp, spawn_type=spawn.spawn_sandbox)[1][0].split(":")]) - os.unlink(fp) - -+ -+ @capability_based(spawn.sandbox_capable, "sandbox binary wasn't found") -+ def test_sandbox_empty_dir(self): -+ """ -+ sandbox gets pissy if it's ran from a nonexistant dir -+ -+ this verifies our fix works. -+ """ -+ fp = self.generate_script( -+ "pkgcore-spawn-sandbox.sh", "echo $LD_PRELOAD") -+ dpath = os.path.join(self.dir, "dar") -+ os.mkdir(dpath) -+ try: -+ cwd = os.getcwd() -+ except OSError: -+ cwd = None -+ try: -+ os.chdir(dpath) -+ os.rmdir(dpath) -+ self.assertIn("libsandbox.so", [os.path.basename(x.strip()) for x in -+ spawn.spawn_get_output( -+ fp, spawn_type=spawn.spawn_sandbox, chdir='/')[1][0].split(":")]) -+ os.unlink(fp) -+ finally: -+ if cwd is not None: -+ os.chdir(cwd) -+ - @capability_based(spawn.fakeroot_capable, "fakeroot binary wasn't found") - def test_fakeroot(self): - try: - -# revision id: ferringb@gentoo.org-20061001003828-74aa66b080d128bf -# sha1: 79dcf8b726e7596560bb1f1d1dd5b5489baacb65 -# inventory sha1: 2035b787956ee5082dd5ed878ec7db4f490b7278 -# parent ids: -# ferringb@gentoo.org-20061001002928-e3ad5eb445bb7f3a -# base id: ferringb@gentoo.org-20060930215710-1f00848a64fa7930 -# properties: -# branch-nick: integration - -# message: -# add chdir resetting option for spawn, use it for sandbox (sandbox sucks) when ran from a non existant dir -# -# committer: Brian Harring -# date: Sat 2006-09-30 17:29:28.269999981 -0700 - -=== modified file pkgcore/ebuild/processor.py // encoding:base64 -LS0tIHBrZ2NvcmUvZWJ1aWxkL3Byb2Nlc3Nvci5weQorKysgcGtnY29yZS9lYnVpbGQvcHJvY2Vz -c29yLnB5CkBAIC0yMDYsNiArMjA2LDkgQEAKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHNw -YXduX2Z1bmMgPSBwa2djb3JlLnNwYXduLnNwYXduCiAKKyAgICAgICAgIyBmb3JjZSB0byBhIG5l -dXRyYWwgZGlyIHNvIHRoYXQgc2FuZGJveC9mYWtlcm9vdCB3b24ndCBleHBsb2RlIGlmCisgICAg -ICAgICMgcmFuIGZyb20gYSBub25leGlzdGFudCBkaXIKKyAgICAgICAgc3Bhd25fb3B0c1siY2hk -aXIiXSA9ICIvdG1wIgogICAgICAgICAjIGxpdHRsZSB0cmljay4gd2UgZm9yY2UgdGhlIHBpcGVz -IHRvIGJlIGhpZ2ggdXAgZmQgd2lzZSBzbwogICAgICAgICAjIG5vYm9keSBzdHVwaWRseSBoaXRz -ICdlbS4KICAgICAgICAgbWF4X2ZkID0gbWluKHBrZ2NvcmUuc3Bhd24ubWF4X2ZkX2xpbWl0LCAx -MDI0KQoK - -=== modified file pkgcore/spawn.py // encoding:base64 -LS0tIHBrZ2NvcmUvc3Bhd24ucHkKKysrIHBrZ2NvcmUvc3Bhd24ucHkKQEAgLTEzMCw3ICsxMzAs -NyBAQAogCiBkZWYgc3Bhd24obXljb21tYW5kLCBlbnY9Tm9uZSwgb3B0X25hbWU9Tm9uZSwgZmRf -cGlwZXM9Tm9uZSwgcmV0dXJucGlkPUZhbHNlLAogICAgICAgICAgIHVpZD1Ob25lLCBnaWQ9Tm9u -ZSwgZ3JvdXBzPU5vbmUsIHVtYXNrPU5vbmUsIGxvZ2ZpbGU9Tm9uZSwKLSAgICAgICAgICBwYXRo -X2xvb2t1cD1UcnVlKToKKyAgICAgICAgICBjaGRpcj1Ob25lLCBwYXRoX2xvb2t1cD1UcnVlKToK -IAogICAgICIiIndyYXBwZXIgYXJvdW5kIGV4ZWN2ZQogCkBAIC0xOTUsNyArMTk1LDcgQEAKICAg -ICAgICAgIyBweWxpbnQ6IGRpc2FibGUtbXNnPVcwNzAzCiAgICAgICAgIHRyeToKICAgICAgICAg -ICAgIF9leGVjKGJpbmFyeSwgbXljb21tYW5kLCBvcHRfbmFtZSwgZmRfcGlwZXMsIGVudiwgZ2lk -LCBncm91cHMsCi0gICAgICAgICAgICAgICAgICB1aWQsIHVtYXNrKQorICAgICAgICAgICAgICAg -ICAgdWlkLCB1bWFzaywgY2hkaXIpCiAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24sIGU6CiAgICAg -ICAgICAgICAjIFdlIG5lZWQgdG8gY2F0Y2ggX2FueV8gZXhjZXB0aW9uIHNvIHRoYXQgaXQgZG9l -c24ndAogICAgICAgICAgICAgIyBwcm9wb2dhdGUgb3V0IG9mIHRoaXMgZnVuY3Rpb24gYW5kIGNh -dXNlIGV4aXRpbmcKQEAgLTI0OSw3ICsyNDksOCBAQAogICAgICMgRXZlcnl0aGluZyBzdWNjZWVk -ZWQKICAgICByZXR1cm4gMAogCi1kZWYgX2V4ZWMoYmluYXJ5LCBteWNvbW1hbmQsIG9wdF9uYW1l -LCBmZF9waXBlcywgZW52LCBnaWQsIGdyb3VwcywgdWlkLCB1bWFzayk6CitkZWYgX2V4ZWMoYmlu -YXJ5LCBteWNvbW1hbmQsIG9wdF9uYW1lLCBmZF9waXBlcywgZW52LCBnaWQsIGdyb3VwcywgdWlk -LCB1bWFzaywKKyAgICBjaGRpcik6CiAgICAgIiIiaW50ZXJuYWwgZnVuY3Rpb24gdG8gaGFuZGxl -IGV4ZWMnaW5nIHRoZSBjaGlsZCBwcm9jZXNzLgogCiAgICAgSWYgaXQgc3VjY2VlZHMgdGhpcyBm -dW5jdGlvbiBkb2VzIG5vdCByZXR1cm4uIEl0IG1pZ2h0IHJhaXNlIGFuCkBAIC0yODYsNiArMjg3 -LDkgQEAKICAgICAgICAgICAgIGV4Y2VwdCBPU0Vycm9yOgogICAgICAgICAgICAgICAgIHBhc3MK -IAorICAgIGlmIGNoZGlyIGlzIG5vdCBOb25lOgorICAgICAgICBvcy5jaGRpcihjaGRpcikKKwog -ICAgICMgU2V0IHJlcXVlc3RlZCBwcm9jZXNzIHBlcm1pc3Npb25zLgogICAgIGlmIGdpZDoKICAg -ICAgICAgb3Muc2V0Z2lkKGdpZCkKCg== - -# revision id: ferringb@gentoo.org-20061001002928-e3ad5eb445bb7f3a -# sha1: b4ccfdb63ee142de540dd13229b45f005e66fe1a -# inventory sha1: 75babaf4b20292a23aed08646032d6d20e8d5e8b -# parent ids: -# ferringb@gentoo.org-20060930215710-1f00848a64fa7930 -# properties: -# branch-nick: integration - 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 deleted file mode 100644 index 77606efccf60..000000000000 --- a/sys-apps/pkgcore/files/pkgcore-0.1.1-curses-errors.patch +++ /dev/null @@ -1,32 +0,0 @@ -# Bazaar revision bundle v0.8 -# -# message: -# Deal with curses errors. -# committer: Marien Zwart -# 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 deleted file mode 100644 index 2bcce3451b47..000000000000 --- a/sys-apps/pkgcore/files/pkgcore-0.1.1-filter-env-cflags.patch +++ /dev/null @@ -1,43 +0,0 @@ -# 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 -# 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 deleted file mode 100644 index dd8b3da8d970..000000000000 --- a/sys-apps/pkgcore/pkgcore-0.1.1-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# 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.2 2006/10/07 01:28:33 jer 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 ~hppa ~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" -} diff --git a/sys-apps/pkgcore/pkgcore-0.1.2-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.1.2-r1.ebuild deleted file mode 100644 index 07f5ac0beb84..000000000000 --- a/sys-apps/pkgcore/pkgcore-0.1.2-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# 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.2-r1.ebuild,v 1.1 2006/10/12 13:19:54 marienz Exp $ - -inherit distutils 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 ~hppa ~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_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() { - distutils_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" -} diff --git a/sys-apps/pkgcore/pkgcore-0.1.2.ebuild b/sys-apps/pkgcore/pkgcore-0.1.2.ebuild deleted file mode 100644 index f6c4abce341b..000000000000 --- a/sys-apps/pkgcore/pkgcore-0.1.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# 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.2.ebuild,v 1.1 2006/10/10 03:14:06 marienz Exp $ - -inherit distutils 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 ~hppa ~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_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" -} diff --git a/sys-apps/pkgcore/pkgcore-0.1.3.ebuild b/sys-apps/pkgcore/pkgcore-0.1.3.ebuild deleted file mode 100644 index 0a180797f2b5..000000000000 --- a/sys-apps/pkgcore/pkgcore-0.1.3.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# 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.3.ebuild,v 1.1 2006/10/23 23:17:00 marienz Exp $ - -inherit distutils 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 ~hppa ~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_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() { - distutils_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" -} diff --git a/sys-apps/pkgcore/pkgcore-0.2.ebuild b/sys-apps/pkgcore/pkgcore-0.2.ebuild new file mode 100644 index 000000000000..c119f8cc2816 --- /dev/null +++ b/sys-apps/pkgcore/pkgcore-0.2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.2.ebuild,v 1.1 2007/01/22 10:24:57 jokey Exp $ + +inherit distutils toolchain-funcs + +DESCRIPTION="pkgcore package manager" +HOMEPAGE="http://pkgcore.org" +SRC_URI="http://pkgcore.org/releases/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc64 ~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_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() { + distutils_pkg_postinst + echo "updating pkgcore plugin cache" + pplugincache +} + +src_test() { + "${python}" setup.py build_ext --inplace || \ + die "failed building extensions in src dir for testing" + "${python}" setup.py test || die "tested returned non zero" +}