From 4957ccba195ea0ea6073741c82d1fa07d87e3c3a Mon Sep 17 00:00:00 2001 From: "Fernando J. Pereda" Date: Mon, 23 Apr 2007 18:53:42 +0000 Subject: [PATCH] New upstream version. Package-Manager: portage-2.1.2.2 --- dev-util/git/ChangeLog | 7 +- dev-util/git/Manifest | 26 +++-- dev-util/git/files/digest-git-1.5.1.2 | 9 ++ dev-util/git/git-1.5.1.2.ebuild | 160 ++++++++++++++++++++++++++ 4 files changed, 193 insertions(+), 9 deletions(-) create mode 100644 dev-util/git/files/digest-git-1.5.1.2 create mode 100644 dev-util/git/git-1.5.1.2.ebuild diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog index e8fd3e5325f9..f907afa4962a 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.186 2007/04/12 10:51:49 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.187 2007/04/23 18:53:42 ferdy Exp $ + +*git-1.5.1.2 (23 Apr 2007) + + 23 Apr 2007; Fernando J. Pereda +git-1.5.1.2.ebuild: + New upstream version. *git-1.5.1.1 (12 Apr 2007) diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest index 6ca8161a661d..1204f15b150b 100644 --- a/dev-util/git/Manifest +++ b/dev-util/git/Manifest @@ -25,14 +25,17 @@ DIST git-1.4.1.1.tar.bz2 752419 RMD160 1e8c8cc2ee0685fb0ece9e0ee0720cb608140c05 DIST git-1.4.4.4.tar.bz2 888482 RMD160 a507e7d636e771fb3ed03054d3d70e6758385c28 SHA1 b9243da9071d28f616b530eff94a46fb223cc368 SHA256 b2117774fb96d53f4b07d89df389ee0097f29637c859ec8fecc020cf37622657 DIST git-1.5.0.7.tar.bz2 1053367 RMD160 c8ad03381005152d2513e0d12099d976ccad42a9 SHA1 1e0d09f27cd8eb3ac96590ed4c1baba459d5359e SHA256 6fae7d1de3f4ec2b04423d6af194bf75c9262785997c80fc4e1cd5e62b1b7ada DIST git-1.5.1.1.tar.bz2 1118103 RMD160 51210d5c53304fe35e9bef13092a07d22f9300bb SHA1 d8a7617c4267903f24b69017efa67aa138595c87 SHA256 27d108d833ed01c8167bca222bad8c744e01158eaafe3a0bd195172ffa0b4a87 +DIST git-1.5.1.2.tar.bz2 1120779 RMD160 91019f417972162b2e14d1ddb607522390f68d75 SHA1 d49e6ae0aecd9cff403a110c67041b3c0dbd7a1f SHA256 629a6bd89b226f20cc21c954bd695c91e284b664c05b7d66b706866112b7f628 DIST git-htmldocs-1.4.1.1.tar.bz2 263120 RMD160 4a50c2cec7ecd612690ee5dd0f7fbe69f11fe1bf SHA1 6a22f41064f1db29e69a65ad2177e9f6e18aea77 SHA256 8e4ccf995645fe08f7644b62535c4054515355942b5f3551fcbebd3f5ec36d1d DIST git-htmldocs-1.4.4.4.tar.bz2 325718 RMD160 cf55f807769e8aa731d512b654e847089d25ea0e SHA1 66192a27b74aef8e673252174dda8c9be23dcd7a SHA256 196e901cd416f48b8068a10914455a27aa542bc821f677a705a69fb950145975 DIST git-htmldocs-1.5.0.7.tar.bz2 450009 RMD160 0292aa6e166b5ccc3dd89eaeb0b56ab9a98b25f8 SHA1 4767bc6c617d1b5906acc3cc869b870c9743d294 SHA256 9f9dd3beb5b267080a556239bb0a99b5d2ac396cdd15b38c932976a0ec24b823 DIST git-htmldocs-1.5.1.1.tar.bz2 467792 RMD160 af1e8604f596d5b2097dcd39d2b2c0b180bf9715 SHA1 ba614a0e2a0f637af630042ef910627d058b6516 SHA256 782dfdaae9ece1d9358e08771452793e29c1c0446b5799c2f228905157797fa6 +DIST git-htmldocs-1.5.1.2.tar.bz2 471266 RMD160 9c739f6b4d7e1ba79148d610e3fa0accf14e08a7 SHA1 2684caa9c0a1392dfd0a97b6d0568f82c0b02ec8 SHA256 6ec2942ab5dd90db19324d39a3307f67a471dd41af6bb9749555f3c21aefd94b DIST git-manpages-1.4.1.1.tar.bz2 83956 RMD160 894b8717e9e4099f7aacb97a3673e81c09e23daf SHA1 c899fbdef72bdfdb29c03e3372ee736781d58289 SHA256 2b2759a15eb9432e972743846c7299518e542e99a23a7318c540f0086e746ee4 DIST git-manpages-1.4.4.4.tar.bz2 103840 RMD160 488e8ad8514180ed1d2d2d0d5e948351d4092f29 SHA1 17d7246560049ebcab7e7a67c2b82e8fb233e42e SHA256 73f136bd93683fa559b22c8770acaebce70699798f6797e840d23a2a5cffa3a4 DIST git-manpages-1.5.0.7.tar.bz2 126927 RMD160 37028035ea1aca310c79bd079ae1d1e65ca9fe32 SHA1 66de3c514b1942920b66f434350f55e2ff70f90e SHA256 df6879361c0e671e3a228e3bd9954d9f712a7c74e9e151e4ca89bb6037d4dbba DIST git-manpages-1.5.1.1.tar.bz2 131987 RMD160 f27bfc0137d5e1ea54487014962cd41333b9fc58 SHA1 7da66a0f6db55d72883a1d301c02d404fd10520a SHA256 2c8b5977890285d1251f854c787b3fd6dfc4c81e0d9a402bb34c695f8466de2f +DIST git-manpages-1.5.1.2.tar.bz2 132716 RMD160 f835da9dcf54860eaabc3c861c9013ee9f717f6d SHA1 08b61944669a6c4260a29281d3e62f127142e942 SHA256 bc5b6514c0bedfecc81ec7221a1e4bece967e0bed33aeaaa90a7c6823b541dec EBUILD git-1.4.1.1.ebuild 4317 RMD160 af6f33eefe6b8cc51e8baab09332f5d326a9e0bb SHA1 2689d6bbbd1d05ca4c80d45f4c32cc24968cd56d SHA256 dcceafef03e741badc8001596c2dce2a1d85fc5d84ecce03076e47f418f5c36c MD5 6f522378494ea249b90fce628a1ff7f0 git-1.4.1.1.ebuild 4317 RMD160 af6f33eefe6b8cc51e8baab09332f5d326a9e0bb git-1.4.1.1.ebuild 4317 @@ -49,10 +52,14 @@ EBUILD git-1.5.1.1.ebuild 4354 RMD160 b663c76aab5dc003a2e74d0d8d58fb46d4b126fb S MD5 03bdb91abe2cdf13094ebc647f4c3a03 git-1.5.1.1.ebuild 4354 RMD160 b663c76aab5dc003a2e74d0d8d58fb46d4b126fb git-1.5.1.1.ebuild 4354 SHA256 aefa1636c8c8bf52a7e0cc3e0fda8231ef0d251e1d4f03ad3d0793c32a2339ef git-1.5.1.1.ebuild 4354 -MISC ChangeLog 26521 RMD160 81f701ecb6526c32f43303f497ffe11e80444782 SHA1 c2f602629e751c5d29985afa7f429a8293dcc408 SHA256 b375a97b716c62cc04c784a21f533ba8db83aa96c9be0fd5caf2b20e73fd2996 -MD5 a67c87a80709c14ca5f9fbe977d397d3 ChangeLog 26521 -RMD160 81f701ecb6526c32f43303f497ffe11e80444782 ChangeLog 26521 -SHA256 b375a97b716c62cc04c784a21f533ba8db83aa96c9be0fd5caf2b20e73fd2996 ChangeLog 26521 +EBUILD git-1.5.1.2.ebuild 4354 RMD160 56903aed6cdbaffd569d2a8f6b46d24f150a44b9 SHA1 ed3c8a4cd6359ade366be92217e48d296733dfe9 SHA256 a80c6e4cc48d164f6377cdeabcb0ac99eccc5e86a6d5a43dce147f16f100d945 +MD5 c424fb8f99535e87101cffc97859821a git-1.5.1.2.ebuild 4354 +RMD160 56903aed6cdbaffd569d2a8f6b46d24f150a44b9 git-1.5.1.2.ebuild 4354 +SHA256 a80c6e4cc48d164f6377cdeabcb0ac99eccc5e86a6d5a43dce147f16f100d945 git-1.5.1.2.ebuild 4354 +MISC ChangeLog 26648 RMD160 40a80d2121c5317193a37a1a21a7344d236b18ce SHA1 1be7167971805a668000eb6e0e0fd70fb8980186 SHA256 023cfad158db319c2bf622e1723f315fc28e3eb16f41f2f523513a70e4543ee4 +MD5 2f808a6f548e3799bcfca72c2fca1686 ChangeLog 26648 +RMD160 40a80d2121c5317193a37a1a21a7344d236b18ce ChangeLog 26648 +SHA256 023cfad158db319c2bf622e1723f315fc28e3eb16f41f2f523513a70e4543ee4 ChangeLog 26648 MISC metadata.xml 253 RMD160 e09bab6a5a422f501b8e07a3983c5790e00ac92a SHA1 7c2340e011ce57927ff31d7e3397ef4bb1c7ad27 SHA256 1f2e9f9f57e781c296ac5c39c54eabf82a47b7facd0698b296bc76f50799432c MD5 22c5a3ad567fa12332dab8687b9c2d1c metadata.xml 253 RMD160 e09bab6a5a422f501b8e07a3983c5790e00ac92a metadata.xml 253 @@ -69,10 +76,13 @@ SHA256 e83d17bc0cecaec146675934ca0ee7f15d8996c16e587954dc9d6c627772581c files/di MD5 d3fe4f48571c37f8a112f66d3f8d5273 files/digest-git-1.5.1.1 771 RMD160 a612ebf3d1cd2097e0d32ea43018fc701d611c81 files/digest-git-1.5.1.1 771 SHA256 839c1946009b2cda5f91a1ffab61b313b5d5e38b3770f6cdac41a9cff48fe029 files/digest-git-1.5.1.1 771 +MD5 8fef28f020c2339cfd39fb0d8787bc97 files/digest-git-1.5.1.2 771 +RMD160 5a83b7eaa433212099c4c019f26ff80de3d84fb4 files/digest-git-1.5.1.2 771 +SHA256 422de6b7613fb6c9c368344ed6aa566e9ce90b2ae3144a00fedff563be4629c9 files/digest-git-1.5.1.2 771 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFGIO588bi6rjpTunYRAiZ0AKClYmHb4PQGeCJ88EQq8tG0YAxP8ACeNAi+ -Mgh663+MqBoJkCCJ871fDFY= -=h4rU +iD8DBQFGLQDJViELBEf1JB0RArMmAKCC3/RpQKDbQhjdWDFJa55666+ALgCbBliy +MABbl83PkgHD3bhCk0mlD+g= +=dGgJ -----END PGP SIGNATURE----- diff --git a/dev-util/git/files/digest-git-1.5.1.2 b/dev-util/git/files/digest-git-1.5.1.2 new file mode 100644 index 000000000000..89b676fac021 --- /dev/null +++ b/dev-util/git/files/digest-git-1.5.1.2 @@ -0,0 +1,9 @@ +MD5 d017c48085e07f24b8459f6f5fbaf918 git-1.5.1.2.tar.bz2 1120779 +RMD160 91019f417972162b2e14d1ddb607522390f68d75 git-1.5.1.2.tar.bz2 1120779 +SHA256 629a6bd89b226f20cc21c954bd695c91e284b664c05b7d66b706866112b7f628 git-1.5.1.2.tar.bz2 1120779 +MD5 5455264cec20da5d556707a6b7ec9f0f git-htmldocs-1.5.1.2.tar.bz2 471266 +RMD160 9c739f6b4d7e1ba79148d610e3fa0accf14e08a7 git-htmldocs-1.5.1.2.tar.bz2 471266 +SHA256 6ec2942ab5dd90db19324d39a3307f67a471dd41af6bb9749555f3c21aefd94b git-htmldocs-1.5.1.2.tar.bz2 471266 +MD5 64cd60f6ea1344def2b7ea00aee6e170 git-manpages-1.5.1.2.tar.bz2 132716 +RMD160 f835da9dcf54860eaabc3c861c9013ee9f717f6d git-manpages-1.5.1.2.tar.bz2 132716 +SHA256 bc5b6514c0bedfecc81ec7221a1e4bece967e0bed33aeaaa90a7c6823b541dec git-manpages-1.5.1.2.tar.bz2 132716 diff --git a/dev-util/git/git-1.5.1.2.ebuild b/dev-util/git/git-1.5.1.2.ebuild new file mode 100644 index 000000000000..9bb9605339a2 --- /dev/null +++ b/dev-util/git/git-1.5.1.2.ebuild @@ -0,0 +1,160 @@ +# 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.1.2.ebuild,v 1.1 2007/04/23 18:53:42 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://git.or.cz/" +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 perl 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 + perl? ( dev-perl/Error ) + 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} + + epatch "${FILESDIR}"/${PN}-1.5.0-symlinks.patch + + 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):" \ + -e 's:ln :ln -s :g' \ + 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) )" + showpkgdeps git-send-email "USE=perl" + showpkgdeps git-remote "USE=perl" + echo +} + +pkg_postrm() { + # regenerate site-gentoo if we are merged USE=emacs and unmerged + # USE=-emacs + has_version virtual/emacs && elisp-site-regen +} -- 2.26.2