From: Fernando J. Pereda Date: Wed, 15 Nov 2006 21:34:22 +0000 (+0000) Subject: New upstream version. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=94de98736ccd91b618ab1407d7ffa3b2ddca636c;p=gentoo.git New upstream version. Package-Manager: portage-2.1.1-r1 --- diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog index b4869ff3c371..679738aeb633 100644 --- a/dev-util/git/ChangeLog +++ b/dev-util/git/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/git # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.144 2006/11/12 22:09:04 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.145 2006/11/15 21:34:22 ferdy Exp $ + +*git-1.4.4 (15 Nov 2006) + + 15 Nov 2006; Fernando J. Pereda +git-1.4.4.ebuild: + New upstream version. *git-1.4.3.5 (12 Nov 2006) diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest index 4f896689acc1..2e608688915f 100644 --- a/dev-util/git/Manifest +++ b/dev-util/git/Manifest @@ -20,12 +20,15 @@ SHA256 6a3503904204163775722e8a455e4ebaa8648f6d288340979387ad4eb55f4c0a files/gi DIST git-1.4.1.1.tar.bz2 752419 RMD160 1e8c8cc2ee0685fb0ece9e0ee0720cb608140c05 SHA1 376a96ecf68cf90fa0b29fde700e5e947967531a SHA256 e4a9ef8403c3716f7494d4865ee6c3e862b93012df41522237ace91f68a6d6ce DIST git-1.4.2.4.tar.bz2 787793 RMD160 03664bb1c98c7d9dc8c6f1dfa56149d807fd5164 SHA1 ff80a407cbad5b759adaecf434b37b293a167096 SHA256 1efbbee0e3e8704b25ef6fbc9519ba6f94a21aee48a231b986408627a4017632 DIST git-1.4.3.5.tar.bz2 859712 RMD160 076514f909a901f18f01151a1839b6cac03d1e1e SHA1 1cd03ee2744dfd7a2c31269f0002b72b75d08ad1 SHA256 8ab38be18a8221d2181a09b17dd98d4e29e33d897be7c6d9ee31495dc5756409 +DIST git-1.4.4.tar.bz2 886549 RMD160 99352e32da5b79928d85e3176cc5abe5013ba474 SHA1 9a08d1a94570dc92c3caa0369a3f5c8ac02096e0 SHA256 ae878e93dbade210601b47fe56a7a36c84ae8a28457c5f415626f829e511fe17 DIST git-htmldocs-1.4.1.1.tar.bz2 263120 RMD160 4a50c2cec7ecd612690ee5dd0f7fbe69f11fe1bf SHA1 6a22f41064f1db29e69a65ad2177e9f6e18aea77 SHA256 8e4ccf995645fe08f7644b62535c4054515355942b5f3551fcbebd3f5ec36d1d DIST git-htmldocs-1.4.2.4.tar.bz2 283907 RMD160 6aaa9e601cc16d4e45176e58fbbc87a332afb243 SHA1 e05b2ef0a5354b8c6ff4d043d620e0b229cda7a9 SHA256 90f3ad4bced74bbadfc6f02a1c3d222a6bcf13d940b9aef368b7cbae083c1f86 DIST git-htmldocs-1.4.3.5.tar.bz2 306180 RMD160 8880c493ed1ff3ae361200dbfba0c7156542b908 SHA1 972a00c65e2778f9eb4f31b23c02347cbe71cde8 SHA256 b4674fe2013dc95b21b94f8b327d0c74017b5075fa991665c2e4cbb736b7fbc9 +DIST git-htmldocs-1.4.4.tar.bz2 321241 RMD160 225fb4067857e4e242783d314ab4ab1c31970470 SHA1 fb427fc6570649703d26300068d6f631adbead27 SHA256 d73d3fb7093d2a2ed60be4c24389324ce153b7f6c26de0fbf9611a804561d2ba DIST git-manpages-1.4.1.1.tar.bz2 83956 RMD160 894b8717e9e4099f7aacb97a3673e81c09e23daf SHA1 c899fbdef72bdfdb29c03e3372ee736781d58289 SHA256 2b2759a15eb9432e972743846c7299518e542e99a23a7318c540f0086e746ee4 DIST git-manpages-1.4.2.4.tar.bz2 90375 RMD160 0b3d486d04a5a64aab273c75823c603f307fcd02 SHA1 961b3981f074663ec64bbbc5b82fdab0c45b7919 SHA256 6e0520fd779225e79957871d981ddfc9e93f157374de88f654d4f20958557518 DIST git-manpages-1.4.3.5.tar.bz2 98349 RMD160 14628c3cd19d717e6544eecefe84989aca6fdd2c SHA1 40945f3749a0c371c356bd4890bbafcfca4318c4 SHA256 43fa90b9bd11723a3750dab74c5960ffb102feb04ceac9c6e74239e7e678a0c9 +DIST git-manpages-1.4.4.tar.bz2 103893 RMD160 51e717edb8ab53239b098f2ea47ddbedd24a806c SHA1 1ef1bb6554cd8b6ef629ae5d8d0b078e72c185c5 SHA256 549ad09b5a70bf059a1a0d994778aabfef17e02433dc019585d48c0343f73c06 EBUILD git-1.4.1.1.ebuild 4357 RMD160 741099499ec1a318cdeda9c30b0df2f4b85681d7 SHA1 7821e58d71dfca386d65650778bb8ee3f02d955a SHA256 9725d2544544ca5b708a3b04d5a3845ed73a8cf1b59f4fc111670075b8a0fa3e MD5 30fe00de7349add84335eb4bad62baf4 git-1.4.1.1.ebuild 4357 RMD160 741099499ec1a318cdeda9c30b0df2f4b85681d7 git-1.4.1.1.ebuild 4357 @@ -38,10 +41,14 @@ EBUILD git-1.4.3.5.ebuild 4063 RMD160 cb5c81faec35cd78f6b32cbc4881ae03fc5a0e25 S MD5 104f2d15f980593041d41fa295b622c5 git-1.4.3.5.ebuild 4063 RMD160 cb5c81faec35cd78f6b32cbc4881ae03fc5a0e25 git-1.4.3.5.ebuild 4063 SHA256 c394377d6fc5ad39917da0af5f22cbae720941fccd610677bc07617f360ab89f git-1.4.3.5.ebuild 4063 -MISC ChangeLog 21010 RMD160 3333adfde1c7c00a7c4c4704c83f3c6263983f0c SHA1 075fcb5f9619ef8cea31b5747c223efff79cb0d6 SHA256 ca5c534434bb98d4a5f2d66957b78c7e00018e11be8b82c394cb02da3b01dcf8 -MD5 e90b9f3556a1430ae415f077aa674f14 ChangeLog 21010 -RMD160 3333adfde1c7c00a7c4c4704c83f3c6263983f0c ChangeLog 21010 -SHA256 ca5c534434bb98d4a5f2d66957b78c7e00018e11be8b82c394cb02da3b01dcf8 ChangeLog 21010 +EBUILD git-1.4.4.ebuild 4061 RMD160 d4216c941c468854f403847977b36136ce1d281c SHA1 12dc28e72f4475325703601f9cdf343fe2398e02 SHA256 31579f63d47b41ee8307fb0f110d98e83f3fea088a0fd61c03d35bd57475e19d +MD5 5260f6629346a199c2322aa49e845876 git-1.4.4.ebuild 4061 +RMD160 d4216c941c468854f403847977b36136ce1d281c git-1.4.4.ebuild 4061 +SHA256 31579f63d47b41ee8307fb0f110d98e83f3fea088a0fd61c03d35bd57475e19d git-1.4.4.ebuild 4061 +MISC ChangeLog 21133 RMD160 ab44434e9ccc153a44387ffcf5b9d16e1ab0731a SHA1 add91f6b34ee32e681fb178fc1edcf6beea1293a SHA256 54a56695914641b644eae4fc63769fb925a0c5f5711cf7f9b9e9990802f5b785 +MD5 4a70633a6abca354166c9526c552bf5f ChangeLog 21133 +RMD160 ab44434e9ccc153a44387ffcf5b9d16e1ab0731a ChangeLog 21133 +SHA256 54a56695914641b644eae4fc63769fb925a0c5f5711cf7f9b9e9990802f5b785 ChangeLog 21133 MISC metadata.xml 255 RMD160 db414d29c445e388d486f826b368b5359b74f72d SHA1 0317bb4c83bba580ddb586efe8a929b85759d0d2 SHA256 45f65b01b99f13e87c53843765ab287065988ab80e675287cdcc81ce3e22f9a2 MD5 c2a7223a6caa6908d13db012ce74b388 metadata.xml 255 RMD160 db414d29c445e388d486f826b368b5359b74f72d metadata.xml 255 @@ -55,10 +62,13 @@ SHA256 d48ebc25dd2dcb75d72f633f74f2754ddb2fd25894abe15cb0159e429dccb7a5 files/di MD5 75862c43f94bd15f94cd619d9e1f785b files/digest-git-1.4.3.5 765 RMD160 b69d5311a039e90e9eb1617297f1b67630e4e1a0 files/digest-git-1.4.3.5 765 SHA256 69b0b0cbe7604d63e6dc3f42e40a965c0cecb824c900b368427f6c2d0deb4550 files/digest-git-1.4.3.5 765 +MD5 d35887562c659a5784d8b3c2bbc100a0 files/digest-git-1.4.4 750 +RMD160 9b7ab3e463046e19055fcc888ef859be1e39c680 files/digest-git-1.4.4 750 +SHA256 6a661680ca0cde949ec1bd585cd5637c75627429f41fa2c2f232dbee9cd3c638 files/digest-git-1.4.4 750 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFFV5uNViELBEf1JB0RAmVSAJ99lEdws8u3qxkRCH3AOagHx5d0FQCdGoit -sQ5p12bfpEqKmFhOWNJKGJw= -=xf68 +iD8DBQFFW4frViELBEf1JB0RAsT8AJ0fq9c8HZ8Kkn1aRysyJc779pkEIACggvk/ +gP4/GiVJ+H+Z96wng+CMXPA= +=lrMQ -----END PGP SIGNATURE----- diff --git a/dev-util/git/files/digest-git-1.4.4 b/dev-util/git/files/digest-git-1.4.4 new file mode 100644 index 000000000000..5106c260a0d6 --- /dev/null +++ b/dev-util/git/files/digest-git-1.4.4 @@ -0,0 +1,9 @@ +MD5 3bf19bd4c5746c5dc74f19cf167f4eb1 git-1.4.4.tar.bz2 886549 +RMD160 99352e32da5b79928d85e3176cc5abe5013ba474 git-1.4.4.tar.bz2 886549 +SHA256 ae878e93dbade210601b47fe56a7a36c84ae8a28457c5f415626f829e511fe17 git-1.4.4.tar.bz2 886549 +MD5 e25f433c6f605cd3a557db9390ece1f4 git-htmldocs-1.4.4.tar.bz2 321241 +RMD160 225fb4067857e4e242783d314ab4ab1c31970470 git-htmldocs-1.4.4.tar.bz2 321241 +SHA256 d73d3fb7093d2a2ed60be4c24389324ce153b7f6c26de0fbf9611a804561d2ba git-htmldocs-1.4.4.tar.bz2 321241 +MD5 9996ee76099d68229bc85565a799715c git-manpages-1.4.4.tar.bz2 103893 +RMD160 51e717edb8ab53239b098f2ea47ddbedd24a806c git-manpages-1.4.4.tar.bz2 103893 +SHA256 549ad09b5a70bf059a1a0d994778aabfef17e02433dc019585d48c0343f73c06 git-manpages-1.4.4.tar.bz2 103893 diff --git a/dev-util/git/git-1.4.4.ebuild b/dev-util/git/git-1.4.4.ebuild new file mode 100644 index 000000000000..49e275be973a --- /dev/null +++ b/dev-util/git/git-1.4.4.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.4.4.ebuild,v 1.1 2006/11/15 21:34:22 ferdy Exp $ + +inherit python toolchain-funcs eutils elisp-common perl-module bash-completion + +DOC_VER=${PV} + +DESCRIPTION="GIT - the stupid content tracker" +HOMEPAGE="http://kernel.org/pub/software/scm/git/" +SRC_URI="mirror://kernel/software/scm/git/${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 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="curl doc elibc_uclibc emacs gtk mozsha1 ppcsha1 tk webdav" + +DEPEND="dev-libs/openssl + sys-libs/zlib + !app-misc/git + curl? ( net-misc/curl ) + webdav? ( dev-libs/expat ) + emacs? ( virtual/emacs )" +RDEPEND="${DEPEND} + dev-lang/perl + >=dev-lang/python-2.3 + app-text/rcs + tk? ( dev-lang/tk ) + gtk? ( >=dev-python/pygtk-2.6 )" + +# 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 mozsha1 ; then + myopts="${myopts} MOZILLA_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" + use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring." + fi + + myopts="${myopts} WITH_SEND_EMAIL=YesPlease" + + # Older python versions need own subproccess.py + python_version + [[ ${PYVER} < 2.4 ]] && myopts="${myopts} WITH_OWN_SUBPROCESS_PY=YesPlease" + + use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease" + + export MY_MAKEOPTS=${myopts} +} + +showpkgdeps() { + local pkg=$1 + shift + einfo " $(printf "%-17s:" ${pkg}) ${@}" +} + +src_unpack() { + unpack ${A} + cd ${S} + + sed -i \ + -e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \ + -e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \ + -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ + -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ + Makefile || die "sed failed" + + exportmakeopts +} + +src_compile() { + emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" + + if use emacs ; then + elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" + fi +} + +src_install() { + emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || die "make install failed" + + use tk || rm "${D}"/usr/bin/gitk + + doman "${WORKDIR}"/man?/* + + dodoc README COPYING Documentation/SubmittingPatches + if use doc ; then + dodoc Documentation/technical/* + dodir /usr/share/doc/${PF}/html + cp -r "${WORKDIR}"/{*.html,howto} "${D}"/usr/share/doc/${PF}/html + fi + + dobashcompletion contrib/completion/git-completion.bash ${PN} + + if use emacs ; then + insinto "${SITELISP}" + doins contrib/emacs/{,vc-}git.el* + elisp-site-file-install "${FILESDIR}"/70git-gentoo.el + fi + + if use gtk ; then + dobin contrib/gitview/gitview + use doc && dodoc contrib/gitview/gitview.txt + fi + + insinto /etc/xinetd.d + newins "${FILESDIR}"/git-daemon.xinetd git-daemon + + newinitd "${FILESDIR}"/git-daemon.initd git-daemon + newconfd "${FILESDIR}"/git-daemon.confd git-daemon + + fixlocalpod +} + +src_test() { + cd "${S}" + + has_version dev-util/subversion || \ + MY_MAKEOPTS="${MY_MAKEOPTS} NO_SVN_TESTS=YesPlease" + emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" +} + +pkg_postinst() { + use emacs && elisp-site-regen + einfo "These additional scripts need some dependencies:" + einfo + showpkgdeps git-archimport "dev-util/tla" + showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1" + showpkgdeps git-svnimport "dev-util/subversion(USE=perl)" + showpkgdeps git-svn "dev-util/subversion(USE=perl)" "dev-perl/libwww-perl" + showpkgdeps git-quiltimport "dev-util/quilt" + showpkgdeps git-cvsserver "dev-perl/DBI" "dep-perl/DBD-SQLite" + einfo +} + +pkg_postrm() { + # regenerate site-gentoo if we are merged USE=emacs and unmerged + # USE=-emacs + has_version virtual/emacs && elisp-site-regen +}