Version bump. Add ruby20, ruby21 support. Remove old.

Package-Manager: portage-2.2.15/cvs/Linux x86_64

diff --git a/dev-vcs/hub/ChangeLog b/dev-vcs/hub/ChangeLog
index a6efd8691d4ee89808389b3699cc1b7da62cb87c..7a963009016ae8f352301ba1dc1c2abca91fd335 100644 (file)
--- a/dev-vcs/hub/ChangeLog
+++ b/dev-vcs/hub/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/hub
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hub/ChangeLog,v 1.13 2014/10/07 07:04:42 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hub/ChangeLog,v 1.14 2015/01/05 15:25:47 mrueg Exp $
+
+*hub-1.12.4 (05 Jan 2015)
+
+  05 Jan 2015; Manuel Rüger <mrueg@gentoo.org> +hub-1.12.4.ebuild,
+  -hub-1.12.1.ebuild, -hub-1.12.2.ebuild:
+  Version bump. Add ruby20, ruby21 support. Remove old.
 
 *hub-1.12.2-r1 (07 Oct 2014)
 

diff --git a/dev-vcs/hub/Manifest b/dev-vcs/hub/Manifest
index 78f5f5734a119ac1bf058f5867b7b4453534cea8..ac5634ab4b932fd3f8c3a7267def4a4366ca6e1c 100644 (file)
--- a/dev-vcs/hub/Manifest
+++ b/dev-vcs/hub/Manifest
@@ -1,29 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-DIST hub-1.12.1.tar.gz 76174 SHA256 dd763fbd94edf824f8af0e115212d0b2a6ab6565ed79b1ea742fa24d94dfad62 SHA512 067812f7406653912246eb58bee5fc0cb599d42b970915bd2ed693921437656b947f462b918112ffbcccb364401c354388437d003901ef07daf9a65b56b460ff WHIRLPOOL 958dd83fd4f9676a0cee82e02b84e7f62c757020c88c01b83669ec62365696f5171ba01eb91785e5b6036deb0e3ac0aba3bbdd59803bf4ec7ebc117f51dcf905
 DIST hub-1.12.2.tar.gz 76584 SHA256 e9c49a98a4d90202c33f57d63c6191cd28f0e1d9d7cf54d0e655d3d9d3765e84 SHA512 bbcfec1444c9bde3423a95a885840f790d2251a94d714657d4ddde10c9250b38d0797df36ad70790f2556f4900c10a23f0a496164ee79d4a4cd693b6bcefe25d WHIRLPOOL 97aaaa4914273161df41e78473e5a75c62c2815c8c75e7a27b967479f935f04c6a11735e34c73ad59b9ea870187d49fb6c6d6f06a3d49476de3c43f8032ddbda
-EBUILD hub-1.12.1.ebuild 906 SHA256 c26a568e272f2de74d6f1966dce146f7e4bfba5da1d2ce9f4c71c621e8a9ecf0 SHA512 dca56dd1e6af49f3cb33f13c8e9f15e47d64dfeeca6423320ee3496b1c4061100db813add2f7be9975f4532a751935edb4fc9fbccbe33921c04ad9340e01d010 WHIRLPOOL 18d2e7bb131ef3d93c5c2dad94ec1ca4283c7b1e3bca35827cb5a8c73b1d8c5202a916e0f739c64314abb593ebfef5b9320895b7f35ceef5a141bc0fd9d6de3a
+DIST hub-1.12.4.tar.gz 76798 SHA256 b7fe404d7dc5f60554f088bec12de5e80229331430ea0ced46d5bf89ecae5117 SHA512 3c80592954f6f9bd9406adf8faaaf3e307a5387b623b07f06f574e6841899a7e253b67429417ba37c78b53064ddd0188b9f37e3e24130d899207c23bad389618 WHIRLPOOL 46c0870101add366c83d12ea92cfd1d434e841df58101ef8b1250e040cb0fe92590245b3e092780213b837cc2f9d9ad9bd9bff37a110bc608d63cddd7bbf4898
 EBUILD hub-1.12.2-r1.ebuild 1225 SHA256 9c4d5c60b11cb6fed1edba6fcc598b8c653db255d639c906b92d7a1bba88655c SHA512 f67fa3d4c06b8e5cedbdfe5b3b7fe002ab805de66c2b29173aed0408103619a8519db41a9af91d49557bb1816c58e4e74571ad8da1bfe79704401e86e359451b WHIRLPOOL 0ee553321b8393d76c2e17157edb096f2a7c5c4f4a3d9f42b25d9b48e380d4a215f0d4c51640aecbb091a1135d23435796bbc2c9c3d27b555031298d16fccec4
