diff options
| -rw-r--r-- | dev-util/git/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/git/Manifest | 7 | ||||
| -rw-r--r-- | dev-util/git/files/git-1.7.0-always-install-js.patch | 36 | ||||
| -rw-r--r-- | dev-util/git/git-1.7.0.ebuild | 413 |
4 files changed, 462 insertions, 2 deletions
diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog index 74ed62f83530..0cdcc629c1f4 100644 --- a/dev-util/git/ChangeLog +++ b/dev-util/git/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/git # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.395 2010/02/13 17:34:19 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.396 2010/02/13 18:37:09 robbat2 Exp $ + +*git-1.7.0 (13 Feb 2010) + + 13 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.0.ebuild, + +files/git-1.7.0-always-install-js.patch: + Version bump. *git-1.6.6.2 (13 Feb 2010) diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest index 451cdc7cda79..30b6f502ce11 100644 --- a/dev-util/git/Manifest +++ b/dev-util/git/Manifest @@ -1,5 +1,6 @@ AUX 50git-gentoo.el 473 RMD160 3ae4696cc90d35bf2a1dca17cfe2fda78c0025e4 SHA1 7b67b759e6c3fc27552b211a6a48f3e4e2018c24 SHA256 c32f14d036e5ccb5c4583621dc10903346ab810ee838457e2de6e53d883348c0 AUX git-1.6.6-always-install-js.patch 1300 RMD160 7a288526624acb0748e4c917a56d662439cc28db SHA1 8bac9d1ecafd14f0dc7cf3564a9b6c53e32726b1 SHA256 019e5dbf6d0c3e57056b038db2ac1d7e501258e02ae5dacb6360a1e639ed4b67 +AUX git-1.7.0-always-install-js.patch 1304 RMD160 e4d110d7bd86a50f928cdf5fa1e3513aebbb0dab SHA1 9324fe19cb85709b2a198ba853866a99d6088f64 SHA256 5cb12dd43e114d07ea4ab6cd04f386cdc0c6e9a998529943be2da3308e1d1509 AUX git-daemon.confd 700 RMD160 2dea5af0c6b3aa5304aa5417bb40099bd4cdb45b SHA1 0b7c3078c4d284eb2572a5fb7c1efff5a4837f6e SHA256 9ca387e81ca875d4e543fa64398620451ff74273fa06b122a6af47db1fee1630 AUX git-daemon.initd 741 RMD160 83ab8615b51c521ac0b961b42de7a7955f81147f SHA1 1dacace343cb952cab793cf46be110969473f84b SHA256 16a684cc66377e2840d09dd8cc39ed4cb13ce4807e22039f8bc176dff030ddec AUX git-daemon.xinetd 260 RMD160 5bfeca2541488bb955ca349474c1fa3e80913aef SHA1 88d6fc44644c88ed6f2ce54a936f41dc15d2268e SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67 @@ -27,6 +28,7 @@ DIST git-1.6.6.2.tar.bz2 2336377 RMD160 661e1c2b1f91c5ab62f8107a975534c87d89dc7d DIST git-1.6.6.rc3.tar.bz2 2325545 RMD160 ca5a780f70175469ed21fad5a91753e677ffd37f SHA1 10c50d29fbf63e6959d81ae27bf89b95b78eaaf8 SHA256 6f237057745a61de2050a7775f6c2d7b16534e7c4a2d46c282167826609b6967 DIST git-1.6.6.rc4.tar.bz2 2326566 RMD160 820e8b592ea09b84c4a3ffce5c867a87f53f532c SHA1 b13d9dff668ecd86d3aa14129e5ac4cdc31fb38d SHA256 8a79ad53bba052ef4822132a01cdb21c32ec1a9409da47f9d5dbbb78dcd032d8 DIST git-1.6.6.tar.bz2 2328343 RMD160 59d96548ef54f117892d6c602973bd0decf155b4 SHA1 21d83108c618d0f90a166b7ce403c9d1166a0d95 SHA256 c3f7a384f7f8618ec1c2a732c8c0a94accf00214602beea34fbb39566041c19c +DIST git-1.7.0.tar.bz2 2430104 RMD160 5f37b556845dba23cc3e604e9b503b4ef0a9d3f7 SHA1 c0b536735a7f593877d61f5a8af72bdad0193d97 SHA256 a61e863944381c4f8231841f678f41f56b634bebca486a61005b35e5bcbb7c79 DIST git-htmldocs-1.6.3.1.tar.bz2 741913 RMD160 279b298feed72e0c0712c54061f5cbed3b9eb279 SHA1 4a6e77f7171b16878aa71765a3f947432e669214 SHA256 6376efa888075de5b319c1ebade8516b2fb0edea675cc7172dcbf139324800a1 DIST git-htmldocs-1.6.3.3.tar.bz2 742321 RMD160 0ea1318aa4a1259bb00c45b03a84cd09f07114f4 SHA1 f6d5bec24edfd27bf91f0f0cc13cfcfd7ecd045f SHA256 b387dbbe281adbfe6aafb949b94970f753f2658220e998a8dd5258b8980443d4 DIST git-htmldocs-1.6.3.4.tar.bz2 743064 RMD160 758777b01f19553e69630dfd6583fdc2c91a9463 SHA1 b36232082254515484e952caad75b8de8bb825b0 SHA256 af5cf3b339c447c1221ca5bf75f1707ad713f8b463ba8e9d71abc5aa3a1a1d6b @@ -51,6 +53,7 @@ DIST git-htmldocs-1.6.6.2.tar.bz2 848818 RMD160 a824bc07dad28c669668d8ab4a7f1a62 DIST git-htmldocs-1.6.6.rc3.tar.bz2 846535 RMD160 a8a8e3dc712cd59e6712821d58b9d852ad9d9c39 SHA1 04c17f269524fa19415886283faac1b81840c202 SHA256 4f6ddc4a329a150a9525e61d948339fbd67ac8f5f2ac017a40b52164cee739b6 DIST git-htmldocs-1.6.6.rc4.tar.bz2 847454 RMD160 4a14752e3fced6e389387a66c5927b35664aae7c SHA1 c2b8e44bdc4de0a7e064da9303e05f0963fae46b SHA256 17721212bff450f795c359fddf58e45924be6db0f7f48edc494cfe63ad9c7ee3 DIST git-htmldocs-1.6.6.tar.bz2 847046 RMD160 4f21ac2d123579970c3f46d9b87aae96c319e230 SHA1 8313c14989d63317d0d6866a0aad68db5abb194b SHA256 35ed4ffef3231e0641ee6042952ffb55e108af098bd32296b04a570b17a157df +DIST git-htmldocs-1.7.0.tar.bz2 861086 RMD160 06be1a51168f4b4e522d06ed0edc3437658bd519 SHA1 efc0f2b5d663e72c8e543f3ea7fd47b98e58b029 SHA256 8338f71c9ee019ee591805a2804e7ed59de0b03538bffeb6a504088a63779241 DIST git-manpages-1.6.3.1.tar.bz2 244098 RMD160 7de9ac0607365c2fed0eae6c67fdd0f826d044f8 SHA1 e4dd5f5a08d5a9b09cfcd2ba62f3ce7f77479afc SHA256 00ec75ef5d71e933ca173aa96cf254943f7750d536146433c0566ade984744fe DIST git-manpages-1.6.3.3.tar.bz2 243822 RMD160 57ffb06cdb1d0daf59aeeed2408860cfb2208e35 SHA1 0153298e215ac6beb3c6073aa1c8bd0de9a1da3b SHA256 a05a18f448a327137e1d6b04175caaabcc9c88f8327290b8f82b69119db39330 DIST git-manpages-1.6.3.4.tar.bz2 243454 RMD160 48b11821afcd34e383d5bca119e70a271a72ab4a SHA1 eb2884190214351f9cff962d90d28b8adb607372 SHA256 71c77710f884ea9aad510ab98da5e89a1983b845cfbd63b50133b82664742603 @@ -75,6 +78,7 @@ DIST git-manpages-1.6.6.2.tar.bz2 264990 RMD160 300d2a874cf1605c0bf4ec0db69b0003 DIST git-manpages-1.6.6.rc3.tar.bz2 264396 RMD160 987619b81ffbca2a7024961242653c5d54968149 SHA1 dfe1312fe7a294b609c855c5256e7409c58fece0 SHA256 9de35dd5e5a2bbfb8af933cd03358b7d9ab9e65a32134c5aa97429600715e25b DIST git-manpages-1.6.6.rc4.tar.bz2 264432 RMD160 14a8631bf6f91083822020f4fd44cfa6a88c1f48 SHA1 3b3c7c7a6e811e6f89b0162c5e847928c6466b81 SHA256 be91019bd480e7109b454e824608ef44b93732edc66374613ea245111d985168 DIST git-manpages-1.6.6.tar.bz2 264409 RMD160 86fda1c25e75fbce40719f5c26b61727394f6f84 SHA1 1621c502908d6cbd640a81a7c96dc22a30a68a60 SHA256 d1f5ec7e4094bc1ee9b6326e93c7354962c0da29ae801793c48a044e2846e862 +DIST git-manpages-1.7.0.tar.bz2 272259 RMD160 520953c815c821f5350e6bb96f605c2830678ce0 SHA1 8d8b149df1a3146c76a41f50c14302e0424a29af SHA256 62f629db43b2b2f5b871977a300cba43c25f67c7a03decad4d364c021b7573b6 EBUILD git-1.6.3.1.ebuild 9808 RMD160 547b2191eb86130314ef482ced8b9bf30bedf547 SHA1 bea16aa8acb4df95b56694094ad79c74e86f5c9d SHA256 60a1f34e6736823a03ba179414545de8eb3a4e51d6ca4b1a9fb98b28410fc417 EBUILD git-1.6.3.3.ebuild 9798 RMD160 1189f089b84d3425866aa8168dbe94c80155d68b SHA1 a8c000b062a9471e436abe3f3160cb426b6f98e6 SHA256 5f263a9ae34f32a7a8f8147e9f179ccdb1e84264ed97832cffb4e39c46c2cf20 EBUILD git-1.6.3.4.ebuild 9808 RMD160 605e94c928960242325800d2dc390de0f059462c SHA1 9c3d7585e0c41cacdbca0f2b0ce5009c1277a74e SHA256 06aca6df19b7531174d7e824217024c34dccc84f9d444974e39dc2bae729c9cc @@ -102,6 +106,7 @@ EBUILD git-1.6.6.2.ebuild 11129 RMD160 25fc00a6472644c14554e3861612b45e7143b11d EBUILD git-1.6.6.ebuild 10944 RMD160 5fbeb97e618d70fd89d769625b3f326e4807a663 SHA1 92d66eb3692532b79ad27823cbad7de83088d7c7 SHA256 8ef6535cf8d2016e2e4797071d11f9878b877c711d4e2a45efe95b06ae624772 EBUILD git-1.6.6_rc3.ebuild 10948 RMD160 d26ee1d80db76370257ef1a9dc98d147dac8998e SHA1 fa5850d6fd8b645e766cea7f7db0f13c01727fd5 SHA256 39316fe2f1e1b6dcf36ee3cb67f1c949ee2cb86d83fe3ec20bc2337b9c42a223 EBUILD git-1.6.6_rc4.ebuild 10948 RMD160 a8a6e815a9bad3b2b0bd585a03249ba5ebaac3ab SHA1 31f2c22aed19ae373096deceee109e8812a5b1d4 SHA256 02dba7f8470d2bfef0116c8b8266de9200693745bf396bdf2e93036f0a2fb540 +EBUILD git-1.7.0.ebuild 11127 RMD160 5e8e9601335a362ac385ffd89ef5a1cb1efca20a SHA1 5e59b94b4b060a584b054197f3d6f586f62b8962 SHA256 c8086a4bf6f8bc07c0f181acd385c355ff1d94aa9ea2c051fc44226509f1db04 EBUILD git-9999.ebuild 11127 RMD160 f8d5ae620a551c4ff473356a931ad8d445e6b8cb SHA1 4eb76484dc64f5aff32e1dba45eb2d3319c686b0 SHA256 23ef849a0321e3237cd5c909e774078e6ada59a5a92a08407d81a1d257ee0883 -MISC ChangeLog 61188 RMD160 b1cc9f68b27b27e68e6de245502d4d2fd91f2ac4 SHA1 e4cd1e7f2773ff4cc5e855a12a50d58e8a8e759f SHA256 f78cb371c9f25b4f9e4e7c2530ed633842efb1916753f96f6f89b1fa84edef39 +MISC ChangeLog 61347 RMD160 da73551408e98bbb00387f93d5e4f5736c0a8037 SHA1 152f660f31a8b635f585ae3a89388acd407027f2 SHA256 7d6e7aef0c80967770cd78d5a620239850c7f4aee27001c42bdc4b4f5bf45727 MISC metadata.xml 1610 RMD160 6b03b898986d26bba7ff441dc1c8c9ec04a9a2b9 SHA1 a0a0d304138c648729d225954de89c1aac359008 SHA256 d070dc8e46e0fd44676d0491353f95385e65c1ffcd1313193dc59d495245c007 diff --git a/dev-util/git/files/git-1.7.0-always-install-js.patch b/dev-util/git/files/git-1.7.0-always-install-js.patch new file mode 100644 index 000000000000..56f455e47601 --- /dev/null +++ b/dev-util/git/files/git-1.7.0-always-install-js.patch @@ -0,0 +1,36 @@ +JS install cleanup fixes + +- Always install the JS for GitWeb, even if it is not being minified. +- Also ensure the minified JS is built before instaweb as it is referenced in + the sed expression. + +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> + +diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.0.orig/Makefile git-1.7.0/Makefile +--- git-1.7.0.orig/Makefile 2010-02-13 00:44:43.000000000 +0000 ++++ git-1.7.0/Makefile 2010-02-13 18:11:52.923807675 +0000 +@@ -1500,13 +1500,8 @@ + gitweb: + $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all + +-ifdef JSMIN +-OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/gitweb.min.js +-gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/gitweb.min.js +-else +-OTHER_PROGRAMS += gitweb/gitweb.cgi +-gitweb/gitweb.cgi: gitweb/gitweb.perl +-endif ++OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/$(GITWEB_JS) ++gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/$(GITWEB_JS) + $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@) + + ifdef JSMIN +@@ -1515,7 +1510,7 @@ + endif # JSMIN + + +-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/gitweb.js ++git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/$(GITWEB_JS) + $(QUIET_GEN)$(RM) $@ $@+ && \ + sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ + -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ diff --git a/dev-util/git/git-1.7.0.ebuild b/dev-util/git/git-1.7.0.ebuild new file mode 100644 index 000000000000..1c108479b855 --- /dev/null +++ b/dev-util/git/git-1.7.0.ebuild @@ -0,0 +1,413 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.7.0.ebuild,v 1.1 2010/02/13 18:37:09 robbat2 Exp $ + +EAPI=2 + +inherit toolchain-funcs eutils elisp-common perl-module bash-completion +[ "$PV" == "9999" ] && inherit git + +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://www.git-scm.com/" +if [ "$PV" != "9999" ]; then + 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 )" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +else + SRC_URI="" + EGIT_BRANCH="master" + EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" + # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" + KEYWORDS="" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion" + +# Common to both DEPEND and RDEPEND +CDEPEND=" + !blksha1? ( dev-libs/openssl ) + sys-libs/zlib + perl? ( dev-lang/perl ) + tk? ( dev-lang/tk ) + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + emacs? ( virtual/emacs )" + +RDEPEND="${CDEPEND} + 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[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) + ) + gtk? + ( + >=dev-python/pygtk-2.8 + || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) + )" + +# This is how info docs are created with Git: +# .txt/asciidoc --(asciidoc)---------> .xml/docbook +# .xml/docbook --(docbook2texi.pl)--> .texi +# .texi --(makeinfo)---------> .info +DEPEND="${CDEPEND} + app-arch/cpio + doc? ( + app-text/asciidoc + app-text/docbook2X + sys-apps/texinfo + )" + +# Live ebuild builds HTML docs, additionally +if [ "$PV" == "9999" ]; then + DEPEND="${DEPEND} + doc? ( + app-text/xmlto + )" +fi + +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 blksha1 ; then + myopts="${myopts} BLK_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} INSTALLDIRS=vendor" \ + || myopts="${myopts} NO_PERL=YesPlease" + use threads \ + && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" + use subversion \ + || myopts="${myopts} NO_SVN_TESTS=YesPlease" + + has_version '>=app-text/asciidoc-8.0' \ + && myopts="${myopts} ASCIIDOC8=YesPlease" + myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" + + # Bug 290465: + # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' + [[ "${CHOST}" == *-uclibc* ]] && \ + myopts="${myopts} NO_NSEC=YesPlease" + + export MY_MAKEOPTS="${myopts}" +} + +src_unpack() { + if [ "${PV}" != "9999" ]; then + 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}" + else + git_src_unpack + cd "${S}" + #cp "${FILESDIR}"/GIT-VERSION-GEN . + fi + +} + +src_prepare() { + # Noperl is being merged to upstream as of 2009/04/05 + #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch + + # GetOpt-Long v2.38 is strict + # Merged in 1.6.3 final 2009/05/07 + #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch + + # JS install fixup + epatch "${FILESDIR}"/git-1.7.0-always-install-js.patch + + sed -i \ + -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC = \).*$:\1$(OPTCC):' \ + -e 's:^\(AR = \).*$:\1$(OPTAR):' \ + Makefile || die "sed failed" + + # Never install the private copy of Error.pm (bug #296310) + sed -i \ + -e '/private-Error.pm/s,^,#,' \ + perl/Makefile.PL + + # Fix docbook2texi command + sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ + Documentation/Makefile || die "sed failed" + +} + +git_emake() { + emake ${MY_MAKEOPTS} \ + DESTDIR="${D}" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ + OPTCC="$(tc-getCC)" \ + OPTAR="$(tc-getAR)" \ + prefix=/usr \ + htmldir=/usr/share/doc/${PF}/html \ + "$@" +} + +src_configure() { + exportmakeopts +} + +src_compile() { + git_emake || die "emake failed" + + if use emacs ; then + elisp-compile contrib/emacs/git{,-blame}.el \ + || die "emacs modules failed" + fi + + if use perl && use cgi ; then + git_emake \ + gitweb/gitweb.cgi \ + || die "emake gitweb/gitweb.cgi failed" + fi + + cd "${S}"/Documentation + if [[ "$PV" == "9999" ]] ; then + git_emake man \ + || die "emake man failed" + if use doc ; then + git_emake info html \ + || die "emake info html failed" + fi + else + if use doc ; then + git_emake info \ + || die "emake info html failed" + fi + fi +} + +src_install() { + git_emake \ + install || \ + die "make install failed" + + doman man?/*.[157] Documentation/*.[157] + + 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 / + # Upstream does not ship this pre-built :-( + use doc && doinfo Documentation/{git,gitman}.info + + dobashcompletion contrib/completion/git-completion.bash ${PN} + + if use emacs ; then + elisp-install ${PN} contrib/emacs/git.{el,elc} || die + elisp-install ${PN} contrib/emacs/git-blame.{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 + + 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 + js=gitweb.js + [ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js + doins "${S}"/gitweb/${js} + 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 + + find "${D}"/usr/lib64/perl5/ \ + -name .packlist \ + -exec rm \{\} \; + 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" + # Bug #225601 - t0004 is not suitable for root perm + # Bug #219839 - t1004 is not suitable for root perm + # t0001-init.sh - check for init notices EPERM* fails + local tests_nonroot="t0001-init.sh \ + t0004-unwritable.sh \ + t1004-read-tree-m-u-wf.sh \ + t3700-add.sh \ + t7300-clean.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 [[ ${EUID} -eq 0 ]]; 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 + einfo "Skipping other tests that require being non-root" + disabled="${disabled} ${tests_nonroot}" + else + [[ $cvs -gt 0 ]] && \ + has_version dev-util/cvs && \ + let cvs=$cvs+1 + [[ $cvs -gt 1 ]] && \ + 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" + git_emake \ + 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 +} |