diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-vcs/git-cola | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-vcs/git-cola')
-rw-r--r-- | dev-vcs/git-cola/Manifest | 2 | ||||
-rw-r--r-- | dev-vcs/git-cola/files/README.gentoo | 3 | ||||
-rw-r--r-- | dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch | 16 | ||||
-rw-r--r-- | dev-vcs/git-cola/files/git-cola-1.9.3-disable-tests.patch | 21 | ||||
-rw-r--r-- | dev-vcs/git-cola/files/git-cola-2.2.1-disable-live-tests.patch | 22 | ||||
-rw-r--r-- | dev-vcs/git-cola/files/git-cola-2.2.1-update-git-config-in-tests.patch | 13 | ||||
-rw-r--r-- | dev-vcs/git-cola/files/index.html | 15 | ||||
-rw-r--r-- | dev-vcs/git-cola/git-cola-2.1.2.ebuild | 111 | ||||
-rw-r--r-- | dev-vcs/git-cola/git-cola-2.2.1.ebuild | 98 | ||||
-rw-r--r-- | dev-vcs/git-cola/metadata.xml | 15 |
10 files changed, 316 insertions, 0 deletions
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest new file mode 100644 index 000000000000..25d590c0a2d5 --- /dev/null +++ b/dev-vcs/git-cola/Manifest @@ -0,0 +1,2 @@ +DIST git-cola-2.1.2.tar.gz 960514 SHA256 f0465f74858fc78b1b30e06856cdd6b5fa5f0cb9587b5c7e9b489f4d0e4d8f8d SHA512 79eae7937db148cde22b3d5dc1564180c3919965c35c11853270525be4eb19c7f223ddc215ba8122ed8bcb70e0e6ec57948f1e02aeeae1a9c3e7c98efef1e42d WHIRLPOOL 8797f0f0d02eaea1c7e1ef5544fc7e5e2bf6ca738cff721ce56db194de8cd94a3e825bf557f478237d75c5cf782ed43cdafc7a7afdaf1417fa4f3d8b65bcb756 +DIST git-cola-2.2.1.tar.gz 996484 SHA256 df0a3e1d3c49629926f2e30f55d635eca3c8da12e96232196b307613fa4b3aec SHA512 a91fe706ea150d9bd9a05a9d494c63d373cae0154deca8e40e30fc20e70be32d4fd1f021a971c067d46ab24f472965a12c115eeb4bd94e4f62c21e546d89c109 WHIRLPOOL ac68a558775bc5fdf3a168416132dedbeffe554f6f60f50b7e33f0d17d67aa829318b7a0df2607b47e41b8823d60e206e0544e03382eae7651b9ca1c3b9dfc09 diff --git a/dev-vcs/git-cola/files/README.gentoo b/dev-vcs/git-cola/files/README.gentoo new file mode 100644 index 000000000000..0f4af85d5ccc --- /dev/null +++ b/dev-vcs/git-cola/files/README.gentoo @@ -0,0 +1,3 @@ +Please make sure you have either a SSH key management installed and activated or +installed a SSH askpass app like net-misc/x11-ssh-askpass. +Otherwise git-cola may hang when pushing/pulling from remote git repositories via SSH. diff --git a/dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch b/dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch new file mode 100644 index 000000000000..0aa476fe83ea --- /dev/null +++ b/dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch @@ -0,0 +1,16 @@ +diff --git a/cola/app.py b/cola/app.py +index f9236de..4636c81 100644 +--- a/cola/app.py ++++ b/cola/app.py +@@ -66,9 +66,9 @@ def setup_environment(): + elif ssh_askpass: + askpass = ssh_askpass + elif sys.platform == 'darwin': +- askpass = resources.share('bin', 'ssh-askpass-darwin') ++ askpass = resources.prefix('bin', 'ssh-askpass-darwin') + else: +- askpass = resources.share('bin', 'ssh-askpass') ++ askpass = resources.prefix('bin', 'ssh-askpass') + + compat.setenv('GIT_ASKPASS', askpass) + compat.setenv('SSH_ASKPASS', askpass) diff --git a/dev-vcs/git-cola/files/git-cola-1.9.3-disable-tests.patch b/dev-vcs/git-cola/files/git-cola-1.9.3-disable-tests.patch new file mode 100644 index 000000000000..79f1ec2ff8bc --- /dev/null +++ b/dev-vcs/git-cola/files/git-cola-1.9.3-disable-tests.patch @@ -0,0 +1,21 @@ +diff -Naur cola-1.3.7.21.orig/test/git_test.py cola-1.3.7.21/test/git_test.py +--- cola-1.3.7.21.orig/test/git_test.py 2009-04-30 13:56:22.352319047 +0200 ++++ cola-1.3.7.21/test/git_test.py 2009-04-30 13:56:53.123149963 +0200 +@@ -24,17 +24,6 @@ + version = self.git.version()[STDOUT] + self.failUnless(version.startswith('git version')) + +- def test_tag(self): +- """Test running 'git tag'""" +- tags = self.git.tag()[STDOUT].splitlines() +- self.failUnless( 'v1.0.0' in tags ) +- +- def test_show(self): +- """Test running 'git show'""" +- sha = '1b9742bda5d26a4f250fa64657f66ed20624a084' +- contents = self.git.show(sha)[STDOUT].splitlines() +- self.failUnless(contents[0] == '/build') +- + def test_stdout(self): + """Test overflowing the stdout buffer""" + # Write to stdout only diff --git a/dev-vcs/git-cola/files/git-cola-2.2.1-disable-live-tests.patch b/dev-vcs/git-cola/files/git-cola-2.2.1-disable-live-tests.patch new file mode 100644 index 000000000000..2ebdc9880d1e --- /dev/null +++ b/dev-vcs/git-cola/files/git-cola-2.2.1-disable-live-tests.patch @@ -0,0 +1,22 @@ +diff --git a/test/git_test.py b/test/git_test.py +index 9f812b2..ff7da24 100644 +--- a/test/git_test.py ++++ b/test/git_test.py +@@ -53,17 +53,6 @@ class GitCommandTest(unittest.TestCase): + version = self.git.version()[STDOUT] + self.failUnless(version.startswith('git version')) + +- def test_tag(self): +- """Test running 'git tag'""" +- tags = self.git.tag()[STDOUT].splitlines() +- self.failUnless( 'v1.0.0' in tags ) +- +- def test_show(self): +- """Test running 'git show'""" +- sha = '1b9742bda5d26a4f250fa64657f66ed20624a084' +- contents = self.git.show(sha)[STDOUT].splitlines() +- self.failUnless(contents[0] == '/build') +- + def test_stdout(self): + """Test overflowing the stdout buffer""" + # Write to stdout only diff --git a/dev-vcs/git-cola/files/git-cola-2.2.1-update-git-config-in-tests.patch b/dev-vcs/git-cola/files/git-cola-2.2.1-update-git-config-in-tests.patch new file mode 100644 index 000000000000..96271d05548c --- /dev/null +++ b/dev-vcs/git-cola/files/git-cola-2.2.1-update-git-config-in-tests.patch @@ -0,0 +1,13 @@ +diff --git a/test/helper.py b/test/helper.py +index 006a5b1..64d0dfc 100644 +--- a/test/helper.py ++++ b/test/helper.py +@@ -87,6 +87,8 @@ class GitRepositoryTestCase(TmpPathTestCase): + + def initialize_repo(self): + self.git('init') ++ self.git('config', '--local', 'user.name', 'Your Name') ++ self.git('config', '--local', 'user.email', 'you@example.com') + self.touch('A', 'B') + self.git('add', 'A', 'B') + diff --git a/dev-vcs/git-cola/files/index.html b/dev-vcs/git-cola/files/index.html new file mode 100644 index 000000000000..7f1e814a0b51 --- /dev/null +++ b/dev-vcs/git-cola/files/index.html @@ -0,0 +1,15 @@ +<html> +<head> + <title>Missing documentation</title> +</head> +<body> +<div style="border: 4px double red; padding: 2em; margin: 4em; top: 4em; width: 20em;"> + This documentation is missing. Please reinstall dev-util/cola with the 'doc' useflag enabled. + + <p style="text-align: right;"> + Sincerely,<br/> + your package maintainer. + </p> +</div> +</body> +</html> diff --git a/dev-vcs/git-cola/git-cola-2.1.2.ebuild b/dev-vcs/git-cola/git-cola-2.1.2.ebuild new file mode 100644 index 000000000000..2de6715817e4 --- /dev/null +++ b/dev-vcs/git-cola/git-cola-2.1.2.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} ) +DISTUTILS_SINGLE_IMPL=true + +inherit distutils-r1 readme.gentoo virtualx + +DESCRIPTION="The highly caffeinated git GUI" +HOMEPAGE="http://git-cola.github.com/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +IUSE="doc test" + +REQUIRED_USE="doc? ( python_targets_python2_7 )" + +RDEPEND=" + dev-python/jsonpickle[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + dev-python/PyQt4[${PYTHON_USEDEP}] + dev-vcs/git" +DEPEND="${RDEPEND} + app-text/asciidoc + app-text/xmlto + sys-devel/gettext + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')] + ) + test? ( + dev-python/nose[${PYTHON_USEDEP}] + sys-apps/net-tools + )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.9.3-disable-tests.patch + "${FILESDIR}"/${PN}-1.9.1-system-ssh-askpass.patch + ) + +pkg_pretend() { + if use test && [[ -z "$(hostname -d)" ]] ; then + die "Test will fail if no domain is set" + fi +} + +python_prepare_all() { + rm share/git-cola/bin/*askpass* || die + + # unfinished translate framework + rm test/i18n_test.py || die + + # 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}'|" \ + cola/resources.py || die "sed failed" + + distutils-r1_python_prepare_all +} + +python_compile_all() { + cd share/doc/${PN}/ + if use doc ; then + emake all + else + sed \ + -e '/^install:/s:install-html::g' \ + -e '/^install:/s:install-man::g' \ + -i Makefile || die + fi +} + +python_test() { + PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \ + VIRTUALX_COMMAND="nosetests --verbose \ + --with-id --with-doctest --exclude=sphinxtogithub" \ + virtualmake +} + +src_install() { + distutils-r1_src_install +} + +python_install_all() { + cd share/doc/${PN}/ || die + emake \ + DESTDIR="${D}" \ + docdir="${EPREFIX}/usr/share/doc/${PF}" \ + prefix="${EPREFIX}/usr" \ + install + + python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" + python_optimize "${ED}/usr/share/git-cola/lib/cola" + + if ! use doc ; then + HTML_DOCS=( "${FILESDIR}"/index.html ) + fi + + distutils-r1_python_install_all + readme.gentoo_create_doc + docompress /usr/share/doc/${PF}/git-cola.txt +} diff --git a/dev-vcs/git-cola/git-cola-2.2.1.ebuild b/dev-vcs/git-cola/git-cola-2.2.1.ebuild new file mode 100644 index 000000000000..0990e9db29c9 --- /dev/null +++ b/dev-vcs/git-cola/git-cola-2.2.1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} ) +DISTUTILS_SINGLE_IMPL=true + +inherit distutils-r1 readme.gentoo virtualx + +DESCRIPTION="The highly caffeinated git GUI" +HOMEPAGE="https://git-cola.github.io/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc test" + +RDEPEND=" + dev-python/pyinotify[${PYTHON_USEDEP}] + dev-python/send2trash[${PYTHON_USEDEP}] + dev-python/PyQt4[${PYTHON_USEDEP}] + dev-vcs/git" +DEPEND="${RDEPEND} + sys-devel/gettext + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + python_targets_python2_7? ( dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')] ) + ) + test? ( dev-python/nose[${PYTHON_USEDEP}] ) +" + +PATCHES=( + "${FILESDIR}"/${P}-disable-live-tests.patch + "${FILESDIR}"/${P}-update-git-config-in-tests.patch +) + +python_prepare_all() { + rm share/git-cola/bin/*askpass* || die + + # remove broken tests + rm test/i18n_test.py || die + + # don't install docs into wrong location + sed -i -e '/doc/d' setup.py || die + + # fix doc directory reference + sed -i \ + -e "s/'doc', 'git-cola'/'doc', '${PF}'/" \ + cola/resources.py || die + + # fix ssh-askpass directory reference + sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die + + distutils-r1_python_prepare_all +} + +python_compile_all() { + cd share/doc/${PN}/ || die + if use doc; then + emake all + else + sed \ + -e '/^install:/s:install-html::g' \ + -e '/^install:/s:install-man::g' \ + -i Makefile || die + fi +} + +python_test() { + PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \ + VIRTUALX_COMMAND="nosetests --verbose --with-id --with-doctest \ + --exclude=sphinxtogithub" \ + virtualmake +} + +src_install() { + distutils-r1_src_install +} + +python_install_all() { + cd share/doc/${PN}/ || die + emake \ + DESTDIR="${D}" \ + docdir="${EPREFIX}/usr/share/doc/${PF}" \ + prefix="${EPREFIX}/usr" \ + install + + python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" + python_optimize "${ED}/usr/share/git-cola/lib/cola" + + use doc || HTML_DOCS=( "${FILESDIR}"/index.html ) + + distutils-r1_python_install_all + readme.gentoo_create_doc +} diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml new file mode 100644 index 000000000000..7ee28e37558e --- /dev/null +++ b/dev-vcs/git-cola/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>dev-zero@gentoo.org</email> + <name>Tiziano Müller</name> + </maintainer> + <maintainer> + <email>jlec@gentoo.org</email> + <name>Justin Lecher</name> + </maintainer> + <upstream> + <remote-id type="github">git-cola/git-cola</remote-id> + </upstream> +</pkgmetadata> |