diff options
Diffstat (limited to 'dev-util')
24 files changed, 59 insertions, 1758 deletions
diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog index 39ff2aab243f..bbd9c23c91a8 100644 --- a/dev-util/git/ChangeLog +++ b/dev-util/git/ChangeLog @@ -1,6 +1,17 @@ # 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.247 2008/01/01 19:51:52 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.248 2008/01/10 11:51:48 ferdy Exp $ + +*git-1.5.3.8 (10 Jan 2008) + + 10 Jan 2008; Fernando J. Pereda <ferdy@gentoo.org> + +files/git-1.5.3.8-t9106.patch, -git-1.5.3.2.ebuild, -git-1.5.3.3.ebuild, + -git-1.5.3.4.ebuild, -git-1.5.3.4-r1.ebuild, -git-1.5.3.5.ebuild, + -git-1.5.3.6.ebuild, -git-1.5.3.6-r1.ebuild, -git-1.5.3.7.ebuild, + +git-1.5.3.8.ebuild, -git-1.5.4_rc0.ebuild, -git-1.5.4_rc1.ebuild, + git-1.5.4_rc2.ebuild: + Version bump. Fix some bugs and style nits. Remove unneeded verbosity. + Remove unused versions. *git-1.5.4_rc2 (01 Jan 2008) diff --git a/dev-util/git/files/digest-git-1.5.3.2 b/dev-util/git/files/digest-git-1.5.3.2 deleted file mode 100644 index af179b362f7e..000000000000 --- a/dev-util/git/files/digest-git-1.5.3.2 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 2113337dd27141a6890ff84f25164901 git-1.5.3.2.tar.bz2 1344171 -RMD160 ef5436d8e95080415dc968c45b2e8f480a1d66c7 git-1.5.3.2.tar.bz2 1344171 -SHA256 e39b5492f3982a4f935e48294c775ddd0e63fdd2ba75b675f882479d29329d45 git-1.5.3.2.tar.bz2 1344171 -MD5 8f04afcd5c6d5b8a245bfb213ce1a35d git-htmldocs-1.5.3.2.tar.bz2 537124 -RMD160 e2d0423ab2eaa11fbb61365445ace3d1427c76dc git-htmldocs-1.5.3.2.tar.bz2 537124 -SHA256 c424e7b43d753b50e07e836d569233a545eacae5485b7dc562b492676db516c6 git-htmldocs-1.5.3.2.tar.bz2 537124 -MD5 375183e7370877f752674063e4336dfa git-manpages-1.5.3.2.tar.bz2 147283 -RMD160 9d8d9ae79f50b838f22a82ed71ee831ebc83ce98 git-manpages-1.5.3.2.tar.bz2 147283 -SHA256 b6c6c444e8c1a7f4d5b3a1307739f583cf90e58f4ddfb8156005958f087e904f git-manpages-1.5.3.2.tar.bz2 147283 diff --git a/dev-util/git/files/digest-git-1.5.3.3 b/dev-util/git/files/digest-git-1.5.3.3 deleted file mode 100644 index d5fbf2e0d5ef..000000000000 --- a/dev-util/git/files/digest-git-1.5.3.3 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 49ab93f99a11925789602da3ac87feed git-1.5.3.3.tar.bz2 1347290 -RMD160 d47a9adc4069b26888fe7ddd63b4e45d272ca49e git-1.5.3.3.tar.bz2 1347290 -SHA256 e064142312d340feb6b09426e5c7ee4ec15ff3404350ed3275f159bbe5826ea6 git-1.5.3.3.tar.bz2 1347290 -MD5 10aebc1687b922aafded70960f790959 git-htmldocs-1.5.3.3.tar.bz2 541175 -RMD160 02e26a8f1a84fdff3808285fada3a49dbff1af85 git-htmldocs-1.5.3.3.tar.bz2 541175 -SHA256 ad86390dfef6c44ab777bd2d7394770aa12008c7f1f9e1d1368b2f7b17fc24bc git-htmldocs-1.5.3.3.tar.bz2 541175 -MD5 f5cb572ef8504561cbaf86400d7f0279 git-manpages-1.5.3.3.tar.bz2 147278 -RMD160 3f8c51922b01aeb9aa518c86611b528a8d389868 git-manpages-1.5.3.3.tar.bz2 147278 -SHA256 fe57dc04e6e9c7ea3e6b28d04c355740b73639aa880d6b1dd64c71d009942410 git-manpages-1.5.3.3.tar.bz2 147278 diff --git a/dev-util/git/files/digest-git-1.5.3.4 b/dev-util/git/files/digest-git-1.5.3.4 deleted file mode 100644 index 4f736f79b032..000000000000 --- a/dev-util/git/files/digest-git-1.5.3.4 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 b35fd5abba0e8655733c8e8c470f39cf git-1.5.3.4.tar.bz2 1349196 -RMD160 739153affbb5e5372bf5ccd8ea502bf3b6126903 git-1.5.3.4.tar.bz2 1349196 -SHA256 3f2954c68cc6463924a0af7ccb684db0332e3db31258e993830521532a7aa764 git-1.5.3.4.tar.bz2 1349196 -MD5 577f686fc8eed259e11e6d424134025a git-htmldocs-1.5.3.4.tar.bz2 542116 -RMD160 3a899140806b02413661cc5bad9e23c7ce683bfd git-htmldocs-1.5.3.4.tar.bz2 542116 -SHA256 1be968219cdac1ce6035bf81d42e24973ca6d4841f5d1775e6adebb52d44bbf8 git-htmldocs-1.5.3.4.tar.bz2 542116 -MD5 1cfaecc1e29cdccd6c595e2fca343ff9 git-manpages-1.5.3.4.tar.bz2 147392 -RMD160 49acd94b911b61b2581539985fad6723c56282e1 git-manpages-1.5.3.4.tar.bz2 147392 -SHA256 08861a12a0abb37e9156f5942154fe103db3232dc70e980152b61c197dcbce96 git-manpages-1.5.3.4.tar.bz2 147392 diff --git a/dev-util/git/files/digest-git-1.5.3.4-r1 b/dev-util/git/files/digest-git-1.5.3.4-r1 deleted file mode 100644 index 4f736f79b032..000000000000 --- a/dev-util/git/files/digest-git-1.5.3.4-r1 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 b35fd5abba0e8655733c8e8c470f39cf git-1.5.3.4.tar.bz2 1349196 -RMD160 739153affbb5e5372bf5ccd8ea502bf3b6126903 git-1.5.3.4.tar.bz2 1349196 -SHA256 3f2954c68cc6463924a0af7ccb684db0332e3db31258e993830521532a7aa764 git-1.5.3.4.tar.bz2 1349196 -MD5 577f686fc8eed259e11e6d424134025a git-htmldocs-1.5.3.4.tar.bz2 542116 -RMD160 3a899140806b02413661cc5bad9e23c7ce683bfd git-htmldocs-1.5.3.4.tar.bz2 542116 -SHA256 1be968219cdac1ce6035bf81d42e24973ca6d4841f5d1775e6adebb52d44bbf8 git-htmldocs-1.5.3.4.tar.bz2 542116 -MD5 1cfaecc1e29cdccd6c595e2fca343ff9 git-manpages-1.5.3.4.tar.bz2 147392 -RMD160 49acd94b911b61b2581539985fad6723c56282e1 git-manpages-1.5.3.4.tar.bz2 147392 -SHA256 08861a12a0abb37e9156f5942154fe103db3232dc70e980152b61c197dcbce96 git-manpages-1.5.3.4.tar.bz2 147392 diff --git a/dev-util/git/files/digest-git-1.5.3.5 b/dev-util/git/files/digest-git-1.5.3.5 deleted file mode 100644 index 0d17ab778a07..000000000000 --- a/dev-util/git/files/digest-git-1.5.3.5 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 3fdff0bdb3638fce1c4bc6795ed81fb3 git-1.5.3.5.tar.bz2 1351433 -RMD160 188cdbf40fe841cd5a59f8f11a621a135a61f406 git-1.5.3.5.tar.bz2 1351433 -SHA256 92abf9ccaf3e32d8fcf92a32a0308db21fa6ca9f7e9d6b63a1ba7e5e841e6629 git-1.5.3.5.tar.bz2 1351433 -MD5 a4efa2e64921e7bc5513a10b47bca06f git-htmldocs-1.5.3.5.tar.bz2 542940 -RMD160 3597521cee89eb538db7ead2c49108522c9f674e git-htmldocs-1.5.3.5.tar.bz2 542940 -SHA256 0e7d9a59930a08c644fdf37deca1f36d36fe5cfb559f4bea38901bec6094e45b git-htmldocs-1.5.3.5.tar.bz2 542940 -MD5 2cc722f80968b1c2f99a217457b056d4 git-manpages-1.5.3.5.tar.bz2 147502 -RMD160 9ee059e372c7dc6660de5c77d27b5e559bb47018 git-manpages-1.5.3.5.tar.bz2 147502 -SHA256 e75de44c08f7dc2026d38c62855ff0895cbe640785042f89918e6f0475da5f51 git-manpages-1.5.3.5.tar.bz2 147502 diff --git a/dev-util/git/files/digest-git-1.5.3.6 b/dev-util/git/files/digest-git-1.5.3.6 deleted file mode 100644 index 85f99e352469..000000000000 --- a/dev-util/git/files/digest-git-1.5.3.6 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 9b0a6cea7b084f3fc78f264cd2fb49bd git-1.5.3.6.tar.bz2 1356739 -RMD160 dbda09ada993a9835f9f403d7fa5c54ed3598b46 git-1.5.3.6.tar.bz2 1356739 -SHA256 95a5f9d8a9174277b539296901561fff6dbbba20dbdd4cfe5595c22a5a4d2221 git-1.5.3.6.tar.bz2 1356739 -MD5 20fdbd3a2e1f9835c3c5cb6b78c08d0c git-htmldocs-1.5.3.6.tar.bz2 545021 -RMD160 4174428f3d37d3c32776137390bb46d3667a47a9 git-htmldocs-1.5.3.6.tar.bz2 545021 -SHA256 893b72beed877cca84de11f941807441685666016994bf83cbd28cf07b8144c9 git-htmldocs-1.5.3.6.tar.bz2 545021 -MD5 cc8556ff7e89db26dd1a024cfe8584e3 git-manpages-1.5.3.6.tar.bz2 147732 -RMD160 4080488cd65b82b2459b373c3d8eb6d3024b24e9 git-manpages-1.5.3.6.tar.bz2 147732 -SHA256 ec03a96deb343267d34801bb20f18d296c693da19280910cf3e68f5acc89de07 git-manpages-1.5.3.6.tar.bz2 147732 diff --git a/dev-util/git/files/digest-git-1.5.3.6-r1 b/dev-util/git/files/digest-git-1.5.3.6-r1 deleted file mode 100644 index 85f99e352469..000000000000 --- a/dev-util/git/files/digest-git-1.5.3.6-r1 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 9b0a6cea7b084f3fc78f264cd2fb49bd git-1.5.3.6.tar.bz2 1356739 -RMD160 dbda09ada993a9835f9f403d7fa5c54ed3598b46 git-1.5.3.6.tar.bz2 1356739 -SHA256 95a5f9d8a9174277b539296901561fff6dbbba20dbdd4cfe5595c22a5a4d2221 git-1.5.3.6.tar.bz2 1356739 -MD5 20fdbd3a2e1f9835c3c5cb6b78c08d0c git-htmldocs-1.5.3.6.tar.bz2 545021 -RMD160 4174428f3d37d3c32776137390bb46d3667a47a9 git-htmldocs-1.5.3.6.tar.bz2 545021 -SHA256 893b72beed877cca84de11f941807441685666016994bf83cbd28cf07b8144c9 git-htmldocs-1.5.3.6.tar.bz2 545021 -MD5 cc8556ff7e89db26dd1a024cfe8584e3 git-manpages-1.5.3.6.tar.bz2 147732 -RMD160 4080488cd65b82b2459b373c3d8eb6d3024b24e9 git-manpages-1.5.3.6.tar.bz2 147732 -SHA256 ec03a96deb343267d34801bb20f18d296c693da19280910cf3e68f5acc89de07 git-manpages-1.5.3.6.tar.bz2 147732 diff --git a/dev-util/git/files/digest-git-1.5.3.7 b/dev-util/git/files/digest-git-1.5.3.7 deleted file mode 100644 index 431f5f87d94a..000000000000 --- a/dev-util/git/files/digest-git-1.5.3.7 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 a114cbf532ff627698a031a66d072173 git-1.5.3.7.tar.bz2 1361540 -RMD160 74bfccd50c895e22d10b9e25f481f00a20617077 git-1.5.3.7.tar.bz2 1361540 -SHA256 f4f03dd1a5255019c2d771a04b8a647509b4c6cf51728acc50e8f26d99e62fec git-1.5.3.7.tar.bz2 1361540 -MD5 e25249bfa66933f0381f28e2104c46a1 git-htmldocs-1.5.3.7.tar.bz2 549391 -RMD160 18d01c803fd529ac897ae249ce4e05193ee9850a git-htmldocs-1.5.3.7.tar.bz2 549391 -SHA256 e28c7e149e0f5adb66093af287dffe0caef83926ae08c6cdb6a2d35bc9148d04 git-htmldocs-1.5.3.7.tar.bz2 549391 -MD5 bc810162a466e63ee5819ff35e4fb343 git-manpages-1.5.3.7.tar.bz2 147932 -RMD160 fd4b45c221cbc63f580a32595c59eb52da1baa2f git-manpages-1.5.3.7.tar.bz2 147932 -SHA256 870e68ef57f4175152b9b8decc721d8cbc9850ed8eda73919fc9e060f3968ffa git-manpages-1.5.3.7.tar.bz2 147932 diff --git a/dev-util/git/files/digest-git-1.5.3.8 b/dev-util/git/files/digest-git-1.5.3.8 new file mode 100644 index 000000000000..35588005330e --- /dev/null +++ b/dev-util/git/files/digest-git-1.5.3.8 @@ -0,0 +1,9 @@ +MD5 bb2477df09d4af52b05f0ee64d6ccc54 git-1.5.3.8.tar.bz2 1363259 +RMD160 8e35e67cc94152c681849e14cb4aec86f1b316cf git-1.5.3.8.tar.bz2 1363259 +SHA256 f98c6b900c9f3b87a1fbbe0c5f466e9d981cb9f1d193066b6d371df4b8066b77 git-1.5.3.8.tar.bz2 1363259 +MD5 8ac4cf1dc25501812b22d531d65a056b git-htmldocs-1.5.3.8.tar.bz2 549444 +RMD160 f4df777094158beea16bd2f0783ef846198e2c36 git-htmldocs-1.5.3.8.tar.bz2 549444 +SHA256 200a7231d6a594aeb5cb0c0e1cf25513c086f53b84170c7c5376199b2659b874 git-htmldocs-1.5.3.8.tar.bz2 549444 +MD5 6aebdb18ab71309d6404f5be3cd7f09d git-manpages-1.5.3.8.tar.bz2 147875 +RMD160 c2a15b7a0742f14a70d0bf06d4d14fe9cf2b329b git-manpages-1.5.3.8.tar.bz2 147875 +SHA256 73a7cc2c0473694d454a6b7cb311ccdeb82f350bc8e652229d361592ea0a482f git-manpages-1.5.3.8.tar.bz2 147875 diff --git a/dev-util/git/files/digest-git-1.5.4_rc0 b/dev-util/git/files/digest-git-1.5.4_rc0 deleted file mode 100644 index 8c826ca8f931..000000000000 --- a/dev-util/git/files/digest-git-1.5.4_rc0 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 14433eb6f51bb3373a2b3cbd523da65a git-1.5.4.rc0.tar.bz2 1539299 -RMD160 5bd261e7b1bd312e6e7b55674c5cb9e22678c127 git-1.5.4.rc0.tar.bz2 1539299 -SHA256 d1d952e06f8112c0b217cde3a9bbb9352b116d2002fec1b71e9c61e30a2ea7c8 git-1.5.4.rc0.tar.bz2 1539299 -MD5 fdea02ce5ebfd285deddecc850c64b1a git-htmldocs-1.5.4.rc0.tar.bz2 571372 -RMD160 7da3cdce5aeccf8e423ac9141c025409944f151f git-htmldocs-1.5.4.rc0.tar.bz2 571372 -SHA256 2248d40a2acdb85fed5355ab135a98a6ab658c4f73511fc347aa0a6a1656614f git-htmldocs-1.5.4.rc0.tar.bz2 571372 -MD5 9727f05d73fb6d22cc5ad8f96b2d7afd git-manpages-1.5.4.rc0.tar.bz2 153501 -RMD160 746e9e0d09ad462ab6c3684032bfb09629ed10dd git-manpages-1.5.4.rc0.tar.bz2 153501 -SHA256 ad184fdf2e430610cb60562bc9b302cf2c9cc6c2edfcfa2a4dfcaed5df98c376 git-manpages-1.5.4.rc0.tar.bz2 153501 diff --git a/dev-util/git/files/digest-git-1.5.4_rc1 b/dev-util/git/files/digest-git-1.5.4_rc1 deleted file mode 100644 index b3ab18152208..000000000000 --- a/dev-util/git/files/digest-git-1.5.4_rc1 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 37b44a578fc2b32ef2669d8e177e5d1d git-1.5.4.rc1.tar.bz2 1548134 -RMD160 a0d64bd1f8981922be35ecc0350879af587ffe3b git-1.5.4.rc1.tar.bz2 1548134 -SHA256 4f1c45574a16bd66fcfa370c5f7acc0e2fd20217fd200ad55371071c3c8038a8 git-1.5.4.rc1.tar.bz2 1548134 -MD5 4c8d7d6cc723beece3d1992f8f27edcc git-htmldocs-1.5.4.rc1.tar.bz2 600054 -RMD160 6c0570d9a4d81a61445c795247758d84d451b947 git-htmldocs-1.5.4.rc1.tar.bz2 600054 -SHA256 66aad13fc1768a2b57dd76100535d997d58f3731159d6cb568d7bd4b6887b107 git-htmldocs-1.5.4.rc1.tar.bz2 600054 -MD5 16c95f31b4ff74229bdcc9742a263c6f git-manpages-1.5.4.rc1.tar.bz2 153363 -RMD160 b754f0c74bf0059e0811eea2b41d6a88f73a279f git-manpages-1.5.4.rc1.tar.bz2 153363 -SHA256 2121a9c28214f4285e4004c321fa6b2a50a13e3a281def775eda978b192f58cd git-manpages-1.5.4.rc1.tar.bz2 153363 diff --git a/dev-util/git/files/git-1.5.3.8-t9106.patch b/dev-util/git/files/git-1.5.3.8-t9106.patch new file mode 100644 index 000000000000..b5df85f3994d --- /dev/null +++ b/dev-util/git/files/git-1.5.3.8-t9106.patch @@ -0,0 +1,22 @@ +commit 8d92f24852420c425f3ee499d3c3be01be4dc15c +Author: Eric Wong <normalperson@yhbt.net> +Date: Wed Nov 21 00:57:33 2007 -0800 + + t9106: fix a race condition that caused svn to miss modifications + + carbonated beverage noticed this test was occasionally failing. + + Signed-off-by: Eric Wong <normalperson@yhbt.net> + +diff --git a/t/t9106-git-svn-dcommit-clobber-series.sh b/t/t9106-git-svn-dcommit-clobber-series.sh +index d59acc8..7452546 100755 +--- a/t/t9106-git-svn-dcommit-clobber-series.sh ++++ b/t/t9106-git-svn-dcommit-clobber-series.sh +@@ -22,6 +22,7 @@ test_expect_success '(supposedly) non-conflicting change from SVN' " + cd tmp && + perl -i -p -e 's/^58\$/5588/' file && + perl -i -p -e 's/^61\$/6611/' file && ++ poke file && + test x\"\`sed -n -e 58p < file\`\" = x5588 && + test x\"\`sed -n -e 61p < file\`\" = x6611 && + svn commit -m '58 => 5588, 61 => 6611' && diff --git a/dev-util/git/git-1.5.3.2.ebuild b/dev-util/git/git-1.5.3.2.ebuild deleted file mode 100644 index cb780f7cf2fe..000000000000 --- a/dev-util/git/git-1.5.3.2.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# 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.3.2.ebuild,v 1.2 2007/12/17 05:23:41 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 ~x86 ~x86-fbsd" -IUSE="curl doc elibc_uclibc emacs gtk mozsha1 perl ppcsha1 tk webdav" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - dev-lang/perl - tk? ( dev-lang/tk ) - curl? ( net-misc/curl ) - webdav? ( dev-libs/expat ) - emacs? ( virtual/emacs )" -RDEPEND="${DEPEND} - perl? ( dev-perl/Error ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=71${PN}-gentoo.el -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.3-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/git{k,-gui} - - doman "${WORKDIR}"/man?/* - - dodoc README 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 - elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - 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() { - 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" \ - "dev-perl/TermReadKey" - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite" - showpkgdeps git-instaweb "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )" - showpkgdeps git-send-email "USE=perl" - showpkgdeps git-remote "USE=perl" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/git/git-1.5.3.3.ebuild b/dev-util/git/git-1.5.3.3.ebuild deleted file mode 100644 index e4145a97fb7b..000000000000 --- a/dev-util/git/git-1.5.3.3.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# 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.3.3.ebuild,v 1.2 2007/12/17 05:23:41 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 ~x86 ~x86-fbsd" -IUSE="curl doc elibc_uclibc emacs gtk mozsha1 perl ppcsha1 tk webdav" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - dev-lang/perl - tk? ( dev-lang/tk ) - curl? ( net-misc/curl ) - webdav? ( dev-libs/expat ) - emacs? ( virtual/emacs )" -RDEPEND="${DEPEND} - perl? ( dev-perl/Error ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=71${PN}-gentoo.el -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.3-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/git{k,-gui} - - doman "${WORKDIR}"/man?/* - - dodoc README 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 - elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - 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() { - 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" \ - "dev-perl/TermReadKey" - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite" - showpkgdeps git-instaweb "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )" - showpkgdeps git-send-email "USE=perl" - showpkgdeps git-remote "USE=perl" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/git/git-1.5.3.4-r1.ebuild b/dev-util/git/git-1.5.3.4-r1.ebuild deleted file mode 100644 index ebfa54acf2a4..000000000000 --- a/dev-util/git/git-1.5.3.4-r1.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# 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.3.4-r1.ebuild,v 1.3 2007/12/17 05:23:41 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 ~x86 ~x86-fbsd" -IUSE="curl doc emacs gtk iconv mozsha1 perl ppcsha1 tk webdav" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - dev-lang/perl - tk? ( dev-lang/tk ) - curl? ( net-misc/curl ) - webdav? ( dev-libs/expat ) - emacs? ( virtual/emacs )" -RDEPEND="${DEPEND} - perl? ( dev-perl/Error ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${PN}-gentoo.el -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 iconv || 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.3-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/git{k,-gui} - - doman "${WORKDIR}"/man?/* - - dodoc README 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 - elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/gitview - use doc && dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dodir /usr/share/${PN}/contrib - cp -rf \ - "${S}"/contrib/{vim,stats,workdir,hg-to-git,fast-import,hooks} \ - "${D}"/usr/share/${PN}/contrib - - 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() { - 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() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - 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" \ - "dev-perl/TermReadKey" - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )" - showpkgdeps git-send-email "USE=perl" - showpkgdeps git-remote "USE=perl" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/git/git-1.5.3.4.ebuild b/dev-util/git/git-1.5.3.4.ebuild deleted file mode 100644 index b1e021d813f4..000000000000 --- a/dev-util/git/git-1.5.3.4.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# 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.3.4.ebuild,v 1.3 2007/12/17 05:23:41 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 ~x86 ~x86-fbsd" -IUSE="curl doc emacs gtk iconv mozsha1 perl ppcsha1 tk webdav" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - dev-lang/perl - tk? ( dev-lang/tk ) - curl? ( net-misc/curl ) - webdav? ( dev-libs/expat ) - emacs? ( virtual/emacs )" -RDEPEND="${DEPEND} - perl? ( dev-perl/Error ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${PN}-gentoo.el -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 iconv || 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.3-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/git{k,-gui} - - doman "${WORKDIR}"/man?/* - - dodoc README 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 - elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - 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() { - 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() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - 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" \ - "dev-perl/TermReadKey" - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )" - showpkgdeps git-send-email "USE=perl" - showpkgdeps git-remote "USE=perl" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/git/git-1.5.3.5.ebuild b/dev-util/git/git-1.5.3.5.ebuild deleted file mode 100644 index d078d26c736e..000000000000 --- a/dev-util/git/git-1.5.3.5.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# 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.3.5.ebuild,v 1.2 2007/12/17 05:23:41 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 ~x86 ~x86-fbsd" -IUSE="curl doc emacs gtk iconv mozsha1 perl ppcsha1 tk webdav" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - dev-lang/perl - tk? ( dev-lang/tk ) - curl? ( net-misc/curl ) - webdav? ( dev-libs/expat ) - emacs? ( virtual/emacs )" -RDEPEND="${DEPEND} - perl? ( dev-perl/Error ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${PN}-gentoo.el -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 iconv || 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.3-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/git{k,-gui} - - doman "${WORKDIR}"/man?/* - - dodoc README 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 - elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/gitview - use doc && dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dodir /usr/share/${PN}/contrib - cp -rf \ - "${S}"/contrib/{vim,stats,workdir,hg-to-git,fast-import,hooks} \ - "${D}"/usr/share/${PN}/contrib - - 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() { - 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() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - 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" \ - "dev-perl/TermReadKey" - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )" - showpkgdeps git-send-email "USE=perl" - showpkgdeps git-remote "USE=perl" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/git/git-1.5.3.6-r1.ebuild b/dev-util/git/git-1.5.3.6-r1.ebuild deleted file mode 100644 index 6bb438bbc2f0..000000000000 --- a/dev-util/git/git-1.5.3.6-r1.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# 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.3.6-r1.ebuild,v 1.2 2007/12/17 05:23:41 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 ~x86 ~x86-fbsd" -IUSE="curl doc emacs gtk iconv mozsha1 perl ppcsha1 tk webdav" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - dev-lang/perl - app-arch/cpio - tk? ( dev-lang/tk ) - curl? ( net-misc/curl ) - webdav? ( dev-libs/expat ) - emacs? ( virtual/emacs )" -RDEPEND="${DEPEND} - perl? ( dev-perl/Error ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${PN}-gentoo.el -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 iconv || myopts="${myopts} NO_ICONV=YesPlease" - - export MY_MAKEOPTS=${myopts} -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -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}"/${PN}-1.5.3-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/git{k,-gui} - - doman man?/* - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - einfo "Doing Documentation${d}" - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - newbin "${S}"/contrib/blameview/blameview.perl blameview - newdoc "${S}"/contrib/blameview/README README.blameview - fi - - dodir /usr/share/${PN}/contrib - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh vim stats \ - workdir ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${D}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - 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() { - 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() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - 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" \ - "dev-perl/TermReadKey" - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )" - showpkgdeps git-send-email "USE=perl" - showpkgdeps git-remote "USE=perl" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/git/git-1.5.3.6.ebuild b/dev-util/git/git-1.5.3.6.ebuild deleted file mode 100644 index 8f0b0f1efdb7..000000000000 --- a/dev-util/git/git-1.5.3.6.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# 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.3.6.ebuild,v 1.2 2007/12/17 05:23:41 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 ~x86 ~x86-fbsd" -IUSE="curl doc emacs gtk iconv mozsha1 perl ppcsha1 tk webdav" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - dev-lang/perl - tk? ( dev-lang/tk ) - curl? ( net-misc/curl ) - webdav? ( dev-libs/expat ) - emacs? ( virtual/emacs )" -RDEPEND="${DEPEND} - perl? ( dev-perl/Error ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${PN}-gentoo.el -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 iconv || 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.3-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/git{k,-gui} - - doman "${WORKDIR}"/man?/* - - dodoc README 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 - elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/gitview - use doc && dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dodir /usr/share/${PN}/contrib - cp -rf \ - "${S}"/contrib/{vim,stats,workdir,hg-to-git,fast-import,hooks} \ - "${D}"/usr/share/${PN}/contrib - - 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() { - 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() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - 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" \ - "dev-perl/TermReadKey" - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )" - showpkgdeps git-send-email "USE=perl" - showpkgdeps git-remote "USE=perl" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/git/git-1.5.3.7.ebuild b/dev-util/git/git-1.5.3.7.ebuild deleted file mode 100644 index 5f1a71cff119..000000000000 --- a/dev-util/git/git-1.5.3.7.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# 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.3.7.ebuild,v 1.2 2007/12/17 05:23:41 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 ~x86 ~x86-fbsd" -IUSE="curl doc emacs gtk iconv mozsha1 perl ppcsha1 tk webdav" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - dev-lang/perl - app-arch/cpio - tk? ( dev-lang/tk ) - curl? ( net-misc/curl ) - webdav? ( dev-libs/expat ) - emacs? ( virtual/emacs )" -RDEPEND="${DEPEND} - perl? ( dev-perl/Error ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${PN}-gentoo.el -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 iconv || myopts="${myopts} NO_ICONV=YesPlease" - - export MY_MAKEOPTS=${myopts} -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -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}"/${PN}-1.5.3-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/git{k,-gui} - - doman man?/* - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - einfo "Doing Documentation${d}" - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - newbin "${S}"/contrib/blameview/blameview.perl blameview - newdoc "${S}"/contrib/blameview/README README.blameview - fi - - dodir /usr/share/${PN}/contrib - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh vim stats \ - workdir ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${D}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - 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() { - 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 - if has userpriv "${FEATURES}"; then - einfo "Enabling CVS tests as we have FEATURES=userpriv" - else - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - for i in t9200-git-cvsexportcommit.sh t9600-cvsimport.sh ; do - rm "${S}"/t/${i} || die "Failed to remove ${i}" - done - fi - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - 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" \ - "dev-perl/TermReadKey" - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )" - showpkgdeps git-send-email "USE=perl" - showpkgdeps git-remote "USE=perl" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/git/git-1.5.4_rc0.ebuild b/dev-util/git/git-1.5.3.8.ebuild index ae3ee6a0eaae..6a75e7c47ebc 100644 --- a/dev-util/git/git-1.5.4_rc0.ebuild +++ b/dev-util/git/git-1.5.3.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# 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.5.4_rc0.ebuild,v 1.4 2007/12/25 08:57:27 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.3.8.ebuild,v 1.1 2008/01/10 11:51:48 ferdy Exp $ inherit toolchain-funcs eutils elisp-common perl-module bash-completion @@ -31,7 +31,7 @@ DEPEND=" webdav? ( dev-libs/expat ) emacs? ( virtual/emacs )" RDEPEND="${DEPEND} - cgi? ( virtual/perl-CGI ) + cgi? ( virtual/perl-CGI ) perl? ( dev-perl/Error ) gtk? ( >=dev-python/pygtk-2.8 )" @@ -78,6 +78,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${PN}-1.5.3-symlinks.patch + epatch "${FILESDIR}"/${P}-t9106.patch sed -i \ -e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \ @@ -113,7 +114,6 @@ src_install() { dodoc README Documentation/{SubmittingPatches,CodingGuidelines} use doc && dodir /usr/share/doc/${PF}/html for d in / /howto/ /technical/ ; do - einfo "Doing Documentation${d}" docinto ${d} dodoc Documentation${d}*.txt use doc && dohtml -p ${d} Documentation${d}*.html @@ -143,13 +143,9 @@ src_install() { newbin contrib/fast-import/import-tars.perl import-tars dodir /usr/share/${PN}/contrib - # The following are excluded: - # 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 vim stats \ - workdir convert-objects ; do + workdir ; do cp -rf \ "${S}"/contrib/${i} \ "${D}"/usr/share/${PN}/contrib \ @@ -181,16 +177,14 @@ src_test() { 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 - if has userpriv "${FEATURES}"; then - einfo "Enabling CVS tests as we have FEATURES=userpriv" - else + if ! has userpriv "${FEATURES}"; then ewarn "Skipping CVS tests because CVS does not work as root!" ewarn "You should retest with FEATURES=userpriv!" for i in t9200-git-cvsexportcommit.sh t9600-cvsimport.sh ; do rm "${S}"/t/${i} || die "Failed to remove ${i}" done fi + built_with_use dev-util/cvs server || rm "${S}"/t/t9600-cvsimport.sh emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" } @@ -208,13 +202,14 @@ pkg_postinst() { showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1" showpkgdeps git-svnimport "dev-util/subversion(USE=perl)" showpkgdeps git-svn \ + "USE=perl" \ "dev-util/subversion(USE=perl)" \ "dev-perl/libwww-perl" \ "dev-perl/TermReadKey" showpkgdeps git-quiltimport "dev-util/quilt" showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite" showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )" + "|| ( www-servers/lighttpd www-servers/apache )" showpkgdeps git-send-email "USE=perl" showpkgdeps git-remote "USE=perl" echo diff --git a/dev-util/git/git-1.5.4_rc1.ebuild b/dev-util/git/git-1.5.4_rc1.ebuild deleted file mode 100644 index b5587ae98714..000000000000 --- a/dev-util/git/git-1.5.4_rc1.ebuild +++ /dev/null @@ -1,225 +0,0 @@ -# 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.4_rc1.ebuild,v 1.3 2007/12/29 10:41:59 welp 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 webdav" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - dev-lang/perl - app-arch/cpio - tk? ( dev-lang/tk ) - curl? ( net-misc/curl ) - webdav? ( dev-libs/expat ) - emacs? ( virtual/emacs )" -RDEPEND="${DEPEND} - cgi? ( virtual/perl-CGI ) - perl? ( dev-perl/Error ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${PN}-gentoo.el -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 iconv || myopts="${myopts} NO_ICONV=YesPlease" - use tk || myopts="${myopts} NO_TCLTK=YesPlease" - - export MY_MAKEOPTS=${myopts} -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -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}"/${PN}-1.5.3-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 - if use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr 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 - einfo "Doing Documentation${d}" - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - newbin "${S}"/contrib/blameview/blameview.perl blameview - newdoc "${S}"/contrib/blameview/README README.blameview - 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: - # 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 vim stats \ - workdir convert-objects ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${D}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use cgi ; then - dodir /usr/share/${PN}/gitweb - insinto /usr/share/${PN}/gitweb - doins "${S}"/gitweb/gitweb.{cgi,css} - doins "${S}"/gitweb/git-{favicon,logo}.png - docinto / - # INSTALL discusses configuration issues, not just installation - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - 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() { - 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 - if has userpriv "${FEATURES}"; then - einfo "Enabling CVS tests as we have FEATURES=userpriv" - else - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - for i in t9200-git-cvsexportcommit.sh t9600-cvsimport.sh ; do - rm "${S}"/t/${i} || die "Failed to remove ${i}" - done - fi - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - elog "These additional scripts need some dependencies:" - elog "(These are also needed for FEATURES=test)" - 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" \ - "dev-perl/TermReadKey" - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )" - showpkgdeps git-send-email "USE=perl" - showpkgdeps git-remote "USE=perl" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/git/git-1.5.4_rc2.ebuild b/dev-util/git/git-1.5.4_rc2.ebuild index ece8366de490..8f9dbecf1ba3 100644 --- a/dev-util/git/git-1.5.4_rc2.ebuild +++ b/dev-util/git/git-1.5.4_rc2.ebuild @@ -1,6 +1,6 @@ # 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.5.4_rc2.ebuild,v 1.1 2008/01/01 19:51:52 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4_rc2.ebuild,v 1.2 2008/01/10 11:51:48 ferdy Exp $ inherit toolchain-funcs eutils elisp-common perl-module bash-completion @@ -17,7 +17,7 @@ SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +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 webdav" DEPEND=" @@ -31,7 +31,7 @@ DEPEND=" webdav? ( dev-libs/expat ) emacs? ( virtual/emacs )" RDEPEND="${DEPEND} - cgi? ( virtual/perl-CGI ) + cgi? ( virtual/perl-CGI ) perl? ( dev-perl/Error ) gtk? ( >=dev-python/pygtk-2.8 )" @@ -113,7 +113,6 @@ src_install() { dodoc README Documentation/{SubmittingPatches,CodingGuidelines} use doc && dodir /usr/share/doc/${PF}/html for d in / /howto/ /technical/ ; do - einfo "Doing Documentation${d}" docinto ${d} dodoc Documentation${d}*.txt use doc && dohtml -p ${d} Documentation${d}*.html @@ -181,16 +180,14 @@ src_test() { 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 - if has userpriv "${FEATURES}"; then - einfo "Enabling CVS tests as we have FEATURES=userpriv" - else + if ! has userpriv "${FEATURES}"; then ewarn "Skipping CVS tests because CVS does not work as root!" ewarn "You should retest with FEATURES=userpriv!" for i in t9200-git-cvsexportcommit.sh t9600-cvsimport.sh ; do rm "${S}"/t/${i} || die "Failed to remove ${i}" done fi + built_with_use dev-util/cvs server || rm "${S}"/t/t9600-cvsimport.sh emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" } @@ -208,13 +205,14 @@ pkg_postinst() { showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1" showpkgdeps git-svnimport "dev-util/subversion(USE=perl)" showpkgdeps git-svn \ + "USE=perl" \ "dev-util/subversion(USE=perl)" \ "dev-perl/libwww-perl" \ "dev-perl/TermReadKey" showpkgdeps git-quiltimport "dev-util/quilt" showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite" showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )" + "|| ( www-servers/lighttpd www-servers/apache )" showpkgdeps git-send-email "USE=perl" showpkgdeps git-remote "USE=perl" echo |