diff options
author | Donnie Berkholz <dberkholz@gentoo.org> | 2009-04-04 18:59:28 -0700 |
---|---|---|
committer | Donnie Berkholz <dberkholz@gentoo.org> | 2009-04-04 18:59:28 -0700 |
commit | 616dc6a9b458c52d595a3d6602945bd6e9ab2d0a (patch) | |
tree | a678b7e0d7d9fc396fafdc9af3a034eaffa4438f /dev-util | |
parent | gnuplot: update live ebuild to work with current HEAD. (diff) | |
download | dberkholz-616dc6a9b458c52d595a3d6602945bd6e9ab2d0a.tar.gz dberkholz-616dc6a9b458c52d595a3d6602945bd6e9ab2d0a.tar.bz2 dberkholz-616dc6a9b458c52d595a3d6602945bd6e9ab2d0a.zip |
git: drop, robbat2 tells me there's one in the main tree.
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/git/Manifest | 12 | ||||
-rw-r--r-- | dev-util/git/files/20080414-git-1.5.5-noperl.patch | 325 | ||||
-rw-r--r-- | dev-util/git/files/70git-gentoo.el | 4 | ||||
-rw-r--r-- | dev-util/git/files/72git-gentoo.el | 8 | ||||
-rw-r--r-- | dev-util/git/files/digest-git-9999 | 1 | ||||
-rw-r--r-- | dev-util/git/files/git-1.5.3-symlinks.patch | 13 | ||||
-rw-r--r-- | dev-util/git/files/git-daemon.confd | 12 | ||||
-rw-r--r-- | dev-util/git/files/git-daemon.initd | 22 | ||||
-rw-r--r-- | dev-util/git/files/git-daemon.xinetd | 13 | ||||
-rw-r--r-- | dev-util/git/git-1.5.5.ebuild | 271 | ||||
-rw-r--r-- | dev-util/git/git-9999.ebuild | 150 |
11 files changed, 0 insertions, 831 deletions
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest deleted file mode 100644 index 5d5820c..0000000 --- a/dev-util/git/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -AUX 20080414-git-1.5.5-noperl.patch 9810 RMD160 c82d9fdfd490b7cd196de7ca712f68c01d711f64 SHA1 cd631a7591a5c2587e6350169991abc3e20e2d30 SHA256 eb517516be2917c4dd4b8a84b3a5829641534dde0f3dcc3a77d3f31766d9365b -AUX 70git-gentoo.el 88 RMD160 fe9b87bdbe14141580745063092a5d08924f23fd SHA1 332f9cbf5a1dbb176e54646fa23aa140aee917f7 SHA256 7589206de5ea91e912e0332f7dc503689d348cb752e17ba84a724987c4bbe04a -AUX 72git-gentoo.el 337 RMD160 644e711f842f0947592fbc9e58f9f3ea2f085229 SHA1 33d594c19a5f5e7147719b61573505076a3c4984 SHA256 b022fdc82776c869c8e573c154fb0ff9ac748f0b6f4fbcd2f28618e3b946412f -AUX git-1.5.3-symlinks.patch 645 RMD160 24fc6002042e67611f337cae3867bb400fd8c7d6 SHA1 f64270b9a85248057fc8034efda4d102fa9279c9 SHA256 dc8786302f5806eff376f3d1921c85d4907fda0318aa20c2c4a73ca8aea58340 -AUX git-daemon.confd 376 RMD160 70cbd0b87cbd2ce6b494f07ead732f33f7ea623f SHA1 3a00fa3af96d83bec1589d7ef53eff01ea838ea1 SHA256 266045958a3a4072529f25208d1f84a178bbb10aa0b6fa19543f7a62f9a5e3fe -AUX git-daemon.initd 528 RMD160 9786bd637bc6d58dd3cce07bb7a4442d318acd1e SHA1 aafe9b7b642f0e8ae634e6ae8488777a4588300b SHA256 741e904e20d307e05edd545a30acaf9f50c2ff152a68d32e65495fb6f0d63858 -AUX git-daemon.xinetd 260 RMD160 9c1abde72ac5064e1fc86afd29c2a74079db91a4 SHA1 4763c4595ae65e38c189366fca35f73f18c9a03a SHA256 6a3503904204163775722e8a455e4ebaa8648f6d288340979387ad4eb55f4c0a -DIST git-1.5.5.tar.bz2 1673736 RMD160 7b72399bdd38230ee0d12f4ad0a85848b81924ca SHA1 9553a4fcd9f7197529deef2361810258247915e1 SHA256 27483890c598450d7d1b4583e40dd8ec6c8def08c7cec94b20eb7336bb83e65e -DIST git-htmldocs-1.5.5.tar.bz2 637681 RMD160 45d7714c1711f7bfcfbdeab49cc3f7ca65a3fbca SHA1 76a2e4117c261fc243d75ea45b6736c9196145e1 SHA256 7d14288bac4a8c115caafb8bd449f0796f42fa3f06861fdc570a19bb9757df26 -DIST git-manpages-1.5.5.tar.bz2 162609 RMD160 36687b0f53582e5b7c6576638d88f86c59570263 SHA1 65bb20343372f69dfc9f0fee26140233ee48b4d2 SHA256 cc7f16b72a228cafd6bcc41ea09fdc67f4c5d50a0bf4521b80d8ea75127bb802 -EBUILD git-1.5.5.ebuild 7887 RMD160 c155b19e2cddec9f7657e4fb62e75bf7b59955b6 SHA1 97bc6c55c9c220f4e8d0f8935877d4885b964246 SHA256 94c5cc24aaa78e46f9435ff2f6a2c678c73c5a54db9b16d42810c2ee7a4805cf -EBUILD git-9999.ebuild 3699 RMD160 230d0825d154a6ff8fe452510086bdee0d438e22 SHA1 fc3abc44febac421de1dd3ea4ad4f676cfffdc05 SHA256 a859649d02f70a1a66c248c71d21ddf560aaea3b3a9e12395ed9448410100c09 diff --git a/dev-util/git/files/20080414-git-1.5.5-noperl.patch b/dev-util/git/files/20080414-git-1.5.5-noperl.patch deleted file mode 100644 index 41b0a6a..0000000 --- a/dev-util/git/files/20080414-git-1.5.5-noperl.patch +++ /dev/null @@ -1,325 +0,0 @@ -diff -urN git-1.5.5.orig/builtin-add.c git-1.5.5/builtin-add.c ---- git-1.5.5.orig/builtin-add.c 2008-04-14 12:57:10.000000000 -0700 -+++ git-1.5.5/builtin-add.c 2008-04-14 12:57:23.000000000 -0700 -@@ -135,6 +135,7 @@ - free(seen); - } - -+#ifndef NO_PERL - static const char **validate_pathspec(int argc, const char **argv, const char *prefix) - { - const char **pathspec = get_pathspec(prefix, argv); -@@ -170,6 +171,7 @@ - free(args); - return status; - } -+#endif - - static struct lock_file lock_file; - -@@ -182,8 +184,10 @@ - OPT__DRY_RUN(&show_only), - OPT__VERBOSE(&verbose), - OPT_GROUP(""), -+#ifndef NO_PERL - OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"), - OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"), -+#endif - OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"), - OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked files"), - OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"), -@@ -198,10 +202,12 @@ - - argc = parse_options(argc, argv, builtin_add_options, - builtin_add_usage, 0); -+#ifndef NO_PERL - if (patch_interactive) - add_interactive = 1; - if (add_interactive) - exit(interactive_add(argc, argv, prefix)); -+#endif - - git_config(git_default_config); - -diff -urN git-1.5.5.orig/builtin-commit.c git-1.5.5/builtin-commit.c ---- git-1.5.5.orig/builtin-commit.c 2008-04-14 12:57:10.000000000 -0700 -+++ git-1.5.5/builtin-commit.c 2008-04-14 12:57:23.000000000 -0700 -@@ -97,7 +97,9 @@ - OPT_GROUP("Commit contents options"), - OPT_BOOLEAN('a', "all", &all, "commit all changed files"), - OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"), -+#ifndef NO_PERL - OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"), -+#endif - OPT_BOOLEAN('o', "only", &only, ""), - OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"), - OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"), -@@ -217,11 +219,13 @@ - struct path_list partial; - const char **pathspec = NULL; - -+#ifndef NO_PERL - if (interactive) { - interactive_add(argc, argv, prefix); - commit_style = COMMIT_AS_IS; - return get_index_file(); - } -+#endif - - if (read_cache() < 0) - die("index file corrupt"); -diff -urN git-1.5.5.orig/Makefile git-1.5.5/Makefile ---- git-1.5.5.orig/Makefile 2008-04-14 12:57:10.000000000 -0700 -+++ git-1.5.5/Makefile 2008-04-14 12:57:53.000000000 -0700 -@@ -130,6 +130,8 @@ - # - # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's - # MakeMaker (e.g. using ActiveState under Cygwin). -+ -+# Define NO_PERL if you do not want Perl scripts at all. - # - # Define NO_TCLTK if you do not want Tcl/Tk GUI. - # -@@ -255,6 +257,8 @@ - SCRIPT_SH += git-submodule.sh - SCRIPT_SH += git-web--browse.sh - -+SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) -+ifndef NO_PERL - SCRIPT_PERL += git-add--interactive.perl - SCRIPT_PERL += git-archimport.perl - SCRIPT_PERL += git-cvsexportcommit.perl -@@ -263,10 +267,11 @@ - SCRIPT_PERL += git-relink.perl - SCRIPT_PERL += git-send-email.perl - SCRIPT_PERL += git-svn.perl -- --SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ -- $(patsubst %.perl,%,$(SCRIPT_PERL)) \ -- git-instaweb -+SCRIPTS += $(patsubst %.perl,%,$(SCRIPT_PERL)) \ -+ git-instaweb -+else -+SCRIPT_PERL = -+endif - - # Empty... - EXTRA_PROGRAMS = -@@ -315,7 +320,10 @@ - ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS) - - # what 'all' will build but not install in gitexecdir --OTHER_PROGRAMS = git$X gitweb/gitweb.cgi -+OTHER_PROGRAMS = git$X -+ifndef NO_PERL -+OTHER_PROGRAMS += gitweb/gitweb.cgi -+endif - - # Set paths to tools early so that they can be used for version tests. - ifndef SHELL_PATH -@@ -716,6 +724,10 @@ - endif - endif - -+ifdef NO_PERL -+ BASIC_CFLAGS += -DNO_PERL -+endif -+ - ifdef ZLIB_PATH - BASIC_CFLAGS += -I$(ZLIB_PATH)/include - EXTLIBS += -L$(ZLIB_PATH)/$(lib) $(CC_LD_DYNPATH)$(ZLIB_PATH)/$(lib) -@@ -896,6 +908,11 @@ - ifeq ($(TCLTK_PATH),) - NO_TCLTK=NoThanks - endif -+ifeq ($(PERL_PATH),) -+NO_PERL=NoThanks -+export NO_PERL -+export NO_PERL_MAKEMAKER -+endif - - QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir - QUIET_SUBDIR1 = -@@ -968,7 +985,9 @@ - $(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) all - $(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all - endif -+ifndef NO_PERL - $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all -+endif - $(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) - - strip: $(PROGRAMS) git$X -@@ -1007,6 +1026,7 @@ - chmod +x $@+ && \ - mv $@+ $@ - -+ifndef NO_PERL - $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak - - perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL -@@ -1065,6 +1085,7 @@ - $@.sh > $@+ && \ - chmod +x $@+ && \ - mv $@+ $@ -+endif # NO_PERL - - configure: configure.ac - $(QUIET_GEN)$(RM) $@ $<+ && \ -@@ -1218,7 +1239,9 @@ - $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)' - $(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)' - $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install -+ifndef NO_PERL - $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install -+endif - ifndef NO_TCLTK - $(MAKE) -C gitk-git install - $(MAKE) -C git-gui install -@@ -1307,9 +1330,11 @@ - $(RM) -r $(GIT_TARNAME) .doc-tmp-dir - $(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz - $(RM) $(htmldocs).tar.gz $(manpages).tar.gz -- $(RM) gitweb/gitweb.cgi - $(MAKE) -C Documentation/ clean -+ifndef NO_PERL -+ $(RM) gitweb/gitweb.cgi - $(MAKE) -C perl clean -+endif - $(MAKE) -C templates/ clean - $(MAKE) -C t/ clean - ifndef NO_TCLTK -diff -urN git-1.5.5.orig/t/lib-git-svn.sh git-1.5.5/t/lib-git-svn.sh ---- git-1.5.5.orig/t/lib-git-svn.sh 2008-04-14 12:57:10.000000000 -0700 -+++ git-1.5.5/t/lib-git-svn.sh 2008-04-14 12:57:23.000000000 -0700 -@@ -6,6 +6,12 @@ - test_done - exit - fi -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-svn tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - GIT_DIR=$PWD/.git - GIT_SVN_DIR=$GIT_DIR/svn/git-svn -diff -urN git-1.5.5.orig/t/t5505-remote.sh git-1.5.5/t/t5505-remote.sh ---- git-1.5.5.orig/t/t5505-remote.sh 2008-04-14 12:57:10.000000000 -0700 -+++ git-1.5.5/t/t5505-remote.sh 2008-04-14 12:57:23.000000000 -0700 -@@ -3,6 +3,12 @@ - test_description='git remote porcelain-ish' - - . ./test-lib.sh -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-cvsimport tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - setup_repository () { - mkdir "$1" && ( -diff -urN git-1.5.5.orig/t/t7501-commit.sh git-1.5.5/t/t7501-commit.sh ---- git-1.5.5.orig/t/t7501-commit.sh 2008-04-14 12:57:10.000000000 -0700 -+++ git-1.5.5/t/t7501-commit.sh 2008-04-14 13:00:29.000000000 -0700 -@@ -38,7 +38,7 @@ - "echo King of the bongo >file && - ! git-commit -m foo -a file" - --test_expect_success \ -+[ -z "$NO_PERL" ] && test_expect_success \ - "using paths with --interactive" \ - "echo bong-o-bong >file && - ! echo 7 | git-commit -m foo --interactive file" -@@ -119,7 +119,7 @@ - "echo 'gak' >file && \ - git-commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a" - --test_expect_success \ -+[ -z "$NO_PERL" ] && test_expect_success \ - "interactive add" \ - "echo 7 | git-commit --interactive | grep 'What now'" - -diff -urN git-1.5.5.orig/t/t9001-send-email.sh git-1.5.5/t/t9001-send-email.sh ---- git-1.5.5.orig/t/t9001-send-email.sh 2008-04-14 12:57:10.000000000 -0700 -+++ git-1.5.5/t/t9001-send-email.sh 2008-04-14 12:57:23.000000000 -0700 -@@ -2,6 +2,12 @@ - - test_description='git-send-email' - . ./test-lib.sh -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-send-email tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - PROG='git send-email' - test_expect_success \ -diff -urN git-1.5.5.orig/t/t9200-git-cvsexportcommit.sh git-1.5.5/t/t9200-git-cvsexportcommit.sh ---- git-1.5.5.orig/t/t9200-git-cvsexportcommit.sh 2008-04-14 12:57:10.000000000 -0700 -+++ git-1.5.5/t/t9200-git-cvsexportcommit.sh 2008-04-14 12:57:23.000000000 -0700 -@@ -13,6 +13,12 @@ - test_done - exit - fi -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-cvsexportcommit tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - CVSROOT=$(pwd)/cvsroot - CVSWORK=$(pwd)/cvswork -diff -urN git-1.5.5.orig/t/t9400-git-cvsserver-server.sh git-1.5.5/t/t9400-git-cvsserver-server.sh ---- git-1.5.5.orig/t/t9400-git-cvsserver-server.sh 2008-04-14 12:57:10.000000000 -0700 -+++ git-1.5.5/t/t9400-git-cvsserver-server.sh 2008-04-14 12:57:23.000000000 -0700 -@@ -17,6 +17,12 @@ - test_done - exit - fi -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-cvsserver tests, NO_PERL defined' : -+ test_done -+ exit -+fi - perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { - test_expect_success 'skipping git-cvsserver tests, Perl SQLite interface unavailable' : - test_done -diff -urN git-1.5.5.orig/t/t9500-gitweb-standalone-no-errors.sh git-1.5.5/t/t9500-gitweb-standalone-no-errors.sh ---- git-1.5.5.orig/t/t9500-gitweb-standalone-no-errors.sh 2008-04-14 12:57:10.000000000 -0700 -+++ git-1.5.5/t/t9500-gitweb-standalone-no-errors.sh 2008-04-14 12:57:23.000000000 -0700 -@@ -67,6 +67,13 @@ - } - - . ./test-lib.sh -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping gitweb-standalone-no-errors tests, NO_PERL defined' : -+ test_done -+ exit -+fi -+ - - perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || { - test_expect_success 'skipping gitweb tests, perl version is too old' : -diff -urN git-1.5.5.orig/t/t9600-cvsimport.sh git-1.5.5/t/t9600-cvsimport.sh ---- git-1.5.5.orig/t/t9600-cvsimport.sh 2008-04-14 12:57:10.000000000 -0700 -+++ git-1.5.5/t/t9600-cvsimport.sh 2008-04-14 12:57:23.000000000 -0700 -@@ -15,6 +15,12 @@ - test_done - exit - fi -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-cvsimport tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'` - case "$cvsps_version" in diff --git a/dev-util/git/files/70git-gentoo.el b/dev-util/git/files/70git-gentoo.el deleted file mode 100644 index ed65bb4..0000000 --- a/dev-util/git/files/70git-gentoo.el +++ /dev/null @@ -1,4 +0,0 @@ -;;; git site-lisp configuration - -(add-to-list 'vc-handled-backends 'GIT) -(require 'git) diff --git a/dev-util/git/files/72git-gentoo.el b/dev-util/git/files/72git-gentoo.el deleted file mode 100644 index 1941361..0000000 --- a/dev-util/git/files/72git-gentoo.el +++ /dev/null @@ -1,8 +0,0 @@ -;;; dev-util/git site-lisp configuration - -(unless (fboundp 'vc-git-registered) - (add-to-list 'load-path "@SITELISP@") - (add-to-list 'vc-handled-backends 'GIT) - (autoload 'git-status "git" "Entry point into git-status mode." t) - (autoload 'git-blame-mode "git-blame" - "Minor mode for incremental blame for Git." t)) diff --git a/dev-util/git/files/digest-git-9999 b/dev-util/git/files/digest-git-9999 deleted file mode 100644 index 8b13789..0000000 --- a/dev-util/git/files/digest-git-9999 +++ /dev/null @@ -1 +0,0 @@ - diff --git a/dev-util/git/files/git-1.5.3-symlinks.patch b/dev-util/git/files/git-1.5.3-symlinks.patch deleted file mode 100644 index 3a4d834..0000000 --- a/dev-util/git/files/git-1.5.3-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 2f3b9b2..5c595ac 100644 ---- a/Makefile -+++ b/Makefile -@@ -997,7 +997,7 @@ endif - cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \ - '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \ - fi -- $(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) -+ $(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) - ifneq (,$X) - $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';) - endif diff --git a/dev-util/git/files/git-daemon.confd b/dev-util/git/files/git-daemon.confd deleted file mode 100644 index ace9cbd..0000000 --- a/dev-util/git/files/git-daemon.confd +++ /dev/null @@ -1,12 +0,0 @@ -# conf.d file for git-daemon -# -# Please check man 1 git-daemon for more information about the options -# git-daemon accepts. -# -# Meaningful options are: -# --syslog --- Enables syslog logging -# --verbose --- Enables verbose logging -# --export-all --- Exports all repositories -# --port=XXXX --- Starts in port XXXX instead of 9418 -# -GITDAEMON_OPTS="--syslog" diff --git a/dev-util/git/files/git-daemon.initd b/dev-util/git/files/git-daemon.initd deleted file mode 100644 index beb2fc3..0000000 --- a/dev-util/git/files/git-daemon.initd +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/files/git-daemon.initd,v 1.2 2008/03/20 12:11:54 vapier Exp $ - -depend() { - need net - use logger -} - -start() { - ebegin "Starting git-daemon" - start-stop-daemon --start --quiet --background \ - --exec /usr/bin/git-daemon -- ${GITDAEMON_OPTS} - eend $? -} - -stop() { - ebegin "Stopping git-daemon" - start-stop-daemon --stop --quiet --name git-daemon - eend $? -} diff --git a/dev-util/git/files/git-daemon.xinetd b/dev-util/git/files/git-daemon.xinetd deleted file mode 100644 index a0748b2..0000000 --- a/dev-util/git/files/git-daemon.xinetd +++ /dev/null @@ -1,13 +0,0 @@ -service git-daemon -{ - disable = yes - socket_type = stream - wait = no - user = nobody - type = UNLISTED - protocol = tcp - log_on_failure += USERID - port = 9418 - server = /usr/bin/git-daemon - server_args = --inetd --syslog --export-all --base-path=/var/git -} diff --git a/dev-util/git/git-1.5.5.ebuild b/dev-util/git/git-1.5.5.ebuild deleted file mode 100644 index f2a9fa9..0000000 --- a/dev-util/git/git-1.5.5.ebuild +++ /dev/null @@ -1,271 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4.5.ebuild,v 1.1 2008/03/29 07:59:42 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( net-misc/curl ) - webdav? ( dev-libs/expat ) - emacs? ( virtual/emacs )" -# dev-perl/{Authen-SASL,Net-SMTP-SSL} are used by git-send-email - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - if use cgi || use cvs || use subversion ; then - eerror "You must built dev-util/git with USE=perl and the" - eerror "applicable USE flag to use any of the following:" - eerror "gitweb, git-cvs*, git-svn, git-archimport, git-quiltimport" - die "You need USE=perl to satisfy your other USE= requests!" - fi - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use mozsha1 ; then - myopts="${myopts} MOZILLA_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring." - fi - - use iconv || myopts="${myopts} NO_ICONV=YesPlease" - use tk || myopts="${myopts} NO_TCLTK=YesPlease" - use perl || myopts="${myopts} NO_PERL=YesPlease" - use threads && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion || myopts="${myopts} NO_SVN_TESTS=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && cd "${S}"/Documentation && unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - - epatch "${FILESDIR}"/${PN}-1.5.3-symlinks.patch - epatch "${FILESDIR}"/20080414-${PN}-1.5.5-noperl.patch - - sed -i \ - -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - -e 's:ln :ln -s :g' \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # svnimport - use git-svn - # p4import - excluded because fast-import has a better one - # examples - these are stuff that is not used in Git anymore actually - # patches - stuff the Git guys made to go upstream to other places - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh vim stats \ - workdir convert-objects blameview ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${D}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - dodir /usr/share/${PN}/gitweb - insinto /usr/share/${PN}/gitweb - newins "${S}"/gitweb/gitweb.perl gitweb.cgi - doins "${S}"/gitweb/gitweb.css - doins "${S}"/gitweb/git-{favicon,logo}.png - docinto / - # INSTALL discusses configuration issues, not just installation - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9600-cvsimport.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - has_version app-arch/unzip || \ - einfo "Disabling tar-tree tests" && \ - disabled="${disabled} \ - t5000-tar-tree.sh" - - if ! has userpriv "${FEATURES}"; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} \ - ${tests_cvs}" - fi - - use cvs && \ - has_version dev-util/cvs && \ - built_with_use dev-util/cvs server || \ - einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])" && \ - disabled="${disabled} \ - ${tests_cvs}" - - use perl || \ - einfo "Disabling tests that need Perl" && \ - disabled="${disabled} \ - ${tests_perl}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - cd "${S}" - # Now run the tests - einfo "Start test run" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - if use subversion && ! built_with_use dev-util/subversion perl ; then - ewarn "You must build dev-util/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-archimport "dev-util/tla" - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/git/git-9999.ebuild b/dev-util/git/git-9999.ebuild deleted file mode 100644 index 75f8da9..0000000 --- a/dev-util/git/git-9999.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.3.3.ebuild,v 1.2 2006/05/21 01:18:44 ferdy Exp $ - -inherit python toolchain-funcs eutils elisp-common git - -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - -DOC_VER=${PV} - -DESCRIPTION="GIT - the stupid content tracker" -HOMEPAGE="http://kernel.org/pub/software/scm/git/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="curl doc emacs mozsha1 ppcsha1 webdav X" - -DEPEND="dev-libs/openssl - sys-libs/zlib - !app-misc/git - curl? ( net-misc/curl ) - webdav? ( dev-libs/expat ) - app-text/asciidoc - app-text/xmlto" -RDEPEND="${DEPEND} - dev-lang/perl - >=dev-lang/python-2.3 - app-text/rcs - X? ( dev-lang/tk )" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use mozsha1 ; then - myopts="${myopts} MOZILLA_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring." - fi - - myopts="${myopts} WITH_SEND_EMAIL=YesPlease" - - # Older python versions need own subproccess.py - python_version - [[ ${PYVER} < 2.4 ]] && myopts="${myopts} WITH_OWN_SUBPROCESS_PY=YesPlease" - - use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease" - - export MY_MAKEOPTS=${myopts} -} - -src_unpack() { - git_src_unpack - cd ${S} - - sed -i \ - -e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake \ - ${MY_MAKEOPTS} \ - prefix=/usr \ - || die "make failed" - emake \ - doc \ - ${MY_MAKEOPTS} \ - prefix=/usr \ - || die "make doc failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi -} - -src_install() { - emake \ - install \ - ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - || die "make install failed" - emake \ - install-doc \ - ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - mandir='$(prefix)/share/man' \ - || die "make install-doc failed" - - use X || rm "${D}"/usr/bin/gitk - - dodoc README COPYING Documentation/SubmittingPatches - dodoc Documentation/technical/* - - prepman - - if use emacs ; then - insinto "${SITELISP}" - doins contrib/emacs/{,vc-}git.el* - elisp-site-file-install "${FILESDIR}"/70git-gentoo.el - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon -} - -src_test() { - cd "${S}" - make ${MY_MAKEOPTS} test || die "tests failed" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo - einfo "If you want to import arch repositories into git, consider using the" - einfo "git-archimport command. You should install dev-util/tla before" - einfo - einfo "If you want to import cvs repositories into git, consider using the" - einfo "git-cvsimport command. You should install >=dev-util/cvsps-2.1 before" - einfo - einfo "If you want to import svn repositories into git, consider using the" - einfo "git-svnimport command. You should install dev-util/subversion before" - einfo - einfo "If you want to use the included CVS server you will need to install" - einfo "dev-perl/DBI and dev-perl/DBD-SQLite" - einfo -} - -pkg_postrm() { - # regenerate site-gentoo if we are merged USE=emacs and unmerged - # USE=-emacs - has_version virtual/emacs && elisp-site-regen -} |