-EBUILD hub-1.12.2.ebuild 906 SHA256 979da93e7f2745099b568427c714e35b5fad0d7f259ce8f8f7e0f2d58718f901 SHA512 91b4b5ca86993962f82e3c37c0b67fb9b8a96cf200d5363fbbd77abd64b8771083ee59e02307f7933f23a7a20948abe2c3b4baf6e07379a2874ed14406b9b6cb WHIRLPOOL 00181ed2bc1e9ebcf80249f87b380f4f8f29a94e0fb40f16f29671bda17e1938377276b272333c02c3e00422abb9706372c811ea057e79269aef882189236d45
-MISC ChangeLog 1987 SHA256 9d9ebea591359e51dc40889a12345f2aadde1aea4654f6d5007543845d0b4e5d SHA512 35e433b493e077412a49164a0fb8a740d1b5fb5820abb96f92de0d609bf2e2868ea785c55dc5d8f308718bf1d2f8275494785b2aac7013a12b799dc3bba05f8a WHIRLPOOL 30b7e0558110e5c9680e35e280ece8170b09ae0b5fa6f6cca47fe0e142f546b93e6f0fc129155a09659670250e3ffce86d65579c78a75fc5eccf2412a114fdba
+EBUILD hub-1.12.4.ebuild 1306 SHA256 5cd1851e273b0863b341d6963efda1dff35053f5b68c3ec7d74cfce4861b1244 SHA512 06e0aede0c3faab6976eb7d6e7959a6e5891578963f2d4477e791efe9610d931175b9e7b7b9764ebb9860557f9bc18ae5b818ca9fe6f0c82ebf7d6a7c45ecf53 WHIRLPOOL 8d5ca3d8d6b2ec57f2f0384124fe06e0d54516995ffa64f12d93f63b1c665af2f94da0d4581dd0566a33280064fff1d6bce85daf44506fc16817b727634f72e9
+MISC ChangeLog 2182 SHA256 bef8e156f02b8df7965c192701a47cb6211a31294c25cf001e03978762646659 SHA512 127e0b078d032f0b34d337814754ee71642b50f2334531bef889d64b4acb65212c87f40e00b6c2c0535c39d2c420b872034d42764ba194ca4fb79468710f7c88 WHIRLPOOL 794fc18d1443b2d67a7ad3ee957c406f3f6dc10008c15707c0e67182e2312a6978de18a2864d4ac0eedc9d3674be31efa05da87b1440ea1bf8b1996e7f395944
 MISC metadata.xml 429 SHA256 bc866460364aeff9652dcb3566b714e0d8a765134729290471a048de6a9e7a4f SHA512 ae082422ef2df2a54cd867fd65d1160800498c0df0af7977fb602532dde59066a3749a42b80f0dcb197f76ae110a0bf7e8a34351d1189b796d35532fe24bc53e WHIRLPOOL fe57b40a351fe69809409dd232a08179ac5da481da320d8e86671af1fb34f58e726fff100fa5dfd4c100528d83e132f93f9391725cb18804ab3aefbc5fc57155
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJUM5CLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirYsgQAJaxrkvWqhRJIGyTJCx0B1Ye
-icW8hEgMCFmN0EarnzhmjQt53vZ102/U/hzG2pLt8tzytmKAAMKa7KnSj/xolGBP
-y053eiGaiG1lRiG0xeV+YgXp5FcJVkaaqPUrWyuNU+9rm05XCWO00NJzbhf7FnLe
-/TjU5SofL7AmWq7KhTUPMVAH8MdsIFBxrdjqLlglJiM00jKNQz8JK/OtPJVdNS/6
-6KEdsVyyGzVjnLCXlBEYMgEQZnnpfejyr3f5uzWAqCxFwvq7ykhZNkuoTmxoAn1N
-MW538k65gb89iPkvPmnd1ij+YOUG0/4Tml71hC8VjUckEiM/urU/CoR+PxdTSqR6
-HemjCXZZF7NnQhv7RoLcthTlJF3d5EN6K5nnieml39cS0StQEr9sp/ruf4YA/dsf
-52yaPlSVhLGq3SYFGVmfzzf0Mib+oeXk4G7UoQwGcZMKQUh9dRTRCiGOHerQaZRA
-wJNifwjMAJmiQkwXi8Ren1++wz4wDdB4yeGU2Z+4XPR29kJ/HvHQcC5/K473tKD+
-CbLn2TAVpB+ANkhyIli8j+FP8hPb24LGbKYy7PPTdfckzKFZ1s6F0npq9dK3VLT5
-GBEC9ayvtlVbI3b7NnSrPYfziWStu6SVr17xoOcXJTOMMHxdPKdMVrHoBQpx23ho
-kB25g1iXQM38hgYBgIar
-=WGCG
------END PGP SIGNATURE-----

