polynomial-c 14/08/30 08:59:38
Modified: git-2.0.2.ebuild git-9999-r3.ebuild
git-9999-r1.ebuild ChangeLog git-2.1.0.ebuild
git-2.0.4.ebuild git-9999-r2.ebuild git-9999.ebuild
Log:
Don't install git-remote helpers for bzr and hg anymore (bug #512422). Synced
live ebuilds with latest release ebuild
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key
0x981CA6FC)
Revision Changes Path
1.5 dev-vcs/git/git-2.0.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild?r1=1.4&r2=1.5
Index: git-2.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- git-2.0.2.ebuild 24 Aug 2014 13:56:32 -0000 1.4
+++ git-2.0.2.ebuild 30 Aug 2014 08:59:38 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild,v 1.4
2014/08/24 13:56:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild,v 1.5
2014/08/30 08:59:38 polynomial-c Exp $
EAPI=5
@@ -451,13 +451,6 @@
cd "${S}"
fi
- # remote-helpers
- if use python ; then
- python_scriptinto /usr/libexec/git-core/
- python_doscript
"${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
- python_optimize
- fi
-
dodir /usr/share/${PN}/contrib
# The following are excluded:
# completion - installed above
1.7 dev-vcs/git/git-9999-r3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild?r1=1.6&r2=1.7
Index: git-9999-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- git-9999-r3.ebuild 24 Aug 2014 13:56:32 -0000 1.6
+++ git-9999-r3.ebuild 30 Aug 2014 08:59:38 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.6
2014/08/24 13:56:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.7
2014/08/30 08:59:38 polynomial-c Exp $
EAPI=5
@@ -22,7 +22,7 @@
DESCRIPTION="GIT - the stupid content tracker, the revision control system
heavily used by the Linux kernel team"
HOMEPAGE="http://www.git-scm.com/";
if [[ ${PV} != *9999 ]]; then
- SRC_URI_SUFFIX="gz"
+ SRC_URI_SUFFIX="xz"
SRC_URI_GOOG="http://git-core.googlecode.com/files";
SRC_URI_KORG="mirror://kernel/software/scm/git"
SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
@@ -33,7 +33,7 @@
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
else
SRC_URI=""
KEYWORDS=""
@@ -225,7 +225,7 @@
src_prepare() {
# bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-2.0.0_rc0-optional-cvs.patch
+ epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch
# install mediawiki perl modules also in vendor_dir
# hack, needs better upstream solution
@@ -420,10 +420,6 @@
cd "${S}"
fi
- # git-diffall
- dobin contrib/diffall/git-diffall
- newdoc contrib/diffall/README git-diffall.txt
-
# diff-highlight
dobin contrib/diff-highlight/diff-highlight
newdoc contrib/diff-highlight/README README.diff-highlight
@@ -451,19 +447,11 @@
cd "${S}"
fi
- # remote-helpers
- if use python ; then
- python_scriptinto /usr/libexec/git-core/
- python_doscript
"${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
- python_optimize
- fi
-
dodir /usr/share/${PN}/contrib
# The following are excluded:
# completion - installed above
# credential/gnome-keyring TODO
# diff-highlight - done above
- # diffall - done above
# emacs - installed above
# examples - these are stuff that is not used in Git anymore actually
# git-jump - done above
@@ -478,7 +466,7 @@
for i in \
buildsystems convert-objects fast-import \
hg-to-git hooks remotes2config.sh rerere-train.sh \
- stats vim workdir \
+ stats workdir \
; do
cp -rf \
"${S}"/contrib/${i} \
@@ -634,8 +622,8 @@
pkg_postinst() {
use emacs && elisp-site-regen
einfo "Please read /usr/share/bash-completion/git for Git bash command
completion"
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash
prompt"
- einfo "Note that the prompt bash code is now in the seperate script"
+ einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+ einfo "Note that the prompt bash code is now in that separate script"
elog "These additional scripts need some dependencies:"
echo
showpkgdeps git-quiltimport "dev-util/quilt"
1.6 dev-vcs/git/git-9999-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild?r1=1.5&r2=1.6
Index: git-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- git-9999-r1.ebuild 24 Aug 2014 13:56:32 -0000 1.5
+++ git-9999-r1.ebuild 30 Aug 2014 08:59:38 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v 1.5
2014/08/24 13:56:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v 1.6
2014/08/30 08:59:38 polynomial-c Exp $
EAPI=5
@@ -22,7 +22,7 @@
DESCRIPTION="GIT - the stupid content tracker, the revision control system
heavily used by the Linux kernel team"
HOMEPAGE="http://www.git-scm.com/";
if [[ ${PV} != *9999 ]]; then
- SRC_URI_SUFFIX="gz"
+ SRC_URI_SUFFIX="xz"
SRC_URI_GOOG="http://git-core.googlecode.com/files";
SRC_URI_KORG="mirror://kernel/software/scm/git"
SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
@@ -33,7 +33,7 @@
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
else
SRC_URI=""
KEYWORDS=""
@@ -225,7 +225,7 @@
src_prepare() {
# bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.9.0_rc3-optional-cvs.patch
+ epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch
# install mediawiki perl modules also in vendor_dir
# hack, needs better upstream solution
@@ -420,10 +420,6 @@
cd "${S}"
fi
- # git-diffall
- dobin contrib/diffall/git-diffall
- newdoc contrib/diffall/README git-diffall.txt
-
# diff-highlight
dobin contrib/diff-highlight/diff-highlight
newdoc contrib/diff-highlight/README README.diff-highlight
@@ -451,19 +447,11 @@
cd "${S}"
fi
- # remote-helpers
- if use python ; then
- python_scriptinto /usr/libexec/git-core/
- python_doscript
"${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
- python_optimize
- fi
-
dodir /usr/share/${PN}/contrib
# The following are excluded:
# completion - installed above
# credential/gnome-keyring TODO
# diff-highlight - done above
- # diffall - done above
# emacs - installed above
# examples - these are stuff that is not used in Git anymore actually
# git-jump - done above
@@ -478,7 +466,7 @@
for i in \
buildsystems convert-objects fast-import \
hg-to-git hooks remotes2config.sh rerere-train.sh \
- stats vim workdir \
+ stats workdir \
; do
cp -rf \
"${S}"/contrib/${i} \
@@ -634,8 +622,8 @@
pkg_postinst() {
use emacs && elisp-site-regen
einfo "Please read /usr/share/bash-completion/git for Git bash command
completion"
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash
prompt"
- einfo "Note that the prompt bash code is now in the seperate script"
+ einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+ einfo "Note that the prompt bash code is now in that separate script"
elog "These additional scripts need some dependencies:"
echo
showpkgdeps git-quiltimport "dev-util/quilt"
1.280 dev-vcs/git/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.280&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.280&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.279&r2=1.280
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- ChangeLog 26 Aug 2014 17:00:01 -0000 1.279
+++ ChangeLog 30 Aug 2014 08:59:38 -0000 1.280
@@ -1,6 +1,12 @@
# ChangeLog for dev-vcs/git
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.279 2014/08/26
17:00:01 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.280 2014/08/30
08:59:38 polynomial-c Exp $
+
+ 30 Aug 2014; Lars Wendler <polynomia...@gentoo.org> git-2.0.2.ebuild,
+ git-2.0.4.ebuild, git-2.1.0.ebuild, git-9999.ebuild, git-9999-r1.ebuild,
+ git-9999-r2.ebuild, git-9999-r3.ebuild:
+ Don't install git-remote helpers for bzr and hg anymore (bug #512422). Synced
+ live ebuilds with latest release ebuild.
26 Aug 2014; Lars Wendler <polynomia...@gentoo.org> git-2.1.0.ebuild:
Restrict test for >=git-2.1.0. See bug #520270 for details.
1.5 dev-vcs/git/git-2.1.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.1.0.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.1.0.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.1.0.ebuild?r1=1.4&r2=1.5
Index: git-2.1.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.1.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- git-2.1.0.ebuild 26 Aug 2014 17:00:01 -0000 1.4
+++ git-2.1.0.ebuild 30 Aug 2014 08:59:38 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.1.0.ebuild,v 1.4
2014/08/26 17:00:01 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.1.0.ebuild,v 1.5
2014/08/30 08:59:38 polynomial-c Exp $
EAPI=5
@@ -449,13 +449,6 @@
cd "${S}"
fi
- # remote-helpers
- if use python ; then
- python_scriptinto /usr/libexec/git-core/
- python_doscript
"${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
- python_optimize
- fi
-
dodir /usr/share/${PN}/contrib
# The following are excluded:
# completion - installed above
1.3 dev-vcs/git/git-2.0.4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.4.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.4.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.4.ebuild?r1=1.2&r2=1.3
Index: git-2.0.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.4.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- git-2.0.4.ebuild 24 Aug 2014 13:56:32 -0000 1.2
+++ git-2.0.4.ebuild 30 Aug 2014 08:59:38 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.4.ebuild,v 1.2
2014/08/24 13:56:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.4.ebuild,v 1.3
2014/08/30 08:59:38 polynomial-c Exp $
EAPI=5
@@ -451,13 +451,6 @@
cd "${S}"
fi
- # remote-helpers
- if use python ; then
- python_scriptinto /usr/libexec/git-core/
- python_doscript
"${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
- python_optimize
- fi
-
dodir /usr/share/${PN}/contrib
# The following are excluded:
# completion - installed above
1.6 dev-vcs/git/git-9999-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild?r1=1.5&r2=1.6
Index: git-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- git-9999-r2.ebuild 24 Aug 2014 13:56:32 -0000 1.5
+++ git-9999-r2.ebuild 30 Aug 2014 08:59:38 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.5
2014/08/24 13:56:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.6
2014/08/30 08:59:38 polynomial-c Exp $
EAPI=5
@@ -22,7 +22,7 @@
DESCRIPTION="GIT - the stupid content tracker, the revision control system
heavily used by the Linux kernel team"
HOMEPAGE="http://www.git-scm.com/";
if [[ ${PV} != *9999 ]]; then
- SRC_URI_SUFFIX="gz"
+ SRC_URI_SUFFIX="xz"
SRC_URI_GOOG="http://git-core.googlecode.com/files";
SRC_URI_KORG="mirror://kernel/software/scm/git"
SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
@@ -33,7 +33,7 @@
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
else
SRC_URI=""
KEYWORDS=""
@@ -225,7 +225,7 @@
src_prepare() {
# bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.9.0_rc3-optional-cvs.patch
+ epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch
# install mediawiki perl modules also in vendor_dir
# hack, needs better upstream solution
@@ -420,10 +420,6 @@
cd "${S}"
fi
- # git-diffall
- dobin contrib/diffall/git-diffall
- newdoc contrib/diffall/README git-diffall.txt
-
# diff-highlight
dobin contrib/diff-highlight/diff-highlight
newdoc contrib/diff-highlight/README README.diff-highlight
@@ -451,19 +447,11 @@
cd "${S}"
fi
- # remote-helpers
- if use python ; then
- python_scriptinto /usr/libexec/git-core/
- python_doscript
"${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
- python_optimize
- fi
-
dodir /usr/share/${PN}/contrib
# The following are excluded:
# completion - installed above
# credential/gnome-keyring TODO
# diff-highlight - done above
- # diffall - done above
# emacs - installed above
# examples - these are stuff that is not used in Git anymore actually
# git-jump - done above
@@ -478,7 +466,7 @@
for i in \
buildsystems convert-objects fast-import \
hg-to-git hooks remotes2config.sh rerere-train.sh \
- stats vim workdir \
+ stats workdir \
; do
cp -rf \
"${S}"/contrib/${i} \
@@ -634,8 +622,8 @@
pkg_postinst() {
use emacs && elisp-site-regen
einfo "Please read /usr/share/bash-completion/git for Git bash command
completion"
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash
prompt"
- einfo "Note that the prompt bash code is now in the seperate script"
+ einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+ einfo "Note that the prompt bash code is now in that separate script"
elog "These additional scripts need some dependencies:"
echo
showpkgdeps git-quiltimport "dev-util/quilt"
1.61 dev-vcs/git/git-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.61&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.61&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?r1=1.60&r2=1.61
Index: git-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- git-9999.ebuild 24 Aug 2014 13:56:32 -0000 1.60
+++ git-9999.ebuild 30 Aug 2014 08:59:38 -0000 1.61
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.60
2014/08/24 13:56:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.61
2014/08/30 08:59:38 polynomial-c Exp $
EAPI=5
@@ -22,7 +22,7 @@
DESCRIPTION="GIT - the stupid content tracker, the revision control system
heavily used by the Linux kernel team"
HOMEPAGE="http://www.git-scm.com/";
if [[ ${PV} != *9999 ]]; then
- SRC_URI_SUFFIX="gz"
+ SRC_URI_SUFFIX="xz"
SRC_URI_GOOG="http://git-core.googlecode.com/files";
SRC_URI_KORG="mirror://kernel/software/scm/git"
SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
@@ -33,7 +33,7 @@
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
else
SRC_URI=""
KEYWORDS=""
@@ -225,7 +225,7 @@
src_prepare() {
# bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.9.0_rc3-optional-cvs.patch
+ epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch
# install mediawiki perl modules also in vendor_dir
# hack, needs better upstream solution
@@ -420,10 +420,6 @@
cd "${S}"
fi
- # git-diffall
- dobin contrib/diffall/git-diffall
- newdoc contrib/diffall/README git-diffall.txt
-
# diff-highlight
dobin contrib/diff-highlight/diff-highlight
newdoc contrib/diff-highlight/README README.diff-highlight
@@ -451,19 +447,11 @@
cd "${S}"
fi
- # remote-helpers
- if use python ; then
- python_scriptinto /usr/libexec/git-core/
- python_doscript
"${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
- python_optimize
- fi
-
dodir /usr/share/${PN}/contrib
# The following are excluded:
# completion - installed above
# credential/gnome-keyring TODO
# diff-highlight - done above
- # diffall - done above
# emacs - installed above
# examples - these are stuff that is not used in Git anymore actually
# git-jump - done above
@@ -478,7 +466,7 @@
for i in \
buildsystems convert-objects fast-import \
hg-to-git hooks remotes2config.sh rerere-train.sh \
- stats vim workdir \
+ stats workdir \
; do
cp -rf \
"${S}"/contrib/${i} \
@@ -634,8 +622,8 @@
pkg_postinst() {
use emacs && elisp-site-regen
einfo "Please read /usr/share/bash-completion/git for Git bash command
completion"
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash
prompt"
- einfo "Note that the prompt bash code is now in the seperate script"
+ einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+ einfo "Note that the prompt bash code is now in that separate script"
elog "These additional scripts need some dependencies:"
echo
showpkgdeps git-quiltimport "dev-util/quilt"
