summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2011-04-06 23:07:49 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2011-04-06 23:07:49 +0000
commit2feb7ea58e4dae8ff40b11a95462d42b648ce6a8 (patch)
tree9bb483ab5280e1bd18fd7a97221cca8010c6cfeb /dev-vcs
parentVersion bump. (diff)
downloadgentoo-2-2feb7ea58e4dae8ff40b11a95462d42b648ce6a8.tar.gz
gentoo-2-2feb7ea58e4dae8ff40b11a95462d42b648ce6a8.tar.bz2
gentoo-2-2feb7ea58e4dae8ff40b11a95462d42b648ce6a8.zip
Clean up old 1.7.4_rc versions. Version bump to other new versions.
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/git/ChangeLog10
-rw-r--r--dev-vcs/git/git-1.7.4.4.ebuild (renamed from dev-vcs/git/git-1.7.4_rc3.ebuild)2
-rw-r--r--dev-vcs/git/git-1.7.4_rc1-r1.ebuild502
-rw-r--r--dev-vcs/git/git-1.7.4_rc1-r2.ebuild515
-rw-r--r--dev-vcs/git/git-1.7.4_rc1.ebuild492
-rw-r--r--dev-vcs/git/git-1.7.5_rc1.ebuild (renamed from dev-vcs/git/git-1.7.4_rc2.ebuild)2
6 files changed, 11 insertions, 1512 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 159567a0f39b..add1cf456e4e 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,14 @@
# 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.88 2011/04/04 08:58:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.89 2011/04/06 23:07:49 robbat2 Exp $
+
+*git-1.7.5_rc1 (06 Apr 2011)
+*git-1.7.4.4 (06 Apr 2011)
+
+ 06 Apr 2011; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.4_rc1.ebuild,
+ -git-1.7.4_rc1-r1.ebuild, -git-1.7.4_rc1-r2.ebuild, -git-1.7.4_rc2.ebuild,
+ -git-1.7.4_rc3.ebuild, +git-1.7.4.4.ebuild, +git-1.7.5_rc1.ebuild:
+ Clean up old 1.7.4_rc versions. Version bump to other new versions.
04 Apr 2011; Pacho Ramos <pacho@gentoo.org> git-1.6.4.5.ebuild,
git-1.7.2.5.ebuild, git-1.7.3.4-r1.ebuild, git-1.7.3.5.ebuild,
diff --git a/dev-vcs/git/git-1.7.4_rc3.ebuild b/dev-vcs/git/git-1.7.4.4.ebuild
index db738ac5f9bc..b2ef60784665 100644
--- a/dev-vcs/git/git-1.7.4_rc3.ebuild
+++ b/dev-vcs/git/git-1.7.4.4.ebuild
@@ -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-1.7.4_rc3.ebuild,v 1.2 2011/04/04 08:58:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4.4.ebuild,v 1.1 2011/04/06 23:07:49 robbat2 Exp $
EAPI=3
diff --git a/dev-vcs/git/git-1.7.4_rc1-r1.ebuild b/dev-vcs/git/git-1.7.4_rc1-r1.ebuild
deleted file mode 100644
index 01dbde68cc59..000000000000
--- a/dev-vcs/git/git-1.7.4_rc1-r1.ebuild
+++ /dev/null
@@ -1,502 +0,0 @@
-# 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-1.7.4_rc1-r1.ebuild,v 1.4 2011/04/04 08:58:41 pacho Exp $
-
-EAPI=3
-
-GENTOO_DEPEND_ON_PERL=no
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-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 )"
- 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
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-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
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI )
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
- )
- python? ( gtk?
- (
- >=dev-python/pygtk-2.8
- dev-python/pygtksourceview:2
- ) )"
-
-# This is how info docs are created with Git:
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook
-# .xml/docbook --(docbook2texi.pl)--> .texi
-# .texi --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
- app-arch/cpio
- doc? (
- app-text/asciidoc
- app-text/docbook2X
- sys-apps/texinfo
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [ "$PV" == "9999" ]; then
- DEPEND="${DEPEND}
- app-text/asciidoc
- app-text/xmlto"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if ! use perl ; then
- use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
- use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
- use subversion && ewarn "git-svn needs USE=perl, it won't work"
- fi
- if use webdav && ! use curl ; then
- ewarn "USE=webdav needs USE=curl. Ignoring"
- fi
- if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
- ewarn "with USE=dso, there may be weird crashes in git-svn. You"
- ewarn "have been warned."
- fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
- local myopts
-
- if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
- elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
- fi
-
- if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
- else
- 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 \
- || 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 \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
- use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
- use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
- use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
- use cvs \
- || myopts="${myopts} NO_CVS=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"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
- # Bug 290465:
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
- [[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
-
- export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
- if [ "${PV}" != "9999" ]; then
- unpack ${MY_P}.tar.bz2
- cd "${S}"
- unpack ${PN}-manpages-${DOC_VER}.tar.bz2
- use doc && \
- cd "${S}"/Documentation && \
- unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
- cd "${S}"
- else
- git_src_unpack
- cd "${S}"
- #cp "${FILESDIR}"/GIT-VERSION-GEN .
- fi
-
-}
-
-src_prepare() {
- # Noperl is being merged to upstream as of 2009/04/05
- #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
- # GetOpt-Long v2.38 is strict
- # Merged in 1.6.3 final 2009/05/07
- #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
- # JS install fixup
- 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
-
- # Fix false positives with t3404 due to SHELL=/bin/false for the portage
- # user.
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
-
- # bug #350075: t9001: fix missing prereq on some tests
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
-
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.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)
- sed -i \
- -e '/private-Error.pm/s,^,#,' \
- perl/Makefile.PL
-
- # Fix docbook2texi command
- sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
- Documentation/Makefile || die "sed failed"
-
- # bug #318289
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
-}
-
-git_emake() {
- # bug #326625: PERL_PATH, PERL_MM_OPT
- # bug #320647: PYTHON_PATH
- PYTHON_PATH=""
- use python && PYTHON_PATH="${EPREFIX}/usr/bin/python"
- emake ${MY_MAKEOPTS} \
- DESTDIR="${D}" \
- OPTCFLAGS="${CFLAGS}" \
- OPTLDFLAGS="${LDFLAGS}" \
- OPTCC="$(tc-getCC)" \
- OPTAR="$(tc-getAR)" \
- prefix="${EPREFIX}"/usr \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- sysconfdir="${EPREFIX}"/etc \
- PYTHON_PATH="${PYTHON_PATH}" \
- PERL_PATH="${EPREFIX}/usr/bin/env perl" \
- PERL_MM_OPT="" \
- GIT_TEST_OPTS="--no-color" \
- "$@"
-}
-
-src_configure() {
- exportmakeopts
-}
-
-src_compile() {
- git_emake || die "emake failed"
-
- if use emacs ; then
- elisp-compile contrib/emacs/git{,-blame}.el \
- || die "emacs modules failed"
- fi
-
- if use perl && use cgi ; then
- git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
- fi
-
- cd "${S}"/Documentation
- if [[ "$PV" == "9999" ]] ; then
- git_emake man \
- || die "emake man failed"
- if use doc ; then
- git_emake info html \
- || die "emake info html failed"
- fi
- else
- if use doc ; then
- git_emake info \
- || die "emake info html failed"
- fi
- fi
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- # 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
- for d in / /howto/ /technical/ ; do
- docinto ${d}
- dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
- done
- docinto /
- # Upstream does not ship this pre-built :-(
- use doc && doinfo Documentation/{git,gitman}.info
-
- dobashcompletion contrib/completion/git-completion.bash ${PN}
-
- if use emacs ; then
- elisp-install ${PN} contrib/emacs/git.{el,elc} || die
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
- #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 "${ED}${SITELISP}/${PN}/compat/.nosearch"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
- fi
-
- if use python && use gtk ; then
- dobin "${S}"/contrib/gitview/gitview
- dodoc "${S}"/contrib/gitview/gitview.txt
- fi
-
- 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:
- # 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
- # 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} \
- "${ED}"/usr/share/${PN}/contrib \
- || die "Failed contrib ${i}"
- done
-
- if use perl && use cgi ; then
- # We used to install in /usr/share/${PN}/gitweb
- # but upstream installs in /usr/share/gitweb
- # so we will install a symlink and use their location for compat with other
- # distros
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
- # INSTALL discusses configuration issues, not just installation
- docinto /
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
- newdoc "${S}"/gitweb/README README.gitweb
-
- find "${ED}"/usr/lib64/perl5/ \
- -name .packlist \
- -exec rm \{\} \;
- else
- rm -rf "${ED}"/usr/share/gitweb
- fi
-
- if ! use subversion ; then
- rm -f "${ED}"/usr/libexec/git-core/git-svn \
- "${ED}"/usr/share/man/man1/git-svn.1*
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon
- fi
-
- newinitd "${FILESDIR}"/git-daemon.initd git-daemon
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
- fixlocalpod
-}
-
-src_test() {
- local disabled=""
- local tests_cvs="t9200-git-cvsexportcommit.sh \
- t9400-git-cvsserver-server.sh \
- t9401-git-cvsserver-crlf.sh \
- t9600-cvsimport.sh \
- t9601-cvsimport-vendor-branch.sh \
- t9602-cvsimport-branches-tags.sh \
- t9603-cvsimport-patchsets.sh"
- local tests_perl="t5502-quickfetch.sh \
- t5512-ls-remote.sh \
- t5520-pull.sh"
- # Bug #225601 - t0004 is not suitable for root perm
- # Bug #219839 - t1004 is not suitable for root perm
- # t0001-init.sh - check for init notices EPERM* fails
- local tests_nonroot="t0001-init.sh \
- t0004-unwritable.sh \
- t1004-read-tree-m-u-wf.sh \
- t3700-add.sh \
- t7300-clean.sh"
-
- # Unzip is used only for the testcase code, not by any normal parts of Git.
- if ! has_version app-arch/unzip ; then
- einfo "Disabling tar-tree tests"
- disabled="${disabled} t5000-tar-tree.sh"
- fi
-
- cvs=0
- use cvs && let cvs=$cvs+1
- if [[ ${EUID} -eq 0 ]]; then
- if [[ $cvs -eq 1 ]]; then
- ewarn "Skipping CVS tests because CVS does not work as root!"
- ewarn "You should retest with FEATURES=userpriv!"
- disabled="${disabled} ${tests_cvs}"
- fi
- einfo "Skipping other tests that require being non-root"
- disabled="${disabled} ${tests_nonroot}"
- else
- [[ $cvs -gt 0 ]] && \
- has_version dev-vcs/cvs && \
- let cvs=$cvs+1
- [[ $cvs -gt 1 ]] && \
- built_with_use dev-vcs/cvs server && \
- let cvs=$cvs+1
- if [[ $cvs -lt 3 ]]; then
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
- disabled="${disabled} ${tests_cvs}"
- fi
- fi
-
- if ! use perl ; then
- einfo "Disabling tests that need Perl"
- disabled="${disabled} ${tests_perl}"
- fi
-
- # Reset all previously disabled tests
- cd "${S}/t"
- for i in *.sh.DISABLED ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
- done
- einfo "Disabled tests:"
- for i in ${disabled} ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
- done
-
- # Avoid the test system removing the results because we want them ourselves
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
- -i "${S}"/t/Makefile
-
- # Clean old results first
- cd "${S}/t"
- git_emake clean
-
- # Now run the tests
- cd "${S}"
- einfo "Start test run"
- git_emake test
- rc=$?
-
- # Display nice results
- cd "${S}/t"
- git_emake aggregate-results
-
- # And exit
- [ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
- local pkg=$1
- shift
- elog " $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then
- ewarn "You must build dev-vcs/subversion with USE=perl"
- ewarn "to get the full functionality of git-svn!"
- fi
- elog "These additional scripts need some dependencies:"
- echo
- showpkgdeps git-quiltimport "dev-util/quilt"
- showpkgdeps git-instaweb \
- "|| ( www-servers/lighttpd www-servers/apache )"
- echo
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-1.7.4_rc1-r2.ebuild b/dev-vcs/git/git-1.7.4_rc1-r2.ebuild
deleted file mode 100644
index 15c178698b6c..000000000000
--- a/dev-vcs/git/git-1.7.4_rc1-r2.ebuild
+++ /dev/null
@@ -1,515 +0,0 @@
-# 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-1.7.4_rc1-r2.ebuild,v 1.7 2011/04/04 08:58:41 pacho Exp $
-
-EAPI=3
-
-GENTOO_DEPEND_ON_PERL=no
-
-# 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}"
-MY_P="${PN}-${MY_PV}"
-
-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 )"
- 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
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- !blksha1? ( dev-libs/openssl )
- sys-libs/zlib
- perl? ( dev-lang/perl[-build] )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI )
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
- )
- python? ( gtk?
- (
- >=dev-python/pygtk-2.8
- dev-python/pygtksourceview:2
- ) )"
-
-# This is how info docs are created with Git:
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook
-# .xml/docbook --(docbook2texi.pl)--> .texi
-# .texi --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
- app-arch/cpio
- doc? (
- app-text/asciidoc
- app-text/docbook2X
- sys-apps/texinfo
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [ "$PV" == "9999" ]; then
- DEPEND="${DEPEND}
- app-text/asciidoc
- app-text/xmlto"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if ! use perl ; then
- use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
- use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
- use subversion && ewarn "git-svn needs USE=perl, it won't work"
- fi
- if use webdav && ! use curl ; then
- ewarn "USE=webdav needs USE=curl. Ignoring"
- fi
- if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
- 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
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
- local myopts
-
- if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
- elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
- fi
-
- if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
- else
- 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 \
- || 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 \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
- use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
- use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
- use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
- use cvs \
- || myopts="${myopts} NO_CVS=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
- if [[ ${CHOST} == *-*-aix* ]]; then
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
- fi
-
- has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
- # Bug 290465:
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
- [[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
-
- export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
- if [ "${PV}" != "9999" ]; then
- unpack ${MY_P}.tar.bz2
- cd "${S}"
- unpack ${PN}-manpages-${DOC_VER}.tar.bz2
- use doc && \
- cd "${S}"/Documentation && \
- unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
- cd "${S}"
- else
- git_src_unpack
- cd "${S}"
- #cp "${FILESDIR}"/GIT-VERSION-GEN .
- fi
-
-}
-
-src_prepare() {
- # Noperl is being merged to upstream as of 2009/04/05
- #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
- # GetOpt-Long v2.38 is strict
- # Merged in 1.6.3 final 2009/05/07
- #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
- # JS install fixup
- 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
-
- # Fix false positives with t3404 due to SHELL=/bin/false for the portage
- # user.
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
-
- # bug #350075: t9001: fix missing prereq on some tests
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
-
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.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)
- sed -i \
- -e '/private-Error.pm/s,^,#,' \
- perl/Makefile.PL
-
- # Fix docbook2texi command
- sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
- Documentation/Makefile || die "sed failed"
-
- # bug #318289
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
-}
-
-git_emake() {
- # bug #326625: PERL_PATH, PERL_MM_OPT
- # bug #320647: PYTHON_PATH
- PYTHON_PATH=""
- use python && PYTHON_PATH="$(PYTHON -a)"
- emake ${MY_MAKEOPTS} \
- DESTDIR="${D}" \
- OPTCFLAGS="${CFLAGS}" \
- OPTLDFLAGS="${LDFLAGS}" \
- OPTCC="$(tc-getCC)" \
- OPTAR="$(tc-getAR)" \
- prefix="${EPREFIX}"/usr \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- sysconfdir="${EPREFIX}"/etc \
- PYTHON_PATH="${PYTHON_PATH}" \
- PERL_PATH="${EPREFIX}/usr/bin/env perl" \
- PERL_MM_OPT="" \
- GIT_TEST_OPTS="--no-color" \
- "$@"
-}
-
-src_configure() {
- exportmakeopts
-}
-
-src_compile() {
- git_emake || die "emake failed"
-
- if use emacs ; then
- elisp-compile contrib/emacs/git{,-blame}.el \
- || die "emacs modules failed"
- fi
-
- if use perl && use cgi ; then
- git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
- fi
-
- cd "${S}"/Documentation
- if [[ "$PV" == "9999" ]] ; then
- git_emake man \
- || die "emake man failed"
- if use doc ; then
- git_emake info html \
- || die "emake info html failed"
- fi
- else
- if use doc ; then
- git_emake info \
- || die "emake info html failed"
- fi
- fi
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- # 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
- for d in / /howto/ /technical/ ; do
- docinto ${d}
- dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
- done
- docinto /
- # Upstream does not ship this pre-built :-(
- use doc && doinfo Documentation/{git,gitman}.info
-
- dobashcompletion contrib/completion/git-completion.bash ${PN}
-
- if use emacs ; then
- elisp-install ${PN} contrib/emacs/git.{el,elc} || die
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
- #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 "${ED}${SITELISP}/${PN}/compat/.nosearch"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
- fi
-
- if use python && use gtk ; then
- dobin "${S}"/contrib/gitview/gitview
- python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
- dodoc "${S}"/contrib/gitview/gitview.txt
- fi
-
- 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:
- # 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
- # 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} \
- "${ED}"/usr/share/${PN}/contrib \
- || die "Failed contrib ${i}"
- done
-
- if use perl && use cgi ; then
- # We used to install in /usr/share/${PN}/gitweb
- # but upstream installs in /usr/share/gitweb
- # so we will install a symlink and use their location for compat with other
- # distros
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
- # INSTALL discusses configuration issues, not just installation
- docinto /
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
- newdoc "${S}"/gitweb/README README.gitweb
-
- find "${ED}"/usr/lib64/perl5/ \
- -name .packlist \
- -exec rm \{\} \;
- else
- rm -rf "${ED}"/usr/share/gitweb
- fi
-
- if ! use subversion ; then
- rm -f "${ED}"/usr/libexec/git-core/git-svn \
- "${ED}"/usr/share/man/man1/git-svn.1*
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon
- fi
-
- newinitd "${FILESDIR}"/git-daemon.initd git-daemon
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
- fixlocalpod
-}
-
-src_test() {
- local disabled=""
- local tests_cvs="t9200-git-cvsexportcommit.sh \
- t9400-git-cvsserver-server.sh \
- t9401-git-cvsserver-crlf.sh \
- t9600-cvsimport.sh \
- t9601-cvsimport-vendor-branch.sh \
- t9602-cvsimport-branches-tags.sh \
- t9603-cvsimport-patchsets.sh"
- local tests_perl="t5502-quickfetch.sh \
- t5512-ls-remote.sh \
- t5520-pull.sh"
- # Bug #225601 - t0004 is not suitable for root perm
- # Bug #219839 - t1004 is not suitable for root perm
- # t0001-init.sh - check for init notices EPERM* fails
- local tests_nonroot="t0001-init.sh \
- t0004-unwritable.sh \
- t1004-read-tree-m-u-wf.sh \
- t3700-add.sh \
- t7300-clean.sh"
-
- # Unzip is used only for the testcase code, not by any normal parts of Git.
- if ! has_version app-arch/unzip ; then
- einfo "Disabling tar-tree tests"
- disabled="${disabled} t5000-tar-tree.sh"
- fi
-
- cvs=0
- use cvs && let cvs=$cvs+1
- if [[ ${EUID} -eq 0 ]]; then
- if [[ $cvs -eq 1 ]]; then
- ewarn "Skipping CVS tests because CVS does not work as root!"
- ewarn "You should retest with FEATURES=userpriv!"
- disabled="${disabled} ${tests_cvs}"
- fi
- einfo "Skipping other tests that require being non-root"
- disabled="${disabled} ${tests_nonroot}"
- else
- [[ $cvs -gt 0 ]] && \
- has_version dev-vcs/cvs && \
- let cvs=$cvs+1
- [[ $cvs -gt 1 ]] && \
- built_with_use dev-vcs/cvs server && \
- let cvs=$cvs+1
- if [[ $cvs -lt 3 ]]; then
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
- disabled="${disabled} ${tests_cvs}"
- fi
- fi
-
- if ! use perl ; then
- einfo "Disabling tests that need Perl"
- disabled="${disabled} ${tests_perl}"
- fi
-
- # Reset all previously disabled tests
- cd "${S}/t"
- for i in *.sh.DISABLED ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
- done
- einfo "Disabled tests:"
- for i in ${disabled} ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
- done
-
- # Avoid the test system removing the results because we want them ourselves
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
- -i "${S}"/t/Makefile
-
- # Clean old results first
- cd "${S}/t"
- git_emake clean
-
- # Now run the tests
- cd "${S}"
- einfo "Start test run"
- git_emake test
- rc=$?
-
- # Display nice results
- cd "${S}/t"
- git_emake aggregate-results
-
- # And exit
- [ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
- local pkg=$1
- shift
- elog " $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- use python && python_mod_optimize git_remote_helpers
- if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then
- ewarn "You must build dev-vcs/subversion with USE=perl"
- ewarn "to get the full functionality of git-svn!"
- fi
- elog "These additional scripts need some dependencies:"
- echo
- showpkgdeps git-quiltimport "dev-util/quilt"
- showpkgdeps git-instaweb \
- "|| ( www-servers/lighttpd www-servers/apache )"
- echo
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use python && python_mod_cleanup git_remote_helpers
-}
diff --git a/dev-vcs/git/git-1.7.4_rc1.ebuild b/dev-vcs/git/git-1.7.4_rc1.ebuild
deleted file mode 100644
index 86661b86a661..000000000000
--- a/dev-vcs/git/git-1.7.4_rc1.ebuild
+++ /dev/null
@@ -1,492 +0,0 @@
-# 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-1.7.4_rc1.ebuild,v 1.2 2011/04/04 08:58:41 pacho Exp $
-
-EAPI=3
-
-GENTOO_DEPEND_ON_PERL=no
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-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 )"
- 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
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- !blksha1? ( dev-libs/openssl )
- sys-libs/zlib
- perl? ( dev-lang/perl[-build] )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI )
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
- )
- gtk?
- (
- >=dev-python/pygtk-2.8
- dev-python/pygtksourceview:2
- )"
-
-# This is how info docs are created with Git:
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook
-# .xml/docbook --(docbook2texi.pl)--> .texi
-# .texi --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
- app-arch/cpio
- doc? (
- app-text/asciidoc
- app-text/docbook2X
- sys-apps/texinfo
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [ "$PV" == "9999" ]; then
- DEPEND="${DEPEND}
- app-text/asciidoc
- app-text/xmlto"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if ! use perl ; then
- use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
- use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
- use subversion && ewarn "git-svn needs USE=perl, it won't work"
- fi
- if use webdav && ! use curl ; then
- ewarn "USE=webdav needs USE=curl. Ignoring"
- fi
- if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
- ewarn "with USE=dso, there may be weird crashes in git-svn. You"
- ewarn "have been warned."
- fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
- local myopts
-
- if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
- elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
- fi
-
- if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
- else
- 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 \
- || 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 \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
- use threads \
- && 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"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
- # Bug 290465:
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
- [[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
-
- export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
- if [ "${PV}" != "9999" ]; then
- unpack ${MY_P}.tar.bz2
- cd "${S}"
- unpack ${PN}-manpages-${DOC_VER}.tar.bz2
- use doc && \
- cd "${S}"/Documentation && \
- unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
- cd "${S}"
- else
- git_src_unpack
- cd "${S}"
- #cp "${FILESDIR}"/GIT-VERSION-GEN .
- fi
-
-}
-
-src_prepare() {
- # Noperl is being merged to upstream as of 2009/04/05
- #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
- # GetOpt-Long v2.38 is strict
- # Merged in 1.6.3 final 2009/05/07
- #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
- # JS install fixup
- 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
-
- # Fix false positives with t3404 due to SHELL=/bin/false for the portage
- # user.
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
-
- # bug #350075: t9001: fix missing prereq on some tests
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.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)
- sed -i \
- -e '/private-Error.pm/s,^,#,' \
- perl/Makefile.PL
-
- # Fix docbook2texi command
- sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
- Documentation/Makefile || die "sed failed"
-
- # bug #318289
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
-}
-
-git_emake() {
- # bug #326625: PERL_PATH, PERL_MM_OPT
- # bug #320647: PYTHON_PATH
- emake ${MY_MAKEOPTS} \
- DESTDIR="${D}" \
- OPTCFLAGS="${CFLAGS}" \
- OPTLDFLAGS="${LDFLAGS}" \
- OPTCC="$(tc-getCC)" \
- OPTAR="$(tc-getAR)" \
- prefix="${EPREFIX}"/usr \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- sysconfdir="${EPREFIX}"/etc \
- PYTHON_PATH="${EPREFIX}/usr/bin/python" \
- PERL_PATH="${EPREFIX}/usr/bin/env perl" \
- PERL_MM_OPT="" \
- GIT_TEST_OPTS="--no-color" \
- "$@"
-}
-
-src_configure() {
- exportmakeopts
-}
-
-src_compile() {
- git_emake || die "emake failed"
-
- if use emacs ; then
- elisp-compile contrib/emacs/git{,-blame}.el \
- || die "emacs modules failed"
- fi
-
- if use perl && use cgi ; then
- git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
- fi
-
- cd "${S}"/Documentation
- if [[ "$PV" == "9999" ]] ; then
- git_emake man \
- || die "emake man failed"
- if use doc ; then
- git_emake info html \
- || die "emake info html failed"
- fi
- else
- if use doc ; then
- git_emake info \
- || die "emake info html failed"
- fi
- fi
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- # 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
- for d in / /howto/ /technical/ ; do
- docinto ${d}
- dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
- done
- docinto /
- # Upstream does not ship this pre-built :-(
- use doc && doinfo Documentation/{git,gitman}.info
-
- dobashcompletion contrib/completion/git-completion.bash ${PN}
-
- if use emacs ; then
- elisp-install ${PN} contrib/emacs/git.{el,elc} || die
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
- #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 "${ED}${SITELISP}/${PN}/compat/.nosearch"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
- fi
-
- if use gtk ; then
- dobin "${S}"/contrib/gitview/gitview
- dodoc "${S}"/contrib/gitview/gitview.txt
- fi
-
- 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:
- # 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
- # 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} \
- "${ED}"/usr/share/${PN}/contrib \
- || die "Failed contrib ${i}"
- done
-
- if use perl && use cgi ; then
- # We used to install in /usr/share/${PN}/gitweb
- # but upstream installs in /usr/share/gitweb
- # so we will install a symlink and use their location for compat with other
- # distros
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
- # INSTALL discusses configuration issues, not just installation
- docinto /
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
- newdoc "${S}"/gitweb/README README.gitweb
-
- find "${ED}"/usr/lib64/perl5/ \
- -name .packlist \
- -exec rm \{\} \;
- else
- rm -rf "${D}"/usr/share/gitweb
- fi
-
- if ! use subversion ; then
- rm -f "${ED}"/usr/libexec/git-core/git-svn \
- "${ED}"/usr/share/man/man1/git-svn.1*
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon
- fi
-
- newinitd "${FILESDIR}"/git-daemon.initd git-daemon
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
- fixlocalpod
-}
-
-src_test() {
- local disabled=""
- local tests_cvs="t9200-git-cvsexportcommit.sh \
- t9400-git-cvsserver-server.sh \
- t9401-git-cvsserver-crlf.sh \
- t9600-cvsimport.sh \
- t9601-cvsimport-vendor-branch.sh \
- t9602-cvsimport-branches-tags.sh \
- t9603-cvsimport-patchsets.sh"
- local tests_perl="t5502-quickfetch.sh \
- t5512-ls-remote.sh \
- t5520-pull.sh"
- # Bug #225601 - t0004 is not suitable for root perm
- # Bug #219839 - t1004 is not suitable for root perm
- # t0001-init.sh - check for init notices EPERM* fails
- local tests_nonroot="t0001-init.sh \
- t0004-unwritable.sh \
- t1004-read-tree-m-u-wf.sh \
- t3700-add.sh \
- t7300-clean.sh"
-
- # Unzip is used only for the testcase code, not by any normal parts of Git.
- if ! has_version app-arch/unzip ; then
- einfo "Disabling tar-tree tests"
- disabled="${disabled} t5000-tar-tree.sh"
- fi
-
- cvs=0
- use cvs && let cvs=$cvs+1
- if [[ ${EUID} -eq 0 ]]; then
- if [[ $cvs -eq 1 ]]; then
- ewarn "Skipping CVS tests because CVS does not work as root!"
- ewarn "You should retest with FEATURES=userpriv!"
- disabled="${disabled} ${tests_cvs}"
- fi
- einfo "Skipping other tests that require being non-root"
- disabled="${disabled} ${tests_nonroot}"
- else
- [[ $cvs -gt 0 ]] && \
- has_version dev-vcs/cvs && \
- let cvs=$cvs+1
- [[ $cvs -gt 1 ]] && \
- built_with_use dev-vcs/cvs server && \
- let cvs=$cvs+1
- if [[ $cvs -lt 3 ]]; then
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
- disabled="${disabled} ${tests_cvs}"
- fi
- fi
-
- if ! use perl ; then
- einfo "Disabling tests that need Perl"
- disabled="${disabled} ${tests_perl}"
- fi
-
- # Reset all previously disabled tests
- cd "${S}/t"
- for i in *.sh.DISABLED ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
- done
- einfo "Disabled tests:"
- for i in ${disabled} ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
- done
-
- # Avoid the test system removing the results because we want them ourselves
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
- -i "${S}"/t/Makefile
-
- # Clean old results first
- cd "${S}/t"
- git_emake clean
-
- # Now run the tests
- cd "${S}"
- einfo "Start test run"
- git_emake test
- rc=$?
-
- # Display nice results
- cd "${S}/t"
- git_emake aggregate-results
-
- # And exit
- [ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
- local pkg=$1
- shift
- elog " $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then
- ewarn "You must build dev-vcs/subversion with USE=perl"
- ewarn "to get the full functionality of git-svn!"
- fi
- elog "These additional scripts need some dependencies:"
- echo
- showpkgdeps git-quiltimport "dev-util/quilt"
- showpkgdeps git-instaweb \
- "|| ( www-servers/lighttpd www-servers/apache )"
- echo
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-1.7.4_rc2.ebuild b/dev-vcs/git/git-1.7.5_rc1.ebuild
index 0b5d5f57a0bd..5b265010b966 100644
--- a/dev-vcs/git/git-1.7.4_rc2.ebuild
+++ b/dev-vcs/git/git-1.7.5_rc1.ebuild
@@ -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-1.7.4_rc2.ebuild,v 1.2 2011/04/04 08:58:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.5_rc1.ebuild,v 1.1 2011/04/06 23:07:49 robbat2 Exp $
EAPI=3