diff --git a/dev-vcs/hub/hub-1.12.1.ebuild b/dev-vcs/hub/hub-1.12.1.ebuild
deleted file mode 100644 (file)
index fd19f48..0000000
--- a/dev-vcs/hub/hub-1.12.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hub/hub-1.12.1.ebuild,v 1.2 2014/08/14 13:53:39 mrueg Exp $
-
-EAPI="5"
-
-USE_RUBY="ruby19"
-RUBY_FAKEGEM_TASK_DOC=
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit readme.gentoo ruby-fakegem
-
-ruby_add_bdepend "
-       test? (
-               dev-ruby/webmock
-               dev-util/cucumber
-               virtual/ruby-minitest
-       )"
-
-DESCRIPTION="command-line wrapper for git that makes you better at GitHub"
-HOMEPAGE="https://github.com/github/hub"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-RDEPEND="dev-vcs/git"
-
-DOC_CONTENTS="You may want to add 'alias git=hub' to your .{csh,bash}rc"
-
-all_ruby_prepare() {
-       sed -i -e 's/Minitest/MiniTest/g' test/*.rb
-}
-
-src_install() {
-       ruby-ng_src_install
-       readme.gentoo_create_doc
-}

diff --git a/dev-vcs/hub/hub-1.12.2.ebuild b/dev-vcs/hub/hub-1.12.2.ebuild
deleted file mode 100644 (file)
index 528b730..0000000
--- a/dev-vcs/hub/hub-1.12.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hub/hub-1.12.2.ebuild,v 1.2 2014/08/14 13:53:39 mrueg Exp $
-
-EAPI="5"
-
-USE_RUBY="ruby19"
-RUBY_FAKEGEM_TASK_DOC=
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit readme.gentoo ruby-fakegem
-
-ruby_add_bdepend "
-       test? (
-               dev-ruby/webmock
-               dev-util/cucumber
-               virtual/ruby-minitest
-       )"
-
-DESCRIPTION="command-line wrapper for git that makes you better at GitHub"
-HOMEPAGE="https://github.com/github/hub"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-RDEPEND="dev-vcs/git"
-
-DOC_CONTENTS="You may want to add 'alias git=hub' to your .{csh,bash}rc"
-
-all_ruby_prepare() {
-       sed -i -e 's/Minitest/MiniTest/g' test/*.rb
-}
-
-src_install() {
-       ruby-ng_src_install
-       readme.gentoo_create_doc
-}

diff --git a/dev-vcs/hub/hub-1.12.4.ebuild b/dev-vcs/hub/hub-1.12.4.ebuild
new file mode 100644 (file)
index 0000000..2ee9423
--- /dev/null
+++ b/dev-vcs/hub/hub-1.12.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hub/hub-1.12.4.ebuild,v 1.1 2015/01/05 15:25:47 mrueg Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+RUBY_FAKEGEM_TASK_DOC=
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit bash-completion-r1 readme.gentoo ruby-fakegem
+
+DESCRIPTION="Command-line wrapper for git that makes you better at GitHub"
+HOMEPAGE="https://github.com/github/hub"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+RDEPEND+=" dev-vcs/git"
+
+ruby_add_bdepend "
+       test? (
+               dev-ruby/webmock
+               dev-util/cucumber
+               dev-ruby/minitest:5
+       )"
+
+DOC_CONTENTS="You may want to add 'alias git=hub' to your .{csh,bash}rc"
+
+all_ruby_prepare() {
+       # Git's manpage changed, so this test will fail
+       sed -i -e '/test_help_custom_command/,+4 s/^/#/' test/hub_test.rb || die
+}
+
+src_install() {
+       ruby-ng_src_install
+       readme.gentoo_create_doc
+
+       cd "${S}"/all/${P} || die
+
+       doman man/${PN}.1
+
+       insinto /usr/share/${PN}/
+       doins -r git-hooks
+
+       # Broken with autoloader
+       # https://github.com/github/hub/issues/592
+       #newbashcomp etc/hub.bash_completion.sh ${PN}
+
+       insinto /usr/share/zsh/site-functions
+       newins etc/hub.zsh_completion ${PN}
+}