* [gentoo-commits] proj/gentoo-bsd:master commit in: dev-vcs/git/, dev-vcs/git/files/
@ 2012-09-14 20:11 Alexis Ballier
0 siblings, 0 replies; only message in thread
From: Alexis Ballier @ 2012-09-14 20:11 UTC (permalink / raw
To: gentoo-commits
commit: 788e75a9a30629ab00a3dd8aeec173f78f85c512
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 20:10:55 2012 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 20:10:55 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=788e75a9
remove git ebuild, it is overshadowed by the portage tree and latest seems to work
---
dev-vcs/git/Manifest | 10 -
dev-vcs/git/files/50git-gentoo.el | 13 -
.../git/files/git-1.7.2-always-install-js.patch | 31 --
dev-vcs/git/files/git-1.7.3.2-interix.patch | 90 ----
dev-vcs/git/files/git-daemon.confd | 19 -
dev-vcs/git/files/git-daemon.initd | 30 --
dev-vcs/git/files/git-daemon.xinetd | 13 -
dev-vcs/git/git-1.7.3.2-r1.ebuild | 459 --------------------
8 files changed, 0 insertions(+), 665 deletions(-)
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
deleted file mode 100644
index 2b08d63..0000000
--- a/dev-vcs/git/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX 50git-gentoo.el 472 RMD160 3d9c7dcb70d781dd7f12e4a19e838996681ec0d4 SHA1 fc47553c2422af82bbd2588e9853cc0c9cb437c7 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2
-AUX git-1.7.2-always-install-js.patch 1167 RMD160 36cae52a1dbcb2450a521b60ce66dbd48e58b3a9 SHA1 45f652281e36627f80b2d559a6861e784b8afa75 SHA256 2988513c5a81f446818b850414b4bf7dc8a3177eb1dc32f29e530a80479baa9e
-AUX git-1.7.3.2-interix.patch 2283 RMD160 2c448d5a8bfb9696cbc55a52328e04617de9fcf1 SHA1 b35a35d6b6729c3868482c689a7c629b35c7e414 SHA256 13dc741c481fcba6db060bbc8b54d0e19350c9c2270e113afe5ac3962d78e8b6
-AUX git-daemon.confd 700 RMD160 2dea5af0c6b3aa5304aa5417bb40099bd4cdb45b SHA1 0b7c3078c4d284eb2572a5fb7c1efff5a4837f6e SHA256 9ca387e81ca875d4e543fa64398620451ff74273fa06b122a6af47db1fee1630
-AUX git-daemon.initd 738 RMD160 23de3f02cd33251ce0f66c1b6e1d6a20ee45ee5b SHA1 b6f8e80130ddddf8cbd70a553b31706d570f7d5a SHA256 48e7e1228c9811079dce8fecc560000cf645de5b4bb697f8f8ad3f906906330b
-AUX git-daemon.xinetd 260 RMD160 5bfeca2541488bb955ca349474c1fa3e80913aef SHA1 88d6fc44644c88ed6f2ce54a936f41dc15d2268e SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67
-DIST git-1.7.3.2.tar.bz2 2630629 RMD160 b645fc9e82eff3e186398280bc0a4ad72089b457 SHA1 cd8d806752aa6f5716cf193585024a002e098bf4 SHA256 bc4cf6bc7c116056050ef43b051691828d7101327b23311d424b02eaee553e71
-DIST git-htmldocs-1.7.3.2.tar.bz2 910291 RMD160 3a30ca0bdda0a2db9d99ad23857e55b376ee1ec5 SHA1 4be705c67a4c7954591c642437c2733b902b080d SHA256 7de0674b93c6f2159b9adbec31b48747328cb2c7508a66bd7ba0ff037b407187
-DIST git-manpages-1.7.3.2.tar.bz2 291349 RMD160 2a3e82a28bc955ffadfa91c5459f992ed17fa9f2 SHA1 0be6fabbca523085e185711f2b80c99330f1e4ac SHA256 ce6ca1cb1c62b7dd8d258cf9a94cda7de90a9476b7bb315968f3ed1976dc621e
-EBUILD git-1.7.3.2-r1.ebuild 13203 RMD160 8ac42406ea41543d474bcf5506d91af433e22c2c SHA1 ece8bdb1be61cf4b5f5f8ba1ab2ff585ba6e3fc3 SHA256 002d5cc602b4185d0a021dfbc42e2a8067d813b58d4862fa15179ba6dbec152a
diff --git a/dev-vcs/git/files/50git-gentoo.el b/dev-vcs/git/files/50git-gentoo.el
deleted file mode 100644
index 1646a39..0000000
--- a/dev-vcs/git/files/50git-gentoo.el
+++ /dev/null
@@ -1,13 +0,0 @@
-
-;;; dev-vcs/git site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(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)
-
-;; GNU Emacs >=22.2 already includes vc-git.el.
-;; Enable the following only if Emacs has no GIT support.
-(unless (fboundp 'vc-git-registered)
- (add-to-list 'load-path "@SITELISP@/compat")
- (add-to-list 'vc-handled-backends 'GIT))
diff --git a/dev-vcs/git/files/git-1.7.2-always-install-js.patch b/dev-vcs/git/files/git-1.7.2-always-install-js.patch
deleted file mode 100644
index fea661b..0000000
--- a/dev-vcs/git/files/git-1.7.2-always-install-js.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.2.orig/Makefile git-1.7.2/Makefile
---- git-1.7.2.orig/Makefile 2010-07-21 21:35:25.000000000 +0000
-+++ git-1.7.2/Makefile 2010-07-22 16:52:22.994872806 +0000
-@@ -1650,17 +1650,16 @@
- $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all
-
- ifdef JSMIN
--GITWEB_PROGRAMS += gitweb/static/gitweb.min.js
- GITWEB_JS = gitweb/static/gitweb.min.js
- else
- GITWEB_JS = gitweb/static/gitweb.js
- endif
- ifdef CSSMIN
--GITWEB_PROGRAMS += gitweb/static/gitweb.min.css
- GITWEB_CSS = gitweb/static/gitweb.min.css
- else
- GITWEB_CSS = gitweb/static/gitweb.css
- endif
-+GITWEB_PROGRAMS += $(GITWEB_JS) $(GITWEB_CSS)
- OTHER_PROGRAMS += gitweb/gitweb.cgi $(GITWEB_PROGRAMS)
- gitweb/gitweb.cgi: gitweb/gitweb.perl $(GITWEB_PROGRAMS)
- $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)
-@@ -1675,7 +1674,7 @@
- endif # CSSMIN
-
-
--git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/static/gitweb.js
-+git-instaweb: git-instaweb.sh gitweb/gitweb.cgi $(GITWEB_CSS) $(GITWEB_JS)
- $(QUIET_GEN)$(RM) $@ $@+ && \
- sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
- -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
diff --git a/dev-vcs/git/files/git-1.7.3.2-interix.patch b/dev-vcs/git/files/git-1.7.3.2-interix.patch
deleted file mode 100644
index 2e333b5..0000000
--- a/dev-vcs/git/files/git-1.7.3.2-interix.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-upstream report: http://marc.info/?l=git&m=128774216918941&w=2
-
-diff -ru git-1.7.3.1.orig/Makefile git-1.7.3.1/Makefile
---- git-1.7.3.1.orig/Makefile 2010-10-22 10:58:17 +0200
-+++ git-1.7.3.1/Makefile 2010-10-22 11:17:28 +0200
-@@ -1091,6 +1091,25 @@
- endif
- X = .exe
- endif
-+ifeq ($(uname_S),Interix)
-+ NO_SYS_POLL_H = YesPlease
-+ NO_INTTYPES_H = YesPlease
-+ NO_INITGROUPS = YesPlease
-+ NO_IPV6 = YesPlease
-+ NO_MEMMEM = YesPlease
-+ NO_MKDTEMP = YesPlease
-+ NO_STRTOUMAX = YesPlease
-+ NO_NSEC = YesPlease
-+ NO_MKSTEMPS = YesPlease
-+ ifeq ($(uname_R),3.5)
-+ NO_INET_NTOP = YesPlease
-+ NO_INET_PTON = YesPlease
-+ endif
-+ ifeq ($(uname_R),5.2)
-+ NO_INET_NTOP = YesPlease
-+ NO_INET_PTON = YesPlease
-+ endif
-+endif
- ifneq (,$(findstring MINGW,$(uname_S)))
- pathsep = ;
- NO_PREAD = YesPlease
-@@ -1354,6 +1373,15 @@
- ifdef NO_SYS_SELECT_H
- BASIC_CFLAGS += -DNO_SYS_SELECT_H
- endif
-+ifdef NO_SYS_POLL_H
-+ BASIC_CFLAGS += -DNO_SYS_POLL_H
-+endif
-+ifdef NO_INTTYPES_H
-+ BASIC_CFLAGS += -DNO_INTTYPES_H
-+endif
-+ifdef NO_INITGROUPS
-+ BASIC_CFLAGS += -DNO_INITGROUPS
-+endif
- ifdef NO_MMAP
- COMPAT_CFLAGS += -DNO_MMAP
- COMPAT_OBJS += compat/mmap.o
-diff -ru git-1.7.3.1.orig/daemon.c git-1.7.3.1/daemon.c
---- git-1.7.3.1.orig/daemon.c 2010-10-22 10:58:11 +0200
-+++ git-1.7.3.1/daemon.c 2010-10-22 11:10:21 +0200
-@@ -956,7 +956,11 @@
- listen_addr, listen_port);
-
- if (pass && gid &&
-- (initgroups(pass->pw_name, gid) || setgid (gid) ||
-+ (
-+#ifndef NO_INITGROUPS
-+ initgroups(pass->pw_name, gid) ||
-+#endif
-+ setgid (gid) ||
- setuid(pass->pw_uid)))
- die("cannot drop privileges");
-
-diff -ru git-1.7.3.1.orig/git-compat-util.h git-1.7.3.1/git-compat-util.h
---- git-1.7.3.1.orig/git-compat-util.h 2010-10-22 10:58:16 +0200
-+++ git-1.7.3.1/git-compat-util.h 2010-10-22 11:12:22 +0200
-@@ -94,7 +94,11 @@
- #include <utime.h>
- #ifndef __MINGW32__
- #include <sys/wait.h>
-+#ifndef NO_SYS_POLL_H
- #include <sys/poll.h>
-+#else
-+#include <poll.h>
-+#endif
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <termios.h>
-@@ -106,7 +110,11 @@
- #include <arpa/inet.h>
- #include <netdb.h>
- #include <pwd.h>
-+#ifndef NO_INTTYPES_H
- #include <inttypes.h>
-+#else
-+#include <stdint.h>
-+#endif
- #if defined(__CYGWIN__)
- #undef _XOPEN_SOURCE
- #include <grp.h>
diff --git a/dev-vcs/git/files/git-daemon.confd b/dev-vcs/git/files/git-daemon.confd
deleted file mode 100644
index 75b4216..0000000
--- a/dev-vcs/git/files/git-daemon.confd
+++ /dev/null
@@ -1,19 +0,0 @@
-# conf.d file for git-daemon
-#
-# Please check man 1 git-daemon for more information about the options
-# git-daemon accepts. You MUST edit this to include your repositories you wish
-# to serve.
-#
-# Some of the 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 /var/git"
-
-# To run an anonymous git safely, the following user should be able to only
-# read your Git repositories. It should not able able to write to anywhere on
-# your system, esp. not the repositories.
-GIT_USER="nobody"
-GIT_GROUP="nobody"
diff --git a/dev-vcs/git/files/git-daemon.initd b/dev-vcs/git/files/git-daemon.initd
deleted file mode 100644
index c6ee19f..0000000
--- a/dev-vcs/git/files/git-daemon.initd
+++ /dev/null
@@ -1,30 +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-vcs/git/files/git-daemon.initd,v 1.1 2010/03/17 15:13:27 sping Exp $
-
-PIDFILE=/var/run/git-daemon.pid
-
-depend() {
- need net
- use logger
-}
-
-start() {
- [ -e /lib/librc.so ] || BL1_COMPAT="--name git-daemon"
- ebegin "Starting git-daemon"
- start-stop-daemon --start --quiet --background \
- --pidfile ${PIDFILE} ${BL1_COMPAT} \
- --exec /usr/bin/git -- daemon \
- --pid-file=${PIDFILE} \
- --user=${GIT_USER} --group=${GIT_GROUP} \
- ${GITDAEMON_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping git-daemon"
- start-stop-daemon --stop --quiet \
- --pidfile ${PIDFILE}
- eend $?
-}
diff --git a/dev-vcs/git/files/git-daemon.xinetd b/dev-vcs/git/files/git-daemon.xinetd
deleted file mode 100644
index 02c938d..0000000
--- a/dev-vcs/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
- server_args = daemon --inetd --syslog --export-all --base-path=/var/git
-}
diff --git a/dev-vcs/git/git-1.7.3.2-r1.ebuild b/dev-vcs/git/git-1.7.3.2-r1.ebuild
deleted file mode 100644
index 1ed8025..0000000
--- a/dev-vcs/git/git-1.7.3.2-r1.ebuild
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.2-r1.ebuild,v 1.1 2010/10/26 21:06:34 robbat2 Exp $
-
-EAPI=3
-
-GENTOO_DEPEND_ON_PERL=no
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [ "$PV" != "9999" ]; then
- SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
- mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
- doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
- SRC_URI=""
- EGIT_BRANCH="master"
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
- # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
- KEYWORDS="~ppc ~ppc64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- !blksha1? ( dev-libs/openssl )
- sys-libs/zlib
- perl? ( dev-lang/perl[-build] )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI )
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
- )
- gtk?
- (
- >=dev-python/pygtk-2.8
- || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python )
- )"
-
-# This is how info docs are created with Git:
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook
-# .xml/docbook --(docbook2texi.pl)--> .texi
-# .texi --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
- app-arch/cpio
- doc? (
- app-text/asciidoc
- app-text/docbook2X
- sys-apps/texinfo
- )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
- DEPEND="${DEPEND}
- doc? (
- app-text/xmlto
- )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if ! use perl ; then
- use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
- use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
- use subversion && ewarn "git-svn needs USE=perl, it won't work"
- fi
- if use webdav && ! use curl ; then
- ewarn "USE=webdav needs USE=curl. Ignoring"
- fi
- if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
- ewarn "with USE=dso, there may be weird crashes in git-svn. You"
- ewarn "have been warned."
- fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
- local myopts
-
- if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
- elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
- fi
-
- if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
- else
- myopts="${myopts} NO_CURL=YesPlease"
- fi
-
- # broken assumptions, because of broken build system ...
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
- myopts="${myopts} INSTALL=install TAR=tar"
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
- myopts="${myopts} SANE_TOOL_PATH="
- myopts="${myopts} OLD_ICONV="
- myopts="${myopts} NO_EXTERNAL_GREP="
-
- # can't define this to null, since the entire makefile depends on it
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
- use iconv \
- || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
- # || myopts="${myopts} NO_ICONV=YesPlease"
- # because, above, we need to do this unconditionally (no "&& use iconv")
- use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
- use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
- use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
- use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-# if [[ ${CHOST} == *-mint* ]] ; then
-# myopts="${myopts} NO_MMAP=YesPlease"
-# myopts="${myopts} NO_IPV6=YesPlease"
-# myopts="${myopts} NO_STRLCPY=YesPlease"
-# myopts="${myopts} NO_MEMMEM=YesPlease"
-# myopts="${myopts} NO_MKDTEMP=YesPlease"
-# myopts="${myopts} NO_MKSTEMPS=YesPlease"
-# fi
- if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts="${myopts} NO_NSEC=YesPlease"
- fi
-
- has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
- # Bug 290465:
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
- [[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
-
- export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
- if [ "${PV}" != "9999" ]; then
- unpack ${MY_P}.tar.bz2
- cd "${S}"
- unpack ${PN}-manpages-${DOC_VER}.tar.bz2
- use doc && \
- cd "${S}"/Documentation && \
- unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
- cd "${S}"
- else
- git_src_unpack
- cd "${S}"
- #cp "${FILESDIR}"/GIT-VERSION-GEN .
- fi
-
-}
-
-src_prepare() {
- # Noperl is being merged to upstream as of 2009/04/05
- #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
- # GetOpt-Long v2.38 is strict
- # Merged in 1.6.3 final 2009/05/07
- #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
- # JS install fixup
- epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
-
- # USE=-iconv causes segfaults, fixed post 1.7.1
- # Gentoo bug #321895
- #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
- sed -i \
- -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
- -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
- -e 's:^\(CC = \).*$:\1$(OPTCC):' \
- -e 's:^\(AR = \).*$:\1$(OPTAR):' \
- -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
- -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
- Makefile || die "sed failed"
-
- # Never install the private copy of Error.pm (bug #296310)
- sed -i \
- -e '/private-Error.pm/s,^,#,' \
- perl/Makefile.PL
-
- # Fix docbook2texi command
- sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
- Documentation/Makefile || die "sed failed"
-
- # bug #318289
- epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
-}
-
-git_emake() {
- emake ${MY_MAKEOPTS} \
- DESTDIR="${D}" \
- OPTCFLAGS="${CFLAGS}" \
- OPTLDFLAGS="${LDFLAGS}" \
- OPTCC="$(tc-getCC)" \
- OPTAR="$(tc-getAR)" \
- prefix="${EPREFIX}"/usr \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- sysconfdir="${EPREFIX}"/etc \
- PYTHON_PATH="${EPREFIX}"/usr/bin/python \
- "$@"
-}
-
-src_configure() {
- exportmakeopts
-}
-
-src_compile() {
- git_emake || die "emake failed"
-
- if use emacs ; then
- elisp-compile contrib/emacs/git{,-blame}.el \
- || die "emacs modules failed"
- fi
-
- if use perl && use cgi ; then
- git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
- fi
-
- cd "${S}"/Documentation
- if [[ "$PV" == "9999" ]] ; then
- git_emake man \
- || die "emake man failed"
- if use doc ; then
- git_emake info html \
- || die "emake info html failed"
- fi
- else
- if use doc ; then
- git_emake info \
- || die "emake info html failed"
- fi
- fi
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- doman man?/*.[157] Documentation/*.[157]
-
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
- use doc && dodir /usr/share/doc/${PF}/html
- for d in / /howto/ /technical/ ; do
- docinto ${d}
- dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
- done
- docinto /
- # Upstream does not ship this pre-built :-(
- use doc && doinfo Documentation/{git,gitman}.info
-
- dobashcompletion contrib/completion/git-completion.bash ${PN}
-
- if use emacs ; then
- elisp-install ${PN} contrib/emacs/git.{el,elc} || die
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
- # don't add automatically to the load-path, so the sitefile
- # can do a conditional loading
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
- fi
-
- if use gtk ; then
- dobin "${S}"/contrib/gitview/gitview
- dodoc "${S}"/contrib/gitview/gitview.txt
- fi
-
- dobin contrib/fast-import/git-p4
- dodoc contrib/fast-import/git-p4.txt
- newbin contrib/fast-import/import-tars.perl import-tars
- newbin contrib/git-resurrect.sh git-resurrect
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # svnimport - use git-svn
- # thunderbird-patch-inline - fixes thunderbird
- for i in \
- blameview buildsystems ciabot continuous convert-objects fast-import \
- hg-to-git hooks remotes2config.sh remotes2config.sh \
- rerere-train.sh stats svn-fe vim workdir \
- ; do
- cp -rf \
- "${S}"/contrib/${i} \
- "${ED}"/usr/share/${PN}/contrib \
- || die "Failed contrib ${i}"
- done
-
- if use perl && use cgi ; then
- exeinto /usr/share/${PN}/gitweb
- doexe "${S}"/gitweb/gitweb.cgi
- insinto /usr/share/${PN}/gitweb/static
- doins "${S}"/gitweb/static/gitweb.css
- js=gitweb.js
- [ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js
- doins "${S}"/gitweb/static/${js}
- doins "${S}"/gitweb/static/git-{favicon,logo}.png
-
- # INSTALL discusses configuration issues, not just installation
- docinto /
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
- newdoc "${S}"/gitweb/README README.gitweb
-
- find "${ED}"/usr/lib64/perl5/ \
- -name .packlist \
- -exec rm \{\} \;
- fi
- if ! use subversion ; then
- rm -f "${ED}"/usr/libexec/git-core/git-svn \
- "${ED}"/usr/share/man/man1/git-svn.1*
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon
- fi
-
- newinitd "${FILESDIR}"/git-daemon.initd git-daemon
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
- fixlocalpod
-}
-
-src_test() {
- local disabled=""
- local tests_cvs="t9200-git-cvsexportcommit.sh \
- t9400-git-cvsserver-server.sh \
- t9401-git-cvsserver-crlf.sh \
- t9600-cvsimport.sh \
- t9601-cvsimport-vendor-branch.sh \
- t9602-cvsimport-branches-tags.sh \
- t9603-cvsimport-patchsets.sh"
- local tests_perl="t5502-quickfetch.sh \
- t5512-ls-remote.sh \
- t5520-pull.sh"
- # Bug #225601 - t0004 is not suitable for root perm
- # Bug #219839 - t1004 is not suitable for root perm
- # t0001-init.sh - check for init notices EPERM* fails
- local tests_nonroot="t0001-init.sh \
- t0004-unwritable.sh \
- t1004-read-tree-m-u-wf.sh \
- t3700-add.sh \
- t7300-clean.sh"
-
- # Unzip is used only for the testcase code, not by any normal parts of Git.
- if ! has_version app-arch/unzip ; then
- einfo "Disabling tar-tree tests"
- disabled="${disabled} t5000-tar-tree.sh"
- fi
-
- cvs=0
- use cvs && let cvs=$cvs+1
- if [[ ${EUID} -eq 0 ]]; then
- if [[ $cvs -eq 1 ]]; then
- ewarn "Skipping CVS tests because CVS does not work as root!"
- ewarn "You should retest with FEATURES=userpriv!"
- disabled="${disabled} ${tests_cvs}"
- fi
- einfo "Skipping other tests that require being non-root"
- disabled="${disabled} ${tests_nonroot}"
- else
- [[ $cvs -gt 0 ]] && \
- has_version dev-vcs/cvs && \
- let cvs=$cvs+1
- [[ $cvs -gt 1 ]] && \
- built_with_use dev-vcs/cvs server && \
- let cvs=$cvs+1
- if [[ $cvs -lt 3 ]]; then
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
- disabled="${disabled} ${tests_cvs}"
- fi
- fi
-
- if ! use perl ; then
- einfo "Disabling tests that need Perl"
- disabled="${disabled} ${tests_perl}"
- fi
-
- # Reset all previously disabled tests
- cd "${S}/t"
- for i in *.sh.DISABLED ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
- done
- einfo "Disabled tests:"
- for i in ${disabled} ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
- done
- cd "${S}"
- # Now run the tests
- einfo "Start test run"
- git_emake \
- test || die "tests failed"
-}
-
-showpkgdeps() {
- local pkg=$1
- shift
- elog " $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then
- ewarn "You must build dev-vcs/subversion with USE=perl"
- ewarn "to get the full functionality of git-svn!"
- fi
- elog "These additional scripts need some dependencies:"
- echo
- showpkgdeps git-quiltimport "dev-util/quilt"
- showpkgdeps git-instaweb \
- "|| ( www-servers/lighttpd www-servers/apache )"
- echo
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-09-14 20:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-14 20:11 [gentoo-commits] proj/gentoo-bsd:master commit in: dev-vcs/git/, dev-vcs/git/files/ Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox