diff options
author | 2008-12-23 08:07:04 +0000 | |
---|---|---|
committer | 2008-12-23 08:07:04 +0000 | |
commit | a3f1d61b70f74e0f8d74988361412de48ef50358 (patch) | |
tree | be5436eb90d86b488dd7dfd8df0d19ea88c228bc /dev-util/git | |
parent | add debian bug url and clean cruft (diff) | |
download | historical-a3f1d61b70f74e0f8d74988361412de48ef50358.tar.gz historical-a3f1d61b70f74e0f8d74988361412de48ef50358.tar.bz2 historical-a3f1d61b70f74e0f8d74988361412de48ef50358.zip |
Version bump.
Package-Manager: portage-2.2_rc18/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64
Diffstat (limited to 'dev-util/git')
-rw-r--r-- | dev-util/git/ChangeLog | 7 | ||||
-rw-r--r-- | dev-util/git/Manifest | 6 | ||||
-rw-r--r-- | dev-util/git/git-1.6.0.6.ebuild | 311 |
3 files changed, 322 insertions, 2 deletions
diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog index 79eec2ca2d21..222ccf51d39b 100644 --- a/dev-util/git/ChangeLog +++ b/dev-util/git/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/git # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.307 2008/11/27 20:33:34 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.308 2008/12/23 08:07:04 robbat2 Exp $ + +*git-1.6.0.6 (23 Dec 2008) + + 23 Dec 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.6.ebuild: + Version bump. 27 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> files/git-daemon.initd: Refix bug #238351 so that it works under baselayout1 and baselayout2. diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest index ac362e41ad8d..1811efe37e7e 100644 --- a/dev-util/git/Manifest +++ b/dev-util/git/Manifest @@ -29,6 +29,7 @@ DIST git-1.6.0.1.tar.bz2 1861853 RMD160 2820a1ec30b1572aa7db6f254ee672b916aaf3e6 DIST git-1.6.0.2.tar.bz2 1865485 RMD160 eb91ca256d0fbcc956f91ad02da659d9b322261d SHA1 4a1d78604d1fb6c0deb43a498feb454970fb6704 SHA256 a332fbcb1c9cf8b1dc224135d5b14e99da4720fc8b082e595b4f20eaf640dad8 DIST git-1.6.0.3.tar.bz2 1874309 RMD160 0109ac07d0a6ea911526be8e40edb797c032a1bf SHA1 9144717196a0c8c18f0b412b137697a70b255f2a SHA256 4a15393da4059587a633686174b46aef3d1f1e4e0280c6352dbde517c01c300b DIST git-1.6.0.4.tar.bz2 1876842 RMD160 c4ca52d92993955b551ed26e6ef01529b716aa6d SHA1 6e9471519d482894ffd7ecc10cf2c09506971e3d SHA256 f8ccac357f2c721e735ae16bbb02a420d2aaaed483f5d46043c5fe627ab4b260 +DIST git-1.6.0.6.tar.bz2 1882225 RMD160 897a02479c527dad0ba821e599a5cff94d933ce9 SHA1 80ad0c2a450e182322c6e006f9345b784dfc66e3 SHA256 e1d65bece5e8da1b72db22d3f6f2cbcefd28360c7f5bba141af436f43f887d0c DIST git-1.6.0.tar.bz2 1860591 RMD160 ae3a0d3a39592f7ca2c9908917eb433860b71c38 SHA1 873fbe7141042ed96e5aa3178cb159b5636f60ed SHA256 b8d71cd080c059f4e5d949b1fd6a5c42ca648562326b7dcc04d9f06a777142f0 DIST git-htmldocs-1.5.1.6.tar.bz2 489138 RMD160 eda63828bbb928699c9b3bb52876d7b7dc489ba7 SHA1 907749b4eba99c696589be750bc9432b9818954b SHA256 566928345f80850bdebb278d52591f017041d9de67b2cd561963065c847c6685 DIST git-htmldocs-1.5.3.7.tar.bz2 549391 RMD160 18d01c803fd529ac897ae249ce4e05193ee9850a SHA1 926fb29604d69ce45ecf7b57d1b8feeb6c356f9b SHA256 e28c7e149e0f5adb66093af287dffe0caef83926ae08c6cdb6a2d35bc9148d04 @@ -45,6 +46,7 @@ DIST git-htmldocs-1.6.0.1.tar.bz2 705872 RMD160 dda5c1d99148319f3847ad9fe200e688 DIST git-htmldocs-1.6.0.2.tar.bz2 708053 RMD160 694a3ae65337336674a0e5bf38c7382f86f3381d SHA1 ba96fbe8b938df9084e962c70a3a5076b2230371 SHA256 8e3e86f0d2175c1c2e9fc8016352f8524e546253a0b301653b05f132b1b1691d DIST git-htmldocs-1.6.0.3.tar.bz2 710365 RMD160 69b59fa8dc81d6faeffc93ce8fb02e2cc3076551 SHA1 b385580adc81a07b671f2c4af7a3aa6d281c5455 SHA256 5aad1de2c00912a26eee1f3cbbdac4ee0d3f804f7aac0862d0f141199aaffe2b DIST git-htmldocs-1.6.0.4.tar.bz2 685868 RMD160 3a3bb7d52623efb46c71b751b32cb39b0785f87c SHA1 2ce03c496bc6d332cfaed4bd58ddb0a0bce3adea SHA256 207b91956a9451a42c5e2488fe4310c3455756d10180bc1aae2003976f45a4f0 +DIST git-htmldocs-1.6.0.6.tar.bz2 691282 RMD160 9b268ac521da2bf03995533d53dc3f7d43897ef1 SHA1 9eecc27e26e88c8f7ed0eea658c2c2d71ec9b9a6 SHA256 1738845dfe336dee5bd736a37823876e32cf633dc2a9bf7047bd35a0c3b64e58 DIST git-htmldocs-1.6.0.tar.bz2 704837 RMD160 7acb9b23946221a4d86e4f66fa3bf09b100ec603 SHA1 779f5145a66275444a67968c208cccb2296f739d SHA256 31fdd420327d39b6fe0ef8298b72b3b6cbdb4f35a3657abbe279f3c042dcc988 DIST git-manpages-1.5.1.6.tar.bz2 133945 RMD160 ed047e78031882fb1d954ed9368127e4d0019da8 SHA1 f4eeb116aaeeabf329c9de8d49421af42e4a6f51 SHA256 22a06a220a915b3c1493462f0d902ea70d1dee25e0362984a1c896a73c721c4d DIST git-manpages-1.5.3.7.tar.bz2 147932 RMD160 fd4b45c221cbc63f580a32595c59eb52da1baa2f SHA1 7cc45f156298d0fbd4ead4a9b2096ed2143287b8 SHA256 870e68ef57f4175152b9b8decc721d8cbc9850ed8eda73919fc9e060f3968ffa @@ -61,6 +63,7 @@ DIST git-manpages-1.6.0.1.tar.bz2 221756 RMD160 dbc78ba3b002fa41659023cac1313556 DIST git-manpages-1.6.0.2.tar.bz2 222534 RMD160 60384440283ef0e6b86d324850e3072e1ab4dd67 SHA1 aab4cfc70a03ca447bbb86422226c892d9be1e4e SHA256 198472533f9c8abe124ce93fda5639e07b6ee73e67d02d393648b20dd79476c7 DIST git-manpages-1.6.0.3.tar.bz2 224091 RMD160 abd6cfa847122e5096413b255231b5fa930812ad SHA1 9ff7497f16dd359d979fa778cfc49a667648d0dc SHA256 dac8386c601cd519824e89c159d26c6a80e6c4e9f8a4510e92b4323ed0593e6c DIST git-manpages-1.6.0.4.tar.bz2 216926 RMD160 567e901113de12c91e8b698981da585496c82573 SHA1 26e713ef11449187f9762fb603cca43b2b5b80b8 SHA256 9f1a9f70918e06c475b6d5b3fac8f2c631b254087166cd1655a5be3d9da682d4 +DIST git-manpages-1.6.0.6.tar.bz2 217074 RMD160 81bdf5ac9662a7790682cb110640b32ca0f00756 SHA1 6a27a20f05cf0ac980915d5577d241a4836134de SHA256 80dc6a8a05bccdb49de261c32c9c22ab8c2e957edd618c0315fdf49e46f89bc8 DIST git-manpages-1.6.0.tar.bz2 221399 RMD160 9e8cbb5d6ebda82407df325ed19f1ced12860f65 SHA1 c7b4204cdf941681a09084641c8aea3c6ef34dec SHA256 d8092a55dfaf31e78aecd802129af4b51b86dedf4ad12a397f487d89b822ef81 EBUILD git-1.5.1.6.ebuild 4400 RMD160 c81b28b5efca8244c87cc5f0ac1923c03c9e5b1f SHA1 bb71d825a1c1eef4a5ba26958a7e4dd35b02d938 SHA256 8cbd6c76e3cc3a9e00a3accdb69dec8e134b99acf7cad1e39b243c6289559734 EBUILD git-1.5.3.7-r1.ebuild 6371 RMD160 847ed38b63b34256ce17991dc6c4dbd34c207955 SHA1 d6edbbd1bcd150992f69eb2655e1ab5b4a925420 SHA256 7d881d0f76b68244aa0021e71beb8537197f2147aa464b5707c39217ec6be87c @@ -80,6 +83,7 @@ EBUILD git-1.6.0.3.ebuild 8416 RMD160 f2c4ed1b4e0806e468a7f3dbf5ac27381ecdad9b S EBUILD git-1.6.0.4-r1.ebuild 8948 RMD160 8931b3756e1c0302d46bea731c15715b5549b0cf SHA1 4c41d4512cd01983a81b91e6da0aa872f9cdefa4 SHA256 fdb03c4d902d6169300595a231b965349844c03f0f5f5ff291daa1c0435a82bb EBUILD git-1.6.0.4-r2.ebuild 8948 RMD160 6da6d8ad23d1f4666044098149409130b33b1cc9 SHA1 e72e51557d1831763059164c83348fd4e3e63eaa SHA256 4ef3dc1039dbeff20f1dadb08e24071e97124fe2f4bb93f5eddc8fc7ab975063 EBUILD git-1.6.0.4.ebuild 8416 RMD160 d4d959465b22fa6747e187547d9e7c5c86dad177 SHA1 ca3eec4154653011f6b68d4d4cae5fa1c0ad31d6 SHA256 78bbe545b099da0c431f0b19da417c8c125f267005791721683961e9093c5b7b +EBUILD git-1.6.0.6.ebuild 8945 RMD160 ffd94fd19bf0ec087831c4bc2c11d611ff2aaf71 SHA1 4cb2233eafbb8c018c2596027ae069f89b1d8524 SHA256 a858fabf74d865201ed475dfd43c192625c1219f56c2b659907af5b628ee3b90 EBUILD git-1.6.0.ebuild 8414 RMD160 3c1d79572a1231ccc82de22d16a5be15eab5ea66 SHA1 02cfa595340ca2d11bfe17b59b392c884f1b94cb SHA256 650f93ca84a368bc3ed617a9c023ee67a810b1d41f1691807c46c31a22d26b2c -MISC ChangeLog 46431 RMD160 af910b5a7f21f463be8ba816a16bcf371b218293 SHA1 5640e31fbc2acac0535d5ca1b90f1489eed543a4 SHA256 3d574f60871227ec2573ac15aa8663aa64f6079b8d0c4692af57316220c4c624 +MISC ChangeLog 46550 RMD160 b03189c02b03b67d1cc098c92675625d6c29827d SHA1 bbdae9c7a92dc91ad1edfca8914c194d0e453d28 SHA256 56b022e24be3b41218073b0da7e8cc51a1ff1f72d2e1e2a17b4c97957981556e MISC metadata.xml 1539 RMD160 b8c0182e6c64bf0399c979942ec403c309a95019 SHA1 e3fbe7df1c4a5209d10ae82d7aa368df6bbf8a9e SHA256 9b0b2c3e7607e1e280edd997169c72799f37c7cac547bce3e294584eaabbb3e5 diff --git a/dev-util/git/git-1.6.0.6.ebuild b/dev-util/git/git-1.6.0.6.ebuild new file mode 100644 index 000000000000..cbad1ce7a389 --- /dev/null +++ b/dev-util/git/git-1.6.0.6.ebuild @@ -0,0 +1,311 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.6.ebuild,v 1.1 2008/12/23 08:07:04 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, the revision control system heavily used by the Linux kernel team" +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 ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" + +DEPEND=" + !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="${DEPEND} + perl? ( dev-perl/Error + dev-perl/Net-SMTP-SSL + dev-perl/Authen-SASL + cgi? ( virtual/perl-CGI ) + cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) + subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) + ) + gtk? ( >=dev-python/pygtk-2.8 )" + +SITEFILE=50${PN}-gentoo.el +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if ! use perl ; then + use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" + use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" + use subversion && ewarn "git-svn needs USE=perl, it won't work" + fi + if use webdav && ! use curl ; then + ewarn "USE=webdav needs USE=curl. 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=dso, 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 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" + fi + + use iconv || myopts="${myopts} NO_ICONV=YesPlease" + use tk || myopts="${myopts} NO_TCLTK=YesPlease" + use perl || myopts="${myopts} NO_PERL=YesPlease" + use threads && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" + use subversion || myopts="${myopts} NO_SVN_TESTS=YesPlease" + + export MY_MAKEOPTS="${myopts}" +} + +src_unpack() { + 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}" + + epatch "${FILESDIR}"/20080626-git-1.5.6.1-noperl.patch + epatch "${FILESDIR}"/20081123-git-1.6.0.4-noperl-cvsserver.patch + + sed -i \ + -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ + -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ + -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ + Makefile || die "sed failed" + + exportmakeopts +} + +src_compile() { + emake ${MY_MAKEOPTS} \ + DESTDIR="${D}" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ + prefix=/usr \ + htmldir=/usr/share/doc/${PF}/html \ + || die "make failed" + + if use emacs ; then + elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" + fi + if use perl && use cgi ; then + emake ${MY_MAKEOPTS} \ + DESTDIR="${D}" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ + prefix=/usr \ + htmldir=/usr/share/doc/${PF}/html \ + gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" + fi +} + +src_install() { + emake ${MY_MAKEOPTS} \ + DESTDIR="${D}" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ + prefix=/usr \ + htmldir=/usr/share/doc/${PF}/html \ + install || \ + die "make install failed" + + doman man?/* + + 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}/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 + + if use vim-syntax ; then + insinto /usr/share/vim/vimfiles/syntax/ + doins contrib/vim/syntax/gitcommit.vim + insinto /usr/share/vim/vimfiles/ftdetect/ + newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim + fi + + 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 + 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="" + local tests_cvs="t9200-git-cvsexportcommit.sh \ + t9400-git-cvsserver-server.sh \ + t9600-cvsimport.sh" + local tests_perl="t5502-quickfetch.sh \ + t5512-ls-remote.sh \ + t5520-pull.sh" + + # Unzip is used only for the testcase code, not by any normal parts of Git. + if ! has_version app-arch/unzip ; then + einfo "Disabling tar-tree tests" + disabled="${disabled} t5000-tar-tree.sh" + fi + + cvs=0 + use cvs && let cvs=$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=userpriv!" + disabled="${disabled} ${tests_cvs}" + fi + # Bug #225601 - t0004 is not suitable for root perm + # Bug #219839 - t1004 is not suitable for root perm + disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh" + else + [[ $cvs -gt 0 ]] && \ + has_version dev-util/cvs && \ + let cvs=$cvs+1 + [[ $cvs -gt 0 ]] && \ + built_with_use dev-util/cvs server && \ + let cvs=$cvs+1 + if [[ $cvs -lt 3 ]]; then + einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])" + disabled="${disabled} ${tests_cvs}" + fi + fi + + if ! use perl ; then + einfo "Disabling tests that need Perl" + disabled="${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" + emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" +} + +showpkgdeps() { + local pkg=$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=perl" + 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 +} |