* [gentoo-commits] gentoo-x86 commit in dev-vcs/git: ChangeLog git-9999.ebuild
@ 2010-10-27 7:44 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 6+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-10-27 7:44 UTC (permalink / raw
To: gentoo-commits
robbat2 10/10/27 07:44:41
Modified: ChangeLog git-9999.ebuild
Log:
Bump live build.
(Portage version: 2.2_rc98/cvs/Linux x86_64)
Revision Changes Path
1.43 dev-vcs/git/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.42&r2=1.43
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -p -w -b -B -u -u -r1.42 -r1.43
--- ChangeLog 27 Oct 2010 07:42:07 -0000 1.42
+++ ChangeLog 27 Oct 2010 07:44:41 -0000 1.43
@@ -1,6 +1,9 @@
# ChangeLog for dev-vcs/git
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.42 2010/10/27 07:42:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.43 2010/10/27 07:44:41 robbat2 Exp $
+
+ 27 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
+ Bump live build.
27 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.2-r1.ebuild:
Bug #342845: fix contrib install and doman warning.
1.6 dev-vcs/git/git-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?r1=1.5&r2=1.6
Index: git-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -p -w -b -B -u -u -r1.5 -r1.6
--- git-9999.ebuild 16 Aug 2010 05:47:29 -0000 1.5
+++ git-9999.ebuild 27 Oct 2010 07:44:41 -0000 1.6
@@ -1,8 +1,8 @@
# Copyright 1999-2010 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.5 2010/08/16 05:47:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.6 2010/10/27 07:44:41 robbat2 Exp $
-EAPI=2
+EAPI=3
GENTOO_DEPEND_ON_PERL=no
inherit toolchain-funcs eutils elisp-common perl-module bash-completion
@@ -19,13 +19,13 @@ if [ "$PV" != "9999" ]; then
SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
else
SRC_URI=""
EGIT_BRANCH="master"
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
# EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
- KEYWORDS=""
+ KEYWORDS="~ppc ~ppc64"
fi
LICENSE="GPL-2"
@@ -114,8 +114,23 @@ exportmakeopts() {
myopts="${myopts} NO_CURL=YesPlease"
fi
+ # broken assumptions, because of broken build system ...
+ myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts="${myopts} INSTALL=install TAR=tar"
+ myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts="${myopts} SANE_TOOL_PATH="
+ myopts="${myopts} OLD_ICONV="
+ myopts="${myopts} NO_EXTERNAL_GREP="
+
+ # can't define this to null, since the entire makefile depends on it
+ sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
+ || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
+ # || myopts="${myopts} NO_ICONV=YesPlease"
+ # because, above, we need to do this unconditionally (no "&& use iconv")
+ use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+
use tk \
|| myopts="${myopts} NO_TCLTK=YesPlease"
use perl \
@@ -125,6 +140,18 @@ exportmakeopts() {
&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
use subversion \
|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+# if [[ ${CHOST} == *-mint* ]] ; then
+# myopts="${myopts} NO_MMAP=YesPlease"
+# myopts="${myopts} NO_IPV6=YesPlease"
+# myopts="${myopts} NO_STRLCPY=YesPlease"
+# myopts="${myopts} NO_MEMMEM=YesPlease"
+# myopts="${myopts} NO_MKDTEMP=YesPlease"
+# myopts="${myopts} NO_MKSTEMPS=YesPlease"
+# fi
+ if [[ ${CHOST} == ia64-*-hpux* ]]; then
+ myopts="${myopts} NO_NSEC=YesPlease"
+ fi
has_version '>=app-text/asciidoc-8.0' \
&& myopts="${myopts} ASCIIDOC8=YesPlease"
@@ -164,13 +191,19 @@ src_prepare() {
#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
# JS install fixup
- epatch "${FILESDIR}"/git-1.7.0-always-install-js.patch
+ epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
+
+ # USE=-iconv causes segfaults, fixed post 1.7.1
+ # Gentoo bug #321895
+ #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
sed -i \
-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-e 's:^\(CC = \).*$:\1$(OPTCC):' \
-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+ -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+ -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
Makefile || die "sed failed"
# Never install the private copy of Error.pm (bug #296310)
@@ -182,6 +215,8 @@ src_prepare() {
sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
Documentation/Makefile || die "sed failed"
+ # bug #318289
+ epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
}
git_emake() {
@@ -191,8 +226,9 @@ git_emake() {
OPTLDFLAGS="${LDFLAGS}" \
OPTCC="$(tc-getCC)" \
OPTAR="$(tc-getAR)" \
- prefix=/usr \
- htmldir=/usr/share/doc/${PF}/html \
+ prefix="${EPREFIX}"/usr \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ sysconfdir="${EPREFIX}"/etc \
"$@"
}
@@ -235,7 +271,10 @@ src_install() {
install || \
die "make install failed"
- doman man?/*.[157] Documentation/*.[157]
+ # Depending on the tarball and manual rebuild of the documentation, the
+ # manpages may exist in either OR both of these directories.
+ find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+ find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
use doc && dodir /usr/share/doc/${PF}/html
@@ -256,7 +295,7 @@ src_install() {
#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
# don't add automatically to the load-path, so the sitefile
# can do a conditional loading
- touch "${D}${SITELISP}/${PN}/compat/.nosearch"
+ touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
fi
@@ -268,47 +307,51 @@ src_install() {
dobin contrib/fast-import/git-p4
dodoc contrib/fast-import/git-p4.txt
newbin contrib/fast-import/import-tars.perl import-tars
+ newbin contrib/git-resurrect.sh git-resurrect
dodir /usr/share/${PN}/contrib
# The following are excluded:
- # svnimport - use git-svn
- # p4import - excluded because fast-import has a better one
+ # completion - installed above
+ # emacs - installed above
# examples - these are stuff that is not used in Git anymore actually
+ # gitview - installed above
+ # p4import - excluded because fast-import has a better one
# patches - stuff the Git guys made to go upstream to other places
- for i in continuous fast-import hg-to-git \
- hooks remotes2config.sh stats \
- workdir convert-objects blameview ; do
+ # svnimport - use git-svn
+ # thunderbird-patch-inline - fixes thunderbird
+ for i in \
+ blameview buildsystems ciabot continuous convert-objects fast-import \
+ hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \
+ stats svn-fe vim workdir \
+ ; do
cp -rf \
"${S}"/contrib/${i} \
- "${D}"/usr/share/${PN}/contrib \
+ "${ED}"/usr/share/${PN}/contrib \
|| die "Failed contrib ${i}"
done
if use perl && use cgi ; then
- dodir /usr/share/${PN}/gitweb
- insinto /usr/share/${PN}/gitweb
- doins "${S}"/gitweb/gitweb.cgi
- doins "${S}"/gitweb/gitweb.css
+ exeinto /usr/share/${PN}/gitweb
+ doexe "${S}"/gitweb/gitweb.cgi
+ insinto /usr/share/${PN}/gitweb/static
+ doins "${S}"/gitweb/static/gitweb.css
js=gitweb.js
- [ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js
- doins "${S}"/gitweb/${js}
- doins "${S}"/gitweb/git-{favicon,logo}.png
-
- # Make sure it can run
- fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
+ [ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js
+ doins "${S}"/gitweb/static/${js}
+ doins "${S}"/gitweb/static/git-{favicon,logo}.png
# INSTALL discusses configuration issues, not just installation
docinto /
newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
newdoc "${S}"/gitweb/README README.gitweb
- find "${D}"/usr/lib64/perl5/ \
+ find "${ED}"/usr/lib64/perl5/ \
-name .packlist \
-exec rm \{\} \;
fi
if ! use subversion ; then
- rm -f "${D}"/usr/libexec/git-core/git-svn \
- "${D}"/usr/share/man/man1/git-svn.1*
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \
+ "${ED}"/usr/share/man/man1/git-svn.1*
fi
if use xinetd ; then
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-vcs/git: ChangeLog git-9999.ebuild
@ 2010-10-29 19:45 Mark Loeser (halcy0n)
0 siblings, 0 replies; 6+ messages in thread
From: Mark Loeser (halcy0n) @ 2010-10-29 19:45 UTC (permalink / raw
To: gentoo-commits
halcy0n 10/10/29 19:45:42
Modified: ChangeLog git-9999.ebuild
Log:
Remove ~ppc and ~ppc64
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64)
Revision Changes Path
1.44 dev-vcs/git/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.43&r2=1.44
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog 27 Oct 2010 07:44:41 -0000 1.43
+++ ChangeLog 29 Oct 2010 19:45:42 -0000 1.44
@@ -1,6 +1,9 @@
# ChangeLog for dev-vcs/git
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.43 2010/10/27 07:44:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.44 2010/10/29 19:45:42 halcy0n Exp $
+
+ 29 Oct 2010; Mark Loeser <halcy0n@gentoo.org> git-9999.ebuild:
+ Remove ~ppc and ~ppc64
27 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
Bump live build.
1.7 dev-vcs/git/git-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?r1=1.6&r2=1.7
Index: git-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- git-9999.ebuild 27 Oct 2010 07:44:41 -0000 1.6
+++ git-9999.ebuild 29 Oct 2010 19:45:42 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.6 2010/10/27 07:44:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.7 2010/10/29 19:45:42 halcy0n Exp $
EAPI=3
@@ -25,7 +25,7 @@
EGIT_BRANCH="master"
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
# EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
- KEYWORDS="~ppc ~ppc64"
+ KEYWORDS=""
fi
LICENSE="GPL-2"
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-vcs/git: ChangeLog git-9999.ebuild
@ 2010-11-11 1:04 Sebastian Pipping (sping)
0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Pipping (sping) @ 2010-11-11 1:04 UTC (permalink / raw
To: gentoo-commits
sping 10/11/11 01:04:46
Modified: ChangeLog git-9999.ebuild
Log:
dev-vcs/git: Fix dependencies of live ebuild (bug #343063)
(Portage version: 2.1.9.24/cvs/Linux x86_64)
Revision Changes Path
1.46 dev-vcs/git/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.45&r2=1.46
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ChangeLog 9 Nov 2010 20:49:06 -0000 1.45
+++ ChangeLog 11 Nov 2010 01:04:46 -0000 1.46
@@ -1,6 +1,10 @@
# ChangeLog for dev-vcs/git
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.45 2010/11/09 20:49:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.46 2010/11/11 01:04:46 sping Exp $
+
+ 11 Nov 2010; Sebastian Pipping <sping@gentoo.org> git-9999.ebuild:
+ Make live ebuild depend on asciidoc and xmlto independent of flag "doc"
+ (bug #343063)
09 Nov 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.2.3.ebuild,
git-1.7.3.ebuild, git-1.7.3.1.ebuild, git-1.7.3.2.ebuild,
1.8 dev-vcs/git/git-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?r1=1.7&r2=1.8
Index: git-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- git-9999.ebuild 29 Oct 2010 19:45:42 -0000 1.7
+++ git-9999.ebuild 11 Nov 2010 01:04:46 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.7 2010/10/29 19:45:42 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.8 2010/11/11 01:04:46 sping Exp $
EAPI=3
@@ -70,12 +70,11 @@
sys-apps/texinfo
)"
-# Live ebuild builds HTML docs, additionally
+# Live ebuild builds man pages and HTML docs, additionally
if [ "$PV" == "9999" ]; then
DEPEND="${DEPEND}
- doc? (
- app-text/xmlto
- )"
+ app-text/asciidoc
+ app-text/xmlto"
fi
SITEFILE=50${PN}-gentoo.el
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-vcs/git: ChangeLog git-9999.ebuild
@ 2011-01-07 23:06 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 6+ messages in thread
From: Robin H. Johnson (robbat2) @ 2011-01-07 23:06 UTC (permalink / raw
To: gentoo-commits
robbat2 11/01/07 23:06:38
Modified: ChangeLog git-9999.ebuild
Log:
Also import python improvements to 9999 ebuild.
(Portage version: 2.2.0_alpha13/cvs/Linux x86_64)
Revision Changes Path
1.77 dev-vcs/git/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.76&r2=1.77
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -p -w -b -B -u -u -r1.76 -r1.77
--- ChangeLog 7 Jan 2011 23:03:56 -0000 1.76
+++ ChangeLog 7 Jan 2011 23:06:38 -0000 1.77
@@ -1,6 +1,9 @@
# ChangeLog for dev-vcs/git
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.76 2011/01/07 23:03:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.77 2011/01/07 23:06:38 robbat2 Exp $
+
+ 07 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
+ Also import python improvements to 9999 ebuild.
*git-1.7.4_rc1-r2 (07 Jan 2011)
*git-1.7.3.5-r2 (07 Jan 2011)
1.12 dev-vcs/git/git-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?r1=1.11&r2=1.12
Index: git-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -p -w -b -B -u -u -r1.11 -r1.12
--- git-9999.ebuild 7 Jan 2011 21:51:31 -0000 1.11
+++ git-9999.ebuild 7 Jan 2011 23:06:38 -0000 1.12
@@ -1,11 +1,15 @@
# Copyright 1999-2011 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.11 2011/01/07 21:51:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.12 2011/01/07 23:06:38 robbat2 Exp $
EAPI=3
GENTOO_DEPEND_ON_PERL=no
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion python
[ "$PV" == "9999" ] && inherit git
MY_PV="${PV/_rc/.rc}"
@@ -37,7 +41,6 @@ CDEPEND="
!blksha1? ( dev-libs/openssl )
sys-libs/zlib
perl? ( dev-lang/perl[-build] )
- python? ( dev-lang/python )
tk? ( dev-lang/tk )
curl? (
net-misc/curl
@@ -95,6 +98,10 @@ pkg_setup() {
ewarn "with USE=dso, there may be weird crashes in git-svn. You"
ewarn "have been warned."
fi
+ if use python ; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
}
# This is needed because for some obscure reasons future calls to make don't
@@ -239,8 +246,9 @@ src_prepare() {
git_emake() {
# bug #326625: PERL_PATH, PERL_MM_OPT
# bug #320647: PYTHON_PATH
+ # bug #329479: EPYTHON
PYTHON_PATH=""
- use python && PYTHON_PATH="${EPREFIX}/usr/bin/python"
+ use python && PYTHON_PATH="${EPREFIX}/usr/bin/${EPYTHON}"
emake ${MY_MAKEOPTS} \
DESTDIR="${D}" \
OPTCFLAGS="${CFLAGS}" \
@@ -326,6 +334,7 @@ src_install() {
if use python && use gtk ; then
dobin "${S}"/contrib/gitview/gitview
+ python_convert_shebangs "${D}"/usr/bin/gitview
dodoc "${S}"/contrib/gitview/gitview.txt
fi
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-vcs/git: ChangeLog git-9999.ebuild
@ 2011-04-20 11:53 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 6+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-04-20 11:53 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/04/20 11:53:08
Modified: ChangeLog git-9999.ebuild
Log:
Migrate to git-2 eclass. Update live/stable logic conditionals.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Revision Changes Path
1.90 dev-vcs/git/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.89&r2=1.90
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- ChangeLog 6 Apr 2011 23:07:49 -0000 1.89
+++ ChangeLog 20 Apr 2011 11:53:08 -0000 1.90
@@ -1,6 +1,9 @@
# ChangeLog for dev-vcs/git
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.89 2011/04/06 23:07:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.90 2011/04/20 11:53:08 scarabeus Exp $
+
+ 20 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> git-9999.ebuild:
+ Migrate to git-2 eclass. Update live/stable logic conditionals.
*git-1.7.5_rc1 (06 Apr 2011)
*git-1.7.4.4 (06 Apr 2011)
1.19 dev-vcs/git/git-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?r1=1.18&r2=1.19
Index: git-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- git-9999.ebuild 4 Apr 2011 08:58:41 -0000 1.18
+++ git-9999.ebuild 20 Apr 2011 11:53:08 -0000 1.19
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.18 2011/04/04 08:58:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.19 2011/04/20 11:53:08 scarabeus Exp $
EAPI=3
@@ -8,9 +8,10 @@
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_DEPEND="python? 2"
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion python
-[ "$PV" == "9999" ] && inherit git
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion python ${SCM}
MY_PV="${PV/_rc/.rc}"
MY_P="${PN}-${MY_PV}"
@@ -19,16 +20,13 @@
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
+if [[ ${PV} != *9999 ]]; then
SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
else
SRC_URI=""
- EGIT_BRANCH="master"
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
- # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
KEYWORDS=""
fi
@@ -75,7 +73,7 @@
)"
# Live ebuild builds man pages and HTML docs, additionally
-if [ "$PV" == "9999" ]; then
+if [[ ${PV} == *9999 ]]; then
DEPEND="${DEPEND}
app-text/asciidoc
app-text/xmlto"
@@ -180,7 +178,7 @@
}
src_unpack() {
- if [ "${PV}" != "9999" ]; then
+ if [[ ${PV} != *9999 ]]; then
unpack ${MY_P}.tar.bz2
cd "${S}"
unpack ${PN}-manpages-${DOC_VER}.tar.bz2
@@ -189,7 +187,7 @@
unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
cd "${S}"
else
- git_src_unpack
+ git-2_src_unpack
cd "${S}"
#cp "${FILESDIR}"/GIT-VERSION-GEN .
fi
@@ -286,7 +284,7 @@
fi
cd "${S}"/Documentation
- if [[ "$PV" == "9999" ]] ; then
+ if [[ ${PV} == *9999 ]] ; then
git_emake man \
|| die "emake man failed"
if use doc ; then
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-vcs/git: ChangeLog git-9999.ebuild
@ 2011-10-03 10:07 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 6+ messages in thread
From: Robin H. Johnson (robbat2) @ 2011-10-03 10:07 UTC (permalink / raw
To: gentoo-commits
robbat2 11/10/03 10:07:25
Modified: ChangeLog git-9999.ebuild
Log:
Update live ebuild to sync.
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64)
Revision Changes Path
1.101 dev-vcs/git/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.101&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.101&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.100&r2=1.101
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.101
diff -p -w -b -B -u -u -r1.100 -r1.101
--- ChangeLog 1 Oct 2011 00:06:37 -0000 1.100
+++ ChangeLog 3 Oct 2011 10:07:25 -0000 1.101
@@ -1,6 +1,9 @@
# ChangeLog for dev-vcs/git
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.100 2011/10/01 00:06:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.101 2011/10/03 10:07:25 robbat2 Exp $
+
+ 03 Oct 2011; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
+ Update live ebuild to sync.
*git-1.7.7 (01 Oct 2011)
*git-1.7.6.4 (01 Oct 2011)
1.24 dev-vcs/git/git-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?r1=1.23&r2=1.24
Index: git-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v
retrieving revision 1.23
retrieving revision 1.24
diff -p -w -b -B -u -u -r1.23 -r1.24
--- git-9999.ebuild 19 Aug 2011 18:43:47 -0000 1.23
+++ git-9999.ebuild 3 Oct 2011 10:07:25 -0000 1.24
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.23 2011/08/19 18:43:47 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.24 2011/10/03 10:07:25 robbat2 Exp $
EAPI=3
@@ -21,9 +21,17 @@ DOC_VER=${MY_PV}
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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
- mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
- doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
+ SRC_URI_SUFFIX="gz"
+ 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}
+ ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ doc? (
+ ${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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
else
SRC_URI=""
@@ -179,12 +187,12 @@ exportmakeopts() {
src_unpack() {
if [[ ${PV} != *9999 ]]; then
- unpack ${MY_P}.tar.bz2
+ unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
cd "${S}"
- unpack ${PN}-manpages-${DOC_VER}.tar.bz2
+ unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
use doc && \
cd "${S}"/Documentation && \
- unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
cd "${S}"
else
git-2_src_unpack
@@ -246,6 +254,9 @@ src_prepare() {
# merged upstream
#epatch "${FILESDIR}"/git-1.7.5-interix.patch
+
+ # merged upstream
+ #epatch "${FILESDIR}"/git-1.7.6-interix.patch
}
git_emake() {
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-10-03 10:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-29 19:45 [gentoo-commits] gentoo-x86 commit in dev-vcs/git: ChangeLog git-9999.ebuild Mark Loeser (halcy0n)
-- strict thread matches above, loose matches on Subject: below --
2011-10-03 10:07 Robin H. Johnson (robbat2)
2011-04-20 11:53 Tomas Chvatal (scarabeus)
2011-01-07 23:06 Robin H. Johnson (robbat2)
2010-11-11 1:04 Sebastian Pipping (sping)
2010-10-27 7:44 Robin H. Johnson (robbat2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox