Version bump.
authorRobin H. Johnson <robbat2@gentoo.org>
Tue, 1 May 2007 03:17:06 +0000 (03:17 +0000)
committerRobin H. Johnson <robbat2@gentoo.org>
Tue, 1 May 2007 03:17:06 +0000 (03:17 +0000)
Package-Manager: portage-2.1.2.5

dev-util/git/ChangeLog
dev-util/git/Manifest
dev-util/git/files/digest-git-1.5.1.3 [new file with mode: 0644]
dev-util/git/git-1.5.1.3.ebuild [new file with mode: 0644]

index f0de9bd3f16ace466516c02c6c1502f423e0d35a..5aa4417c5ce644376b13a236884512505574849d 100644 (file)
@@ -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.189 2007/04/24 16:23:52 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.190 2007/05/01 03:17:06 robbat2 Exp $
+
+*git-1.5.1.3 (01 May 2007)
+
+  01 May 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.1.3.ebuild:
+  Version bump.
 
   24 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.1.1.ebuild,
   -git-1.4.4.4.ebuild, -git-1.5.1.1.ebuild:
index c1f8827379421a02bdbc83dca6b279df18dce88c..3ccb7fb5128691b457041f4b7ffc0e6a41d1752e 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70git-gentoo.el 88 RMD160 fe9b87bdbe14141580745063092a5d08924f23fd SHA1 332f9cbf5a1dbb176e54646fa23aa140aee917f7 SHA256 7589206de5ea91e912e0332f7dc503689d348cb752e17ba84a724987c4bbe04a
 MD5 626503da08b9af48199596c83d6f49b3 files/70git-gentoo.el 88
 RMD160 fe9b87bdbe14141580745063092a5d08924f23fd files/70git-gentoo.el 88
@@ -23,10 +20,13 @@ RMD160 9c1abde72ac5064e1fc86afd29c2a74079db91a4 files/git-daemon.xinetd 260
 SHA256 6a3503904204163775722e8a455e4ebaa8648f6d288340979387ad4eb55f4c0a files/git-daemon.xinetd 260
 DIST git-1.5.0.7.tar.bz2 1053367 RMD160 c8ad03381005152d2513e0d12099d976ccad42a9 SHA1 1e0d09f27cd8eb3ac96590ed4c1baba459d5359e SHA256 6fae7d1de3f4ec2b04423d6af194bf75c9262785997c80fc4e1cd5e62b1b7ada
 DIST git-1.5.1.2.tar.bz2 1120779 RMD160 91019f417972162b2e14d1ddb607522390f68d75 SHA1 d49e6ae0aecd9cff403a110c67041b3c0dbd7a1f SHA256 629a6bd89b226f20cc21c954bd695c91e284b664c05b7d66b706866112b7f628
+DIST git-1.5.1.3.tar.bz2 1122617 RMD160 2f1e7e9c0a9dd7745086d9da1478a8fd0be65de0 SHA1 673bbd457e713251a7fbf54369150dd760c5606d SHA256 876c0902e71a87bb59dae5224f094e484269f0f140dab62c2670878625da65d7
 DIST git-htmldocs-1.5.0.7.tar.bz2 450009 RMD160 0292aa6e166b5ccc3dd89eaeb0b56ab9a98b25f8 SHA1 4767bc6c617d1b5906acc3cc869b870c9743d294 SHA256 9f9dd3beb5b267080a556239bb0a99b5d2ac396cdd15b38c932976a0ec24b823
 DIST git-htmldocs-1.5.1.2.tar.bz2 471266 RMD160 9c739f6b4d7e1ba79148d610e3fa0accf14e08a7 SHA1 2684caa9c0a1392dfd0a97b6d0568f82c0b02ec8 SHA256 6ec2942ab5dd90db19324d39a3307f67a471dd41af6bb9749555f3c21aefd94b
+DIST git-htmldocs-1.5.1.3.tar.bz2 474857 RMD160 892f5e1f03bc23c617bfd00c88734f3b221f3f35 SHA1 ba316ca8f3166af98065606c36f84da744b5fcc8 SHA256 14156a2245c36bf6b68f98c715bcf4577a3b45daa2b10eae88d5a017e4baf5f2
 DIST git-manpages-1.5.0.7.tar.bz2 126927 RMD160 37028035ea1aca310c79bd079ae1d1e65ca9fe32 SHA1 66de3c514b1942920b66f434350f55e2ff70f90e SHA256 df6879361c0e671e3a228e3bd9954d9f712a7c74e9e151e4ca89bb6037d4dbba
 DIST git-manpages-1.5.1.2.tar.bz2 132716 RMD160 f835da9dcf54860eaabc3c861c9013ee9f717f6d SHA1 08b61944669a6c4260a29281d3e62f127142e942 SHA256 bc5b6514c0bedfecc81ec7221a1e4bece967e0bed33aeaaa90a7c6823b541dec
+DIST git-manpages-1.5.1.3.tar.bz2 133667 RMD160 ac64a5c16c35cf6feb86fa68361124e25f0186a5 SHA1 3a5ecaa36fb5b7c3dba9a96240016fcccac6cfc0 SHA256 7b21d618b3b14120cf0c3c3385fa572c4dc95d780b92166ccdc5503d2eef5879
 EBUILD git-1.5.0.7.ebuild 4344 RMD160 773db02bbcab8cba9b903e7ddd4dfabdb757e454 SHA1 98c145b5d1e8a4b38b002e6040d146d4c5621980 SHA256 2fdd37d31b701843d2a941a6610939c94de2431c4d4c4088ef83b8719a105681
 MD5 4514af684d0a13883a77a9baadb47724 git-1.5.0.7.ebuild 4344
 RMD160 773db02bbcab8cba9b903e7ddd4dfabdb757e454 git-1.5.0.7.ebuild 4344
