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 1M2VKX-0002vP-US for garchives@archives.gentoo.org; Fri, 08 May 2009 19:01:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2327E0497; Fri, 8 May 2009 19:01:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 76C65E0497 for ; Fri, 8 May 2009 19:01:56 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 0F1F764F4C for ; Fri, 8 May 2009 19:01:56 +0000 (UTC) Received: from robbat2 by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1M2VKV-0001HC-HV for gentoo-commits@lists.gentoo.org; Fri, 08 May 2009 19:01:55 +0000 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-util/git: ChangeLog git-1.6.2.5-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog git-1.6.2.5-r1.ebuild X-VCS-Directories: dev-util/git X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson Content-Type: text/plain; charset=utf8 Message-Id: Sender: "Robin H. Johnson" Date: Fri, 08 May 2009 19:01:55 +0000 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: b84ab8c2-ffed-46a8-817b-40104ff98ca3 X-Archives-Hash: 231514f20dd891a1f1c0a62c21fcc384 robbat2 09/05/08 19:01:55 Modified: ChangeLog Added: git-1.6.2.5-r1.ebuild Log: Bug 268817: Accidently dropped the noperl patch, it's only merged in up= streams 1.6.3.x series. (Portage version: 2.2_rc33/cvs/Linux x86_64) Revision Changes Path 1.339 dev-util/git/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/Chang= eLog?rev=3D1.339&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/Chang= eLog?rev=3D1.339&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/Chang= eLog?r1=3D1.338&r2=3D1.339 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-util/git/ChangeLog,v retrieving revision 1.338 retrieving revision 1.339 diff -p -w -b -B -u -u -r1.338 -r1.339 --- ChangeLog 5 May 2009 19:15:12 -0000 1.338 +++ ChangeLog 8 May 2009 19:01:55 -0000 1.339 @@ -1,6 +1,12 @@ # ChangeLog for dev-util/git # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.338 2009/0= 5/05 19:15:12 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.339 2009/0= 5/08 19:01:55 robbat2 Exp $ + +*git-1.6.2.5-r1 (08 May 2009) + + 08 May 2009; Robin H. Johnson +git-1.6.2.5-r1.ebu= ild: + Bug 268817: Accidently dropped the noperl patch, it's only merged in + upstreams 1.6.3.x series. =20 05 May 2009; Robin H. Johnson git-1.6.2.5.ebuild, git-1.6.3_rc4.ebuild, git-9999.ebuild: 1.1 dev-util/git/git-1.6.2.5-r1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1= .6.2.5-r1.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1= .6.2.5-r1.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: git-1.6.2.5-r1.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-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.2.5-r1.ebuild,v 1= .1 2009/05/08 19:01:55 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 )" 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" fi LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~s= parc ~sparc-fbsd ~x86 ~x86-fbsd" IUSE=3D"curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webd= av xinetd cvs subversion" # Common to both DEPEND and RDEPEND CDEPEND=3D" !app-misc/git dev-libs/openssl sys-libs/zlib app-arch/cpio 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-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/= TermReadKey ) ) gtk? ( >=3Ddev-python/pygtk-2.8 dev-python/gtksourceview-python )" DEPEND=3D"${CDEPEND}" # These are needed to build the docs if [ "$PV" =3D=3D "9999" ]; then DEPEND=3D"${DEPEND} doc? ( app-text/asciidoc app-text/xmlto app-text/docbook2X )" 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-util/subversion && built_with_use -= -missing false dev-util/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 mozsha1 ; then myopts=3D"${myopts} MOZILLA_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 || myopts=3D"${myopts} NO_ICONV=3DYesPlease" use tk || myopts=3D"${myopts} NO_TCLTK=3DYesPlease" use perl || myopts=3D"${myopts} NO_PERL=3DYesPlease" use threads && myopts=3D"${myopts} THREADED_DELTA_SEARCH=3DYesPlease" use subversion || myopts=3D"${myopts} NO_SVN_TESTS=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 epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.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" # 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 if [[ "$PV" =3D=3D "9999" ]] && use doc; then cd Documentation git_emake man info html \ || die "emake man html info failed" 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 / 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 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 \ t9600-cvsimport.sh" local tests_perl=3D"t5502-quickfetch.sh \ t5512-ls-remote.sh \ t5520-pull.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 ! has userpriv "${FEATURES}"; 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 # Bug #225601 - t0004 is not suitable for root perm # Bug #219839 - t1004 is not suitable for root perm disabled=3D"${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh" else [[ $cvs -gt 0 ]] && \ has_version dev-util/cvs && \ let cvs=3D$cvs+1 [[ $cvs -gt 0 ]] && \ built_with_use dev-util/cvs server && \ let cvs=3D$cvs+1 if [[ $cvs -lt 3 ]]; then einfo "Disabling CVS tests (needs dev-util/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-util/subversion && ! built_with_use= --missing false dev-util/subversion perl ; then ewarn "You must build dev-util/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 }