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

Package-Manager: Portage-2.3.49, Repoman-2.3.10

diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 186cdcff1c84a55bfa95ab2d19cddd3b9429b53c..f26b6776b942babb297899daad136679e5fbd942 100644 (file)
--- 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 186cdcff1c84a55bfa95ab2d19cddd3b9429b53c..f26b6776b942babb297899daad136679e5fbd942 100644 (file)
--- 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 a1219aeea6ef5d2189f60cb2a98cacb8d066054c..ce1a4c2f0654944df946830f2777b11a92079385 100644 (file)
--- 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 b6ac61a6a24bdad414d301501a827eb701526c05..958f1ad6aa0141c0ad5a91cd3cac02c962ccfbdf 100644 (file)
--- 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() {