Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 239681 Details for
Bug 329273
Please review EAPI3/Gentoo Prefix changes for =dev-vcs/git-1.7.2
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
git-1.7.1.1-prefix.patch
git-1.7.1.1-prefix.patch (text/plain), 5.18 KB, created by
Jeremy Olexa (darkside) (RETIRED)
on 2010-07-21 13:44:46 UTC
(
hide
)
Description:
git-1.7.1.1-prefix.patch
Filename:
MIME Type:
Creator:
Jeremy Olexa (darkside) (RETIRED)
Created:
2010-07-21 13:44:46 UTC
Size:
5.18 KB
patch
obsolete
>Index: git-1.7.1.1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.1.1.ebuild,v >retrieving revision 1.1 >diff -u -r1.1 git-1.7.1.1.ebuild >--- git-1.7.1.1.ebuild 30 Jun 2010 00:15:58 -0000 1.1 >+++ git-1.7.1.1.ebuild 21 Jul 2010 13:43:15 -0000 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.1.1.ebuild,v 1.1 2010/06/30 00:15:58 robbat2 Exp $ > >-EAPI=2 >+EAPI=3 > > inherit toolchain-funcs eutils elisp-common perl-module bash-completion > [ "$PV" == "9999" ] && inherit git >@@ -18,7 +18,7 @@ > 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 ~sparc-fbsd ~x86-fbsd" >+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" > else > SRC_URI="" > EGIT_BRANCH="master" >@@ -113,6 +113,18 @@ > 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/bash" >+ 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 !elibc_glibc && use iconv && myopts="${myopts} NEEDS_LIBICONV=YesPlease" >+ > use iconv \ > || einfo "Forcing iconv for 1.7.1-r1 due to bugs #321895, #322205." > # || myopts="${myopts} NO_ICONV=YesPlease" >@@ -126,6 +138,29 @@ > use subversion \ > || myopts="${myopts} NO_SVN_TESTS=YesPlease" > >+ 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} == *-interix* ]] ; then >+ myopts="${myopts} NO_IPV6=YesPlease" >+ myopts="${myopts} NO_MEMMEM=YesPlease" >+ myopts="${myopts} NO_MKDTEMP=YesPlease" >+ myopts="${myopts} NO_STRTOUMAX=YesPlease" >+ myopts="${myopts} NO_STRTOULL=YesPlease" >+ myopts="${myopts} NO_INET_NTOP=YesPlease" >+ myopts="${myopts} NO_INET_PTON=YesPlease" >+ myopts="${myopts} NO_NSEC=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" >@@ -163,6 +198,8 @@ > # Merged in 1.6.3 final 2009/05/07 > #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch > >+ [[ ${CHOST} == *-mint* ]] && epatch "${FILESDIR}"/${PN}-1.6.3.3-mint.patch >+ > # JS install fixup > epatch "${FILESDIR}"/git-1.7.1-always-install-js.patch > >@@ -175,6 +212,8 @@ > -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) >@@ -186,6 +225,9 @@ > sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ > Documentation/Makefile || die "sed failed" > >+ # bug #318289 >+ epatch "${FILESDIR}"/${PN}-1.7.1-interix.patch >+ epatch "${FILESDIR}"/${PN}-1.6.6.1-interix6.patch > } > > git_emake() { >@@ -195,8 +237,9 @@ > OPTLDFLAGS="${LDFLAGS}" \ > OPTCC="$(tc-getCC)" \ > OPTAR="$(tc-getAR)" \ >- prefix=/usr \ >- htmldir=/usr/share/doc/${PF}/html \ >+ prefix="${EPREFIX}"/usr \ >+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ >+ sysconfdir="${EPREFIX}"/etc \ > "$@" > } > >@@ -260,7 +303,7 @@ > #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 "${D}${SITELISP}/${PN}/compat/.nosearch" >+ touch "${ED}${SITELISP}/${PN}/compat/.nosearch" > elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die > fi > >@@ -284,7 +327,7 @@ > workdir convert-objects blameview ; do > cp -rf \ > "${S}"/contrib/${i} \ >- "${D}"/usr/share/${PN}/contrib \ >+ "${ED}"/usr/share/${PN}/contrib \ > || die "Failed contrib ${i}" > done > >@@ -306,13 +349,13 @@ > newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb > newdoc "${S}"/gitweb/README README.gitweb > >- find "${D}"/usr/lib64/perl5/ \ >+ find "${ED}"/usr/lib64/perl5/ \ > -name .packlist \ > -exec rm \{\} \; > fi > if ! use subversion ; then >- rm -f "${D}"/usr/libexec/git-core/git-svn \ >- "${D}"/usr/share/man/man1/git-svn.1* >+ rm -f "${ED}"/usr/libexec/git-core/git-svn \ >+ "${ED}"/usr/share/man/man1/git-svn.1* > fi > > if use xinetd ; then
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 329273
: 239681 |
239803
|
239805
|
239807