From: Fernando J. Pereda Date: Wed, 14 Feb 2007 09:16:38 +0000 (+0000) Subject: New upstream version. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=708f563ac1c5b513f50cb427b4c8764368b81cc2;p=gentoo.git New upstream version. Package-Manager: portage-2.1.2-r9 --- diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog index 83cd057746be..9ed2caf73ccd 100644 --- a/dev-util/git/ChangeLog +++ b/dev-util/git/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/git # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.166 2007/01/15 17:17:05 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.167 2007/02/14 09:16:38 ferdy Exp $ + +*git-1.5.0 (14 Feb 2007) + + 14 Feb 2007; Fernando J. Pereda +git-1.5.0.ebuild: + New upstream version. 15 Jan 2007; Gustavo Zacarias git-1.4.4.4.ebuild: Stable on sparc wrt #159822 diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest index 160de7e93e17..fb65905cd0a5 100644 --- a/dev-util/git/Manifest +++ b/dev-util/git/Manifest @@ -21,14 +21,17 @@ DIST git-1.4.1.1.tar.bz2 752419 RMD160 1e8c8cc2ee0685fb0ece9e0ee0720cb608140c05 DIST git-1.4.2.4.tar.bz2 787793 RMD160 03664bb1c98c7d9dc8c6f1dfa56149d807fd5164 SHA1 ff80a407cbad5b759adaecf434b37b293a167096 SHA256 1efbbee0e3e8704b25ef6fbc9519ba6f94a21aee48a231b986408627a4017632 DIST git-1.4.4.3.tar.bz2 888091 RMD160 06184ee7e16c12687b4a644c38d23ff7732e4c54 SHA1 d41b8e62b2c0b5f3ea994bed4618a44cbcfb319e SHA256 5485e66a811f8a047124f1358ded268916fcf07ecccb9345f429b4ea8b76603e DIST git-1.4.4.4.tar.bz2 888482 RMD160 a507e7d636e771fb3ed03054d3d70e6758385c28 SHA1 b9243da9071d28f616b530eff94a46fb223cc368 SHA256 b2117774fb96d53f4b07d89df389ee0097f29637c859ec8fecc020cf37622657 +DIST git-1.5.0.tar.bz2 1041253 RMD160 2ff7a1d31a73e1a75ccd284d8e7c35e05268ec73 SHA1 2a42673745f8131173fa538adc609bc664258406 SHA256 98dc8ac7b1db00dd414349c46cce3cc1d8f7f6aa7dbe3c3ab237b937bf032b9d 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.4.3.tar.bz2 325744 RMD160 52c8f9088ca969255ff93f719563b65f43a59a9f SHA1 1ab02de5bae511f07b19c6048626160d99ff145c SHA256 cca1f7dec9dd063d78920e4d2f7a9a47fa57cfd883b872883b60795541c2c585 DIST git-htmldocs-1.4.4.4.tar.bz2 325718 RMD160 cf55f807769e8aa731d512b654e847089d25ea0e SHA1 66192a27b74aef8e673252174dda8c9be23dcd7a SHA256 196e901cd416f48b8068a10914455a27aa542bc821f677a705a69fb950145975 +DIST git-htmldocs-1.5.0.tar.bz2 439507 RMD160 9ce88799a584bf0202f891cf93151daf230360f5 SHA1 48289288bb98bad6bfa83c169304eb529e825436 SHA256 5264aeebd863e226a27aa7c9ed26479be51e32d8d799362610fcf9b0d022df03 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.4.3.tar.bz2 104756 RMD160 b10969ec6702606ea348d9a6fe05831e28fbcc00 SHA1 decdee44cca3f89843a290402c30422dde9edfa1 SHA256 7f11c3f55a86fc7e445e6bf97d049564e586902bb53e48c6048b7ce0ad90675e DIST git-manpages-1.4.4.4.tar.bz2 103840 RMD160 488e8ad8514180ed1d2d2d0d5e948351d4092f29 SHA1 17d7246560049ebcab7e7a67c2b82e8fb233e42e SHA256 73f136bd93683fa559b22c8770acaebce70699798f6797e840d23a2a5cffa3a4 +DIST git-manpages-1.5.0.tar.bz2 126117 RMD160 66f0cd906963a5000041b6d921833df6307745e3 SHA1 f256e2fa04933aa4e4144aaaf6415c2c51a31f16 SHA256 921429f34ca495d4470c5611c64b02dd9c16dda3bddd8ca050dbb0b879c4c426 EBUILD git-1.4.1.1.ebuild 4338 RMD160 c60faee4041943f56b2b64abde8b26bc7a9d1e17 SHA1 47c42f4ff8d3100a645226934fb9da442e07bae5 SHA256 d0435724636b6ff0749af989a7d493284df3eb38d2c0bcd1b0f29a33d726e606 MD5 62bdf011ee3296485f8c8fbc2f3ecd35 git-1.4.1.1.ebuild 4338 RMD160 c60faee4041943f56b2b64abde8b26bc7a9d1e17 git-1.4.1.1.ebuild 4338 @@ -45,10 +48,14 @@ EBUILD git-1.4.4.4.ebuild 4257 RMD160 5da21ba7d97aa3d0c9238b633c70c916445d8bcd S MD5 844bef7b02245814e4362aa29566e57b git-1.4.4.4.ebuild 4257 RMD160 5da21ba7d97aa3d0c9238b633c70c916445d8bcd git-1.4.4.4.ebuild 4257 SHA256 963f02c4077e2ca70a12f7300caa552a0bfccf76d57dc8b02a1ed3099efe3493 git-1.4.4.4.ebuild 4257 -MISC ChangeLog 23663 RMD160 677030a002868bc123ea39ab990cbf057de0880c SHA1 ec04ea6b9853c4c9384e09e3008517335013a313 SHA256 77e45a92723839c645a0980cbbacee317b21c72ac0da7a60ce611c6b99ed9f94 -MD5 07aa4071325ce9156d3a248df766cebb ChangeLog 23663 -RMD160 677030a002868bc123ea39ab990cbf057de0880c ChangeLog 23663 -SHA256 77e45a92723839c645a0980cbbacee317b21c72ac0da7a60ce611c6b99ed9f94 ChangeLog 23663 +EBUILD git-1.5.0.ebuild 4194 RMD160 8b10c478904259286b0ae6576423042d3eae61cf SHA1 093819fece0e85e7f65bc1a6a66ec3f63f7ee5d2 SHA256 e6b479658bd71cc40dfa32b34dbe4c42c9a85494c49deca7fe0aa880afffa1e0 +MD5 c29a8cb5134621c593781a0f46f5759d git-1.5.0.ebuild 4194 +RMD160 8b10c478904259286b0ae6576423042d3eae61cf git-1.5.0.ebuild 4194 +SHA256 e6b479658bd71cc40dfa32b34dbe4c42c9a85494c49deca7fe0aa880afffa1e0 git-1.5.0.ebuild 4194 +MISC ChangeLog 23783 RMD160 2d76a201ad27461f41eebd8be5cea355821a2f3c SHA1 efa9d69577583b9b3908225af7b6d455c15ae803 SHA256 861a8dcdb0868148b611f72f918ee0198e617adaca8cc4b517239127445e812b +MD5 471dc9cf87ec1c44ec9e985da6ce8811 ChangeLog 23783 +RMD160 2d76a201ad27461f41eebd8be5cea355821a2f3c ChangeLog 23783 +SHA256 861a8dcdb0868148b611f72f918ee0198e617adaca8cc4b517239127445e812b ChangeLog 23783 MISC metadata.xml 253 RMD160 e09bab6a5a422f501b8e07a3983c5790e00ac92a SHA1 7c2340e011ce57927ff31d7e3397ef4bb1c7ad27 SHA256 1f2e9f9f57e781c296ac5c39c54eabf82a47b7facd0698b296bc76f50799432c MD5 22c5a3ad567fa12332dab8687b9c2d1c metadata.xml 253 RMD160 e09bab6a5a422f501b8e07a3983c5790e00ac92a metadata.xml 253 @@ -65,10 +72,13 @@ SHA256 666f5fe026723735f156653f2565168d6c3f902e176d9c009a4c75ae992e475b files/di MD5 0edc8e793ae211228a6b9b338d242566 files/digest-git-1.4.4.4 768 RMD160 ade2fb97dffc61de86d80cffc0b4292ba9027bda files/digest-git-1.4.4.4 768 SHA256 ace650aa865e2cbf70cf1e76a858085da178e9f98f58f28bbabbc972be98467e files/digest-git-1.4.4.4 768 +MD5 dda30afff22c0dae4e710acd8c667c1c files/digest-git-1.5.0 753 +RMD160 943cbd9fa5eba00e399c9df31ec5d5d6d2bd39fe files/digest-git-1.5.0 753 +SHA256 96b50cd88ae55c404a116ddcc143858c065dfd64065cb25fd223818983bb1657 files/digest-git-1.5.0 753 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) +Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFFykjJ8bi6rjpTunYRAiYjAJ9dyIT9BbEtUSkdB5JZB98olpt7WwCfQYaM -IDJDFEYjVGzewigF5mj9l7s= -=jrDa +iD4DBQFF0tOQViELBEf1JB0RAuvyAJ43/5AMfh00/hDUyIDD1xucDjWnBACYtjY2 +KIxuNWiC8DqI1g8Q0nWBMA== +=zFtS -----END PGP SIGNATURE----- diff --git a/dev-util/git/files/digest-git-1.5.0 b/dev-util/git/files/digest-git-1.5.0 new file mode 100644 index 000000000000..9d2e52e4dfb1 --- /dev/null +++ b/dev-util/git/files/digest-git-1.5.0 @@ -0,0 +1,9 @@ +MD5 5c3e163ac201695c9bfd5a19d730303c git-1.5.0.tar.bz2 1041253 +RMD160 2ff7a1d31a73e1a75ccd284d8e7c35e05268ec73 git-1.5.0.tar.bz2 1041253 +SHA256 98dc8ac7b1db00dd414349c46cce3cc1d8f7f6aa7dbe3c3ab237b937bf032b9d git-1.5.0.tar.bz2 1041253 +MD5 cbb5b3e088780888835f66e9e021bf3d git-htmldocs-1.5.0.tar.bz2 439507 +RMD160 9ce88799a584bf0202f891cf93151daf230360f5 git-htmldocs-1.5.0.tar.bz2 439507 +SHA256 5264aeebd863e226a27aa7c9ed26479be51e32d8d799362610fcf9b0d022df03 git-htmldocs-1.5.0.tar.bz2 439507 +MD5 c78a129e12e960fbe541ecde5bbc574b git-manpages-1.5.0.tar.bz2 126117 +RMD160 66f0cd906963a5000041b6d921833df6307745e3 git-manpages-1.5.0.tar.bz2 126117 +SHA256 921429f34ca495d4470c5611c64b02dd9c16dda3bddd8ca050dbb0b879c4c426 git-manpages-1.5.0.tar.bz2 126117 diff --git a/dev-util/git/git-1.5.0.ebuild b/dev-util/git/git-1.5.0.ebuild new file mode 100644 index 000000000000..6d47f79fc81d --- /dev/null +++ b/dev-util/git/git-1.5.0.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.0.ebuild,v 1.1 2007/02/14 09:16:38 ferdy Exp $ + +inherit toolchain-funcs eutils elisp-common perl-module bash-completion + +MY_PV="${PV/_rc/.rc}" +MY_P="${PN}-${MY_PV}" + +DOC_VER=${MY_PV} + +DESCRIPTION="GIT - the stupid content tracker" +HOMEPAGE="http://kernel.org/pub/software/scm/git/" +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 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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 + tk? ( dev-lang/tk ) + gtk? ( >=dev-python/pygtk-2.6 )" + +S="${WORKDIR}/${MY_P}" + +# 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" + + use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease" + + export MY_MAKEOPTS=${myopts} +} + +showpkgdeps() { + local pkg=$1 + shift + elog " $(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" + has_version app-arch/unzip || \ + rm "${S}"/t/t5000-tar-tree.sh + # Stupid CVS won't let some people commit as root + rm "${S}"/t/t9200-git-cvsexportcommit.sh + emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" +} + +pkg_postinst() { + use emacs && elisp-site-regen + elog "These additional scripts need some dependencies:" + echo + 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" "dev-perl/DBD-SQLite" + showpkgdeps git-instaweb "|| ( www-servers/lighttpd net-www/apache(SLOT=2) )" + echo +} + +pkg_postrm() { + # regenerate site-gentoo if we are merged USE=emacs and unmerged + # USE=-emacs + has_version virtual/emacs && elisp-site-regen +}