| 1 |
commit: 70192a12796c10f504a6b67809a5540e31b52cde |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Dec 26 18:42:29 2016 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Dec 26 18:42:29 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=70192a12 |
| 7 |
|
| 8 |
dev-vcs/git: Fixed in tree |
| 9 |
|
| 10 |
dev-vcs/git/Manifest | 22 - |
| 11 |
dev-vcs/git/files/50git-gentoo.el | 13 - |
| 12 |
dev-vcs/git/files/git-1.8.5-mw-vendor.patch | 39 -- |
| 13 |
dev-vcs/git/files/git-2.10.0-optional-cvs.patch | 456 -------------- |
| 14 |
dev-vcs/git/files/git-2.2.0-svn-fe-linking.patch | 11 - |
| 15 |
.../files/git-2.5.1-freebsd-10.x-no-iconv.patch | 14 - |
| 16 |
.../git/files/git-2.7.0-mediawiki-500pages.patch | 46 -- |
| 17 |
.../git/files/git-2.7.0-mediawiki-namespaces.patch | 97 --- |
| 18 |
.../git/files/git-2.7.0-mediawiki-subpages.patch | 48 -- |
| 19 |
dev-vcs/git/files/git-daemon-r1.initd | 13 - |
| 20 |
dev-vcs/git/files/git-daemon.confd | 19 - |
| 21 |
dev-vcs/git/files/git-daemon.socket | 9 - |
| 22 |
dev-vcs/git/files/git-daemon.xinetd | 13 - |
| 23 |
dev-vcs/git/files/git-daemon_at-r1.service | 12 - |
| 24 |
dev-vcs/git/git-2.10.2.ebuild | 680 -------------------- |
| 25 |
dev-vcs/git/git-2.11.0.ebuild | 681 --------------------- |
| 26 |
dev-vcs/git/metadata.xml | 40 -- |
| 27 |
17 files changed, 2213 deletions(-) |
| 28 |
|
| 29 |
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest |
| 30 |
deleted file mode 100644 |
| 31 |
index 8dce5c9..0000000 |
| 32 |
--- a/dev-vcs/git/Manifest |
| 33 |
+++ /dev/null |
| 34 |
@@ -1,22 +0,0 @@ |
| 35 |
-AUX 50git-gentoo.el 472 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2 SHA512 0435d7d67f2b64460a62c6a95c65a722c0f8d5d50d064a81e690de84a761ba518d32db545ee70c0fa3ad7803d77d5dab100689888bc92c9d82f2d6d5073623b3 WHIRLPOOL 887682f79182f6728af3c0fd2ee0e81319d49761a987559684be5e4acae4af579a5b8d1197ddba31452cec179de3c8f5784cc85ad61f78b400e42c204c93f642 |
| 36 |
-AUX git-1.8.5-mw-vendor.patch 1160 SHA256 e613f8874beec8d11644ad8d12c43cccb6585f96e99485d7d8ead6618321e8c0 SHA512 6513104f28eff36c18840f90e56fb21e8e04055e4e9a304ef15e5d7e1c13c8b45c4be0380b7781e776ce3b8ee9f7371ed2200e01174cc257125a613aef43ac9b WHIRLPOOL 6a5dcb28dc40590cf4e4b1369b0d770b40f1060bf933366f252edafbb9781f39d7f46dc218c16d429f507c7d5a9479bafce2df7309178071bcb782095809ed69 |
| 37 |
-AUX git-2.10.0-optional-cvs.patch 14373 SHA256 ca1fdbca8488ed700073075a3bd52bd20d239afb93e8a913e0d1f4f08da230cf SHA512 be1d75789424d49dfcdf87c9e8016e86aeab945bf68c9d82cf77ed1f032622b14194b3f472d21a450748d3c6cf108bbe089e7289e360f30078941a2fdcc8a001 WHIRLPOOL 005b2012486639e5d51930644482ea8cd24ca4d5ec98e04e1a657e3762235c0e971499f1e4d5852887037e38b96290b3e7d46b8364090ff74a7fb327d9f562b3 |
| 38 |
-AUX git-2.2.0-svn-fe-linking.patch 418 SHA256 45b89e10bec13fd7b29f7b530bf5ef57d3263581930ff338bf2105b3a96e6df0 SHA512 ac312e7da4c548073d4dfa5d9bb6823ed48ea70a30d7993da190cfc4cc4b17124e15326748d79e59ca0772675619b29221a57c5af45b7b6c7196dae218772ecd WHIRLPOOL d31618b8012b2b9eca5ae5c4317c893a21697b182aa877e236a34eefc17869b0c659c35617d70e7cd316d430de5d093fe18bce947996f8c6aade7cd8c60a4c38 |
| 39 |
-AUX git-2.5.1-freebsd-10.x-no-iconv.patch 568 SHA256 f5f96e35b9d3138a0806aa2298d00ee0138c453eebd3f325f58ff3d07dabe361 SHA512 9f7334b2c5b69c5a6a94e198a522b176470b0ae9d428694b9a404e4bcf33d269f43c8d2d9b5834e36f9a875d12a7b21f59caaaffad6d05cb6267ab2967e64567 WHIRLPOOL d40617ebd5b7e3ff7b7fd2948178741f427bf505233a3f2d0b3ffa0408218ea39aa5e04c94e2810c4db153ef4a3244ad0af48f8f2b785885f1f2ce81758728eb |
| 40 |
-AUX git-2.7.0-mediawiki-500pages.patch 1317 SHA256 2a3ca7e73ea0b1575c4646a8cf9b2b7bcac74f5fa9c7c5e6b8fc9d320ee2cc89 SHA512 efe580f288c6fdb6d55b742a3e4335ac32ed96cb12c10b959a5f283e505ab0aeed039d0d19d9dbf148a07ac6c7aec075ecea0c0be68456fdbe23dcad77ca01be WHIRLPOOL e890b6c529e007dc1fbb8f6188b9c23f16856d65a38ce702657eea2f065a4ff52b6ee8bd284726582db765222dfefb31da71c14217b3c15968050e093bc14a6f |
| 41 |
-AUX git-2.7.0-mediawiki-namespaces.patch 3188 SHA256 7205e94a95c9e9027b2a8472854e0d76dfb3053b8e7f139836d90b3555c62b89 SHA512 f1597fcb8e771917561d92bf428825e28477ed792be7494e34754434c73422dc52fdf99d981656b291f7eb91a199abe54038ae87e9b5229c9a382a4ea88e9d4f WHIRLPOOL 674de2ded34bf2d1d05c3e606b881e00a92ae7958a45e481d51d8766b0429d0054149017a5f21c024f466b62fffb6dddce64c7569caacfc0aa34c3c2b20d3610 |
| 42 |
-AUX git-2.7.0-mediawiki-subpages.patch 2091 SHA256 322aeee855c163c0e0cd5048b36bf464052fbbbd98fc23257b6e5c525d9057c5 SHA512 e294c0d4588499961632bcc6ea20474984c4bcc7a804ff3cd9d12584cecad3c36f5772c21cf7a884b517370eb7d87542f7bdc3b2c5482c18dbc623abe5e7c73e WHIRLPOOL 3731669811ec1cce64890afb5e0ee3add808d1da8f32a5061ed6d15c7a54aaf0bd4a350f35c4d78565132fe736bf02119fe51ef641fedf02f546e2b3fcc23655 |
| 43 |
-AUX git-daemon-r1.initd 375 SHA256 efa30f5db5b837ed9febd09af29f3740a9d479d098d5c3f8e4dcf334e01f77a3 SHA512 5a962ef717bb761fc113991c6f23264ffa6c7c5d50f261efe04cc2c429be2fcf249e48c56c1587c429472146a780753f9d570e5031d3dbec119eea48d0829244 WHIRLPOOL c2b83f41fde646757d7149ff4daa27ef1aa7a1ef44be8ef180632b184221be10ccd8ca7093d8b8a8142fd4c1b752ac660c180b22a496cb3c2a31ca16d1482356 |
| 44 |
-AUX git-daemon.confd 710 SHA256 4703ba2372c661fb674a29fea7f64983f8b1b3136d971663509249655bca6e21 SHA512 fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec WHIRLPOOL 1ce085e6f8580824f96517ae8d49f0a22124cb8d6cfa740dc041e0800bfe9541fa6d2a6ddb5dc23f96186ddfe4a539f4a72bb87deded2d7af37569957b52b4e5 |
| 45 |
-AUX git-daemon.socket 116 SHA256 66a064b67e441306bf765d3d3115ac55bafa2098400af134f852d4aecf8608d7 SHA512 e383d358999ea0c7201c1709015a9b7c4dd9dd71287605640aca837fac1e2ee33a5a1684e1c3414c08742605f185b722f4864afd5be8b79a9f0d8f7ae0f9b701 WHIRLPOOL 1098e46b6d2be3c8d758a087408aed91e0c01625542dfc90fbff80ed8b40d2a54ea4ab45b4d003ef0b0b8ed1411e1146a58076b68096389412a61fe2d09214dd |
| 46 |
-AUX git-daemon.xinetd 260 SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67 SHA512 5e0c85004e7e2b89fd191350022b9970a6ca03129b4c913e159570b99b5797ab924f667cd3dc5693a9d4916b7b5cf36814eda015dbdf46a1354eb50d1c081f9c WHIRLPOOL 155bfca2c071d5368de09412d1d937cefd3b5cd28a991b99845551738440b92791c33a67ef41be711dbf06fc4faf4a299cbaf1f410b119fe5deb5a4cd741803d |
| 47 |
-AUX git-daemon_at-r1.service 340 SHA256 980b2b2234fc672065286244cd4e690c92865d39a02001936801cb013b7d2dce SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9 WHIRLPOOL fd89d61e15bf499404b0a17a2e47257962c671cab09a3af53cb378758cf7a5f979026831a8da2270ea54fa8897e132def17307d03729ef2e30dfe7950c59b1b3 |
| 48 |
-DIST git-2.10.2.tar.xz 4106108 SHA256 94802903dd707d85ca3b9a2be35e936a54ce86375f52c6a789efe7ce7e238671 SHA512 0ab09de481dbb31c3304382afaa5d3fc9f861115c9954c65b11a8a1c34b939118c7ed3ff60ac329145888596388e3e4d2b2fb677fe109d33a57206d531b5ee6a WHIRLPOOL 808404fa13f908d149028f64aaf5b73400448fff6393dabfaa874d750065e86ff5dae4903724cbca4e59fb74b3ff30b8b8f0a0f1435a0a90c18267c7a0550de6 |
| 49 |
-DIST git-2.11.0.tar.xz 4197984 SHA256 7e7e8d69d494892373b87007674be5820a4bc1ef596a0117d03ea3169119fd0b SHA512 f9588dfcb4ae38adc46300b8ef65ee51343fc4685f9e43bffff10839a492e6a54c7f7a774687fef3ebb8a30108775aa472cda2378aa202905f8555bfb9d4ede2 WHIRLPOOL 73ce3c2cb083906b1e55245935a01b27881be48d2c4c3cace8353a4c2baf87fe3ce338553f66407cb629fa9c8c63d396ef09f4d6aa18803d487af4dd3fef8f10 |
| 50 |
-DIST git-htmldocs-2.10.2.tar.xz 1068436 SHA256 dd43111c3518a92a7fe64ac5cd32a5d4d77d49c67f7d89dce3e8293bc3d6b491 SHA512 8ef57218d7eef285ac427414d92bd5e8eba5c85c2a2a9ec0e423705ee2cb6f26dd33ad780d1b4237e7534dbe5cc3b4d8eea5780d0acc49066d78fc1893df2525 WHIRLPOOL 160fe3446d959d0f2315c9b2be182925619a4d89343602038e92283abdb393805eb5252799c502b83641d9e23a157332033baaa1ef2f1d9401cbbf372d8e86d7 |
| 51 |
-DIST git-htmldocs-2.11.0.tar.xz 1080584 SHA256 3975399f1be3d959edf0fded03eab8fbf94787bfd0318b7644c77cf61e4a7b48 SHA512 50250028030b1b277c17f27bc8bc0aa35938e7ae690d59bfff0a2d1f91c60564b254ce5b242f9ca081bfae60a9fb70cef538586abc0878bab6105e904748ee63 WHIRLPOOL 0839629b8f2fa08e22b69fe3638d67ae08d78dceaa008d8f35932ff361a1c1d8dbcd1262d4e469b5cd511a5dfb1848061d8e3491051188d0f90a6f0f98fa8003 |
| 52 |
-DIST git-manpages-2.10.2.tar.xz 395556 SHA256 83b0a317f6039ad95ef6af6a182cf659c2d053eed5d8f70b06710eb787f8aa6f SHA512 0dc5df8441601865511983b85762102396cbf7c704fd831eb6666ef7b7639252b971f6b4080b8a57226a86124edcdd77acf24374da22047bd315769a09109bef WHIRLPOOL e1d6b9cb4479b584c16a25a4f3b0528d96d483307e768efea3d7bd8156d74e1c59b61a641dfe5671f4cb01a02f10322262d133cb76f85194ac97ee74c6195d0e |
| 53 |
-DIST git-manpages-2.11.0.tar.xz 399992 SHA256 b3d3e78829c0b69b727aaca407ecfe239a46db3f354f16189f7a7c10af9528d8 SHA512 5b72b2dd7e151bde0fdc5ca5044391ebd9943ee8313133fdea1e0cb13b90ddd9164ee46f9c49ca2a70f636da7bcb54651a6389ed1c0a8693cf8eb31bfea49079 WHIRLPOOL 93fd5b6819ab0942421368d9c0e4723d6f5d2650e94ad8cab225499bb616f162e754a5e08a8f7f0ec74e378069cec0109047c72b67fa9d5c2d244399127b942a |
| 54 |
-EBUILD git-2.10.2.ebuild 19217 SHA256 962ee04dbcbab1deca9f16943ffca4728bef1bd0d3b76f5e9a3ea14dc084fc7c SHA512 83c397738745afe612fe45d8ae477b7d7aae0e2912471f77b032b608406c361402ef8fabe938a3f0882865d3f57863b5c8e733325c7f405b83c51d7cecbf6792 WHIRLPOOL c2f9e09599ce636b32c7adf3275ad7b3a04e27aa90fa34a5dcf7a99bc7084b1025a8092ccd61c85b19b734eefdf0e39fc83def5527865fa0bfd58751095887fb |
| 55 |
-EBUILD git-2.11.0.ebuild 19282 SHA256 fb82646406bba1b87cc95b8195c5e40d8bae02d91d7c0dfcfae4db024fae86b1 SHA512 943bbebea028d626288281f79721dbf1c4f156de6e20c0a1569685ea74a627a3fe9a26b66417df9608a2593cba5b3737cb3bd64e1c8fb0bb28d3a30f2653298d WHIRLPOOL d2b61a18a2f052ccee092896c2a2d45272b3cd38ab8838315fd7fd241493ef5f13a6b6a4d6fb37085064b704f78ae09569a5cc9f555b7bd8a43dd2d5a6652d14 |
| 56 |
-MISC metadata.xml 2074 SHA256 e1527bc0d2dc4c23f6c757ee229240f979ee7af2aabb2dd5a49f13f7112c9fc5 SHA512 f5f040ea6db33e7e325c995994c82f92d727d2a6a5f7841a9fb3e28d1ac66fea3d153b09d3a66122ba6365bf7e76a2cb411757f5a706b5525414bda4f504b635 WHIRLPOOL ceff2ccac4564156e3c333b36c056129ea28ef30890d0be4394caa8f734d9e987e33a89a6903dd29d6b010a36b09bc87fa0303c905aff3bb4224b6860e10f283 |
| 57 |
|
| 58 |
diff --git a/dev-vcs/git/files/50git-gentoo.el b/dev-vcs/git/files/50git-gentoo.el |
| 59 |
deleted file mode 100644 |
| 60 |
index 1646a39..0000000 |
| 61 |
--- a/dev-vcs/git/files/50git-gentoo.el |
| 62 |
+++ /dev/null |
| 63 |
@@ -1,13 +0,0 @@ |
| 64 |
- |
| 65 |
-;;; dev-vcs/git site-lisp configuration |
| 66 |
- |
| 67 |
-(add-to-list 'load-path "@SITELISP@") |
| 68 |
-(autoload 'git-status "git" "Entry point into git-status mode." t) |
| 69 |
-;;(autoload 'git-blame-mode "git-blame" |
| 70 |
-;; "Minor mode for incremental blame for Git." t) |
| 71 |
- |
| 72 |
-;; GNU Emacs >=22.2 already includes vc-git.el. |
| 73 |
-;; Enable the following only if Emacs has no GIT support. |
| 74 |
-(unless (fboundp 'vc-git-registered) |
| 75 |
- (add-to-list 'load-path "@SITELISP@/compat") |
| 76 |
- (add-to-list 'vc-handled-backends 'GIT)) |
| 77 |
|
| 78 |
diff --git a/dev-vcs/git/files/git-1.8.5-mw-vendor.patch b/dev-vcs/git/files/git-1.8.5-mw-vendor.patch |
| 79 |
deleted file mode 100644 |
| 80 |
index 54302ef..0000000 |
| 81 |
--- a/dev-vcs/git/files/git-1.8.5-mw-vendor.patch |
| 82 |
+++ /dev/null |
| 83 |
@@ -1,39 +0,0 @@ |
| 84 |
-diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile |
| 85 |
-index a4b6f7a..d83df2c 100644 |
| 86 |
---- a/contrib/mw-to-git/Makefile |
| 87 |
-+++ b/contrib/mw-to-git/Makefile |
| 88 |
-@@ -22,7 +22,7 @@ INSTALL = install |
| 89 |
- |
| 90 |
- SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL)) |
| 91 |
- INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \ |
| 92 |
-- -s --no-print-directory instlibdir) |
| 93 |
-+ -s --no-print-directory instvendorlibdir) |
| 94 |
- DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) |
| 95 |
- INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR)) |
| 96 |
- |
| 97 |
-diff --git a/perl/Makefile b/perl/Makefile |
| 98 |
-index 15d96fc..91348c6 100644 |
| 99 |
---- a/perl/Makefile |
| 100 |
-+++ b/perl/Makefile |
| 101 |
-@@ -12,7 +12,7 @@ ifndef V |
| 102 |
- QUIET = @ |
| 103 |
- endif |
| 104 |
- |
| 105 |
--all install instlibdir: $(makfile) |
| 106 |
-+all install instlibdir instvendorlibdir: $(makfile) |
| 107 |
- $(QUIET)$(MAKE) -f $(makfile) $@ |
| 108 |
- |
| 109 |
- clean: |
| 110 |
-diff --git a/perl/Makefile.PL b/perl/Makefile.PL |
| 111 |
-index 3f29ba9..c0b3508 100644 |
| 112 |
---- a/perl/Makefile.PL |
| 113 |
-+++ b/perl/Makefile.PL |
| 114 |
-@@ -17,6 +17,8 @@ sub MY::postamble { |
| 115 |
- return <<'MAKE_FRAG'; |
| 116 |
- instlibdir: |
| 117 |
- @echo '$(INSTALLSITELIB)' |
| 118 |
-+instvendorlibdir: |
| 119 |
-+ @echo '$(INSTALLVENDORLIB)' |
| 120 |
- |
| 121 |
- ifneq (,$(DESTDIR)) |
| 122 |
- ifeq (0,$(shell expr '$(MM_VERSION)' '>' 6.10)) |
| 123 |
|
| 124 |
diff --git a/dev-vcs/git/files/git-2.10.0-optional-cvs.patch b/dev-vcs/git/files/git-2.10.0-optional-cvs.patch |
| 125 |
deleted file mode 100644 |
| 126 |
index d14aeff..0000000 |
| 127 |
--- a/dev-vcs/git/files/git-2.10.0-optional-cvs.patch |
| 128 |
+++ /dev/null |
| 129 |
@@ -1,456 +0,0 @@ |
| 130 |
-From ef6d24be825b2d1d9666c1fc64ce5351d572b3f4 Mon Sep 17 00:00:00 2001 |
| 131 |
-From: Robin Johnson <robbat2@g.o> |
| 132 |
-Date: Sat, 3 Sep 2016 21:02:10 +0200 |
| 133 |
-Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface |
| 134 |
- utilities |
| 135 |
- |
| 136 |
-Forward-ported from 1.7.12 to current git.git v1.8.4 |
| 137 |
-Forward-ported from v1.8.4 to v1.8.5.1 |
| 138 |
-Forward-ported from v1.8.5.3 to v1.9.0_rc3 |
| 139 |
-Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0 |
| 140 |
-Forward-ported from v2.0.0_rc0 to v2.0.0 |
| 141 |
-Forward-ported from v2.0.0 to v2.2.2 |
| 142 |
-Forward-ported from v2.2.2 to v2.8.4 |
| 143 |
-Forward-ported from v2.8.4 to v2.10.0 |
| 144 |
- |
| 145 |
-Signed-off-by: Lars Wendler <polynomial-c@g.o> |
| 146 |
---- |
| 147 |
- Makefile | 51 ++++++++++++++++++++++++++++---------- |
| 148 |
- t/t9200-git-cvsexportcommit.sh | 5 ++++ |
| 149 |
- t/t9400-git-cvsserver-server.sh | 8 +++++- |
| 150 |
- t/t9401-git-cvsserver-crlf.sh | 15 +++++++---- |
| 151 |
- t/t9600-cvsimport.sh | 41 +++++++++++++++++++----------- |
| 152 |
- t/t9601-cvsimport-vendor-branch.sh | 11 ++++++++ |
| 153 |
- t/t9602-cvsimport-branches-tags.sh | 11 ++++++++ |
| 154 |
- t/t9603-cvsimport-patchsets.sh | 11 ++++++++ |
| 155 |
- t/test-lib.sh | 1 + |
| 156 |
- 9 files changed, 120 insertions(+), 34 deletions(-) |
| 157 |
- |
| 158 |
-diff --git a/Makefile b/Makefile |
| 159 |
-index d96ecb7..ced6b12 100644 |
| 160 |
---- a/Makefile |
| 161 |
-+++ b/Makefile |
| 162 |
-@@ -267,6 +267,8 @@ all:: |
| 163 |
- # Define SANE_TEXT_GREP to "-a" if you use recent versions of GNU grep |
| 164 |
- # and egrep that are pickier when their input contains non-ASCII data. |
| 165 |
- # |
| 166 |
-+# Define NO_CVS if you do not want any CVS interface utilities. |
| 167 |
-+# |
| 168 |
- # The TCL_PATH variable governs the location of the Tcl interpreter |
| 169 |
- # used to optimize git-gui for your system. Only used if NO_TCLTK |
| 170 |
- # is not set. Defaults to the bare 'tclsh'. |
| 171 |
-@@ -484,6 +486,7 @@ LIB_OBJS = |
| 172 |
- PROGRAM_OBJS = |
| 173 |
- PROGRAMS = |
| 174 |
- SCRIPT_PERL = |
| 175 |
-+SCRIPT_PERL_CVS = |
| 176 |
- SCRIPT_PYTHON = |
| 177 |
- SCRIPT_SH = |
| 178 |
- SCRIPT_LIB = |
| 179 |
-@@ -521,13 +524,14 @@ SCRIPT_LIB += git-sh-i18n |
| 180 |
- SCRIPT_PERL += git-add--interactive.perl |
| 181 |
- SCRIPT_PERL += git-difftool.perl |
| 182 |
- SCRIPT_PERL += git-archimport.perl |
| 183 |
--SCRIPT_PERL += git-cvsexportcommit.perl |
| 184 |
--SCRIPT_PERL += git-cvsimport.perl |
| 185 |
--SCRIPT_PERL += git-cvsserver.perl |
| 186 |
- SCRIPT_PERL += git-relink.perl |
| 187 |
- SCRIPT_PERL += git-send-email.perl |
| 188 |
- SCRIPT_PERL += git-svn.perl |
| 189 |
- |
| 190 |
-+SCRIPT_PERL_CVS += git-cvsexportcommit.perl |
| 191 |
-+SCRIPT_PERL_CVS += git-cvsimport.perl |
| 192 |
-+SCRIPT_PERL_CVS += git-cvsserver.perl |
| 193 |
-+ |
| 194 |
- SCRIPT_PYTHON += git-p4.py |
| 195 |
- |
| 196 |
- NO_INSTALL += git-remote-testgit |
| 197 |
-@@ -535,24 +539,26 @@ NO_INSTALL += git-remote-testgit |
| 198 |
- # Generated files for scripts |
| 199 |
- SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) |
| 200 |
- SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) |
| 201 |
-+SCRIPT_PERL_CVS_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL_CVS)) |
| 202 |
- SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) |
| 203 |
- |
| 204 |
- SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN)) |
| 205 |
- SCRIPT_PERL_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_GEN)) |
| 206 |
-+SCRIPT_PERL_CVS_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_CVS_GEN)) |
| 207 |
- SCRIPT_PYTHON_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PYTHON_GEN)) |
| 208 |
- |
| 209 |
- # Individual rules to allow e.g. |
| 210 |
- # "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script" |
| 211 |
- # from subdirectories like contrib/*/ |
| 212 |
- .PHONY: build-perl-script build-sh-script build-python-script |
| 213 |
--build-perl-script: $(SCRIPT_PERL_GEN) |
| 214 |
-+build-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) |
| 215 |
- build-sh-script: $(SCRIPT_SH_GEN) |
| 216 |
- build-python-script: $(SCRIPT_PYTHON_GEN) |
| 217 |
- |
| 218 |
- .PHONY: install-perl-script install-sh-script install-python-script |
| 219 |
- install-sh-script: $(SCRIPT_SH_INS) |
| 220 |
- $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' |
| 221 |
--install-perl-script: $(SCRIPT_PERL_INS) |
| 222 |
-+install-perl-script: $(SCRIPT_PERL_INS) $(SCRIPT_PERL_CVS_INS) |
| 223 |
- $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' |
| 224 |
- install-python-script: $(SCRIPT_PYTHON_INS) |
| 225 |
- $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' |
| 226 |
-@@ -561,12 +567,13 @@ install-python-script: $(SCRIPT_PYTHON_INS) |
| 227 |
- clean-sh-script: |
| 228 |
- $(RM) $(SCRIPT_SH_GEN) |
| 229 |
- clean-perl-script: |
| 230 |
-- $(RM) $(SCRIPT_PERL_GEN) |
| 231 |
-+ $(RM) $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) |
| 232 |
- clean-python-script: |
| 233 |
- $(RM) $(SCRIPT_PYTHON_GEN) |
| 234 |
- |
| 235 |
- SCRIPTS = $(SCRIPT_SH_INS) \ |
| 236 |
- $(SCRIPT_PERL_INS) \ |
| 237 |
-+ $(SCRIPT_PERL_CVS_INS) \ |
| 238 |
- $(SCRIPT_PYTHON_INS) \ |
| 239 |
- git-instaweb |
| 240 |
- |
| 241 |
-@@ -1811,10 +1818,24 @@ git.res: git.rc GIT-VERSION-FILE |
| 242 |
- -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@ |
| 243 |
- |
| 244 |
- # This makes sure we depend on the NO_PERL setting itself. |
| 245 |
--$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS |
| 246 |
-+$(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN): GIT-BUILD-OPTIONS |
| 247 |
-+ |
| 248 |
-+_SCRIPT_PERL_GEN = |
| 249 |
-+_SCRIPT_PERL_NOGEN = |
| 250 |
- |
| 251 |
- ifndef NO_PERL |
| 252 |
--$(SCRIPT_PERL_GEN): perl/perl.mak |
| 253 |
-+ |
| 254 |
-+_SCRIPT_PERL_GEN = $(SCRIPT_PERL_GEN) |
| 255 |
-+ |
| 256 |
-+ifndef NO_CVS |
| 257 |
-+_SCRIPT_PERL_GEN += $(SCRIPT_PERL_CVS_GEN) |
| 258 |
-+else |
| 259 |
-+_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_CVS_GEN) |
| 260 |
-+_REASON = NO_CVS |
| 261 |
-+_REASON_CONTENT = $(NO_CVS) |
| 262 |
-+endif # NO_CVS |
| 263 |
-+ |
| 264 |
-+$(_SCRIPT_PERL_GEN): perl/perl.mak |
| 265 |
- |
| 266 |
- perl/perl.mak: perl/PM.stamp |
| 267 |
- |
| 268 |
-@@ -1827,7 +1848,7 @@ perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL |
| 269 |
- $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F) |
| 270 |
- |
| 271 |
- PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ) |
| 272 |
--$(SCRIPT_PERL_GEN): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE |
| 273 |
-+$(_SCRIPT_PERL_GEN): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE |
| 274 |
- $(QUIET_GEN)$(RM) $@ $@+ && \ |
| 275 |
- INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \ |
| 276 |
- INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \ |
| 277 |
-@@ -1861,14 +1882,18 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES |
| 278 |
- chmod +x $@+ && \ |
| 279 |
- mv $@+ $@ |
| 280 |
- else # NO_PERL |
| 281 |
--$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh |
| 282 |
-+_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) git-instaweb |
| 283 |
-+_REASON = NO_PERL |
| 284 |
-+_REASON_CONTENT = $(NO_PERL) |
| 285 |
-+endif # NO_PERL |
| 286 |
-+ |
| 287 |
-+$(_SCRIPT_PERL_NOGEN): % : unimplemented.sh |
| 288 |
- $(QUIET_GEN)$(RM) $@ $@+ && \ |
| 289 |
- sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ |
| 290 |
-- -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ |
| 291 |
-+ -e 's|@@REASON@@|$(_REASON)=$(_REASON_CONTENT)|g' \ |
| 292 |
- unimplemented.sh >$@+ && \ |
| 293 |
- chmod +x $@+ && \ |
| 294 |
- mv $@+ $@ |
| 295 |
--endif # NO_PERL |
| 296 |
- |
| 297 |
- # This makes sure we depend on the NO_PYTHON setting itself. |
| 298 |
- $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS |
| 299 |
-@@ -2103,7 +2128,7 @@ LOCALIZED_SH = $(SCRIPT_SH) |
| 300 |
- LOCALIZED_SH += git-parse-remote.sh |
| 301 |
- LOCALIZED_SH += git-rebase--interactive.sh |
| 302 |
- LOCALIZED_SH += git-sh-setup.sh |
| 303 |
--LOCALIZED_PERL = $(SCRIPT_PERL) |
| 304 |
-+LOCALIZED_PERL = $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) |
| 305 |
- |
| 306 |
- ifdef XGETTEXT_INCLUDE_TESTS |
| 307 |
- LOCALIZED_C += t/t0200/test.c |
| 308 |
-diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh |
| 309 |
-index bb879a5..17be197 100755 |
| 310 |
---- a/t/t9200-git-cvsexportcommit.sh |
| 311 |
-+++ b/t/t9200-git-cvsexportcommit.sh |
| 312 |
-@@ -11,6 +11,11 @@ if ! test_have_prereq PERL; then |
| 313 |
- test_done |
| 314 |
- fi |
| 315 |
- |
| 316 |
-+if ! test_have_prereq CVS; then |
| 317 |
-+ skip_all='skipping git cvsexportcommit tests, cvs not available' |
| 318 |
-+ test_done |
| 319 |
-+fi |
| 320 |
-+ |
| 321 |
- cvs >/dev/null 2>&1 |
| 322 |
- if test $? -ne 1 |
| 323 |
- then |
| 324 |
-diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh |
| 325 |
-index 432c61d..6907b3f 100755 |
| 326 |
---- a/t/t9400-git-cvsserver-server.sh |
| 327 |
-+++ b/t/t9400-git-cvsserver-server.sh |
| 328 |
-@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server' |
| 329 |
- . ./test-lib.sh |
| 330 |
- |
| 331 |
- if ! test_have_prereq PERL; then |
| 332 |
-- skip_all='skipping git cvsserver tests, perl not available' |
| 333 |
-+ skip_all='skipping git-cvsserver tests, perl not available' |
| 334 |
- test_done |
| 335 |
- fi |
| 336 |
-+ |
| 337 |
-+if ! test_have_prereq CVS; then |
| 338 |
-+ skip_all='skipping git-cvsserver tests, cvs not available' |
| 339 |
-+ test_done |
| 340 |
-+fi |
| 341 |
-+ |
| 342 |
- cvs >/dev/null 2>&1 |
| 343 |
- if test $? -ne 1 |
| 344 |
- then |
| 345 |
-diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh |
| 346 |
-index 84787ee..eecba88 100755 |
| 347 |
---- a/t/t9401-git-cvsserver-crlf.sh |
| 348 |
-+++ b/t/t9401-git-cvsserver-crlf.sh |
| 349 |
-@@ -57,15 +57,20 @@ check_status_options() { |
| 350 |
- return $stat |
| 351 |
- } |
| 352 |
- |
| 353 |
--cvs >/dev/null 2>&1 |
| 354 |
--if test $? -ne 1 |
| 355 |
-+if ! test_have_prereq PERL |
| 356 |
- then |
| 357 |
-- skip_all='skipping git-cvsserver tests, cvs not found' |
| 358 |
-+ skip_all='skipping git-cvsserver tests, perl not available' |
| 359 |
- test_done |
| 360 |
- fi |
| 361 |
--if ! test_have_prereq PERL |
| 362 |
-+if ! test_have_prereq CVS |
| 363 |
- then |
| 364 |
-- skip_all='skipping git-cvsserver tests, perl not available' |
| 365 |
-+ skip_all='skipping git-cvsserver tests, cvs not available' |
| 366 |
-+ test_done |
| 367 |
-+fi |
| 368 |
-+cvs >/dev/null 2>&1 |
| 369 |
-+if test $? -ne 1 |
| 370 |
-+then |
| 371 |
-+ skip_all='skipping git-cvsserver tests, cvs not found' |
| 372 |
- test_done |
| 373 |
- fi |
| 374 |
- perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { |
| 375 |
-diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh |
| 376 |
-index 4c384ff..d601f32 100755 |
| 377 |
---- a/t/t9600-cvsimport.sh |
| 378 |
-+++ b/t/t9600-cvsimport.sh |
| 379 |
-@@ -3,14 +3,25 @@ |
| 380 |
- test_description='git cvsimport basic tests' |
| 381 |
- . ./lib-cvs.sh |
| 382 |
- |
| 383 |
--test_expect_success PERL 'setup cvsroot environment' ' |
| 384 |
-+if ! test_have_prereq PERL |
| 385 |
-+then |
| 386 |
-+ skip_all='skipping git cvsimport tests, perl not available' |
| 387 |
-+ test_done |
| 388 |
-+fi |
| 389 |
-+if ! test_have_prereq CVS |
| 390 |
-+then |
| 391 |
-+ skip_all='skipping git cvsimport tests, cvs not available' |
| 392 |
-+ test_done |
| 393 |
-+fi |
| 394 |
-+ |
| 395 |
-+test_expect_success 'setup cvsroot environment' ' |
| 396 |
- CVSROOT=$(pwd)/cvsroot && |
| 397 |
- export CVSROOT |
| 398 |
- ' |
| 399 |
- |
| 400 |
--test_expect_success PERL 'setup cvsroot' '$CVS init' |
| 401 |
-+test_expect_success 'setup cvsroot' '$CVS init' |
| 402 |
- |
| 403 |
--test_expect_success PERL 'setup a cvs module' ' |
| 404 |
-+test_expect_success 'setup a cvs module' ' |
| 405 |
- |
| 406 |
- mkdir "$CVSROOT/module" && |
| 407 |
- $CVS co -d module-cvs module && |
| 408 |
-@@ -42,23 +53,23 @@ EOF |
| 409 |
- ) |
| 410 |
- ' |
| 411 |
- |
| 412 |
--test_expect_success PERL 'import a trivial module' ' |
| 413 |
-+test_expect_success 'import a trivial module' ' |
| 414 |
- |
| 415 |
- git cvsimport -a -R -z 0 -C module-git module && |
| 416 |
- test_cmp module-cvs/o_fortuna module-git/o_fortuna |
| 417 |
- |
| 418 |
- ' |
| 419 |
- |
| 420 |
--test_expect_success PERL 'pack refs' '(cd module-git && git gc)' |
| 421 |
-+test_expect_success 'pack refs' '(cd module-git && git gc)' |
| 422 |
- |
| 423 |
--test_expect_success PERL 'initial import has correct .git/cvs-revisions' ' |
| 424 |
-+test_expect_success 'initial import has correct .git/cvs-revisions' ' |
| 425 |
- |
| 426 |
- (cd module-git && |
| 427 |
- git log --format="o_fortuna 1.1 %H" -1) > expected && |
| 428 |
- test_cmp expected module-git/.git/cvs-revisions |
| 429 |
- ' |
| 430 |
- |
| 431 |
--test_expect_success PERL 'update cvs module' ' |
| 432 |
-+test_expect_success 'update cvs module' ' |
| 433 |
- (cd module-cvs && |
| 434 |
- cat <<EOF >o_fortuna && |
| 435 |
- O Fortune, |
| 436 |
-@@ -86,7 +97,7 @@ EOF |
| 437 |
- ) |
| 438 |
- ' |
| 439 |
- |
| 440 |
--test_expect_success PERL 'update git module' ' |
| 441 |
-+test_expect_success 'update git module' ' |
| 442 |
- |
| 443 |
- (cd module-git && |
| 444 |
- git config cvsimport.trackRevisions true && |
| 445 |
-@@ -97,7 +108,7 @@ test_expect_success PERL 'update git module' ' |
| 446 |
- |
| 447 |
- ' |
| 448 |
- |
| 449 |
--test_expect_success PERL 'update has correct .git/cvs-revisions' ' |
| 450 |
-+test_expect_success 'update has correct .git/cvs-revisions' ' |
| 451 |
- |
| 452 |
- (cd module-git && |
| 453 |
- git log --format="o_fortuna 1.1 %H" -1 HEAD^ && |
| 454 |
-@@ -105,7 +116,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' ' |
| 455 |
- test_cmp expected module-git/.git/cvs-revisions |
| 456 |
- ' |
| 457 |
- |
| 458 |
--test_expect_success PERL 'update cvs module' ' |
| 459 |
-+test_expect_success 'update cvs module' ' |
| 460 |
- |
| 461 |
- (cd module-cvs && |
| 462 |
- echo 1 >tick && |
| 463 |
-@@ -114,7 +125,7 @@ test_expect_success PERL 'update cvs module' ' |
| 464 |
- ) |
| 465 |
- ' |
| 466 |
- |
| 467 |
--test_expect_success PERL 'cvsimport.module config works' ' |
| 468 |
-+test_expect_success 'cvsimport.module config works' ' |
| 469 |
- |
| 470 |
- (cd module-git && |
| 471 |
- git config cvsimport.module module && |
| 472 |
-@@ -126,7 +137,7 @@ test_expect_success PERL 'cvsimport.module config works' ' |
| 473 |
- |
| 474 |
- ' |
| 475 |
- |
| 476 |
--test_expect_success PERL 'second update has correct .git/cvs-revisions' ' |
| 477 |
-+test_expect_success 'second update has correct .git/cvs-revisions' ' |
| 478 |
- |
| 479 |
- (cd module-git && |
| 480 |
- git log --format="o_fortuna 1.1 %H" -1 HEAD^^ && |
| 481 |
-@@ -135,7 +146,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' ' |
| 482 |
- test_cmp expected module-git/.git/cvs-revisions |
| 483 |
- ' |
| 484 |
- |
| 485 |
--test_expect_success PERL 'import from a CVS working tree' ' |
| 486 |
-+test_expect_success 'import from a CVS working tree' ' |
| 487 |
- |
| 488 |
- $CVS co -d import-from-wt module && |
| 489 |
- (cd import-from-wt && |
| 490 |
-@@ -148,12 +159,12 @@ test_expect_success PERL 'import from a CVS working tree' ' |
| 491 |
- |
| 492 |
- ' |
| 493 |
- |
| 494 |
--test_expect_success PERL 'no .git/cvs-revisions created by default' ' |
| 495 |
-+test_expect_success 'no .git/cvs-revisions created by default' ' |
| 496 |
- |
| 497 |
- ! test -e import-from-wt/.git/cvs-revisions |
| 498 |
- |
| 499 |
- ' |
| 500 |
- |
| 501 |
--test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master' |
| 502 |
-+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' |
| 503 |
- |
| 504 |
- test_done |
| 505 |
-diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh |
| 506 |
-index 827d39f..d730a41 100755 |
| 507 |
---- a/t/t9601-cvsimport-vendor-branch.sh |
| 508 |
-+++ b/t/t9601-cvsimport-vendor-branch.sh |
| 509 |
-@@ -34,6 +34,17 @@ |
| 510 |
- test_description='git cvsimport handling of vendor branches' |
| 511 |
- . ./lib-cvs.sh |
| 512 |
- |
| 513 |
-+if ! test_have_prereq PERL |
| 514 |
-+then |
| 515 |
-+ skip_all='skipping git cvsimport tests, perl not available' |
| 516 |
-+ test_done |
| 517 |
-+fi |
| 518 |
-+if ! test_have_prereq CVS |
| 519 |
-+then |
| 520 |
-+ skip_all='skipping git cvsimport tests, cvs not available' |
| 521 |
-+ test_done |
| 522 |
-+fi |
| 523 |
-+ |
| 524 |
- setup_cvs_test_repository t9601 |
| 525 |
- |
| 526 |
- test_expect_success PERL 'import a module with a vendor branch' ' |
| 527 |
-diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh |
| 528 |
-index e1db323..68f0974 100755 |
| 529 |
---- a/t/t9602-cvsimport-branches-tags.sh |
| 530 |
-+++ b/t/t9602-cvsimport-branches-tags.sh |
| 531 |
-@@ -6,6 +6,17 @@ |
| 532 |
- test_description='git cvsimport handling of branches and tags' |
| 533 |
- . ./lib-cvs.sh |
| 534 |
- |
| 535 |
-+if ! test_have_prereq PERL |
| 536 |
-+then |
| 537 |
-+ skip_all='skipping git cvsimport tests, perl not available' |
| 538 |
-+ test_done |
| 539 |
-+fi |
| 540 |
-+if ! test_have_prereq CVS |
| 541 |
-+then |
| 542 |
-+ skip_all='skipping git cvsimport tests, cvs not available' |
| 543 |
-+ test_done |
| 544 |
-+fi |
| 545 |
-+ |
| 546 |
- setup_cvs_test_repository t9602 |
| 547 |
- |
| 548 |
- test_expect_success PERL 'import module' ' |
| 549 |
-diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh |
| 550 |
-index c4c3c49..9b2957d 100755 |
| 551 |
---- a/t/t9603-cvsimport-patchsets.sh |
| 552 |
-+++ b/t/t9603-cvsimport-patchsets.sh |
| 553 |
-@@ -14,6 +14,17 @@ |
| 554 |
- test_description='git cvsimport testing for correct patchset estimation' |
| 555 |
- . ./lib-cvs.sh |
| 556 |
- |
| 557 |
-+if ! test_have_prereq PERL |
| 558 |
-+then |
| 559 |
-+ skip_all='skipping git cvsimport tests, perl not available' |
| 560 |
-+ test_done |
| 561 |
-+fi |
| 562 |
-+if ! test_have_prereq CVS |
| 563 |
-+then |
| 564 |
-+ skip_all='skipping git cvsimport tests, cvs not available' |
| 565 |
-+ test_done |
| 566 |
-+fi |
| 567 |
-+ |
| 568 |
- setup_cvs_test_repository t9603 |
| 569 |
- |
| 570 |
- test_expect_failure PERL 'import with criss cross times on revisions' ' |
| 571 |
-diff --git a/t/test-lib.sh b/t/test-lib.sh |
| 572 |
-index d731d66..fcee67a 100644 |
| 573 |
---- a/t/test-lib.sh |
| 574 |
-+++ b/t/test-lib.sh |
| 575 |
-@@ -972,6 +972,7 @@ case $(uname -s) in |
| 576 |
- esac |
| 577 |
- |
| 578 |
- ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 |
| 579 |
-+test -z "$NO_CVS" && test_set_prereq CVS |
| 580 |
- test -z "$NO_PERL" && test_set_prereq PERL |
| 581 |
- test -z "$NO_PYTHON" && test_set_prereq PYTHON |
| 582 |
- test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE |
| 583 |
--- |
| 584 |
-2.9.3 |
| 585 |
- |
| 586 |
|
| 587 |
diff --git a/dev-vcs/git/files/git-2.2.0-svn-fe-linking.patch b/dev-vcs/git/files/git-2.2.0-svn-fe-linking.patch |
| 588 |
deleted file mode 100644 |
| 589 |
index b20b889..0000000 |
| 590 |
--- a/dev-vcs/git/files/git-2.2.0-svn-fe-linking.patch |
| 591 |
+++ /dev/null |
| 592 |
@@ -1,11 +0,0 @@ |
| 593 |
---- git-2.2.0/contrib/svn-fe/Makefile |
| 594 |
-+++ git-2.2.0/contrib/svn-fe/Makefile |
| 595 |
-@@ -74,7 +74,7 @@ |
| 596 |
- endif |
| 597 |
- |
| 598 |
- svn-fe$X: svn-fe.o $(VCSSVN_LIB) $(XDIFF_LIB) $(GIT_LIB) |
| 599 |
-- $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(EXTLIBS) -o $@ svn-fe.o $(LIBS) |
| 600 |
-+ $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ svn-fe.o $(LIBS) $(EXTLIBS) |
| 601 |
- |
| 602 |
- svn-fe.o: svn-fe.c ../../vcs-svn/svndump.h |
| 603 |
- $(QUIET_CC)$(CC) $(CFLAGS) -I../../vcs-svn -o $*.o -c $< |
| 604 |
|
| 605 |
diff --git a/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch b/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch |
| 606 |
deleted file mode 100644 |
| 607 |
index a874236..0000000 |
| 608 |
--- a/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch |
| 609 |
+++ /dev/null |
| 610 |
@@ -1,14 +0,0 @@ |
| 611 |
-diff -Naurp git-2.5.1.orig/config.mak.uname git-2.5.1/config.mak.uname |
| 612 |
---- git-2.5.1.orig/config.mak.uname 2015-08-28 15:37:13.000000000 -0400 |
| 613 |
-+++ git-2.5.1/config.mak.uname 2015-09-06 18:54:28.538437000 -0400 |
| 614 |
-@@ -189,7 +189,9 @@ ifeq ($(uname_O),Cygwin) |
| 615 |
- SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield |
| 616 |
- endif |
| 617 |
- ifeq ($(uname_S),FreeBSD) |
| 618 |
-- NEEDS_LIBICONV = YesPlease |
| 619 |
-+ ifeq ($(shell expr "$(uname_R)" : '[1-9]\.'),2) |
| 620 |
-+ NEEDS_LIBICONV = YesPlease |
| 621 |
-+ endif |
| 622 |
- OLD_ICONV = YesPlease |
| 623 |
- NO_MEMMEM = YesPlease |
| 624 |
- BASIC_CFLAGS += -I/usr/local/include |
| 625 |
|
| 626 |
diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch |
| 627 |
deleted file mode 100644 |
| 628 |
index 0ce706d..0000000 |
| 629 |
--- a/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch |
| 630 |
+++ /dev/null |
| 631 |
@@ -1,46 +0,0 @@ |
| 632 |
-Searching for pages using the MediaWiki API returns at most 500 results |
| 633 |
-(hi Patrick). To get a list of all pages in a larger wiki, we need to run |
| 634 |
-repeated searches... |
| 635 |
- |
| 636 |
-Source: https://github.com/moy/Git-Mediawiki/issues/32 |
| 637 |
-Author: anarcat https://github.com/anarcat |
| 638 |
- |
| 639 |
-diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl |
| 640 |
-index 8dd74a9..f2ce311 100755 |
| 641 |
---- a/contrib/mw-to-git/git-remote-mediawiki.perl |
| 642 |
-+++ b/contrib/mw-to-git/git-remote-mediawiki.perl |
| 643 |
-@@ -259,16 +259,29 @@ sub get_mw_tracked_categories { |
| 644 |
- sub get_mw_all_pages { |
| 645 |
- my $pages = shift; |
| 646 |
- # No user-provided list, get the list of pages from the API. |
| 647 |
-- my $mw_pages = $mediawiki->list({ |
| 648 |
-+ my $query = { |
| 649 |
- action => 'query', |
| 650 |
- list => 'allpages', |
| 651 |
- aplimit => 'max' |
| 652 |
-- }); |
| 653 |
-- if (!defined($mw_pages)) { |
| 654 |
-+ }; |
| 655 |
-+ my $curpage; |
| 656 |
-+ my $oldpage = ''; |
| 657 |
-+ while (1) { |
| 658 |
-+ if (defined($curpage)) { |
| 659 |
-+ if ($oldpage eq $curpage) { |
| 660 |
-+ last; |
| 661 |
-+ } |
| 662 |
-+ $query->{apfrom} = $curpage; |
| 663 |
-+ $oldpage = $curpage; |
| 664 |
-+ } |
| 665 |
-+ my $mw_pages = $mediawiki->list($query); |
| 666 |
-+ if (!defined($mw_pages)) { |
| 667 |
- fatal_mw_error("get the list of wiki pages"); |
| 668 |
-- } |
| 669 |
-- foreach my $page (@{$mw_pages}) { |
| 670 |
-+ } |
| 671 |
-+ foreach my $page (@{$mw_pages}) { |
| 672 |
- $pages->{$page->{title}} = $page; |
| 673 |
-+ $curpage = $page->{title}; |
| 674 |
-+ } |
| 675 |
- } |
| 676 |
- return; |
| 677 |
- } |
| 678 |
|
| 679 |
diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch |
| 680 |
deleted file mode 100644 |
| 681 |
index 72ab212..0000000 |
| 682 |
--- a/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch |
| 683 |
+++ /dev/null |
| 684 |
@@ -1,97 +0,0 @@ |
| 685 |
-source: |
| 686 |
-https://gist.github.com/anarcat/f821fa285c6b8b6b16a5 |
| 687 |
-https://github.com/moy/Git-Mediawiki/issues/10 |
| 688 |
- |
| 689 |
- |
| 690 |
-From 147224cfe6143c44b16aec0bb6d6a506a6b96ced Mon Sep 17 00:00:00 2001 |
| 691 |
-From: Kevin <kevin@×××××.org> |
| 692 |
-Date: Fri, 28 Aug 2015 15:53:37 -0500 |
| 693 |
-Subject: [PATCH] Add namespace support to git-mediawiki |
| 694 |
- |
| 695 |
-Signed-off-by: Kevin <kevin@×××××.org> |
| 696 |
---- |
| 697 |
- contrib/mw-to-git/git-remote-mediawiki.perl | 34 +++++++++++++++++++++++++++-- |
| 698 |
- 1 file changed, 32 insertions(+), 2 deletions(-) |
| 699 |
- |
| 700 |
-diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl |
| 701 |
-index 8dd74a9..662a5b5 100755 |
| 702 |
---- a/contrib/mw-to-git/git-remote-mediawiki.perl |
| 703 |
-+++ b/contrib/mw-to-git/git-remote-mediawiki.perl |
| 704 |
-@@ -17,6 +17,7 @@ use Git; |
| 705 |
- use Git::Mediawiki qw(clean_filename smudge_filename connect_maybe |
| 706 |
- EMPTY HTTP_CODE_OK); |
| 707 |
- use DateTime::Format::ISO8601; |
| 708 |
-+use Scalar::Util; |
| 709 |
- use warnings; |
| 710 |
- |
| 711 |
- # By default, use UTF-8 to communicate with Git and the user |
| 712 |
-@@ -63,6 +64,10 @@ chomp(@tracked_pages); |
| 713 |
- my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories")); |
| 714 |
- chomp(@tracked_categories); |
| 715 |
- |
| 716 |
-+# Just like @tracked_categories, but for MediaWiki namespaces. |
| 717 |
-+my @tracked_namespaces = split(/[ \n]/, run_git("config --get-all remote.${remotename}.namespaces")); |
| 718 |
-+chomp(@tracked_namespaces); |
| 719 |
-+ |
| 720 |
- # Import media files on pull |
| 721 |
- my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport"); |
| 722 |
- chomp($import_media); |
| 723 |
-@@ -256,6 +261,23 @@ sub get_mw_tracked_categories { |
| 724 |
- return; |
| 725 |
- } |
| 726 |
- |
| 727 |
-+sub get_mw_tracked_namespaces { |
| 728 |
-+ my $pages = shift; |
| 729 |
-+ foreach my $local_namespace (@tracked_namespaces) { |
| 730 |
-+ my $mw_pages = $mediawiki->list( { |
| 731 |
-+ action => 'query', |
| 732 |
-+ list => 'allpages', |
| 733 |
-+ apnamespace => get_mw_namespace_id($local_namespace), |
| 734 |
-+ aplimit => 'max' } ) |
| 735 |
-+ || die $mediawiki->{error}->{code} . ': ' |
| 736 |
-+ . $mediawiki->{error}->{details} . "\n"; |
| 737 |
-+ foreach my $page (@{$mw_pages}) { |
| 738 |
-+ $pages->{$page->{title}} = $page; |
| 739 |
-+ } |
| 740 |
-+ } |
| 741 |
-+ return; |
| 742 |
-+} |
| 743 |
-+ |
| 744 |
- sub get_mw_all_pages { |
| 745 |
- my $pages = shift; |
| 746 |
- # No user-provided list, get the list of pages from the API. |
| 747 |
-@@ -319,6 +341,10 @@ sub get_mw_pages { |
| 748 |
- $user_defined = 1; |
| 749 |
- get_mw_tracked_categories(\%pages); |
| 750 |
- } |
| 751 |
-+ if (@tracked_namespaces) { |
| 752 |
-+ $user_defined = 1; |
| 753 |
-+ get_mw_tracked_namespaces(\%pages); |
| 754 |
-+ } |
| 755 |
- if (!$user_defined) { |
| 756 |
- get_mw_all_pages(\%pages); |
| 757 |
- } |
| 758 |
-@@ -1263,7 +1289,6 @@ my %cached_mw_namespace_id; |
| 759 |
- sub get_mw_namespace_id { |
| 760 |
- $mediawiki = connect_maybe($mediawiki, $remotename, $url); |
| 761 |
- my $name = shift; |
| 762 |
-- |
| 763 |
- if (!exists $namespace_id{$name}) { |
| 764 |
- # Look at configuration file, if the record for that namespace is |
| 765 |
- # already cached. Namespaces are stored in form: |
| 766 |
-@@ -1331,7 +1356,12 @@ sub get_mw_namespace_id { |
| 767 |
- sub get_mw_namespace_id_for_page { |
| 768 |
- my $namespace = shift; |
| 769 |
- if ($namespace =~ /^([^:]*):/) { |
| 770 |
-- return get_mw_namespace_id($namespace); |
| 771 |
-+ my ($ns, $id) = split(/:/, $namespace); |
| 772 |
-+ if (Scalar::Util::looks_like_number($id)) { |
| 773 |
-+ return get_mw_namespace_id($ns); |
| 774 |
-+ } else{ |
| 775 |
-+ return |
| 776 |
-+ } |
| 777 |
- } else { |
| 778 |
- return; |
| 779 |
- } |
| 780 |
--- |
| 781 |
-2.5.0 |
| 782 |
|
| 783 |
diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch |
| 784 |
deleted file mode 100644 |
| 785 |
index c798a89..0000000 |
| 786 |
--- a/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch |
| 787 |
+++ /dev/null |
| 788 |
@@ -1,48 +0,0 @@ |
| 789 |
-From 2593304723c6def159c10b9060dafa78a775a057 Mon Sep 17 00:00:00 2001 |
| 790 |
-From: Lyubomyr Shaydariv <lyubomyr-shaydariv@××××××××××××××××××××.com> |
| 791 |
-Date: Fri, 11 Sep 2015 00:41:17 +0300 |
| 792 |
-Subject: [PATCH] git-remote-mediawiki: support subpages as subdirectories |
| 793 |
- |
| 794 |
-This is a fix for https://github.com/moy/Git-Mediawiki/issues/22 |
| 795 |
-The subdirectories option is enabled using -c remote.origin.subpageDirs=true |
| 796 |
-during the cloning and it is not recommended to be modified in or |
| 797 |
-removed from .git/config after the cloning. |
| 798 |
---- |
| 799 |
- contrib/mw-to-git/git-remote-mediawiki.perl | 10 +++++++++- |
| 800 |
- 1 file changed, 9 insertions(+), 1 deletion(-) |
| 801 |
- |
| 802 |
-diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl |
| 803 |
-index 8dd74a9..f3624be 100755 |
| 804 |
---- a/contrib/mw-to-git/git-remote-mediawiki.perl |
| 805 |
-+++ b/contrib/mw-to-git/git-remote-mediawiki.perl |
| 806 |
-@@ -63,6 +63,11 @@ |
| 807 |
- my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories")); |
| 808 |
- chomp(@tracked_categories); |
| 809 |
- |
| 810 |
-+# Use subdirectories for subpages |
| 811 |
-+my $use_subpage_dirs = run_git("config --get --bool remote.${remotename}.subpageDirs"); |
| 812 |
-+chomp($use_subpage_dirs); |
| 813 |
-+$use_subpage_dirs = ($use_subpage_dirs eq 'true'); |
| 814 |
-+ |
| 815 |
- # Import media files on pull |
| 816 |
- my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport"); |
| 817 |
- chomp($import_media); |
| 818 |
-@@ -689,6 +694,9 @@ sub fe_escape_path { |
| 819 |
- $path =~ s/\\/\\\\/g; |
| 820 |
- $path =~ s/"/\\"/g; |
| 821 |
- $path =~ s/\n/\\n/g; |
| 822 |
-+ if ($use_subpage_dirs) { |
| 823 |
-+ $path =~ s/%2F/\//g; |
| 824 |
-+ } |
| 825 |
- return qq("${path}"); |
| 826 |
- } |
| 827 |
- |
| 828 |
-@@ -927,7 +935,7 @@ sub mw_import_revids { |
| 829 |
- # If this is a revision of the media page for new version |
| 830 |
- # of a file do one common commit for both file and media page. |
| 831 |
- # Else do commit only for that page. |
| 832 |
-- print {*STDERR} "${n}/", scalar(@{$revision_ids}), ": Revision #$rev->{revid} of $commit{title}\n"; |
| 833 |
-+ print {*STDERR} "${n}/", scalar(@{$revision_ids}), ": Revision #$rev->{revid} of ", fe_escape_path($commit{title}), "\n"; |
| 834 |
- import_file_revision(\%commit, ($fetch_from == 1), $n_actual, \%mediafile); |
| 835 |
- } |
| 836 |
- |
| 837 |
|
| 838 |
diff --git a/dev-vcs/git/files/git-daemon-r1.initd b/dev-vcs/git/files/git-daemon-r1.initd |
| 839 |
deleted file mode 100644 |
| 840 |
index df03162..0000000 |
| 841 |
--- a/dev-vcs/git/files/git-daemon-r1.initd |
| 842 |
+++ /dev/null |
| 843 |
@@ -1,13 +0,0 @@ |
| 844 |
-#!/sbin/openrc-run |
| 845 |
-# Copyright 1999-2016 Gentoo Foundation |
| 846 |
-# Distributed under the terms of the GNU General Public License v2 |
| 847 |
-# $Id$ |
| 848 |
- |
| 849 |
-pidfile="/var/run/git-daemon.pid" |
| 850 |
-command="/usr/bin/git" |
| 851 |
-command_args="daemon ${GITDAEMON_OPTS}" |
| 852 |
-start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME= -b -m -p ${pidfile} -u ${GIT_USER:-nobody}:${GIT_GROUP:-nobody}" |
| 853 |
- |
| 854 |
-depend() { |
| 855 |
- use logger |
| 856 |
-} |
| 857 |
|
| 858 |
diff --git a/dev-vcs/git/files/git-daemon.confd b/dev-vcs/git/files/git-daemon.confd |
| 859 |
deleted file mode 100644 |
| 860 |
index 69b209f..0000000 |
| 861 |
--- a/dev-vcs/git/files/git-daemon.confd |
| 862 |
+++ /dev/null |
| 863 |
@@ -1,19 +0,0 @@ |
| 864 |
-# conf.d file for git-daemon |
| 865 |
-# |
| 866 |
-# Please check man 1 git-daemon for more information about the options |
| 867 |
-# git-daemon accepts. You MUST edit this to include your repositories you wish |
| 868 |
-# to serve. |
| 869 |
-# |
| 870 |
-# Some of the meaningful options are: |
| 871 |
-# --syslog --- Enables syslog logging |
| 872 |
-# --verbose --- Enables verbose logging |
| 873 |
-# --export-all --- Exports all repositories |
| 874 |
-# --port=XXXX --- Starts in port XXXX instead of 9418 |
| 875 |
-# |
| 876 |
-GITDAEMON_OPTS="--syslog --base-path=/var/git" |
| 877 |
- |
| 878 |
-# To run an anonymous git safely, the following user should be able to only |
| 879 |
-# read your Git repositories. It should not be able to write to anywhere on |
| 880 |
-# your system, esp. not the repositories. |
| 881 |
-GIT_USER="nobody" |
| 882 |
-GIT_GROUP="nobody" |
| 883 |
|
| 884 |
diff --git a/dev-vcs/git/files/git-daemon.socket b/dev-vcs/git/files/git-daemon.socket |
| 885 |
deleted file mode 100644 |
| 886 |
index 3dec01d..0000000 |
| 887 |
--- a/dev-vcs/git/files/git-daemon.socket |
| 888 |
+++ /dev/null |
| 889 |
@@ -1,9 +0,0 @@ |
| 890 |
-[Unit] |
| 891 |
-Description=Git Activation Socket |
| 892 |
- |
| 893 |
-[Socket] |
| 894 |
-ListenStream=9418 |
| 895 |
-Accept=true |
| 896 |
- |
| 897 |
-[Install] |
| 898 |
-WantedBy=sockets.target |
| 899 |
|
| 900 |
diff --git a/dev-vcs/git/files/git-daemon.xinetd b/dev-vcs/git/files/git-daemon.xinetd |
| 901 |
deleted file mode 100644 |
| 902 |
index 02c938d..0000000 |
| 903 |
--- a/dev-vcs/git/files/git-daemon.xinetd |
| 904 |
+++ /dev/null |
| 905 |
@@ -1,13 +0,0 @@ |
| 906 |
-service git-daemon |
| 907 |
-{ |
| 908 |
- disable = yes |
| 909 |
- socket_type = stream |
| 910 |
- wait = no |
| 911 |
- user = nobody |
| 912 |
- type = UNLISTED |
| 913 |
- protocol = tcp |
| 914 |
- log_on_failure += USERID |
| 915 |
- port = 9418 |
| 916 |
- server = /usr/bin/git |
| 917 |
- server_args = daemon --inetd --syslog --export-all --base-path=/var/git |
| 918 |
-} |
| 919 |
|
| 920 |
diff --git a/dev-vcs/git/files/git-daemon_at-r1.service b/dev-vcs/git/files/git-daemon_at-r1.service |
| 921 |
deleted file mode 100644 |
| 922 |
index 0a1bd14..0000000 |
| 923 |
--- a/dev-vcs/git/files/git-daemon_at-r1.service |
| 924 |
+++ /dev/null |
| 925 |
@@ -1,12 +0,0 @@ |
| 926 |
-[Unit] |
| 927 |
-Description=Git Repositories Server Daemon |
| 928 |
-Documentation=man:git-daemon(1) |
| 929 |
- |
| 930 |
-[Service] |
| 931 |
-User=nobody |
| 932 |
-Group=nobody |
| 933 |
-# Ignore non-zero exit status, access error makes git-daemon return them |
| 934 |
-ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose |
| 935 |
-StandardInput=socket |
| 936 |
-StandardOutput=inherit |
| 937 |
-StandardError=journal |
| 938 |
|
| 939 |
diff --git a/dev-vcs/git/git-2.10.2.ebuild b/dev-vcs/git/git-2.10.2.ebuild |
| 940 |
deleted file mode 100644 |
| 941 |
index ce7c471..0000000 |
| 942 |
--- a/dev-vcs/git/git-2.10.2.ebuild |
| 943 |
+++ /dev/null |
| 944 |
@@ -1,680 +0,0 @@ |
| 945 |
-# Copyright 1999-2016 Gentoo Foundation |
| 946 |
-# Distributed under the terms of the GNU General Public License v2 |
| 947 |
-# $Id$ |
| 948 |
- |
| 949 |
-EAPI=6 |
| 950 |
- |
| 951 |
-GENTOO_DEPEND_ON_PERL=no |
| 952 |
- |
| 953 |
-# bug #329479: git-remote-testgit is not multiple-version aware |
| 954 |
-PYTHON_COMPAT=( python2_7 ) |
| 955 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
| 956 |
-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. |
| 957 |
-# See https://git-scm.com/docs/gitworkflows#_graduation |
| 958 |
-# In order of stability: |
| 959 |
-# 9999-r0: maint |
| 960 |
-# 9999-r1: master |
| 961 |
-# 9999-r2: next |
| 962 |
-# 9999-r3: pu |
| 963 |
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" |
| 964 |
-EGIT_BRANCH=maint |
| 965 |
-PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN" |
| 966 |
- |
| 967 |
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 968 |
- |
| 969 |
-MY_PV="${PV/_rc/.rc}" |
| 970 |
-MY_P="${PN}-${MY_PV}" |
| 971 |
- |
| 972 |
-DOC_VER=${MY_PV} |
| 973 |
- |
| 974 |
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" |
| 975 |
-HOMEPAGE="http://www.git-scm.com/" |
| 976 |
-if [[ ${PV} != *9999 ]]; then |
| 977 |
- SRC_URI_SUFFIX="xz" |
| 978 |
- SRC_URI_KORG="mirror://kernel/software/scm/git" |
| 979 |
- SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} |
| 980 |
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 981 |
- doc? ( |
| 982 |
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 983 |
- )" |
| 984 |
- KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 985 |
-fi |
| 986 |
- |
| 987 |
-LICENSE="GPL-2" |
| 988 |
-SLOT="0" |
| 989 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 990 |
- |
| 991 |
-# Common to both DEPEND and RDEPEND |
| 992 |
-CDEPEND=" |
| 993 |
- !libressl? ( dev-libs/openssl:0= ) |
| 994 |
- libressl? ( dev-libs/libressl:= ) |
| 995 |
- sys-libs/zlib |
| 996 |
- pcre? ( dev-libs/libpcre ) |
| 997 |
- perl? ( dev-lang/perl:=[-build(-)] ) |
| 998 |
- tk? ( dev-lang/tk:0= ) |
| 999 |
- curl? ( |
| 1000 |
- net-misc/curl |
| 1001 |
- webdav? ( dev-libs/expat ) |
| 1002 |
- ) |
| 1003 |
- emacs? ( virtual/emacs ) |
| 1004 |
- gnome-keyring? ( gnome-base/libgnome-keyring )" |
| 1005 |
- |
| 1006 |
-RDEPEND="${CDEPEND} |
| 1007 |
- gpg? ( app-crypt/gnupg ) |
| 1008 |
- mediawiki? ( |
| 1009 |
- dev-perl/DateTime-Format-ISO8601 |
| 1010 |
- dev-perl/HTML-Tree |
| 1011 |
- dev-perl/MediaWiki-API |
| 1012 |
- ) |
| 1013 |
- perl? ( dev-perl/Error |
| 1014 |
- dev-perl/Net-SMTP-SSL |
| 1015 |
- dev-perl/Authen-SASL |
| 1016 |
- cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) |
| 1017 |
- cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) |
| 1018 |
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) |
| 1019 |
- ) |
| 1020 |
- python? ( gtk? |
| 1021 |
- ( |
| 1022 |
- >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] |
| 1023 |
- >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] |
| 1024 |
- ) |
| 1025 |
- ${PYTHON_DEPS} )" |
| 1026 |
- |
| 1027 |
-# This is how info docs are created with Git: |
| 1028 |
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook |
| 1029 |
-# .xml/docbook --(docbook2texi.pl)--> .texi |
| 1030 |
-# .texi --(makeinfo)---------> .info |
| 1031 |
-DEPEND="${CDEPEND} |
| 1032 |
- doc? ( |
| 1033 |
- app-text/asciidoc |
| 1034 |
- app-text/docbook2X |
| 1035 |
- sys-apps/texinfo |
| 1036 |
- app-text/xmlto |
| 1037 |
- ) |
| 1038 |
- nls? ( sys-devel/gettext ) |
| 1039 |
- test? ( app-crypt/gnupg )" |
| 1040 |
- |
| 1041 |
-# Live ebuild builds man pages and HTML docs, additionally |
| 1042 |
-if [[ ${PV} == *9999 ]]; then |
| 1043 |
- DEPEND="${DEPEND} |
| 1044 |
- app-text/asciidoc" |
| 1045 |
-fi |
| 1046 |
- |
| 1047 |
-SITEFILE=50${PN}-gentoo.el |
| 1048 |
-S="${WORKDIR}/${MY_P}" |
| 1049 |
- |
| 1050 |
-REQUIRED_USE=" |
| 1051 |
- cgi? ( perl ) |
| 1052 |
- cvs? ( perl ) |
| 1053 |
- mediawiki? ( perl ) |
| 1054 |
- mediawiki-experimental? ( mediawiki ) |
| 1055 |
- subversion? ( perl ) |
| 1056 |
- webdav? ( curl ) |
| 1057 |
- gtk? ( python ) |
| 1058 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
| 1059 |
-" |
| 1060 |
- |
| 1061 |
-PATCHES=( |
| 1062 |
- # bug #350330 - automagic CVS when we don't want it is bad. |
| 1063 |
- "${FILESDIR}"/git-2.10.0-optional-cvs.patch |
| 1064 |
- |
| 1065 |
- # install mediawiki perl modules also in vendor_dir |
| 1066 |
- # hack, needs better upstream solution |
| 1067 |
- "${FILESDIR}"/git-1.8.5-mw-vendor.patch |
| 1068 |
- |
| 1069 |
- "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch |
| 1070 |
- |
| 1071 |
- # Bug #493306, where FreeBSD 10.x merged libiconv into its libc. |
| 1072 |
- "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch |
| 1073 |
-) |
| 1074 |
- |
| 1075 |
-pkg_setup() { |
| 1076 |
- if use subversion && has_version "dev-vcs/subversion[dso]"; then |
| 1077 |
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
| 1078 |
- ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
| 1079 |
- ewarn "have been warned." |
| 1080 |
- fi |
| 1081 |
- if use python ; then |
| 1082 |
- python-single-r1_pkg_setup |
| 1083 |
- fi |
| 1084 |
-} |
| 1085 |
- |
| 1086 |
-# This is needed because for some obscure reasons future calls to make don't |
| 1087 |
-# pick up these exports if we export them in src_unpack() |
| 1088 |
-exportmakeopts() { |
| 1089 |
- local myopts |
| 1090 |
- |
| 1091 |
- if use blksha1 ; then |
| 1092 |
- myopts+=" BLK_SHA1=YesPlease" |
| 1093 |
- elif use ppcsha1 ; then |
| 1094 |
- myopts+=" PPC_SHA1=YesPlease" |
| 1095 |
- fi |
| 1096 |
- |
| 1097 |
- if use curl ; then |
| 1098 |
- use webdav || myopts+=" NO_EXPAT=YesPlease" |
| 1099 |
- else |
| 1100 |
- myopts+=" NO_CURL=YesPlease" |
| 1101 |
- fi |
| 1102 |
- |
| 1103 |
- # broken assumptions, because of broken build system ... |
| 1104 |
- myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
| 1105 |
- myopts+=" INSTALL=install TAR=tar" |
| 1106 |
- myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" |
| 1107 |
- myopts+=" SANE_TOOL_PATH=" |
| 1108 |
- myopts+=" OLD_ICONV=" |
| 1109 |
- myopts+=" NO_EXTERNAL_GREP=" |
| 1110 |
- |
| 1111 |
- # For svn-fe |
| 1112 |
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" |
| 1113 |
- |
| 1114 |
- # can't define this to null, since the entire makefile depends on it |
| 1115 |
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile |
| 1116 |
- |
| 1117 |
- use iconv \ |
| 1118 |
- || myopts+=" NO_ICONV=YesPlease" |
| 1119 |
- use nls \ |
| 1120 |
- || myopts+=" NO_GETTEXT=YesPlease" |
| 1121 |
- use tk \ |
| 1122 |
- || myopts+=" NO_TCLTK=YesPlease" |
| 1123 |
- use pcre \ |
| 1124 |
- && myopts+=" USE_LIBPCRE=yes" \ |
| 1125 |
- && extlibs+=" -lpcre" |
| 1126 |
- use perl \ |
| 1127 |
- && myopts+=" INSTALLDIRS=vendor" \ |
| 1128 |
- || myopts+=" NO_PERL=YesPlease" |
| 1129 |
- use python \ |
| 1130 |
- || myopts+=" NO_PYTHON=YesPlease" |
| 1131 |
- use subversion \ |
| 1132 |
- || myopts+=" NO_SVN_TESTS=YesPlease" |
| 1133 |
- use threads \ |
| 1134 |
- && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ |
| 1135 |
- || myopts+=" NO_PTHREADS=YesPlease" |
| 1136 |
- use cvs \ |
| 1137 |
- || myopts+=" NO_CVS=YesPlease" |
| 1138 |
- use elibc_glibc \ |
| 1139 |
- || myopts+=" NO_REGEX=YesPlease" |
| 1140 |
-# Disabled until ~m68k-mint can be keyworded again |
| 1141 |
-# if [[ ${CHOST} == *-mint* ]] ; then |
| 1142 |
-# myopts+=" NO_MMAP=YesPlease" |
| 1143 |
-# myopts+=" NO_IPV6=YesPlease" |
| 1144 |
-# myopts+=" NO_STRLCPY=YesPlease" |
| 1145 |
-# myopts+=" NO_MEMMEM=YesPlease" |
| 1146 |
-# myopts+=" NO_MKDTEMP=YesPlease" |
| 1147 |
-# myopts+=" NO_MKSTEMPS=YesPlease" |
| 1148 |
-# fi |
| 1149 |
- if [[ ${CHOST} == ia64-*-hpux* ]]; then |
| 1150 |
- myopts+=" NO_NSEC=YesPlease" |
| 1151 |
- fi |
| 1152 |
- if [[ ${CHOST} == *-*-aix* ]]; then |
| 1153 |
- myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" |
| 1154 |
- fi |
| 1155 |
- if [[ ${CHOST} == *-solaris* ]]; then |
| 1156 |
- myopts+=" NEEDS_LIBICONV=YesPlease" |
| 1157 |
- myopts+=" HAVE_CLOCK_MONOTONIC=1" |
| 1158 |
- myopts+=" HAVE_GETDELIM=1" |
| 1159 |
- fi |
| 1160 |
- |
| 1161 |
- has_version '>=app-text/asciidoc-8.0' \ |
| 1162 |
- && myopts+=" ASCIIDOC8=YesPlease" |
| 1163 |
- myopts+=" ASCIIDOC_NO_ROFF=YesPlease" |
| 1164 |
- |
| 1165 |
- # Bug 290465: |
| 1166 |
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' |
| 1167 |
- [[ "${CHOST}" == *-uclibc* ]] && \ |
| 1168 |
- myopts+=" NO_NSEC=YesPlease" |
| 1169 |
- |
| 1170 |
- export MY_MAKEOPTS="${myopts}" |
| 1171 |
- export EXTLIBS="${extlibs}" |
| 1172 |
-} |
| 1173 |
- |
| 1174 |
-src_unpack() { |
| 1175 |
- if [[ ${PV} != *9999 ]]; then |
| 1176 |
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX} |
| 1177 |
- cd "${S}" |
| 1178 |
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 1179 |
- use doc && \ |
| 1180 |
- cd "${S}"/Documentation && \ |
| 1181 |
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 1182 |
- cd "${S}" |
| 1183 |
- else |
| 1184 |
- git-r3_src_unpack |
| 1185 |
- cd "${S}" |
| 1186 |
- #cp "${FILESDIR}"/GIT-VERSION-GEN . |
| 1187 |
- fi |
| 1188 |
- |
| 1189 |
-} |
| 1190 |
- |
| 1191 |
-src_prepare() { |
| 1192 |
- # add experimental patches to improve mediawiki support |
| 1193 |
- # see patches for origin |
| 1194 |
- if use mediawiki-experimental ; then |
| 1195 |
- PATCHES+=( |
| 1196 |
- "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch |
| 1197 |
- "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch |
| 1198 |
- "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch |
| 1199 |
- ) |
| 1200 |
- fi |
| 1201 |
- |
| 1202 |
- default |
| 1203 |
- |
| 1204 |
- sed -i \ |
| 1205 |
- -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
| 1206 |
- -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ |
| 1207 |
- -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ |
| 1208 |
- -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ |
| 1209 |
- -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ |
| 1210 |
- -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ |
| 1211 |
- Makefile contrib/svn-fe/Makefile || die "sed failed" |
| 1212 |
- |
| 1213 |
- # Never install the private copy of Error.pm (bug #296310) |
| 1214 |
- sed -i \ |
| 1215 |
- -e '/private-Error.pm/s,^,#,' \ |
| 1216 |
- perl/Makefile.PL |
| 1217 |
- |
| 1218 |
- # Fix docbook2texi command |
| 1219 |
- sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ |
| 1220 |
- Documentation/Makefile || die "sed failed" |
| 1221 |
- |
| 1222 |
- # Fix git-subtree missing DESTDIR |
| 1223 |
- sed -i \ |
| 1224 |
- -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ |
| 1225 |
- -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ |
| 1226 |
- contrib/subtree/Makefile |
| 1227 |
-} |
| 1228 |
- |
| 1229 |
-git_emake() { |
| 1230 |
- # bug #326625: PERL_PATH, PERL_MM_OPT |
| 1231 |
- # bug #320647: PYTHON_PATH |
| 1232 |
- PYTHON_PATH="" |
| 1233 |
- use python && PYTHON_PATH="${PYTHON}" |
| 1234 |
- emake ${MY_MAKEOPTS} \ |
| 1235 |
- DESTDIR="${D}" \ |
| 1236 |
- OPTCFLAGS="${CFLAGS}" \ |
| 1237 |
- OPTLDFLAGS="${LDFLAGS}" \ |
| 1238 |
- OPTCC="$(tc-getCC)" \ |
| 1239 |
- OPTAR="$(tc-getAR)" \ |
| 1240 |
- prefix="${EPREFIX}"/usr \ |
| 1241 |
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
| 1242 |
- sysconfdir="${EPREFIX}"/etc \ |
| 1243 |
- PYTHON_PATH="${PYTHON_PATH}" \ |
| 1244 |
- PERL_MM_OPT="" \ |
| 1245 |
- GIT_TEST_OPTS="--no-color" \ |
| 1246 |
- V=1 \ |
| 1247 |
- "$@" |
| 1248 |
- # This is the fix for bug #326625, but it also causes breakage, see bug |
| 1249 |
- # #352693. |
| 1250 |
- # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ |
| 1251 |
-} |
| 1252 |
- |
| 1253 |
-src_configure() { |
| 1254 |
- exportmakeopts |
| 1255 |
-} |
| 1256 |
- |
| 1257 |
-src_compile() { |
| 1258 |
- if use perl ; then |
| 1259 |
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" |
| 1260 |
- git_emake perl/perl.mak || die "emake perl/perl.mak failed" |
| 1261 |
- fi |
| 1262 |
- git_emake || die "emake failed" |
| 1263 |
- |
| 1264 |
- if use emacs ; then |
| 1265 |
- elisp-compile contrib/emacs/git{,-blame}.el |
| 1266 |
- fi |
| 1267 |
- |
| 1268 |
- if use perl && use cgi ; then |
| 1269 |
- git_emake \ |
| 1270 |
- gitweb \ |
| 1271 |
- || die "emake gitweb (cgi) failed" |
| 1272 |
- fi |
| 1273 |
- |
| 1274 |
- if [[ ${CHOST} == *-darwin* ]]; then |
| 1275 |
- cd "${S}"/contrib/credential/osxkeychain || die |
| 1276 |
- git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ |
| 1277 |
- || die "emake credential-osxkeychain" |
| 1278 |
- fi |
| 1279 |
- |
| 1280 |
- cd "${S}"/Documentation |
| 1281 |
- if [[ ${PV} == *9999 ]] ; then |
| 1282 |
- git_emake man \ |
| 1283 |
- || die "emake man failed" |
| 1284 |
- if use doc ; then |
| 1285 |
- git_emake info html \ |
| 1286 |
- || die "emake info html failed" |
| 1287 |
- fi |
| 1288 |
- else |
| 1289 |
- if use doc ; then |
| 1290 |
- git_emake info \ |
| 1291 |
- || die "emake info html failed" |
| 1292 |
- fi |
| 1293 |
- fi |
| 1294 |
- |
| 1295 |
- if use subversion ; then |
| 1296 |
- cd "${S}"/contrib/svn-fe |
| 1297 |
- # by defining EXTLIBS we override the detection for libintl and |
| 1298 |
- # libiconv, bug #516168 |
| 1299 |
- local nlsiconv= |
| 1300 |
- use nls && use !elibc_glibc && nlsiconv+=" -lintl" |
| 1301 |
- use iconv && use !elibc_glibc && nlsiconv+=" -liconv" |
| 1302 |
- git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" |
| 1303 |
- if use doc ; then |
| 1304 |
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" |
| 1305 |
- fi |
| 1306 |
- cd "${S}" |
| 1307 |
- fi |
| 1308 |
- |
| 1309 |
- if use gnome-keyring ; then |
| 1310 |
- cd "${S}"/contrib/credential/gnome-keyring |
| 1311 |
- git_emake || die "emake git-credential-gnome-keyring failed" |
| 1312 |
- fi |
| 1313 |
- |
| 1314 |
- cd "${S}"/contrib/subtree |
| 1315 |
- git_emake |
| 1316 |
- use doc && git_emake doc |
| 1317 |
- |
| 1318 |
- if use mediawiki ; then |
| 1319 |
- cd "${S}"/contrib/mw-to-git |
| 1320 |
- git_emake |
| 1321 |
- fi |
| 1322 |
-} |
| 1323 |
- |
| 1324 |
-src_install() { |
| 1325 |
- git_emake \ |
| 1326 |
- install || \ |
| 1327 |
- die "make install failed" |
| 1328 |
- |
| 1329 |
- if [[ ${CHOST} == *-darwin* ]]; then |
| 1330 |
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain |
| 1331 |
- fi |
| 1332 |
- |
| 1333 |
- # Depending on the tarball and manual rebuild of the documentation, the |
| 1334 |
- # manpages may exist in either OR both of these directories. |
| 1335 |
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] |
| 1336 |
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
| 1337 |
- dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} |
| 1338 |
- use doc && dodir /usr/share/doc/${PF}/html |
| 1339 |
- for d in / /howto/ /technical/ ; do |
| 1340 |
- docinto ${d} |
| 1341 |
- dodoc Documentation${d}*.txt |
| 1342 |
- if use doc ; then |
| 1343 |
- docinto ${d}/html |
| 1344 |
- dodoc Documentation${d}*.html |
| 1345 |
- fi |
| 1346 |
- done |
| 1347 |
- docinto / |
| 1348 |
- # Upstream does not ship this pre-built :-( |
| 1349 |
- use doc && doinfo Documentation/{git,gitman}.info |
| 1350 |
- |
| 1351 |
- newbashcomp contrib/completion/git-completion.bash ${PN} |
| 1352 |
- bashcomp_alias git gitk |
| 1353 |
- # Not really a bash-completion file (bug #477920) |
| 1354 |
- # but still needed uncompressed (bug #507480) |
| 1355 |
- insinto /usr/share/${PN} |
| 1356 |
- doins contrib/completion/git-prompt.sh |
| 1357 |
- |
| 1358 |
- if use emacs ; then |
| 1359 |
- elisp-install ${PN} contrib/emacs/git.{el,elc} |
| 1360 |
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc} |
| 1361 |
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} |
| 1362 |
- # don't add automatically to the load-path, so the sitefile |
| 1363 |
- # can do a conditional loading |
| 1364 |
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch" |
| 1365 |
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
| 1366 |
- fi |
| 1367 |
- |
| 1368 |
- if use python && use gtk ; then |
| 1369 |
- python_doscript "${S}"/contrib/gitview/gitview |
| 1370 |
- dodoc "${S}"/contrib/gitview/gitview.txt |
| 1371 |
- fi |
| 1372 |
- |
| 1373 |
- #dobin contrib/fast-import/git-p4 # Moved upstream |
| 1374 |
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream |
| 1375 |
- newbin contrib/fast-import/import-tars.perl import-tars |
| 1376 |
- exeinto /usr/libexec/git-core/ |
| 1377 |
- newexe contrib/git-resurrect.sh git-resurrect |
| 1378 |
- |
| 1379 |
- # git-subtree |
| 1380 |
- cd "${S}"/contrib/subtree |
| 1381 |
- git_emake install || die "Failed to emake install git-subtree" |
| 1382 |
- if use doc ; then |
| 1383 |
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" |
| 1384 |
- fi |
| 1385 |
- newdoc README README.git-subtree |
| 1386 |
- dodoc git-subtree.txt |
| 1387 |
- cd "${S}" |
| 1388 |
- |
| 1389 |
- if use mediawiki ; then |
| 1390 |
- cd "${S}"/contrib/mw-to-git |
| 1391 |
- git_emake install |
| 1392 |
- cd "${S}" |
| 1393 |
- fi |
| 1394 |
- |
| 1395 |
- # diff-highlight |
| 1396 |
- dobin contrib/diff-highlight/diff-highlight |
| 1397 |
- newdoc contrib/diff-highlight/README README.diff-highlight |
| 1398 |
- |
| 1399 |
- # git-jump |
| 1400 |
- exeinto /usr/libexec/git-core/ |
| 1401 |
- doexe contrib/git-jump/git-jump |
| 1402 |
- newdoc contrib/git-jump/README git-jump.txt |
| 1403 |
- |
| 1404 |
- # git-contacts |
| 1405 |
- exeinto /usr/libexec/git-core/ |
| 1406 |
- doexe contrib/contacts/git-contacts |
| 1407 |
- dodoc contrib/contacts/git-contacts.txt |
| 1408 |
- |
| 1409 |
- if use gnome-keyring ; then |
| 1410 |
- cd "${S}"/contrib/credential/gnome-keyring |
| 1411 |
- dobin git-credential-gnome-keyring |
| 1412 |
- fi |
| 1413 |
- |
| 1414 |
- if use subversion ; then |
| 1415 |
- cd "${S}"/contrib/svn-fe |
| 1416 |
- dobin svn-fe |
| 1417 |
- dodoc svn-fe.txt |
| 1418 |
- if use doc ; then |
| 1419 |
- doman svn-fe.1 |
| 1420 |
- docinto html |
| 1421 |
- dodoc svn-fe.html |
| 1422 |
- fi |
| 1423 |
- cd "${S}" |
| 1424 |
- fi |
| 1425 |
- |
| 1426 |
- dodir /usr/share/${PN}/contrib |
| 1427 |
- # The following are excluded: |
| 1428 |
- # completion - installed above |
| 1429 |
- # credential/gnome-keyring TODO |
| 1430 |
- # diff-highlight - done above |
| 1431 |
- # emacs - installed above |
| 1432 |
- # examples - these are stuff that is not used in Git anymore actually |
| 1433 |
- # git-jump - done above |
| 1434 |
- # gitview - installed above |
| 1435 |
- # p4import - excluded because fast-import has a better one |
| 1436 |
- # patches - stuff the Git guys made to go upstream to other places |
| 1437 |
- # persistent-https - TODO |
| 1438 |
- # mw-to-git - TODO |
| 1439 |
- # subtree - build seperately |
| 1440 |
- # svnimport - use git-svn |
| 1441 |
- # thunderbird-patch-inline - fixes thunderbird |
| 1442 |
- for i in \ |
| 1443 |
- buildsystems convert-objects fast-import \ |
| 1444 |
- hg-to-git hooks remotes2config.sh rerere-train.sh \ |
| 1445 |
- stats workdir \ |
| 1446 |
- ; do |
| 1447 |
- cp -rf \ |
| 1448 |
- "${S}"/contrib/${i} \ |
| 1449 |
- "${ED}"/usr/share/${PN}/contrib \ |
| 1450 |
- || die "Failed contrib ${i}" |
| 1451 |
- done |
| 1452 |
- |
| 1453 |
- if use perl && use cgi ; then |
| 1454 |
- # We used to install in /usr/share/${PN}/gitweb |
| 1455 |
- # but upstream installs in /usr/share/gitweb |
| 1456 |
- # so we will install a symlink and use their location for compat with other |
| 1457 |
- # distros |
| 1458 |
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb |
| 1459 |
- |
| 1460 |
- # INSTALL discusses configuration issues, not just installation |
| 1461 |
- docinto / |
| 1462 |
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb |
| 1463 |
- newdoc "${S}"/gitweb/README README.gitweb |
| 1464 |
- |
| 1465 |
- find "${ED}"/usr/lib64/perl5/ \ |
| 1466 |
- -name .packlist \ |
| 1467 |
- -exec rm \{\} \; |
| 1468 |
- else |
| 1469 |
- rm -rf "${ED}"/usr/share/gitweb |
| 1470 |
- fi |
| 1471 |
- |
| 1472 |
- if ! use subversion ; then |
| 1473 |
- rm -f "${ED}"/usr/libexec/git-core/git-svn \ |
| 1474 |
- "${ED}"/usr/share/man/man1/git-svn.1* |
| 1475 |
- fi |
| 1476 |
- |
| 1477 |
- if use xinetd ; then |
| 1478 |
- insinto /etc/xinetd.d |
| 1479 |
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
| 1480 |
- fi |
| 1481 |
- |
| 1482 |
- if use !prefix ; then |
| 1483 |
- newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon |
| 1484 |
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
| 1485 |
- systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service" |
| 1486 |
- systemd_dounit "${FILESDIR}/git-daemon.socket" |
| 1487 |
- fi |
| 1488 |
- |
| 1489 |
- perl_delete_localpod |
| 1490 |
- |
| 1491 |
- # Remove disabled linguas |
| 1492 |
- # we could remove sources in src_prepare, but install does not |
| 1493 |
- # handle missing locale dir well |
| 1494 |
- rm_loc() { |
| 1495 |
- if [[ -e "${ED}/usr/share/locale/${1}" ]]; then |
| 1496 |
- rm -r "${ED}/usr/share/locale/${1}" || die |
| 1497 |
- fi |
| 1498 |
- } |
| 1499 |
- l10n_for_each_disabled_locale_do rm_loc |
| 1500 |
-} |
| 1501 |
- |
| 1502 |
-src_test() { |
| 1503 |
- local disabled="" |
| 1504 |
- local tests_cvs="t9200-git-cvsexportcommit.sh \ |
| 1505 |
- t9400-git-cvsserver-server.sh \ |
| 1506 |
- t9401-git-cvsserver-crlf.sh \ |
| 1507 |
- t9402-git-cvsserver-refs.sh \ |
| 1508 |
- t9600-cvsimport.sh \ |
| 1509 |
- t9601-cvsimport-vendor-branch.sh \ |
| 1510 |
- t9602-cvsimport-branches-tags.sh \ |
| 1511 |
- t9603-cvsimport-patchsets.sh \ |
| 1512 |
- t9604-cvsimport-timestamps.sh" |
| 1513 |
- local tests_perl="t3701-add-interactive.sh \ |
| 1514 |
- t5502-quickfetch.sh \ |
| 1515 |
- t5512-ls-remote.sh \ |
| 1516 |
- t5520-pull.sh \ |
| 1517 |
- t7106-reset-unborn-branch.sh \ |
| 1518 |
- t7501-commit.sh" |
| 1519 |
- # Bug #225601 - t0004 is not suitable for root perm |
| 1520 |
- # Bug #219839 - t1004 is not suitable for root perm |
| 1521 |
- # t0001-init.sh - check for init notices EPERM* fails |
| 1522 |
- local tests_nonroot="t0001-init.sh \ |
| 1523 |
- t0004-unwritable.sh \ |
| 1524 |
- t0070-fundamental.sh \ |
| 1525 |
- t1004-read-tree-m-u-wf.sh \ |
| 1526 |
- t3700-add.sh \ |
| 1527 |
- t7300-clean.sh" |
| 1528 |
- # t9100 still fails with symlinks in SVN 1.7 |
| 1529 |
- local test_svn="t9100-git-svn-basic.sh" |
| 1530 |
- |
| 1531 |
- # Unzip is used only for the testcase code, not by any normal parts of Git. |
| 1532 |
- if ! has_version app-arch/unzip ; then |
| 1533 |
- einfo "Disabling tar-tree tests" |
| 1534 |
- disabled="${disabled} t5000-tar-tree.sh" |
| 1535 |
- fi |
| 1536 |
- |
| 1537 |
- cvs=0 |
| 1538 |
- use cvs && let cvs=$cvs+1 |
| 1539 |
- if [[ ${EUID} -eq 0 ]]; then |
| 1540 |
- if [[ $cvs -eq 1 ]]; then |
| 1541 |
- ewarn "Skipping CVS tests because CVS does not work as root!" |
| 1542 |
- ewarn "You should retest with FEATURES=userpriv!" |
| 1543 |
- disabled="${disabled} ${tests_cvs}" |
| 1544 |
- fi |
| 1545 |
- einfo "Skipping other tests that require being non-root" |
| 1546 |
- disabled="${disabled} ${tests_nonroot}" |
| 1547 |
- else |
| 1548 |
- [[ $cvs -gt 0 ]] && \ |
| 1549 |
- has_version dev-vcs/cvs && \ |
| 1550 |
- let cvs=$cvs+1 |
| 1551 |
- [[ $cvs -gt 1 ]] && \ |
| 1552 |
- has_version "dev-vcs/cvs[server]" && \ |
| 1553 |
- let cvs=$cvs+1 |
| 1554 |
- if [[ $cvs -lt 3 ]]; then |
| 1555 |
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" |
| 1556 |
- disabled="${disabled} ${tests_cvs}" |
| 1557 |
- fi |
| 1558 |
- fi |
| 1559 |
- |
| 1560 |
- if ! use perl ; then |
| 1561 |
- einfo "Disabling tests that need Perl" |
| 1562 |
- disabled="${disabled} ${tests_perl}" |
| 1563 |
- fi |
| 1564 |
- |
| 1565 |
- einfo "Disabling tests that fail with SVN 1.7" |
| 1566 |
- disabled="${disabled} ${test_svn}" |
| 1567 |
- |
| 1568 |
- # Reset all previously disabled tests |
| 1569 |
- cd "${S}/t" |
| 1570 |
- for i in *.sh.DISABLED ; do |
| 1571 |
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" |
| 1572 |
- done |
| 1573 |
- einfo "Disabled tests:" |
| 1574 |
- for i in ${disabled} ; do |
| 1575 |
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" |
| 1576 |
- done |
| 1577 |
- |
| 1578 |
- # Avoid the test system removing the results because we want them ourselves |
| 1579 |
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ |
| 1580 |
- -i "${S}"/t/Makefile |
| 1581 |
- |
| 1582 |
- # Clean old results first, must always run |
| 1583 |
- cd "${S}/t" |
| 1584 |
- nonfatal git_emake clean |
| 1585 |
- |
| 1586 |
- # Now run the tests, keep going if we hit an error, and don't terminate on |
| 1587 |
- # failure |
| 1588 |
- cd "${S}" |
| 1589 |
- einfo "Start test run" |
| 1590 |
- #MAKEOPTS=-j1 |
| 1591 |
- nonfatal git_emake --keep-going test |
| 1592 |
- rc=$? |
| 1593 |
- |
| 1594 |
- # Display nice results, now print the results |
| 1595 |
- cd "${S}/t" |
| 1596 |
- nonfatal git_emake aggregate-results |
| 1597 |
- |
| 1598 |
- # And bail if there was a problem |
| 1599 |
- [ $rc -eq 0 ] || die "tests failed. Please file a bug." |
| 1600 |
-} |
| 1601 |
- |
| 1602 |
-showpkgdeps() { |
| 1603 |
- local pkg=$1 |
| 1604 |
- shift |
| 1605 |
- elog " $(printf "%-17s:" ${pkg}) ${@}" |
| 1606 |
-} |
| 1607 |
- |
| 1608 |
-pkg_postinst() { |
| 1609 |
- use emacs && elisp-site-regen |
| 1610 |
- einfo "Please read /usr/share/bash-completion/git for Git bash command completion" |
| 1611 |
- einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" |
| 1612 |
- einfo "Note that the prompt bash code is now in that separate script" |
| 1613 |
- elog "These additional scripts need some dependencies:" |
| 1614 |
- echo |
| 1615 |
- showpkgdeps git-quiltimport "dev-util/quilt" |
| 1616 |
- showpkgdeps git-instaweb \ |
| 1617 |
- "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" |
| 1618 |
- echo |
| 1619 |
- use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." |
| 1620 |
-} |
| 1621 |
- |
| 1622 |
-pkg_postrm() { |
| 1623 |
- use emacs && elisp-site-regen |
| 1624 |
-} |
| 1625 |
|
| 1626 |
diff --git a/dev-vcs/git/git-2.11.0.ebuild b/dev-vcs/git/git-2.11.0.ebuild |
| 1627 |
deleted file mode 100644 |
| 1628 |
index ad9d188..0000000 |
| 1629 |
--- a/dev-vcs/git/git-2.11.0.ebuild |
| 1630 |
+++ /dev/null |
| 1631 |
@@ -1,681 +0,0 @@ |
| 1632 |
-# Copyright 1999-2016 Gentoo Foundation |
| 1633 |
-# Distributed under the terms of the GNU General Public License v2 |
| 1634 |
-# $Id$ |
| 1635 |
- |
| 1636 |
-EAPI=6 |
| 1637 |
- |
| 1638 |
-GENTOO_DEPEND_ON_PERL=no |
| 1639 |
- |
| 1640 |
-# bug #329479: git-remote-testgit is not multiple-version aware |
| 1641 |
-PYTHON_COMPAT=( python2_7 ) |
| 1642 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
| 1643 |
-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. |
| 1644 |
-# See https://git-scm.com/docs/gitworkflows#_graduation |
| 1645 |
-# In order of stability: |
| 1646 |
-# 9999-r0: maint |
| 1647 |
-# 9999-r1: master |
| 1648 |
-# 9999-r2: next |
| 1649 |
-# 9999-r3: pu |
| 1650 |
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" |
| 1651 |
-EGIT_BRANCH=maint |
| 1652 |
-PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN" |
| 1653 |
- |
| 1654 |
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 1655 |
- |
| 1656 |
-MY_PV="${PV/_rc/.rc}" |
| 1657 |
-MY_P="${PN}-${MY_PV}" |
| 1658 |
- |
| 1659 |
-DOC_VER=${MY_PV} |
| 1660 |
- |
| 1661 |
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" |
| 1662 |
-HOMEPAGE="http://www.git-scm.com/" |
| 1663 |
-if [[ ${PV} != *9999 ]]; then |
| 1664 |
- SRC_URI_SUFFIX="xz" |
| 1665 |
- SRC_URI_KORG="mirror://kernel/software/scm/git" |
| 1666 |
- [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' |
| 1667 |
- SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} |
| 1668 |
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 1669 |
- doc? ( |
| 1670 |
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 1671 |
- )" |
| 1672 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 1673 |
-fi |
| 1674 |
- |
| 1675 |
-LICENSE="GPL-2" |
| 1676 |
-SLOT="0" |
| 1677 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 1678 |
- |
| 1679 |
-# Common to both DEPEND and RDEPEND |
| 1680 |
-CDEPEND=" |
| 1681 |
- !libressl? ( dev-libs/openssl:0= ) |
| 1682 |
- libressl? ( dev-libs/libressl:= ) |
| 1683 |
- sys-libs/zlib |
| 1684 |
- pcre? ( dev-libs/libpcre ) |
| 1685 |
- perl? ( dev-lang/perl:=[-build(-)] ) |
| 1686 |
- tk? ( dev-lang/tk:0= ) |
| 1687 |
- curl? ( |
| 1688 |
- net-misc/curl |
| 1689 |
- webdav? ( dev-libs/expat ) |
| 1690 |
- ) |
| 1691 |
- emacs? ( virtual/emacs ) |
| 1692 |
- gnome-keyring? ( gnome-base/libgnome-keyring )" |
| 1693 |
- |
| 1694 |
-RDEPEND="${CDEPEND} |
| 1695 |
- gpg? ( app-crypt/gnupg ) |
| 1696 |
- mediawiki? ( |
| 1697 |
- dev-perl/DateTime-Format-ISO8601 |
| 1698 |
- dev-perl/HTML-Tree |
| 1699 |
- dev-perl/MediaWiki-API |
| 1700 |
- ) |
| 1701 |
- perl? ( dev-perl/Error |
| 1702 |
- dev-perl/Net-SMTP-SSL |
| 1703 |
- dev-perl/Authen-SASL |
| 1704 |
- cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) |
| 1705 |
- cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) |
| 1706 |
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) |
| 1707 |
- ) |
| 1708 |
- python? ( gtk? |
| 1709 |
- ( |
| 1710 |
- >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] |
| 1711 |
- >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] |
| 1712 |
- ) |
| 1713 |
- ${PYTHON_DEPS} )" |
| 1714 |
- |
| 1715 |
-# This is how info docs are created with Git: |
| 1716 |
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook |
| 1717 |
-# .xml/docbook --(docbook2texi.pl)--> .texi |
| 1718 |
-# .texi --(makeinfo)---------> .info |
| 1719 |
-DEPEND="${CDEPEND} |
| 1720 |
- doc? ( |
| 1721 |
- app-text/asciidoc |
| 1722 |
- app-text/docbook2X |
| 1723 |
- sys-apps/texinfo |
| 1724 |
- app-text/xmlto |
| 1725 |
- ) |
| 1726 |
- nls? ( sys-devel/gettext ) |
| 1727 |
- test? ( app-crypt/gnupg )" |
| 1728 |
- |
| 1729 |
-# Live ebuild builds man pages and HTML docs, additionally |
| 1730 |
-if [[ ${PV} == *9999 ]]; then |
| 1731 |
- DEPEND="${DEPEND} |
| 1732 |
- app-text/asciidoc" |
| 1733 |
-fi |
| 1734 |
- |
| 1735 |
-SITEFILE=50${PN}-gentoo.el |
| 1736 |
-S="${WORKDIR}/${MY_P}" |
| 1737 |
- |
| 1738 |
-REQUIRED_USE=" |
| 1739 |
- cgi? ( perl ) |
| 1740 |
- cvs? ( perl ) |
| 1741 |
- mediawiki? ( perl ) |
| 1742 |
- mediawiki-experimental? ( mediawiki ) |
| 1743 |
- subversion? ( perl ) |
| 1744 |
- webdav? ( curl ) |
| 1745 |
- gtk? ( python ) |
| 1746 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
| 1747 |
-" |
| 1748 |
- |
| 1749 |
-PATCHES=( |
| 1750 |
- # bug #350330 - automagic CVS when we don't want it is bad. |
| 1751 |
- "${FILESDIR}"/git-2.10.0-optional-cvs.patch |
| 1752 |
- |
| 1753 |
- # install mediawiki perl modules also in vendor_dir |
| 1754 |
- # hack, needs better upstream solution |
| 1755 |
- "${FILESDIR}"/git-1.8.5-mw-vendor.patch |
| 1756 |
- |
| 1757 |
- "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch |
| 1758 |
- |
| 1759 |
- # Bug #493306, where FreeBSD 10.x merged libiconv into its libc. |
| 1760 |
- "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch |
| 1761 |
-) |
| 1762 |
- |
| 1763 |
-pkg_setup() { |
| 1764 |
- if use subversion && has_version "dev-vcs/subversion[dso]"; then |
| 1765 |
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
| 1766 |
- ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
| 1767 |
- ewarn "have been warned." |
| 1768 |
- fi |
| 1769 |
- if use python ; then |
| 1770 |
- python-single-r1_pkg_setup |
| 1771 |
- fi |
| 1772 |
-} |
| 1773 |
- |
| 1774 |
-# This is needed because for some obscure reasons future calls to make don't |
| 1775 |
-# pick up these exports if we export them in src_unpack() |
| 1776 |
-exportmakeopts() { |
| 1777 |
- local myopts |
| 1778 |
- |
| 1779 |
- if use blksha1 ; then |
| 1780 |
- myopts+=" BLK_SHA1=YesPlease" |
| 1781 |
- elif use ppcsha1 ; then |
| 1782 |
- myopts+=" PPC_SHA1=YesPlease" |
| 1783 |
- fi |
| 1784 |
- |
| 1785 |
- if use curl ; then |
| 1786 |
- use webdav || myopts+=" NO_EXPAT=YesPlease" |
| 1787 |
- else |
| 1788 |
- myopts+=" NO_CURL=YesPlease" |
| 1789 |
- fi |
| 1790 |
- |
| 1791 |
- # broken assumptions, because of broken build system ... |
| 1792 |
- myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
| 1793 |
- myopts+=" INSTALL=install TAR=tar" |
| 1794 |
- myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" |
| 1795 |
- myopts+=" SANE_TOOL_PATH=" |
| 1796 |
- myopts+=" OLD_ICONV=" |
| 1797 |
- myopts+=" NO_EXTERNAL_GREP=" |
| 1798 |
- |
| 1799 |
- # For svn-fe |
| 1800 |
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" |
| 1801 |
- |
| 1802 |
- # can't define this to null, since the entire makefile depends on it |
| 1803 |
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile |
| 1804 |
- |
| 1805 |
- use iconv \ |
| 1806 |
- || myopts+=" NO_ICONV=YesPlease" |
| 1807 |
- use nls \ |
| 1808 |
- || myopts+=" NO_GETTEXT=YesPlease" |
| 1809 |
- use tk \ |
| 1810 |
- || myopts+=" NO_TCLTK=YesPlease" |
| 1811 |
- use pcre \ |
| 1812 |
- && myopts+=" USE_LIBPCRE=yes" \ |
| 1813 |
- && extlibs+=" -lpcre" |
| 1814 |
- use perl \ |
| 1815 |
- && myopts+=" INSTALLDIRS=vendor" \ |
| 1816 |
- || myopts+=" NO_PERL=YesPlease" |
| 1817 |
- use python \ |
| 1818 |
- || myopts+=" NO_PYTHON=YesPlease" |
| 1819 |
- use subversion \ |
| 1820 |
- || myopts+=" NO_SVN_TESTS=YesPlease" |
| 1821 |
- use threads \ |
| 1822 |
- && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ |
| 1823 |
- || myopts+=" NO_PTHREADS=YesPlease" |
| 1824 |
- use cvs \ |
| 1825 |
- || myopts+=" NO_CVS=YesPlease" |
| 1826 |
- use elibc_glibc \ |
| 1827 |
- || myopts+=" NO_REGEX=YesPlease" |
| 1828 |
-# Disabled until ~m68k-mint can be keyworded again |
| 1829 |
-# if [[ ${CHOST} == *-mint* ]] ; then |
| 1830 |
-# myopts+=" NO_MMAP=YesPlease" |
| 1831 |
-# myopts+=" NO_IPV6=YesPlease" |
| 1832 |
-# myopts+=" NO_STRLCPY=YesPlease" |
| 1833 |
-# myopts+=" NO_MEMMEM=YesPlease" |
| 1834 |
-# myopts+=" NO_MKDTEMP=YesPlease" |
| 1835 |
-# myopts+=" NO_MKSTEMPS=YesPlease" |
| 1836 |
-# fi |
| 1837 |
- if [[ ${CHOST} == ia64-*-hpux* ]]; then |
| 1838 |
- myopts+=" NO_NSEC=YesPlease" |
| 1839 |
- fi |
| 1840 |
- if [[ ${CHOST} == *-*-aix* ]]; then |
| 1841 |
- myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" |
| 1842 |
- fi |
| 1843 |
- if [[ ${CHOST} == *-solaris* ]]; then |
| 1844 |
- myopts+=" NEEDS_LIBICONV=YesPlease" |
| 1845 |
- myopts+=" HAVE_CLOCK_MONOTONIC=1" |
| 1846 |
- myopts+=" HAVE_GETDELIM=1" |
| 1847 |
- fi |
| 1848 |
- |
| 1849 |
- has_version '>=app-text/asciidoc-8.0' \ |
| 1850 |
- && myopts+=" ASCIIDOC8=YesPlease" |
| 1851 |
- myopts+=" ASCIIDOC_NO_ROFF=YesPlease" |
| 1852 |
- |
| 1853 |
- # Bug 290465: |
| 1854 |
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' |
| 1855 |
- [[ "${CHOST}" == *-uclibc* ]] && \ |
| 1856 |
- myopts+=" NO_NSEC=YesPlease" |
| 1857 |
- |
| 1858 |
- export MY_MAKEOPTS="${myopts}" |
| 1859 |
- export EXTLIBS="${extlibs}" |
| 1860 |
-} |
| 1861 |
- |
| 1862 |
-src_unpack() { |
| 1863 |
- if [[ ${PV} != *9999 ]]; then |
| 1864 |
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX} |
| 1865 |
- cd "${S}" |
| 1866 |
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 1867 |
- use doc && \ |
| 1868 |
- cd "${S}"/Documentation && \ |
| 1869 |
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 1870 |
- cd "${S}" |
| 1871 |
- else |
| 1872 |
- git-r3_src_unpack |
| 1873 |
- cd "${S}" |
| 1874 |
- #cp "${FILESDIR}"/GIT-VERSION-GEN . |
| 1875 |
- fi |
| 1876 |
- |
| 1877 |
-} |
| 1878 |
- |
| 1879 |
-src_prepare() { |
| 1880 |
- # add experimental patches to improve mediawiki support |
| 1881 |
- # see patches for origin |
| 1882 |
- if use mediawiki-experimental ; then |
| 1883 |
- PATCHES+=( |
| 1884 |
- "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch |
| 1885 |
- "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch |
| 1886 |
- "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch |
| 1887 |
- ) |
| 1888 |
- fi |
| 1889 |
- |
| 1890 |
- default |
| 1891 |
- |
| 1892 |
- sed -i \ |
| 1893 |
- -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
| 1894 |
- -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ |
| 1895 |
- -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ |
| 1896 |
- -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ |
| 1897 |
- -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ |
| 1898 |
- -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ |
| 1899 |
- Makefile contrib/svn-fe/Makefile || die "sed failed" |
| 1900 |
- |
| 1901 |
- # Never install the private copy of Error.pm (bug #296310) |
| 1902 |
- sed -i \ |
| 1903 |
- -e '/private-Error.pm/s,^,#,' \ |
| 1904 |
- perl/Makefile.PL |
| 1905 |
- |
| 1906 |
- # Fix docbook2texi command |
| 1907 |
- sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ |
| 1908 |
- Documentation/Makefile || die "sed failed" |
| 1909 |
- |
| 1910 |
- # Fix git-subtree missing DESTDIR |
| 1911 |
- sed -i \ |
| 1912 |
- -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ |
| 1913 |
- -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ |
| 1914 |
- contrib/subtree/Makefile |
| 1915 |
-} |
| 1916 |
- |
| 1917 |
-git_emake() { |
| 1918 |
- # bug #326625: PERL_PATH, PERL_MM_OPT |
| 1919 |
- # bug #320647: PYTHON_PATH |
| 1920 |
- PYTHON_PATH="" |
| 1921 |
- use python && PYTHON_PATH="${PYTHON}" |
| 1922 |
- emake ${MY_MAKEOPTS} \ |
| 1923 |
- DESTDIR="${D}" \ |
| 1924 |
- OPTCFLAGS="${CFLAGS}" \ |
| 1925 |
- OPTLDFLAGS="${LDFLAGS}" \ |
| 1926 |
- OPTCC="$(tc-getCC)" \ |
| 1927 |
- OPTAR="$(tc-getAR)" \ |
| 1928 |
- prefix="${EPREFIX}"/usr \ |
| 1929 |
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
| 1930 |
- sysconfdir="${EPREFIX}"/etc \ |
| 1931 |
- PYTHON_PATH="${PYTHON_PATH}" \ |
| 1932 |
- PERL_MM_OPT="" \ |
| 1933 |
- GIT_TEST_OPTS="--no-color" \ |
| 1934 |
- V=1 \ |
| 1935 |
- "$@" |
| 1936 |
- # This is the fix for bug #326625, but it also causes breakage, see bug |
| 1937 |
- # #352693. |
| 1938 |
- # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ |
| 1939 |
-} |
| 1940 |
- |
| 1941 |
-src_configure() { |
| 1942 |
- exportmakeopts |
| 1943 |
-} |
| 1944 |
- |
| 1945 |
-src_compile() { |
| 1946 |
- if use perl ; then |
| 1947 |
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" |
| 1948 |
- git_emake perl/perl.mak || die "emake perl/perl.mak failed" |
| 1949 |
- fi |
| 1950 |
- git_emake || die "emake failed" |
| 1951 |
- |
| 1952 |
- if use emacs ; then |
| 1953 |
- elisp-compile contrib/emacs/git{,-blame}.el |
| 1954 |
- fi |
| 1955 |
- |
| 1956 |
- if use perl && use cgi ; then |
| 1957 |
- git_emake \ |
| 1958 |
- gitweb \ |
| 1959 |
- || die "emake gitweb (cgi) failed" |
| 1960 |
- fi |
| 1961 |
- |
| 1962 |
- if [[ ${CHOST} == *-darwin* ]]; then |
| 1963 |
- cd "${S}"/contrib/credential/osxkeychain || die |
| 1964 |
- git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ |
| 1965 |
- || die "emake credential-osxkeychain" |
| 1966 |
- fi |
| 1967 |
- |
| 1968 |
- cd "${S}"/Documentation |
| 1969 |
- if [[ ${PV} == *9999 ]] ; then |
| 1970 |
- git_emake man \ |
| 1971 |
- || die "emake man failed" |
| 1972 |
- if use doc ; then |
| 1973 |
- git_emake info html \ |
| 1974 |
- || die "emake info html failed" |
| 1975 |
- fi |
| 1976 |
- else |
| 1977 |
- if use doc ; then |
| 1978 |
- git_emake info \ |
| 1979 |
- || die "emake info html failed" |
| 1980 |
- fi |
| 1981 |
- fi |
| 1982 |
- |
| 1983 |
- if use subversion ; then |
| 1984 |
- cd "${S}"/contrib/svn-fe |
| 1985 |
- # by defining EXTLIBS we override the detection for libintl and |
| 1986 |
- # libiconv, bug #516168 |
| 1987 |
- local nlsiconv= |
| 1988 |
- use nls && use !elibc_glibc && nlsiconv+=" -lintl" |
| 1989 |
- use iconv && use !elibc_glibc && nlsiconv+=" -liconv" |
| 1990 |
- git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" |
| 1991 |
- if use doc ; then |
| 1992 |
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" |
| 1993 |
- fi |
| 1994 |
- cd "${S}" |
| 1995 |
- fi |
| 1996 |
- |
| 1997 |
- if use gnome-keyring ; then |
| 1998 |
- cd "${S}"/contrib/credential/gnome-keyring |
| 1999 |
- git_emake || die "emake git-credential-gnome-keyring failed" |
| 2000 |
- fi |
| 2001 |
- |
| 2002 |
- cd "${S}"/contrib/subtree |
| 2003 |
- git_emake |
| 2004 |
- use doc && git_emake doc |
| 2005 |
- |
| 2006 |
- if use mediawiki ; then |
| 2007 |
- cd "${S}"/contrib/mw-to-git |
| 2008 |
- git_emake |
| 2009 |
- fi |
| 2010 |
-} |
| 2011 |
- |
| 2012 |
-src_install() { |
| 2013 |
- git_emake \ |
| 2014 |
- install || \ |
| 2015 |
- die "make install failed" |
| 2016 |
- |
| 2017 |
- if [[ ${CHOST} == *-darwin* ]]; then |
| 2018 |
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain |
| 2019 |
- fi |
| 2020 |
- |
| 2021 |
- # Depending on the tarball and manual rebuild of the documentation, the |
| 2022 |
- # manpages may exist in either OR both of these directories. |
| 2023 |
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] |
| 2024 |
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
| 2025 |
- dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} |
| 2026 |
- use doc && dodir /usr/share/doc/${PF}/html |
| 2027 |
- for d in / /howto/ /technical/ ; do |
| 2028 |
- docinto ${d} |
| 2029 |
- dodoc Documentation${d}*.txt |
| 2030 |
- if use doc ; then |
| 2031 |
- docinto ${d}/html |
| 2032 |
- dodoc Documentation${d}*.html |
| 2033 |
- fi |
| 2034 |
- done |
| 2035 |
- docinto / |
| 2036 |
- # Upstream does not ship this pre-built :-( |
| 2037 |
- use doc && doinfo Documentation/{git,gitman}.info |
| 2038 |
- |
| 2039 |
- newbashcomp contrib/completion/git-completion.bash ${PN} |
| 2040 |
- bashcomp_alias git gitk |
| 2041 |
- # Not really a bash-completion file (bug #477920) |
| 2042 |
- # but still needed uncompressed (bug #507480) |
| 2043 |
- insinto /usr/share/${PN} |
| 2044 |
- doins contrib/completion/git-prompt.sh |
| 2045 |
- |
| 2046 |
- if use emacs ; then |
| 2047 |
- elisp-install ${PN} contrib/emacs/git.{el,elc} |
| 2048 |
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc} |
| 2049 |
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} |
| 2050 |
- # don't add automatically to the load-path, so the sitefile |
| 2051 |
- # can do a conditional loading |
| 2052 |
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch" |
| 2053 |
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
| 2054 |
- fi |
| 2055 |
- |
| 2056 |
- if use python && use gtk ; then |
| 2057 |
- python_doscript "${S}"/contrib/gitview/gitview |
| 2058 |
- dodoc "${S}"/contrib/gitview/gitview.txt |
| 2059 |
- fi |
| 2060 |
- |
| 2061 |
- #dobin contrib/fast-import/git-p4 # Moved upstream |
| 2062 |
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream |
| 2063 |
- newbin contrib/fast-import/import-tars.perl import-tars |
| 2064 |
- exeinto /usr/libexec/git-core/ |
| 2065 |
- newexe contrib/git-resurrect.sh git-resurrect |
| 2066 |
- |
| 2067 |
- # git-subtree |
| 2068 |
- cd "${S}"/contrib/subtree |
| 2069 |
- git_emake install || die "Failed to emake install git-subtree" |
| 2070 |
- if use doc ; then |
| 2071 |
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" |
| 2072 |
- fi |
| 2073 |
- newdoc README README.git-subtree |
| 2074 |
- dodoc git-subtree.txt |
| 2075 |
- cd "${S}" |
| 2076 |
- |
| 2077 |
- if use mediawiki ; then |
| 2078 |
- cd "${S}"/contrib/mw-to-git |
| 2079 |
- git_emake install |
| 2080 |
- cd "${S}" |
| 2081 |
- fi |
| 2082 |
- |
| 2083 |
- # diff-highlight |
| 2084 |
- dobin contrib/diff-highlight/diff-highlight |
| 2085 |
- newdoc contrib/diff-highlight/README README.diff-highlight |
| 2086 |
- |
| 2087 |
- # git-jump |
| 2088 |
- exeinto /usr/libexec/git-core/ |
| 2089 |
- doexe contrib/git-jump/git-jump |
| 2090 |
- newdoc contrib/git-jump/README git-jump.txt |
| 2091 |
- |
| 2092 |
- # git-contacts |
| 2093 |
- exeinto /usr/libexec/git-core/ |
| 2094 |
- doexe contrib/contacts/git-contacts |
| 2095 |
- dodoc contrib/contacts/git-contacts.txt |
| 2096 |
- |
| 2097 |
- if use gnome-keyring ; then |
| 2098 |
- cd "${S}"/contrib/credential/gnome-keyring |
| 2099 |
- dobin git-credential-gnome-keyring |
| 2100 |
- fi |
| 2101 |
- |
| 2102 |
- if use subversion ; then |
| 2103 |
- cd "${S}"/contrib/svn-fe |
| 2104 |
- dobin svn-fe |
| 2105 |
- dodoc svn-fe.txt |
| 2106 |
- if use doc ; then |
| 2107 |
- doman svn-fe.1 |
| 2108 |
- docinto html |
| 2109 |
- dodoc svn-fe.html |
| 2110 |
- fi |
| 2111 |
- cd "${S}" |
| 2112 |
- fi |
| 2113 |
- |
| 2114 |
- dodir /usr/share/${PN}/contrib |
| 2115 |
- # The following are excluded: |
| 2116 |
- # completion - installed above |
| 2117 |
- # credential/gnome-keyring TODO |
| 2118 |
- # diff-highlight - done above |
| 2119 |
- # emacs - installed above |
| 2120 |
- # examples - these are stuff that is not used in Git anymore actually |
| 2121 |
- # git-jump - done above |
| 2122 |
- # gitview - installed above |
| 2123 |
- # p4import - excluded because fast-import has a better one |
| 2124 |
- # patches - stuff the Git guys made to go upstream to other places |
| 2125 |
- # persistent-https - TODO |
| 2126 |
- # mw-to-git - TODO |
| 2127 |
- # subtree - build seperately |
| 2128 |
- # svnimport - use git-svn |
| 2129 |
- # thunderbird-patch-inline - fixes thunderbird |
| 2130 |
- for i in \ |
| 2131 |
- buildsystems convert-objects fast-import \ |
| 2132 |
- hg-to-git hooks remotes2config.sh rerere-train.sh \ |
| 2133 |
- stats workdir \ |
| 2134 |
- ; do |
| 2135 |
- cp -rf \ |
| 2136 |
- "${S}"/contrib/${i} \ |
| 2137 |
- "${ED}"/usr/share/${PN}/contrib \ |
| 2138 |
- || die "Failed contrib ${i}" |
| 2139 |
- done |
| 2140 |
- |
| 2141 |
- if use perl && use cgi ; then |
| 2142 |
- # We used to install in /usr/share/${PN}/gitweb |
| 2143 |
- # but upstream installs in /usr/share/gitweb |
| 2144 |
- # so we will install a symlink and use their location for compat with other |
| 2145 |
- # distros |
| 2146 |
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb |
| 2147 |
- |
| 2148 |
- # INSTALL discusses configuration issues, not just installation |
| 2149 |
- docinto / |
| 2150 |
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb |
| 2151 |
- newdoc "${S}"/gitweb/README README.gitweb |
| 2152 |
- |
| 2153 |
- find "${ED}"/usr/lib64/perl5/ \ |
| 2154 |
- -name .packlist \ |
| 2155 |
- -exec rm \{\} \; |
| 2156 |
- else |
| 2157 |
- rm -rf "${ED}"/usr/share/gitweb |
| 2158 |
- fi |
| 2159 |
- |
| 2160 |
- if ! use subversion ; then |
| 2161 |
- rm -f "${ED}"/usr/libexec/git-core/git-svn \ |
| 2162 |
- "${ED}"/usr/share/man/man1/git-svn.1* |
| 2163 |
- fi |
| 2164 |
- |
| 2165 |
- if use xinetd ; then |
| 2166 |
- insinto /etc/xinetd.d |
| 2167 |
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
| 2168 |
- fi |
| 2169 |
- |
| 2170 |
- if use !prefix ; then |
| 2171 |
- newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon |
| 2172 |
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
| 2173 |
- systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service" |
| 2174 |
- systemd_dounit "${FILESDIR}/git-daemon.socket" |
| 2175 |
- fi |
| 2176 |
- |
| 2177 |
- perl_delete_localpod |
| 2178 |
- |
| 2179 |
- # Remove disabled linguas |
| 2180 |
- # we could remove sources in src_prepare, but install does not |
| 2181 |
- # handle missing locale dir well |
| 2182 |
- rm_loc() { |
| 2183 |
- if [[ -e "${ED}/usr/share/locale/${1}" ]]; then |
| 2184 |
- rm -r "${ED}/usr/share/locale/${1}" || die |
| 2185 |
- fi |
| 2186 |
- } |
| 2187 |
- l10n_for_each_disabled_locale_do rm_loc |
| 2188 |
-} |
| 2189 |
- |
| 2190 |
-src_test() { |
| 2191 |
- local disabled="" |
| 2192 |
- local tests_cvs="t9200-git-cvsexportcommit.sh \ |
| 2193 |
- t9400-git-cvsserver-server.sh \ |
| 2194 |
- t9401-git-cvsserver-crlf.sh \ |
| 2195 |
- t9402-git-cvsserver-refs.sh \ |
| 2196 |
- t9600-cvsimport.sh \ |
| 2197 |
- t9601-cvsimport-vendor-branch.sh \ |
| 2198 |
- t9602-cvsimport-branches-tags.sh \ |
| 2199 |
- t9603-cvsimport-patchsets.sh \ |
| 2200 |
- t9604-cvsimport-timestamps.sh" |
| 2201 |
- local tests_perl="t3701-add-interactive.sh \ |
| 2202 |
- t5502-quickfetch.sh \ |
| 2203 |
- t5512-ls-remote.sh \ |
| 2204 |
- t5520-pull.sh \ |
| 2205 |
- t7106-reset-unborn-branch.sh \ |
| 2206 |
- t7501-commit.sh" |
| 2207 |
- # Bug #225601 - t0004 is not suitable for root perm |
| 2208 |
- # Bug #219839 - t1004 is not suitable for root perm |
| 2209 |
- # t0001-init.sh - check for init notices EPERM* fails |
| 2210 |
- local tests_nonroot="t0001-init.sh \ |
| 2211 |
- t0004-unwritable.sh \ |
| 2212 |
- t0070-fundamental.sh \ |
| 2213 |
- t1004-read-tree-m-u-wf.sh \ |
| 2214 |
- t3700-add.sh \ |
| 2215 |
- t7300-clean.sh" |
| 2216 |
- # t9100 still fails with symlinks in SVN 1.7 |
| 2217 |
- local test_svn="t9100-git-svn-basic.sh" |
| 2218 |
- |
| 2219 |
- # Unzip is used only for the testcase code, not by any normal parts of Git. |
| 2220 |
- if ! has_version app-arch/unzip ; then |
| 2221 |
- einfo "Disabling tar-tree tests" |
| 2222 |
- disabled="${disabled} t5000-tar-tree.sh" |
| 2223 |
- fi |
| 2224 |
- |
| 2225 |
- cvs=0 |
| 2226 |
- use cvs && let cvs=$cvs+1 |
| 2227 |
- if [[ ${EUID} -eq 0 ]]; then |
| 2228 |
- if [[ $cvs -eq 1 ]]; then |
| 2229 |
- ewarn "Skipping CVS tests because CVS does not work as root!" |
| 2230 |
- ewarn "You should retest with FEATURES=userpriv!" |
| 2231 |
- disabled="${disabled} ${tests_cvs}" |
| 2232 |
- fi |
| 2233 |
- einfo "Skipping other tests that require being non-root" |
| 2234 |
- disabled="${disabled} ${tests_nonroot}" |
| 2235 |
- else |
| 2236 |
- [[ $cvs -gt 0 ]] && \ |
| 2237 |
- has_version dev-vcs/cvs && \ |
| 2238 |
- let cvs=$cvs+1 |
| 2239 |
- [[ $cvs -gt 1 ]] && \ |
| 2240 |
- has_version "dev-vcs/cvs[server]" && \ |
| 2241 |
- let cvs=$cvs+1 |
| 2242 |
- if [[ $cvs -lt 3 ]]; then |
| 2243 |
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" |
| 2244 |
- disabled="${disabled} ${tests_cvs}" |
| 2245 |
- fi |
| 2246 |
- fi |
| 2247 |
- |
| 2248 |
- if ! use perl ; then |
| 2249 |
- einfo "Disabling tests that need Perl" |
| 2250 |
- disabled="${disabled} ${tests_perl}" |
| 2251 |
- fi |
| 2252 |
- |
| 2253 |
- einfo "Disabling tests that fail with SVN 1.7" |
| 2254 |
- disabled="${disabled} ${test_svn}" |
| 2255 |
- |
| 2256 |
- # Reset all previously disabled tests |
| 2257 |
- cd "${S}/t" |
| 2258 |
- for i in *.sh.DISABLED ; do |
| 2259 |
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" |
| 2260 |
- done |
| 2261 |
- einfo "Disabled tests:" |
| 2262 |
- for i in ${disabled} ; do |
| 2263 |
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" |
| 2264 |
- done |
| 2265 |
- |
| 2266 |
- # Avoid the test system removing the results because we want them ourselves |
| 2267 |
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ |
| 2268 |
- -i "${S}"/t/Makefile |
| 2269 |
- |
| 2270 |
- # Clean old results first, must always run |
| 2271 |
- cd "${S}/t" |
| 2272 |
- nonfatal git_emake clean |
| 2273 |
- |
| 2274 |
- # Now run the tests, keep going if we hit an error, and don't terminate on |
| 2275 |
- # failure |
| 2276 |
- cd "${S}" |
| 2277 |
- einfo "Start test run" |
| 2278 |
- #MAKEOPTS=-j1 |
| 2279 |
- nonfatal git_emake --keep-going test |
| 2280 |
- rc=$? |
| 2281 |
- |
| 2282 |
- # Display nice results, now print the results |
| 2283 |
- cd "${S}/t" |
| 2284 |
- nonfatal git_emake aggregate-results |
| 2285 |
- |
| 2286 |
- # And bail if there was a problem |
| 2287 |
- [ $rc -eq 0 ] || die "tests failed. Please file a bug." |
| 2288 |
-} |
| 2289 |
- |
| 2290 |
-showpkgdeps() { |
| 2291 |
- local pkg=$1 |
| 2292 |
- shift |
| 2293 |
- elog " $(printf "%-17s:" ${pkg}) ${@}" |
| 2294 |
-} |
| 2295 |
- |
| 2296 |
-pkg_postinst() { |
| 2297 |
- use emacs && elisp-site-regen |
| 2298 |
- einfo "Please read /usr/share/bash-completion/git for Git bash command completion" |
| 2299 |
- einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" |
| 2300 |
- einfo "Note that the prompt bash code is now in that separate script" |
| 2301 |
- elog "These additional scripts need some dependencies:" |
| 2302 |
- echo |
| 2303 |
- showpkgdeps git-quiltimport "dev-util/quilt" |
| 2304 |
- showpkgdeps git-instaweb \ |
| 2305 |
- "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" |
| 2306 |
- echo |
| 2307 |
- use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." |
| 2308 |
-} |
| 2309 |
- |
| 2310 |
-pkg_postrm() { |
| 2311 |
- use emacs && elisp-site-regen |
| 2312 |
-} |
| 2313 |
|
| 2314 |
diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml |
| 2315 |
deleted file mode 100644 |
| 2316 |
index 88c7b6c..0000000 |
| 2317 |
--- a/dev-vcs/git/metadata.xml |
| 2318 |
+++ /dev/null |
| 2319 |
@@ -1,40 +0,0 @@ |
| 2320 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 2321 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 2322 |
-<pkgmetadata> |
| 2323 |
- <maintainer type="person"> |
| 2324 |
- <email>robbat2@g.o</email> |
| 2325 |
- <name>Robin H. Johnson</name> |
| 2326 |
- </maintainer> |
| 2327 |
- <maintainer type="person"> |
| 2328 |
- <email>polynomial-c@g.o</email> |
| 2329 |
- <name>Lars Wendler</name> |
| 2330 |
- </maintainer> |
| 2331 |
- <longdescription lang="en"> |
| 2332 |
- Git - Fast Version Control System. Official titled |
| 2333 |
- "GIT - the stupid content tracker". |
| 2334 |
- |
| 2335 |
- Git is a popular version control system designed to handle very large |
| 2336 |
- projects with speed and efficiency; it is used mainly for various open |
| 2337 |
- source projects, most notably the Linux kernel. |
| 2338 |
- |
| 2339 |
- Git falls in the category of distributed source code management tools, |
| 2340 |
- similar to e.g. GNU Arch or Monotone (or BitKeeper in the proprietary |
| 2341 |
- world). Every Git working directory is a full-fledged repository with full |
| 2342 |
- revision tracking capabilities, not dependent on network access or a central |
| 2343 |
- server. |
| 2344 |
- </longdescription> |
| 2345 |
- <use> |
| 2346 |
- <flag name="blksha1">Use the new optimized SHA1 implementation</flag> |
| 2347 |
- <flag name="cgi">Install gitweb too</flag> |
| 2348 |
- <flag name="curl">Support fetching and pushing (requires webdav too) over http:// and https:// protocols</flag> |
| 2349 |
- <flag name="gpg">Pull in gnupg for signing -- without gnupg, attempts at signing will fail at runtime!</flag> |
| 2350 |
- <flag name="gtk">Include the gitview contrib tool</flag> |
| 2351 |
- <flag name="highlight">GitWeb support for app-text/highlight</flag> |
| 2352 |
- <flag name="mediawiki">Support pulling and pushing from MediaWiki</flag> |
| 2353 |
- <flag name="mediawiki-experimental">Add experimental patches for improved MediaWiki support</flag> |
| 2354 |
- <flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag> |
| 2355 |
- <flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag> |
| 2356 |
- <flag name="tk">Include the 'gitk' and 'git gui' tools</flag> |
| 2357 |
- <flag name="webdav">Adds support for push'ing to HTTP/HTTPS repositories via DAV</flag> |
| 2358 |
- </use> |
| 2359 |
-</pkgmetadata> |
Archives