commit: 9d5bd3c4d29dd62736fa6fa888f344f41a4d981d
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 17:01:37 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 17:02:42 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d5bd3c4
dev-vcs/git: add libressl support
.../{git-9999-r3.ebuild => git-2.5.3-r1.ebuild} | 87 +++++++++++-----------
dev-vcs/git/git-9999-r3.ebuild | 5 +-
2 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-2.5.3-r1.ebuild
similarity index 90%
copy from dev-vcs/git/git-9999-r3.ebuild
copy to dev-vcs/git/git-2.5.3-r1.ebuild
index bc14980..c38a8ea 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-2.5.3-r1.ebuild
@@ -38,15 +38,16 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv
mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs
subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv
libressl mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd
cvs subversion test"
# Common to both DEPEND and RDEPEND
CDEPEND="
- dev-libs/openssl:0
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
sys-libs/zlib
pcre? ( dev-libs/libpcre )
perl? ( dev-lang/perl:=[-build(-)] )
- tk? ( dev-lang/tk:0 )
+ tk? ( dev-lang/tk:0= )
curl? (
net-misc/curl
webdav? ( dev-libs/expat )
@@ -79,7 +80,6 @@ RDEPEND="${CDEPEND}
# .xml/docbook --(docbook2texi.pl)--> .texi
# .texi --(makeinfo)---------> .info
DEPEND="${CDEPEND}
- app-arch/cpio
doc? (
app-text/asciidoc
app-text/docbook2X
@@ -125,24 +125,24 @@ exportmakeopts() {
local myopts
if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
+ myopts+=" BLK_SHA1=YesPlease"
elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
+ myopts+=" PPC_SHA1=YesPlease"
fi
if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+ use webdav || myopts+=" NO_EXPAT=YesPlease"
else
- myopts="${myopts} NO_CURL=YesPlease"
+ 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="
+ myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts+=" INSTALL=install TAR=tar"
+ myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts+=" SANE_TOOL_PATH="
+ myopts+=" OLD_ICONV="
+ myopts+=" NO_EXTERNAL_GREP="
# For svn-fe
extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
@@ -151,55 +151,53 @@ exportmakeopts() {
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
+ || myopts+=" NO_ICONV=YesPlease"
use nls \
- || myopts="${myopts} NO_GETTEXT=YesPlease"
+ || myopts+=" NO_GETTEXT=YesPlease"
use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
+ || myopts+=" NO_TCLTK=YesPlease"
use pcre \
- && myopts="${myopts} USE_LIBPCRE=yes" \
- && extlibs="${extlibs} -lpcre"
+ && myopts+=" USE_LIBPCRE=yes" \
+ && extlibs+=" -lpcre"
use perl \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
+ && myopts+=" INSTALLDIRS=vendor" \
+ || myopts+=" NO_PERL=YesPlease"
use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
+ || myopts+=" NO_PYTHON=YesPlease"
use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+ || myopts+=" NO_SVN_TESTS=YesPlease"
use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
- || myopts="${myopts} NO_PTHREADS=YesPlease"
+ && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+ || myopts+=" NO_PTHREADS=YesPlease"
use cvs \
- || myopts="${myopts} NO_CVS=YesPlease"
+ || myopts+=" NO_CVS=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"
+# myopts+=" NO_MMAP=YesPlease"
+# myopts+=" NO_IPV6=YesPlease"
+# myopts+=" NO_STRLCPY=YesPlease"
+# myopts+=" NO_MEMMEM=YesPlease"
+# myopts+=" NO_MKDTEMP=YesPlease"
+# myopts+=" NO_MKSTEMPS=YesPlease"
# fi
if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts="${myopts} NO_NSEC=YesPlease"
+ myopts+=" NO_NSEC=YesPlease"
fi
if [[ ${CHOST} == *-*-aix* ]]; then
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+ myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
fi
if [[ ${CHOST} == *-solaris* ]]; then
- myopts="${myopts} NEEDS_LIBICONV=YesPlease"
- myopts="${myopts} HAVE_CLOCK_MONOTONIC=1"
- myopts="${myopts} HAVE_GETDELIM=1"
+ myopts+=" NEEDS_LIBICONV=YesPlease"
fi
has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+ && myopts+=" ASCIIDOC8=YesPlease"
+ 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"
+ myopts+=" NO_NSEC=YesPlease"
export MY_MAKEOPTS="${myopts}"
export EXTLIBS="${extlibs}"
@@ -232,6 +230,9 @@ src_prepare() {
epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+ # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+ epatch "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+
epatch_user
sed -i \
@@ -300,8 +301,8 @@ src_compile() {
if use perl && use cgi ; then
git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
+ gitweb \
+ || die "emake gitweb (cgi) failed"
fi
if [[ ${CHOST} == *-darwin* ]]; then
@@ -516,7 +517,7 @@ src_install() {
}
src_test() {
- local disabled=""
+ local disabled="" #t7004-tag.sh" #520270
local tests_cvs="t9200-git-cvsexportcommit.sh \
t9400-git-cvsserver-server.sh \
t9401-git-cvsserver-crlf.sh \
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index bc14980..a9feb91 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -38,11 +38,12 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv
mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs
subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv
libressl mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd
cvs subversion test"
# Common to both DEPEND and RDEPEND
CDEPEND="
- dev-libs/openssl:0
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
sys-libs/zlib
pcre? ( dev-libs/libpcre )
perl? ( dev-lang/perl:=[-build(-)] )
