diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2008-11-24 09:24:45 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2008-11-24 09:24:45 +0000 |
commit | 26097319f0fa88268bf70eb52f39bb6eafb5b384 (patch) | |
tree | 348408ce085e5d356bb1b5f6c4bf373928a2e1d1 | |
parent | Version Bump (diff) | |
download | historical-26097319f0fa88268bf70eb52f39bb6eafb5b384.tar.gz historical-26097319f0fa88268bf70eb52f39bb6eafb5b384.tar.bz2 historical-26097319f0fa88268bf70eb52f39bb6eafb5b384.zip |
Fix dumb typo, revbump to ensure any users that got the typo also get the fix.
Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64
-rw-r--r-- | dev-util/git/ChangeLog | 9 | ||||
-rw-r--r-- | dev-util/git/Manifest | 5 | ||||
-rw-r--r-- | dev-util/git/files/git-daemon.initd | 4 | ||||
-rw-r--r-- | dev-util/git/git-1.6.0.4-r2.ebuild | 311 |
4 files changed, 324 insertions, 5 deletions
diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog index 72e2f53fbea5..ba1cff130392 100644 --- a/dev-util/git/ChangeLog +++ b/dev-util/git/ChangeLog @@ -1,6 +1,13 @@ # 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.305 2008/11/24 08:23:34 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.306 2008/11/24 09:24:44 robbat2 Exp $ + +*git-1.6.0.4-r2 (24 Nov 2008) + + 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> files/git-daemon.initd, + +git-1.6.0.4-r2.ebuild: + Fix dumb typo, revbump to ensure any users that got the typo also get the + fix. 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> metadata.xml: Document what USE=gtk does for Git. diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest index 198539a4fbdd..04de5d16fad3 100644 --- a/dev-util/git/Manifest +++ b/dev-util/git/Manifest @@ -11,7 +11,7 @@ AUX git-1.5.3-symlinks.patch 645 RMD160 24fc6002042e67611f337cae3867bb400fd8c7d6 AUX git-1.5.3.8-t9101.patch 878 RMD160 8202afb8f1b8a7ac763ffa0e575aed3feb8a6847 SHA1 6d9c1ed47cec9713ec2e4c6c26f19ede673b8fce SHA256 8f16f4c811010eb4f20e643c9a0c303470bb76451dd729154a1f20d01453bc0e AUX git-1.5.3.8-t9106.patch 897 RMD160 5651dc89e42066b91e525dcbc367f42fa4db79a4 SHA1 e306f87501e98caf587d1e6a86ceef7b9e35139e SHA256 ede8da4f5eb3b9f4824b8db1cdb4d4bd9a1d854ca0676241c2509856dbd49f98 AUX git-daemon.confd 700 RMD160 2dea5af0c6b3aa5304aa5417bb40099bd4cdb45b SHA1 0b7c3078c4d284eb2572a5fb7c1efff5a4837f6e SHA256 9ca387e81ca875d4e543fa64398620451ff74273fa06b122a6af47db1fee1630 -AUX git-daemon.initd 643 RMD160 6ce87cdc6c9e654c455c1d5e7ec36a2e5763a905 SHA1 1a5da2360eeb0055ef289696f24c6516b945f40d SHA256 308dbc573fb03fffa26754a7a97197d37b9b800cf470b82ae87f596679ed94c2 +AUX git-daemon.initd 639 RMD160 01028814caa3d154168736fd8ad6769abb972db8 SHA1 02546f6636c8c4c7261d116e37e4d95215ffbb86 SHA256 b355bd598749728a295ade7e39abf4708caebec65d66851da2970ab40ffcc471 AUX git-daemon.xinetd 260 RMD160 5bfeca2541488bb955ca349474c1fa3e80913aef SHA1 88d6fc44644c88ed6f2ce54a936f41dc15d2268e SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67 AUX vim-ftdetect-gitcommit.vim 261 RMD160 9abf9cb8443082820b978d4890caa021f6da6342 SHA1 6f179228555a6316281db247653ec930877741e4 SHA256 ada04f0d5a61ca71ca50b01cd92f010e906f1ae19ecb263ac38e714b087515fe DIST git-1.5.1.6.tar.bz2 1130713 RMD160 20279c817da53d3bc6d5f58121bfe73e8a25e8a1 SHA1 c1e34ce6a6a9a81bb16f158ef84b4576e6be1b0c SHA256 4429ca98c0789b0f564cdbf76e8e8ad4db928b7c7ac94f116e4a0729e4253a21 @@ -78,7 +78,8 @@ EBUILD git-1.6.0.1.ebuild 8416 RMD160 f66272869bf69e0a324e3bb340bb93fdfd57cb34 S EBUILD git-1.6.0.2.ebuild 8416 RMD160 df5f708da54bfd6a030c5b2dc759e1a30059aaa8 SHA1 ddb81cee72eb8628ad5f85af9354d0e943e57e18 SHA256 8c0d04907936430e533cf020923009b45ef64b7123c71e69100146f47651b40f EBUILD git-1.6.0.3.ebuild 8416 RMD160 f2c4ed1b4e0806e468a7f3dbf5ac27381ecdad9b SHA1 f63af1f522626f3fa25363baae3d72f6e5b1cde9 SHA256 bae9e11f08fecaf9ef2cc65b889c7ad15ce2496168b90366fdaa86c80613fe8f 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.ebuild 8414 RMD160 3c1d79572a1231ccc82de22d16a5be15eab5ea66 SHA1 02cfa595340ca2d11bfe17b59b392c884f1b94cb SHA256 650f93ca84a368bc3ed617a9c023ee67a810b1d41f1691807c46c31a22d26b2c -MISC ChangeLog 46063 RMD160 027e19c5893b823131250c402208c5888ab03971 SHA1 71fb9ccc77de3ddec6d749098055f232e2b90efc SHA256 052dc454d64dfea966860ddf9f27347863e48818a2917a0eaa77627e1b734efe +MISC ChangeLog 46281 RMD160 360ba71269e1c6a6b66d1a035a9b34e9e802a713 SHA1 a9fd156f76f502b0353f5debba36684432f695ad SHA256 490d50a7751d42ae894efe81631c104d5635905a3469a92067d37124e744aafe MISC metadata.xml 1539 RMD160 b8c0182e6c64bf0399c979942ec403c309a95019 SHA1 e3fbe7df1c4a5209d10ae82d7aa368df6bbf8a9e SHA256 9b0b2c3e7607e1e280edd997169c72799f37c7cac547bce3e294584eaabbb3e5 diff --git a/dev-util/git/files/git-daemon.initd b/dev-util/git/files/git-daemon.initd index 07650ea6ff9b..6f7138dc8c35 100644 --- a/dev-util/git/files/git-daemon.initd +++ b/dev-util/git/files/git-daemon.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/files/git-daemon.initd,v 1.4 2008/11/24 01:08:06 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/files/git-daemon.initd,v 1.5 2008/11/24 09:24:45 robbat2 Exp $ depend() { need net @@ -11,7 +11,7 @@ depend() { start() { ebegin "Starting git-daemon" start-stop-daemon --start --quiet --background \ - --exec /usr/bin/git/git -- daemon \ + --exec /usr/bin/git -- daemon \ --pid-file=/var/run/git-daemon.pid \ --user=${GIT_USER} --group=${GIT_GROUP} \ ${GITDAEMON_OPTS} diff --git a/dev-util/git/git-1.6.0.4-r2.ebuild b/dev-util/git/git-1.6.0.4-r2.ebuild new file mode 100644 index 000000000000..331fda5ca4e7 --- /dev/null +++ b/dev-util/git/git-1.6.0.4-r2.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.4-r2.ebuild,v 1.1 2008/11/24 09:24:44 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 +} |