@@ -35,10 +35,14 @@ EBUILD git-1.5.1.2.ebuild 4354 RMD160 56903aed6cdbaffd569d2a8f6b46d24f150a44b9 S
 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 26893 RMD160 7911b583a1b780ca3b800bda1459e6bf72640292 SHA1 9e8cc4fa260b0bc631189e65e0e79856d3eaa34b SHA256 5fd89a24648a52e99d3a641f267dc3f99ccfebcdb6ee713075193128692cfcbe
-MD5 fa18840b0ac1b9d4b7118971dc3fdb6c ChangeLog 26893
-RMD160 7911b583a1b780ca3b800bda1459e6bf72640292 ChangeLog 26893
-SHA256 5fd89a24648a52e99d3a641f267dc3f99ccfebcdb6ee713075193128692cfcbe ChangeLog 26893
+EBUILD git-1.5.1.3.ebuild 4356 RMD160 7a85aca3939a5d0032074f84bdefd87e68fff545 SHA1 331df49d0e4eab854037357f51535969382fd972 SHA256 ec6af37b27278466e283ee28730ae8845150a8829f8cb57b89c567286dfaafa1
+MD5 142f039af51151ee1fd927250945b1e7 git-1.5.1.3.ebuild 4356
+RMD160 7a85aca3939a5d0032074f84bdefd87e68fff545 git-1.5.1.3.ebuild 4356
+SHA256 ec6af37b27278466e283ee28730ae8845150a8829f8cb57b89c567286dfaafa1 git-1.5.1.3.ebuild 4356
+MISC ChangeLog 27014 RMD160 952e51a32de84e37e9feb026b8b77ce6634c2324 SHA1 7515d49ad6ac29b43a803a40972d964ed2ed0813 SHA256 6a4355a3fb4a32540a6232809d38eefc89bbf2ae4a4975dbb0fa126f05508185
+MD5 f2e61491653ea817a6f6ab4cd886a02c ChangeLog 27014
+RMD160 952e51a32de84e37e9feb026b8b77ce6634c2324 ChangeLog 27014
+SHA256 6a4355a3fb4a32540a6232809d38eefc89bbf2ae4a4975dbb0fa126f05508185 ChangeLog 27014
 MISC metadata.xml 253 RMD160 e09bab6a5a422f501b8e07a3983c5790e00ac92a SHA1 7c2340e011ce57927ff31d7e3397ef4bb1c7ad27 SHA256 1f2e9f9f57e781c296ac5c39c54eabf82a47b7facd0698b296bc76f50799432c
 MD5 22c5a3ad567fa12332dab8687b9c2d1c metadata.xml 253
 RMD160 e09bab6a5a422f501b8e07a3983c5790e00ac92a metadata.xml 253
@@ -49,10 +53,6 @@ SHA256 e83d17bc0cecaec146675934ca0ee7f15d8996c16e587954dc9d6c627772581c files/di
 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 v1.4.6 (GNU/Linux)
-
-iD8DBQFGLi8jViELBEf1JB0RAn5tAJ9uX5C4zxIcDU46Pj/XJ/W0g8m0BgCfSiuX
-B+hqxde+0qD8qD0dJGHyWQw=
-=8Al7
------END PGP SIGNATURE-----
+MD5 ec7a764b3772a893a5ec1dc9655de6a5 files/digest-git-1.5.1.3 771
+RMD160 c2230959dfff21ae45cdd2d3ec4d9bac71f480e1 files/digest-git-1.5.1.3 771
+SHA256 9fc0f9f6393c969010cce84eb93594eba826988748306c9560616c21d8b63bce files/digest-git-1.5.1.3 771
diff --git a/dev-util/git/files/digest-git-1.5.1.3 b/dev-util/git/files/digest-git-1.5.1.3
new file mode 100644 (file)
index 0000000..7d26196
--- /dev/null
@@ -0,0 +1,9 @@
+MD5 38eb5e41f0b20e601ea4a10b70553147 git-1.5.1.3.tar.bz2 1122617
+RMD160 2f1e7e9c0a9dd7745086d9da1478a8fd0be65de0 git-1.5.1.3.tar.bz2 1122617
+SHA256 876c0902e71a87bb59dae5224f094e484269f0f140dab62c2670878625da65d7 git-1.5.1.3.tar.bz2 1122617
+MD5 b49f3f3a77c15ab67d2189d6772cdb5a git-htmldocs-1.5.1.3.tar.bz2 474857
+RMD160 892f5e1f03bc23c617bfd00c88734f3b221f3f35 git-htmldocs-1.5.1.3.tar.bz2 474857
+SHA256 14156a2245c36bf6b68f98c715bcf4577a3b45daa2b10eae88d5a017e4baf5f2 git-htmldocs-1.5.1.3.tar.bz2 474857
+MD5 da2cd75092a454205cafdeddc3b1c319 git-manpages-1.5.1.3.tar.bz2 133667
+RMD160 ac64a5c16c35cf6feb86fa68361124e25f0186a5 git-manpages-1.5.1.3.tar.bz2 133667
+SHA256 7b21d618b3b14120cf0c3c3385fa572c4dc95d780b92166ccdc5503d2eef5879 git-manpages-1.5.1.3.tar.bz2 133667
diff --git a/dev-util/git/git-1.5.1.3.ebuild b/dev-util/git/git-1.5.1.3.ebuild
new file mode 100644 (file)
index 0000000..05b2813
--- /dev/null
@@ -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.3.ebuild,v 1.1 2007/05/01 03:17:06 robbat2 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
+}