From 337311846e2b671f8d11138d294c4cabdbcfcb25 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tiziano=20M=C3=BCller?= Date: Tue, 8 Jun 2010 08:15:04 +0000 Subject: [PATCH] Moved from dev-util. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-vcs/cola/ChangeLog | 43 ++++++++++ dev-vcs/cola/Manifest | 8 ++ dev-vcs/cola/cola-1.3.9.14.ebuild | 73 +++++++++++++++++ dev-vcs/cola/cola-1.4.1.2.ebuild | 83 ++++++++++++++++++++ dev-vcs/cola/files/1.3.8-disable-tests.patch | 21 +++++ dev-vcs/cola/files/index.html | 15 ++++ dev-vcs/cola/metadata.xml | 9 +++ 7 files changed, 252 insertions(+) create mode 100644 dev-vcs/cola/ChangeLog create mode 100644 dev-vcs/cola/Manifest create mode 100644 dev-vcs/cola/cola-1.3.9.14.ebuild create mode 100644 dev-vcs/cola/cola-1.4.1.2.ebuild create mode 100644 dev-vcs/cola/files/1.3.8-disable-tests.patch create mode 100644 dev-vcs/cola/files/index.html create mode 100644 dev-vcs/cola/metadata.xml diff --git a/dev-vcs/cola/ChangeLog b/dev-vcs/cola/ChangeLog new file mode 100644 index 000000000000..05c2b2408a44 --- /dev/null +++ b/dev-vcs/cola/ChangeLog @@ -0,0 +1,43 @@ +# ChangeLog for dev-util/cola +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.1 2010/06/08 08:15:04 dev-zero Exp $ + + 17 Mar 2010; Sebastian Pipping cola-1.3.9.14.ebuild, + cola-1.4.1.2.ebuild: + Propagate move of dev-util/git to dev-vcs/git + +*cola-1.4.1.2 (18 Jan 2010) + + 18 Jan 2010; Tiziano Müller -cola-1.3.8.ebuild, + -cola-1.4.0.1.ebuild, -cola-1.4.1.1.ebuild, +cola-1.4.1.2.ebuild: + Version bump. Removed old. + +*cola-1.4.1.1 (16 Dec 2009) + + 16 Dec 2009; Tiziano Müller +cola-1.4.1.1.ebuild: + Version bump. + +*cola-1.4.0.1 (03 Nov 2009) + + 03 Nov 2009; Tiziano Müller +cola-1.4.0.1.ebuild, + +files/index.html: + Version bump, fixed doc deps and doc installation ^Cug #291439, thanks to + Man Shankar). + +*cola-1.3.9.14 (26 Aug 2009) + + 26 Aug 2009; Tiziano Müller +cola-1.3.9.14.ebuild: + Version bump. + + 30 Jun 2009; Christian Faulhammer cola-1.3.8.ebuild: + keyworded ~arch for x86, bug 275353 + + 19 Jun 2009; Tiziano Müller cola-1.3.8.ebuild: + Require pyinotify >=0.7.1 (thanks to a.peyser). + +*cola-1.3.8 (19 Jun 2009) + + 19 Jun 2009; Tiziano Müller + +files/1.3.8-disable-tests.patch, +cola-1.3.8.ebuild, +metadata.xml: + Initial commit, moved over from my overlay (as requested in bug #274621). + diff --git a/dev-vcs/cola/Manifest b/dev-vcs/cola/Manifest new file mode 100644 index 000000000000..4a53bea75d1a --- /dev/null +++ b/dev-vcs/cola/Manifest @@ -0,0 +1,8 @@ +AUX 1.3.8-disable-tests.patch 855 RMD160 0c356e7f28ad1436a1d7d58af1de6b0071e3636d SHA1 49daeb7442f7a859d9c37b58e525d6c3498760f4 SHA256 cb0d81baa5385d1f394b756b9bf21a2ee9b35bb3765ae5a47216519a1e1b6465 +AUX index.html 355 RMD160 f01c51559321acd610cfa38e6ebdaa80a96be8fa SHA1 f08daa85670af655ad92e41026008cb2c1f2d0ef SHA256 9b092445f2da302365c22fae670ad75f8d0a57ca64b4c99bf5662b9999869a60 +DIST cola-1.3.9.14-src.tar.gz 467951 RMD160 181d06f079628ab18eca31ec21dbcfd1c7fb649d SHA1 384de8f995e81a128da0939659ae5350fb0a345f SHA256 720031f63a14dc894fb89bcb776d7efc5c9251afe6bf5e324a0709554f7ee633 +DIST cola-1.4.1.2.tar.gz 495321 RMD160 fdc2cd25e99037b4932993ac3d326800ee0e00d1 SHA1 04fef64fc3ade812279dc36259917c251d63faec SHA256 643dc847b8b6df051e82243d9eb3ad6f88be21ff50c55468f39224dc1a5e66fc +EBUILD cola-1.3.9.14.ebuild 1656 RMD160 bff3dd2ca415a0e89eda1ddda01f5ad8ccdd3b2e SHA1 189e9c4b42f40844a9cad397968316bc704940f1 SHA256 7ac0048d3e3322a19c2b1c6b6ff335ed128d60c79370ff3d7ad333fa2f993072 +EBUILD cola-1.4.1.2.ebuild 1881 RMD160 4275af108a10d3c03f1f3bb186a20cb84b24ff60 SHA1 2119c149a087b0e2554e4336cff49d876fff4eda SHA256 7dc33fcdf551ea3bd53be9ae38a1db95bff531793dedfc3dcc65bd321c8af954 +MISC ChangeLog 1472 RMD160 c5dcca1febff839d35db531e565de4a6a1a995e1 SHA1 a508705ade398eafc7d7b4c62eff9fd1c8dbaef0 SHA256 f36663653ae2b4185a96e4ed062fcc832e980122d9d47d0c57288d8bc4084841 +MISC metadata.xml 258 RMD160 f41059a7f29a2b5493ad80203a94a9a519bc5dcf SHA1 ebaf62e3133e26efd7eaac694e53d0398c2bc0de SHA256 79e17085ca01237995cedc73430ae1c4bbd3092968cffe18ea41237f7a2c1939 diff --git a/dev-vcs/cola/cola-1.3.9.14.ebuild b/dev-vcs/cola/cola-1.3.9.14.ebuild new file mode 100644 index 000000000000..55a1873cb23a --- /dev/null +++ b/dev-vcs/cola/cola-1.3.9.14.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.3.9.14.ebuild,v 1.1 2010/06/08 08:15:04 dev-zero Exp $ + +EAPI="2" + +inherit distutils eutils + +DESCRIPTION="A sweet, carbonated git gui known for its sugary flavour and caffeine-inspired features." +HOMEPAGE="http://cola.tuxfamily.org/" +SRC_URI="http://cola.tuxfamily.org/releases/${P}-src.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" + +RDEPEND="dev-python/PyQt4 + || ( >=dev-lang/python-2.6 ( =dev-lang/python-2.5* dev-python/simplejson ) ) + >=dev-python/pyinotify-0.7.1 + dev-python/jsonpickle + dev-vcs/git" +DEPEND="${RDEPEND} + doc? ( app-text/asciidoc ) + test? ( dev-python/nose )" + +src_prepare() { + # don't install docs into wrong location + sed -i \ + -e '/doc/d' \ + setup.py || die "sed failed" + # don't prefix install path with homedir + rm setup.cfg + + epatch "${FILESDIR}/1.3.8-disable-tests.patch" +} + +src_compile() { + distutils_src_compile + + if use doc ; then + cd share/doc/git-cola/ + emake all || die "building docs failed" + fi +} + +src_install() { + distutils_src_install + + # remove bundled libraries + rm -rf "${D}"/usr/share/git-cola/lib/{jsonpickle,simplejson} + + cd share/doc/git-cola/ + dodoc *.txt + + if use doc ; then + dohtml *.html + doman *.1 + fi +} + +src_test() { + PYTHONPATH="$(pwd):$(pwd)/build/lib:${PYTHONPATH}" nosetests \ + --verbose --with-doctest --with-id --exclude=jsonpickle --exclude=json \ + || die "running nosetests failed" +} + +pkg_postinst() { + python_mod_optimize /usr/share/git-cola +} + +pkg_postrm() { + python_mod_cleanup /usr/share/git-cola +} diff --git a/dev-vcs/cola/cola-1.4.1.2.ebuild b/dev-vcs/cola/cola-1.4.1.2.ebuild new file mode 100644 index 000000000000..a99feae0ade7 --- /dev/null +++ b/dev-vcs/cola/cola-1.4.1.2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.4.1.2.ebuild,v 1.1 2010/06/08 08:15:04 dev-zero Exp $ + +EAPI="2" + +inherit distutils eutils + +DESCRIPTION="A sweet, carbonated git gui known for its sugary flavour and caffeine-inspired features." +HOMEPAGE="http://cola.tuxfamily.org/" +SRC_URI="http://cola.tuxfamily.org/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" + +RDEPEND="dev-python/PyQt4 + || ( >=dev-lang/python-2.6 ( =dev-lang/python-2.5* dev-python/simplejson ) ) + >=dev-python/pyinotify-0.7.1 + dev-python/jsonpickle + dev-vcs/git" +DEPEND="${RDEPEND} + doc? ( app-text/asciidoc + dev-python/sphinx + app-text/xmlto ) + test? ( dev-python/nose )" + +src_prepare() { + # don't install docs into wrong location + sed -i \ + -e '/doc/d' \ + setup.py || die "sed failed" + + sed -i \ + -e "s|'doc', 'git-cola'|'doc', '${PF}', 'html'|" \ + -e 's|git-cola.html|index.html|' \ + cola/resources.py || die "sed failed" + + # don't prefix install path with homedir + rm setup.cfg + + epatch "${FILESDIR}/1.3.8-disable-tests.patch" +} + +src_compile() { + distutils_src_compile + + if use doc ; then + cd share/doc/git-cola/ + emake all || die "building docs failed" + fi +} + +src_install() { + distutils_src_install + + # remove bundled libraries + rm -rf "${D}"/usr/share/git-cola/lib/{jsonpickle,simplejson} + + cd share/doc/git-cola/ + dodoc *.txt + + if use doc ; then + dohtml -r _build/html/* + doman *.1 + else + dohtml "${FILESDIR}/index.html" + fi +} + +src_test() { + PYTHONPATH="$(pwd):$(pwd)/build/lib:${PYTHONPATH}" nosetests \ + --verbose --with-doctest --with-id --exclude=jsonpickle --exclude=json \ + || die "running nosetests failed" +} + +pkg_postinst() { + python_mod_optimize /usr/share/git-cola +} + +pkg_postrm() { + python_mod_cleanup /usr/share/git-cola +} diff --git a/dev-vcs/cola/files/1.3.8-disable-tests.patch b/dev-vcs/cola/files/1.3.8-disable-tests.patch new file mode 100644 index 000000000000..25462c2a37d7 --- /dev/null +++ b/dev-vcs/cola/files/1.3.8-disable-tests.patch @@ -0,0 +1,21 @@ +diff -Naur cola-1.3.7.21.orig/test/test_cola_git.py cola-1.3.7.21/test/test_cola_git.py +--- cola-1.3.7.21.orig/test/test_cola_git.py 2009-04-30 13:56:22.352319047 +0200 ++++ cola-1.3.7.21/test/test_cola_git.py 2009-04-30 13:56:53.123149963 +0200 +@@ -24,17 +24,6 @@ + version = self.git.version() + self.failUnless(version.startswith('git version')) + +- def test_tag(self): +- """Test running 'git tag'""" +- tags = self.git.tag().splitlines() +- self.failUnless( 'v1.0.0' in tags ) +- +- def test_show(self): +- """Test running 'git show'""" +- sha = '1b9742bda5d26a4f250fa64657f66ed20624a084' +- contents = self.git.show(sha).splitlines() +- self.failUnless(contents[0] == '/build') +- + def test_stdout(self): + """Test overflowing the stdout buffer""" + # Write to stdout only diff --git a/dev-vcs/cola/files/index.html b/dev-vcs/cola/files/index.html new file mode 100644 index 000000000000..7f1e814a0b51 --- /dev/null +++ b/dev-vcs/cola/files/index.html @@ -0,0 +1,15 @@ + + + Missing documentation + + +
+ This documentation is missing. Please reinstall dev-util/cola with the 'doc' useflag enabled. + +

+ Sincerely,
+ your package maintainer. +

+
+ + diff --git a/dev-vcs/cola/metadata.xml b/dev-vcs/cola/metadata.xml new file mode 100644 index 000000000000..78170ac0a566 --- /dev/null +++ b/dev-vcs/cola/metadata.xml @@ -0,0 +1,9 @@ + + + + no-herd + + dev-zero@gentoo.org + Tiziano Müller + + -- 2.26.2