[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/

[Lars Wendler]

commit:     525f6a2b9659e3f45ff74648322146df4339a9b6
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 11 08:41:39 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 08:41:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=525f6a2b

dev-vcs/git: Synced/fixed live ebuilds.

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-vcs/git/git-9999-r1.ebuild | 9 ---------
 dev-vcs/git/git-9999-r2.ebuild | 9 ---------
 dev-vcs/git/git-9999-r3.ebuild | 9 ---------
 dev-vcs/git/git-9999.ebuild    | 8 +-------
 4 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 186cdcff1c8..f26b6776b94 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -140,9 +140,6 @@ PATCHES=(
        "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch
 
        "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-       # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-       "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
 )
 
 pkg_setup() {
@@ -294,12 +291,6 @@ src_prepare() {
        # Fix docbook2texi command
        sed -r -i 
's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = 
docbook2texi.pl/' \
                Documentation/Makefile || die
-
-       # Fix git-subtree missing DESTDIR
-       sed -i \
-               -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-               -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-               contrib/subtree/Makefile || die
 }
 
 git_emake() {

diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 186cdcff1c8..f26b6776b94 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -140,9 +140,6 @@ PATCHES=(
        "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch
 
        "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-       # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-       "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
 )
 
 pkg_setup() {
@@ -294,12 +291,6 @@ src_prepare() {
        # Fix docbook2texi command
        sed -r -i 
's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = 
docbook2texi.pl/' \
                Documentation/Makefile || die
-
-       # Fix git-subtree missing DESTDIR
-       sed -i \
-               -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-               -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-               contrib/subtree/Makefile || die
 }
 
 git_emake() {

diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index a1219aeea6e..ce1a4c2f065 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -140,9 +140,6 @@ PATCHES=(
        "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch
 
        "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-       # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-       "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
 )
 
 pkg_setup() {
@@ -294,12 +291,6 @@ src_prepare() {
        # Fix docbook2texi command
        sed -r -i 
's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = 
docbook2texi.pl/' \
                Documentation/Makefile || die
-
-       # Fix git-subtree missing DESTDIR
-       sed -i \
-               -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-               -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-               contrib/subtree/Makefile || die
 }
 
 git_emake() {

diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index b6ac61a6a24..958f1ad6aa0 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -137,7 +137,7 @@ REQUIRED_USE="
 
 PATCHES=(
        # bug #350330 - automagic CVS when we don't want it is bad.
-       "${FILESDIR}"/git-2.17.0_rc1-optional-cvs.patch
+       "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch
 
        "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
 
@@ -294,12 +294,6 @@ src_prepare() {
        # Fix docbook2texi command
        sed -r -i 
's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = 
docbook2texi.pl/' \
                Documentation/Makefile || die
-
-       # Fix git-subtree missing DESTDIR
-       sed -i \
-               -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-               -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-               contrib/subtree/Makefile || die
 }
 
 git_emake() {