From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Obz46-0004DB-9k for garchives@archives.gentoo.org; Thu, 22 Jul 2010 16:56:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8B17E081F; Thu, 22 Jul 2010 16:56:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5B581E081F for ; Thu, 22 Jul 2010 16:56:08 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EFA021B4041 for ; Thu, 22 Jul 2010 16:56:07 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 544) id 51DCD2CE15; Thu, 22 Jul 2010 16:56:07 +0000 (UTC) From: "Robin H. Johnson (robbat2)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, robbat2@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/git: ChangeLog git-1.7.2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog git-1.7.2.ebuild X-VCS-Directories: dev-vcs/git X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson Content-Type: text/plain; charset=utf8 Message-Id: <20100722165607.51DCD2CE15@corvid.gentoo.org> Date: Thu, 22 Jul 2010 16:56:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 2eb328c6-b04f-44e8-bdf5-3938be71c62a X-Archives-Hash: 5ca1baa9df4081d50c8b2cfedc70ac43 robbat2 10/07/22 16:56:07 Modified: ChangeLog Added: git-1.7.2.ebuild Log: Version bump. (Portage version: 2.2_rc67/cvs/Linux x86_64) Revision Changes Path 1.18 dev-vcs/git/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/Change= Log?rev=3D1.18&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/Change= Log?rev=3D1.18&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/Change= Log?r1=3D1.17&r2=3D1.18 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v retrieving revision 1.17 retrieving revision 1.18 diff -p -w -b -B -u -u -r1.17 -r1.18 --- ChangeLog 18 Jul 2010 16:53:48 -0000 1.17 +++ ChangeLog 22 Jul 2010 16:56:06 -0000 1.18 @@ -1,6 +1,12 @@ # 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.17 2010/07/= 18 16:53:48 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.18 2010/07/= 22 16:56:06 robbat2 Exp $ + +*git-1.7.2 (22 Jul 2010) + + 22 Jul 2010; Robin H. Johnson +git-1.7.2.ebuild, + +files/git-1.7.2-always-install-js.patch: + Version bump. =20 18 Jul 2010; Ra=C3=BAl Porcel git-1.7.1-r1.ebuild= : alpha/arm/ia64/s390/sh/sparc stable wrt #321899 1.1 dev-vcs/git/git-1.7.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.= 7.2.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.= 7.2.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: git-1.7.2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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-1.7.2.ebuild,v 1.1 201= 0/07/22 16:56:06 robbat2 Exp $ EAPI=3D2 inherit toolchain-funcs eutils elisp-common perl-module bash-completion [ "$PV" =3D=3D "9999" ] && inherit git MY_PV=3D"${PV/_rc/.rc}" MY_P=3D"${PN}-${MY_PV}" DOC_VER=3D${MY_PV} DESCRIPTION=3D"GIT - the stupid content tracker, the revision control sys= tem heavily used by the Linux kernel team" HOMEPAGE=3D"http://www.git-scm.com/" if [ "$PV" !=3D "9999" ]; then SRC_URI=3D"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=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~= sparc ~x86 ~sparc-fbsd ~x86-fbsd" else SRC_URI=3D"" EGIT_BRANCH=3D"master" EGIT_REPO_URI=3D"git://git.kernel.org/pub/scm/git/git.git" # EGIT_REPO_URI=3D"http://www.kernel.org/pub/scm/git/git.git" KEYWORDS=3D"" fi LICENSE=3D"GPL-2" SLOT=3D"0" IUSE=3D"+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads = +webdav xinetd cvs subversion" # Common to both DEPEND and RDEPEND CDEPEND=3D" !blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs )" RDEPEND=3D"${CDEPEND} perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=3Ddev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-p= erl/TermReadKey ) ) gtk? ( >=3Ddev-python/pygtk-2.8 || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) )" # This is how info docs are created with Git: # .txt/asciidoc --(asciidoc)---------> .xml/docbook # .xml/docbook --(docbook2texi.pl)--> .texi # .texi --(makeinfo)---------> .info DEPEND=3D"${CDEPEND} app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo )" # Live ebuild builds HTML docs, additionally if [ "$PV" =3D=3D "9999" ]; then DEPEND=3D"${DEPEND} doc? ( app-text/xmlto )" fi SITEFILE=3D50${PN}-gentoo.el S=3D"${WORKDIR}/${MY_P}" pkg_setup() { if ! use perl ; then use cgi && ewarn "gitweb needs USE=3Dperl, ignoring USE=3Dcgi" use cvs && ewarn "CVS integration needs USE=3Dperl, ignoring USE=3Dcvs" use subversion && ewarn "git-svn needs USE=3Dperl, it won't work" fi if use webdav && ! use curl ; then ewarn "USE=3Dwebdav needs USE=3Dcurl. 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=3Ddso, 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 do= n't # pick up these exports if we export them in src_unpack() exportmakeopts() { local myopts if use blksha1 ; then myopts=3D"${myopts} BLK_SHA1=3DYesPlease" elif use ppcsha1 ; then myopts=3D"${myopts} PPC_SHA1=3DYesPlease" fi if use curl ; then use webdav || myopts=3D"${myopts} NO_EXPAT=3DYesPlease" else myopts=3D"${myopts} NO_CURL=3DYesPlease" fi use iconv \ || einfo "Forcing iconv for 1.7.1-r1 due to bugs #321895, #322205." # || myopts=3D"${myopts} NO_ICONV=3DYesPlease" use tk \ || myopts=3D"${myopts} NO_TCLTK=3DYesPlease" use perl \ && myopts=3D"${myopts} INSTALLDIRS=3Dvendor" \ || myopts=3D"${myopts} NO_PERL=3DYesPlease" use threads \ && myopts=3D"${myopts} THREADED_DELTA_SEARCH=3DYesPlease" use subversion \ || myopts=3D"${myopts} NO_SVN_TESTS=3DYesPlease" has_version '>=3Dapp-text/asciidoc-8.0' \ && myopts=3D"${myopts} ASCIIDOC8=3DYesPlease" myopts=3D"${myopts} ASCIIDOC_NO_ROFF=3DYesPlease" # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st= _mtim' [[ "${CHOST}" =3D=3D *-uclibc* ]] && \ myopts=3D"${myopts} NO_NSEC=3DYesPlease" export MY_MAKEOPTS=3D"${myopts}" } src_unpack() { if [ "${PV}" !=3D "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=3D-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 =3D\).*$:\1 $(OPTCFLAGS) -Wall:' \ -e 's:^\(LDFLAGS =3D\).*$:\1 $(OPTLDFLAGS):' \ -e 's:^\(CC =3D \).*$:\1$(OPTCC):' \ -e 's:^\(AR =3D \).*$:\1$(OPTAR):' \ 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=3Ddocbook2x-texi/DOCBOOK2X_TEXI=3Ddocbook2texi.= pl/' \ Documentation/Makefile || die "sed failed" } git_emake() { emake ${MY_MAKEOPTS} \ DESTDIR=3D"${D}" \ OPTCFLAGS=3D"${CFLAGS}" \ OPTLDFLAGS=3D"${LDFLAGS}" \ OPTCC=3D"$(tc-getCC)" \ OPTAR=3D"$(tc-getAR)" \ prefix=3D/usr \ htmldir=3D/usr/share/doc/${PF}/html \ "$@" } 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" =3D=3D "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" doman man?/*.[157] 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 "${D}${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 dodir /usr/share/${PN}/contrib # The following are excluded: # svnimport - use git-svn # p4import - excluded because fast-import has a better one # examples - these are stuff that is not used in Git anymore actually # 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 cp -rf \ "${S}"/contrib/${i} \ "${D}"/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 js=3Dgitweb.js [ -f "${S}"/gitweb/gitweb.min.js ] && js=3Dgitweb.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 # 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/ \ -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* 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=3D"" local tests_cvs=3D"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=3D"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=3D"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 G= it. if ! has_version app-arch/unzip ; then einfo "Disabling tar-tree tests" disabled=3D"${disabled} t5000-tar-tree.sh" fi cvs=3D0 use cvs && let cvs=3D$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=3Duserpriv!" disabled=3D"${disabled} ${tests_cvs}" fi einfo "Skipping other tests that require being non-root" disabled=3D"${disabled} ${tests_nonroot}" else [[ $cvs -gt 0 ]] && \ has_version dev-vcs/cvs && \ let cvs=3D$cvs+1 [[ $cvs -gt 1 ]] && \ built_with_use dev-vcs/cvs server && \ let cvs=3D$cvs+1 if [[ $cvs -lt 3 ]]; then einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=3Dserver])" disabled=3D"${disabled} ${tests_cvs}" fi fi if ! use perl ; then einfo "Disabling tests that need Perl" disabled=3D"${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 cd "${S}" # Now run the tests einfo "Start test run" git_emake \ test || die "tests failed" } showpkgdeps() { local pkg=3D$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=3Dperl" 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 }