Attachment #586698 for bug #692030

View | Details | Raw Unified | Return to bug 692030
Collapse All | Expand All





LICENSE="GPL-2"
SLOT="0"
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test"

# Common to both DEPEND and RDEPEND
CDEPEND="

			dev-perl/TermReadKey
		)
	)
	perforce? ( ${PYTHON_DEPS} )
"

# This is how info docs are created with Git:

	subversion? ( perl )
	webdav? ( curl )
	pcre-jit? ( pcre )
	perforce? ( ${PYTHON_REQUIRED_USE} )
"

PATCHES=(

		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
		ewarn "have been warned."
	fi
	if use perforce ; then
		python-single-r1_pkg_setup
	fi
}

		$(usex iconv '' NO_ICONV=YesPlease)
		$(usex nls '' NO_GETTEXT=YesPlease)
		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
		$(usex perforce '' NO_PYTHON=YesPlease)
		$(usex subversion '' NO_SVN_TESTS=YesPlease)
		$(usex threads '' NO_PTHREAD=YesPlease)
		$(usex tk '' NO_TCLTK=YesPlease)

git_emake() {
	# bug #320647: PYTHON_PATH
	local PYTHON_PATH=""
	use perforce && PYTHON_PATH="${PYTHON}"
	emake ${MY_MAKEOPTS} \
		prefix="${EPREFIX}"/usr \
		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \





LICENSE="GPL-2"
SLOT="0"
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test"

# Common to both DEPEND and RDEPEND
CDEPEND="

			dev-perl/TermReadKey
		)
	)
	perforce? ( ${PYTHON_DEPS} )
"

# This is how info docs are created with Git:

	subversion? ( perl )
	webdav? ( curl )
	pcre-jit? ( pcre )
	perforce? ( ${PYTHON_REQUIRED_USE} )
"

PATCHES=(

		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
		ewarn "have been warned."
	fi
	if use perforce ; then
		python-single-r1_pkg_setup
	fi
}

		$(usex iconv '' NO_ICONV=YesPlease)
		$(usex nls '' NO_GETTEXT=YesPlease)
		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
		$(usex perforce '' NO_PYTHON=YesPlease)
		$(usex subversion '' NO_SVN_TESTS=YesPlease)
		$(usex threads '' NO_PTHREAD=YesPlease)
		$(usex tk '' NO_TCLTK=YesPlease)

git_emake() {
	# bug #320647: PYTHON_PATH
	local PYTHON_PATH=""
	use perforce && PYTHON_PATH="${PYTHON}"
	emake ${MY_MAKEOPTS} \
		prefix="${EPREFIX}"/usr \
		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \





LICENSE="GPL-2"
SLOT="0"
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test"

# Common to both DEPEND and RDEPEND
CDEPEND="

			dev-perl/TermReadKey
		)
	)
	perforce? ( ${PYTHON_DEPS} )
"

# This is how info docs are created with Git:

	subversion? ( perl )
	webdav? ( curl )
	pcre-jit? ( pcre )
	perforce? ( ${PYTHON_REQUIRED_USE} )
"

PATCHES=(

		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
		ewarn "have been warned."
	fi
	if use perforce ; then
		python-single-r1_pkg_setup
	fi
}

		$(usex iconv '' NO_ICONV=YesPlease)
		$(usex nls '' NO_GETTEXT=YesPlease)
		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
		$(usex perforce '' NO_PYTHON=YesPlease)
		$(usex subversion '' NO_SVN_TESTS=YesPlease)
		$(usex threads '' NO_PTHREAD=YesPlease)
		$(usex tk '' NO_TCLTK=YesPlease)

git_emake() {
	# bug #320647: PYTHON_PATH
	local PYTHON_PATH=""
	use perforce && PYTHON_PATH="${PYTHON}"
	emake ${MY_MAKEOPTS} \
		prefix="${EPREFIX}"/usr \
		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \





LICENSE="GPL-2"
SLOT="0"
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test"

# Common to both DEPEND and RDEPEND
CDEPEND="

			dev-perl/TermReadKey
		)
	)
	perforce? ( ${PYTHON_DEPS} )
"

# This is how info docs are created with Git:

	subversion? ( perl )
	webdav? ( curl )
	pcre-jit? ( pcre )
	perforce? ( ${PYTHON_REQUIRED_USE} )
"

PATCHES=(

		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
		ewarn "have been warned."
	fi
	if use perforce ; then
		python-single-r1_pkg_setup
	fi
}

		$(usex iconv '' NO_ICONV=YesPlease)
		$(usex nls '' NO_GETTEXT=YesPlease)
		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
		$(usex perforce '' NO_PYTHON=YesPlease)
		$(usex subversion '' NO_SVN_TESTS=YesPlease)
		$(usex threads '' NO_PTHREAD=YesPlease)
		$(usex tk '' NO_TCLTK=YesPlease)

git_emake() {
	# bug #320647: PYTHON_PATH
	local PYTHON_PATH=""
	use perforce && PYTHON_PATH="${PYTHON}"
	emake ${MY_MAKEOPTS} \
		prefix="${EPREFIX}"/usr \
		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \





LICENSE="GPL-2"
SLOT="0"
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test"

# Common to both DEPEND and RDEPEND
CDEPEND="

			dev-perl/TermReadKey
		)
	)
	perforce? ( ${PYTHON_DEPS} )
"

# This is how info docs are created with Git:

	subversion? ( perl )
	webdav? ( curl )
	pcre-jit? ( pcre )
	perforce? ( ${PYTHON_REQUIRED_USE} )
"

PATCHES=(

		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
		ewarn "have been warned."
	fi
	if use perforce ; then
		python-single-r1_pkg_setup
	fi
}

		$(usex iconv '' NO_ICONV=YesPlease)
		$(usex nls '' NO_GETTEXT=YesPlease)
		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
		$(usex perforce '' NO_PYTHON=YesPlease)
		$(usex subversion '' NO_SVN_TESTS=YesPlease)
		$(usex threads '' NO_PTHREAD=YesPlease)
		$(usex tk '' NO_TCLTK=YesPlease)

git_emake() {
	# bug #320647: PYTHON_PATH
	local PYTHON_PATH=""
	use perforce && PYTHON_PATH="${PYTHON}"
	emake ${MY_MAKEOPTS} \
		prefix="${EPREFIX}"/usr \
		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \





LICENSE="GPL-2"
SLOT="0"
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test"

# Common to both DEPEND and RDEPEND
CDEPEND="

			dev-perl/TermReadKey
		)
	)
	perforce? ( ${PYTHON_DEPS} )
"

# This is how info docs are created with Git:

	subversion? ( perl )
	webdav? ( curl )
	pcre-jit? ( pcre )
	perforce? ( ${PYTHON_REQUIRED_USE} )
"

PATCHES=(

		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
		ewarn "have been warned."
	fi
	if use perforce ; then
		python-single-r1_pkg_setup
	fi
}

		$(usex iconv '' NO_ICONV=YesPlease)
		$(usex nls '' NO_GETTEXT=YesPlease)
		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
		$(usex perforce '' NO_PYTHON=YesPlease)
		$(usex subversion '' NO_SVN_TESTS=YesPlease)
		$(usex threads '' NO_PTHREAD=YesPlease)
		$(usex tk '' NO_TCLTK=YesPlease)

git_emake() {
	# bug #320647: PYTHON_PATH
	local PYTHON_PATH=""
	use perforce && PYTHON_PATH="${PYTHON}"
	emake ${MY_MAKEOPTS} \
		prefix="${EPREFIX}"/usr \
		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \





LICENSE="GPL-2"
SLOT="0"
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test"

# Common to both DEPEND and RDEPEND
CDEPEND="

			dev-perl/TermReadKey
		)
	)
	perforce? ( ${PYTHON_DEPS} )
"

# This is how info docs are created with Git:

		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
		ewarn "have been warned."
	fi
	if use perforce ; then
		python-single-r1_pkg_setup
	fi
}

		$(usex iconv '' NO_ICONV=YesPlease)
		$(usex nls '' NO_GETTEXT=YesPlease)
		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
		$(usex perforce '' NO_PYTHON=YesPlease)
		$(usex subversion '' NO_SVN_TESTS=YesPlease)
		$(usex threads '' NO_PTHREAD=YesPlease)
		$(usex tk '' NO_TCLTK=YesPlease)

git_emake() {
	# bug #320647: PYTHON_PATH
	local PYTHON_PATH=""
	use perforce && PYTHON_PATH="${PYTHON}"
	emake ${MY_MAKEOPTS} \
		prefix="${EPREFIX}"/usr \
		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \

Lines 32-37 Link Here

(-)a/dev-vcs/git/metadata.xml (-1 / +1 lines)
32	<flag name="mediawiki">Support pulling and pushing from MediaWiki</flag>	32	<flag name="mediawiki">Support pulling and pushing from MediaWiki</flag>
33	<flag name="mediawiki-experimental">Add experimental patches for improved MediaWiki support</flag>	33	<flag name="mediawiki-experimental">Add experimental patches for improved MediaWiki support</flag>
34	<flag name="pcre-jit">Enable JIT for pcre</flag>	34	<flag name="pcre-jit">Enable JIT for pcre</flag>
		35	<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
35	<flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag>	36	<flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag>
36	<flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag>	37	<flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag>
37	<flag name="tk">Include the 'gitk' and 'git gui' tools</flag>	38	<flag name="tk">Include the 'gitk' and 'git gui' tools</flag>
38	-

Return to bug 692030

Lines 50-56 fi Link Here

(-)a/dev-vcs/git/git-2.21.0-r2.ebuild (-6 / +6 lines)
50		50
51	LICENSE="GPL-2"	51	LICENSE="GPL-2"
52	SLOT="0"	52	SLOT="0"
53	IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"	53	IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test"
54		54
55	# Common to both DEPEND and RDEPEND	55	# Common to both DEPEND and RDEPEND
56	CDEPEND="	56	CDEPEND="
Lines 98-104 RDEPEND="${CDEPEND} Link Here
98	dev-perl/TermReadKey	98	dev-perl/TermReadKey
99	)	99	)
100	)	100	)
101	python? ( ${PYTHON_DEPS} )	101	perforce? ( ${PYTHON_DEPS} )
102	"	102	"
103		103
104	# This is how info docs are created with Git:	104	# This is how info docs are created with Git:
Lines 132-138 REQUIRED_USE=" Link Here
132	subversion? ( perl )	132	subversion? ( perl )
133	webdav? ( curl )	133	webdav? ( curl )
134	pcre-jit? ( pcre )	134	pcre-jit? ( pcre )
135	python? ( ${PYTHON_REQUIRED_USE} )	135	perforce? ( ${PYTHON_REQUIRED_USE} )
136	"	136	"
137		137
138	PATCHES=(	138	PATCHES=(
Lines 151-157 pkg_setup() { Link Here
151	ewarn "with USE=dso, there may be weird crashes in git-svn. You"	151	ewarn "with USE=dso, there may be weird crashes in git-svn. You"
152	ewarn "have been warned."	152	ewarn "have been warned."
153	fi	153	fi
154	if use python ; then	154	if use perforce ; then
155	python-single-r1_pkg_setup	155	python-single-r1_pkg_setup
156	fi	156	fi
157	}	157	}
Lines 166-172 exportmakeopts() { Link Here
166	$(usex iconv '' NO_ICONV=YesPlease)	166	$(usex iconv '' NO_ICONV=YesPlease)
167	$(usex nls '' NO_GETTEXT=YesPlease)	167	$(usex nls '' NO_GETTEXT=YesPlease)
168	$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)	168	$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
169	$(usex python '' NO_PYTHON=YesPlease)	169	$(usex perforce '' NO_PYTHON=YesPlease)
170	$(usex subversion '' NO_SVN_TESTS=YesPlease)	170	$(usex subversion '' NO_SVN_TESTS=YesPlease)
171	$(usex threads '' NO_PTHREAD=YesPlease)	171	$(usex threads '' NO_PTHREAD=YesPlease)
172	$(usex tk '' NO_TCLTK=YesPlease)	172	$(usex tk '' NO_TCLTK=YesPlease)
Lines 301-307 src_prepare() { Link Here
301	git_emake() {	301	git_emake() {
302	# bug #320647: PYTHON_PATH	302	# bug #320647: PYTHON_PATH
303	local PYTHON_PATH=""	303	local PYTHON_PATH=""
304	use python && PYTHON_PATH="${PYTHON}"	304	use perforce && PYTHON_PATH="${PYTHON}"
305	emake ${MY_MAKEOPTS} \	305	emake ${MY_MAKEOPTS} \
306	prefix="${EPREFIX}"/usr \	306	prefix="${EPREFIX}"/usr \
307	htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \	307	htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \

Lines 51-57 fi Link Here

(-)a/dev-vcs/git/git-2.22.0.ebuild (-6 / +6 lines)
51		51
52	LICENSE="GPL-2"	52	LICENSE="GPL-2"
53	SLOT="0"	53	SLOT="0"
54	IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"	54	IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test"
55		55
56	# Common to both DEPEND and RDEPEND	56	# Common to both DEPEND and RDEPEND
57	CDEPEND="	57	CDEPEND="
Lines 99-105 RDEPEND="${CDEPEND} Link Here
99	dev-perl/TermReadKey	99	dev-perl/TermReadKey
100	)	100	)
101	)	101	)
102	python? ( ${PYTHON_DEPS} )	102	perforce? ( ${PYTHON_DEPS} )
103	"	103	"
104		104
105	# This is how info docs are created with Git:	105	# This is how info docs are created with Git:
Lines 133-139 REQUIRED_USE=" Link Here
133	subversion? ( perl )	133	subversion? ( perl )
134	webdav? ( curl )	134	webdav? ( curl )
135	pcre-jit? ( pcre )	135	pcre-jit? ( pcre )
136	python? ( ${PYTHON_REQUIRED_USE} )	136	perforce? ( ${PYTHON_REQUIRED_USE} )
137	"	137	"
138		138
139	PATCHES=(	139	PATCHES=(
Lines 152-158 pkg_setup() { Link Here
152	ewarn "with USE=dso, there may be weird crashes in git-svn. You"	152	ewarn "with USE=dso, there may be weird crashes in git-svn. You"
153	ewarn "have been warned."	153	ewarn "have been warned."
154	fi	154	fi
155	if use python ; then	155	if use perforce ; then
156	python-single-r1_pkg_setup	156	python-single-r1_pkg_setup
157	fi	157	fi
158	}	158	}
Lines 167-173 exportmakeopts() { Link Here
167	$(usex iconv '' NO_ICONV=YesPlease)	167	$(usex iconv '' NO_ICONV=YesPlease)
168	$(usex nls '' NO_GETTEXT=YesPlease)	168	$(usex nls '' NO_GETTEXT=YesPlease)
169	$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)	169	$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
170	$(usex python '' NO_PYTHON=YesPlease)	170	$(usex perforce '' NO_PYTHON=YesPlease)
171	$(usex subversion '' NO_SVN_TESTS=YesPlease)	171	$(usex subversion '' NO_SVN_TESTS=YesPlease)
172	$(usex threads '' NO_PTHREAD=YesPlease)	172	$(usex threads '' NO_PTHREAD=YesPlease)
173	$(usex tk '' NO_TCLTK=YesPlease)	173	$(usex tk '' NO_TCLTK=YesPlease)
Lines 302-308 src_prepare() { Link Here
302	git_emake() {	302	git_emake() {
303	# bug #320647: PYTHON_PATH	303	# bug #320647: PYTHON_PATH
304	local PYTHON_PATH=""	304	local PYTHON_PATH=""
305	use python && PYTHON_PATH="${PYTHON}"	305	use perforce && PYTHON_PATH="${PYTHON}"
306	emake ${MY_MAKEOPTS} \	306	emake ${MY_MAKEOPTS} \
307	prefix="${EPREFIX}"/usr \	307	prefix="${EPREFIX}"/usr \
308	htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \	308	htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \

Lines 51-57 fi Link Here

(-)a/dev-vcs/git/git-2.23.0_rc2.ebuild (-6 / +6 lines)
51		51
52	LICENSE="GPL-2"	52	LICENSE="GPL-2"
53	SLOT="0"	53	SLOT="0"
54	IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"	54	IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test"
55		55
56	# Common to both DEPEND and RDEPEND	56	# Common to both DEPEND and RDEPEND
57	CDEPEND="	57	CDEPEND="
Lines 99-105 RDEPEND="${CDEPEND} Link Here
99	dev-perl/TermReadKey	99	dev-perl/TermReadKey
100	)	100	)
101	)	101	)
102	python? ( ${PYTHON_DEPS} )	102	perforce? ( ${PYTHON_DEPS} )
103	"	103	"
104		104
105	# This is how info docs are created with Git:	105	# This is how info docs are created with Git:
Lines 133-139 REQUIRED_USE=" Link Here
133	subversion? ( perl )	133	subversion? ( perl )
134	webdav? ( curl )	134	webdav? ( curl )
135	pcre-jit? ( pcre )	135	pcre-jit? ( pcre )
136	python? ( ${PYTHON_REQUIRED_USE} )	136	perforce? ( ${PYTHON_REQUIRED_USE} )
137	"	137	"
138		138
139	PATCHES=(	139	PATCHES=(
Lines 152-158 pkg_setup() { Link Here
152	ewarn "with USE=dso, there may be weird crashes in git-svn. You"	152	ewarn "with USE=dso, there may be weird crashes in git-svn. You"
153	ewarn "have been warned."	153	ewarn "have been warned."
154	fi	154	fi
155	if use python ; then	155	if use perforce ; then
156	python-single-r1_pkg_setup	156	python-single-r1_pkg_setup
157	fi	157	fi
158	}	158	}
Lines 167-173 exportmakeopts() { Link Here
167	$(usex iconv '' NO_ICONV=YesPlease)	167	$(usex iconv '' NO_ICONV=YesPlease)
168	$(usex nls '' NO_GETTEXT=YesPlease)	168	$(usex nls '' NO_GETTEXT=YesPlease)
169	$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)	169	$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
170	$(usex python '' NO_PYTHON=YesPlease)	170	$(usex perforce '' NO_PYTHON=YesPlease)
171	$(usex subversion '' NO_SVN_TESTS=YesPlease)	171	$(usex subversion '' NO_SVN_TESTS=YesPlease)
172	$(usex threads '' NO_PTHREAD=YesPlease)	172	$(usex threads '' NO_PTHREAD=YesPlease)
173	$(usex tk '' NO_TCLTK=YesPlease)	173	$(usex tk '' NO_TCLTK=YesPlease)
Lines 302-308 src_prepare() { Link Here
302	git_emake() {	302	git_emake() {
303	# bug #320647: PYTHON_PATH	303	# bug #320647: PYTHON_PATH
304	local PYTHON_PATH=""	304	local PYTHON_PATH=""
305	use python && PYTHON_PATH="${PYTHON}"	305	use perforce && PYTHON_PATH="${PYTHON}"
306	emake ${MY_MAKEOPTS} \	306	emake ${MY_MAKEOPTS} \
307	prefix="${EPREFIX}"/usr \	307	prefix="${EPREFIX}"/usr \
308	htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \	308	htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \

Lines 51-57 fi Link Here

(-)a/dev-vcs/git/git-9999-r1.ebuild (-6 / +6 lines)
51		51
52	LICENSE="GPL-2"	52	LICENSE="GPL-2"
53	SLOT="0"	53	SLOT="0"
54	IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"	54	IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test"
55		55
56	# Common to both DEPEND and RDEPEND	56	# Common to both DEPEND and RDEPEND
57	CDEPEND="	57	CDEPEND="
Lines 99-105 RDEPEND="${CDEPEND} Link Here
99	dev-perl/TermReadKey	99	dev-perl/TermReadKey
100	)	100	)
101	)	101	)
102	python? ( ${PYTHON_DEPS} )	102	perforce? ( ${PYTHON_DEPS} )
103	"	103	"
104		104
105	# This is how info docs are created with Git:	105	# This is how info docs are created with Git:
Lines 133-139 REQUIRED_USE=" Link Here
133	subversion? ( perl )	133	subversion? ( perl )
134	webdav? ( curl )	134	webdav? ( curl )
135	pcre-jit? ( pcre )	135	pcre-jit? ( pcre )
136	python? ( ${PYTHON_REQUIRED_USE} )	136	perforce? ( ${PYTHON_REQUIRED_USE} )
137	"	137	"
138		138
139	PATCHES=(	139	PATCHES=(
Lines 152-158 pkg_setup() { Link Here
152	ewarn "with USE=dso, there may be weird crashes in git-svn. You"	152	ewarn "with USE=dso, there may be weird crashes in git-svn. You"
153	ewarn "have been warned."	153	ewarn "have been warned."
154	fi	154	fi
155	if use python ; then	155	if use perforce ; then
156	python-single-r1_pkg_setup	156	python-single-r1_pkg_setup
157	fi	157	fi
158	}	158	}
Lines 167-173 exportmakeopts() { Link Here
167	$(usex iconv '' NO_ICONV=YesPlease)	167	$(usex iconv '' NO_ICONV=YesPlease)
168	$(usex nls '' NO_GETTEXT=YesPlease)	168	$(usex nls '' NO_GETTEXT=YesPlease)
169	$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)	169	$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
170	$(usex python '' NO_PYTHON=YesPlease)	170	$(usex perforce '' NO_PYTHON=YesPlease)
171	$(usex subversion '' NO_SVN_TESTS=YesPlease)	171	$(usex subversion '' NO_SVN_TESTS=YesPlease)
172	$(usex threads '' NO_PTHREAD=YesPlease)	172	$(usex threads '' NO_PTHREAD=YesPlease)
173	$(usex tk '' NO_TCLTK=YesPlease)	173	$(usex tk '' NO_TCLTK=YesPlease)
Lines 302-308 src_prepare() { Link Here
302	git_emake() {	302	git_emake() {
303	# bug #320647: PYTHON_PATH	303	# bug #320647: PYTHON_PATH
304	local PYTHON_PATH=""	304	local PYTHON_PATH=""
305	use python && PYTHON_PATH="${PYTHON}"	305	use perforce && PYTHON_PATH="${PYTHON}"
306	emake ${MY_MAKEOPTS} \	306	emake ${MY_MAKEOPTS} \
307	prefix="${EPREFIX}"/usr \	307	prefix="${EPREFIX}"/usr \
308	htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \	308	htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \

Lines 51-57 fi Link Here

(-)a/dev-vcs/git/git-9999-r2.ebuild (-6 / +6 lines)
51		51
52	LICENSE="GPL-2"	52	LICENSE="GPL-2"
53	SLOT="0"	53	SLOT="0"
54	IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"	54	IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test"
55		55
56	# Common to both DEPEND and RDEPEND	56	# Common to both DEPEND and RDEPEND
57	CDEPEND="	57	CDEPEND="
Lines 99-105 RDEPEND="${CDEPEND} Link Here
99	dev-perl/TermReadKey	99	dev-perl/TermReadKey
100	)	100	)
101	)	101	)
102	python? ( ${PYTHON_DEPS} )	102	perforce? ( ${PYTHON_DEPS} )
103	"	103	"
104		104
105	# This is how info docs are created with Git:	105	# This is how info docs are created with Git:
Lines 133-139 REQUIRED_USE=" Link Here
133	subversion? ( perl )	133	subversion? ( perl )
134	webdav? ( curl )	134	webdav? ( curl )
135	pcre-jit? ( pcre )	135	pcre-jit? ( pcre )
136	python? ( ${PYTHON_REQUIRED_USE} )	136	perforce? ( ${PYTHON_REQUIRED_USE} )
137	"	137	"
138		138
139	PATCHES=(	139	PATCHES=(
Lines 152-158 pkg_setup() { Link Here
152	ewarn "with USE=dso, there may be weird crashes in git-svn. You"	152	ewarn "with USE=dso, there may be weird crashes in git-svn. You"
153	ewarn "have been warned."	153	ewarn "have been warned."
154	fi	154	fi
155	if use python ; then	155	if use perforce ; then
156	python-single-r1_pkg_setup	156	python-single-r1_pkg_setup
157	fi	157	fi
158	}	158	}
Lines 167-173 exportmakeopts() { Link Here
167	$(usex iconv '' NO_ICONV=YesPlease)	167	$(usex iconv '' NO_ICONV=YesPlease)
168	$(usex nls '' NO_GETTEXT=YesPlease)	168	$(usex nls '' NO_GETTEXT=YesPlease)
169	$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)	169	$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
170	$(usex python '' NO_PYTHON=YesPlease)	170	$(usex perforce '' NO_PYTHON=YesPlease)
171	$(usex subversion '' NO_SVN_TESTS=YesPlease)	171	$(usex subversion '' NO_SVN_TESTS=YesPlease)
172	$(usex threads '' NO_PTHREAD=YesPlease)	172	$(usex threads '' NO_PTHREAD=YesPlease)
173	$(usex tk '' NO_TCLTK=YesPlease)	173	$(usex tk '' NO_TCLTK=YesPlease)
Lines 302-308 src_prepare() { Link Here
302	git_emake() {	302	git_emake() {
303	# bug #320647: PYTHON_PATH	303	# bug #320647: PYTHON_PATH
304	local PYTHON_PATH=""	304	local PYTHON_PATH=""
305	use python && PYTHON_PATH="${PYTHON}"	305	use perforce && PYTHON_PATH="${PYTHON}"
306	emake ${MY_MAKEOPTS} \	306	emake ${MY_MAKEOPTS} \
307	prefix="${EPREFIX}"/usr \	307	prefix="${EPREFIX}"/usr \
308	htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \	308	htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \

Lines 51-57 fi Link Here

(-)a/dev-vcs/git/git-9999-r3.ebuild (-6 / +6 lines)
51		51
52	LICENSE="GPL-2"	52	LICENSE="GPL-2"
53	SLOT="0"	53	SLOT="0"
54	IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"	54	IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test"
55		55
56	# Common to both DEPEND and RDEPEND	56	# Common to both DEPEND and RDEPEND
57	CDEPEND="	57	CDEPEND="
Lines 99-105 RDEPEND="${CDEPEND} Link Here
99	dev-perl/TermReadKey	99	dev-perl/TermReadKey
100	)	100	)
101	)	101	)
102	python? ( ${PYTHON_DEPS} )	102	perforce? ( ${PYTHON_DEPS} )
103	"	103	"
104		104
105	# This is how info docs are created with Git:	105	# This is how info docs are created with Git:
Lines 133-139 REQUIRED_USE=" Link Here
133	subversion? ( perl )	133	subversion? ( perl )
134	webdav? ( curl )	134	webdav? ( curl )
135	pcre-jit? ( pcre )	135	pcre-jit? ( pcre )
136	python? ( ${PYTHON_REQUIRED_USE} )	136	perforce? ( ${PYTHON_REQUIRED_USE} )
137	"	137	"
138		138
139	PATCHES=(	139	PATCHES=(
Lines 152-158 pkg_setup() { Link Here
152	ewarn "with USE=dso, there may be weird crashes in git-svn. You"	152	ewarn "with USE=dso, there may be weird crashes in git-svn. You"
153	ewarn "have been warned."	153	ewarn "have been warned."
154	fi	154	fi
155	if use python ; then	155	if use perforce ; then
156	python-single-r1_pkg_setup	156	python-single-r1_pkg_setup
157	fi	157	fi
158	}	158	}
Lines 167-173 exportmakeopts() { Link Here
167	$(usex iconv '' NO_ICONV=YesPlease)	167	$(usex iconv '' NO_ICONV=YesPlease)
168	$(usex nls '' NO_GETTEXT=YesPlease)	168	$(usex nls '' NO_GETTEXT=YesPlease)
169	$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)	169	$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
170	$(usex python '' NO_PYTHON=YesPlease)	170	$(usex perforce '' NO_PYTHON=YesPlease)
171	$(usex subversion '' NO_SVN_TESTS=YesPlease)	171	$(usex subversion '' NO_SVN_TESTS=YesPlease)
172	$(usex threads '' NO_PTHREAD=YesPlease)	172	$(usex threads '' NO_PTHREAD=YesPlease)
173	$(usex tk '' NO_TCLTK=YesPlease)	173	$(usex tk '' NO_TCLTK=YesPlease)
Lines 302-308 src_prepare() { Link Here
302	git_emake() {	302	git_emake() {
303	# bug #320647: PYTHON_PATH	303	# bug #320647: PYTHON_PATH
304	local PYTHON_PATH=""	304	local PYTHON_PATH=""
305	use python && PYTHON_PATH="${PYTHON}"	305	use perforce && PYTHON_PATH="${PYTHON}"
306	emake ${MY_MAKEOPTS} \	306	emake ${MY_MAKEOPTS} \
307	prefix="${EPREFIX}"/usr \	307	prefix="${EPREFIX}"/usr \
308	htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \	308	htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \

Lines 51-57 fi Link Here

(-)a/dev-vcs/git/git-9999.ebuild (-5 / +5 lines)
51		51
52	LICENSE="GPL-2"	52	LICENSE="GPL-2"
53	SLOT="0"	53	SLOT="0"
54	IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"	54	IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test"
55		55
56	# Common to both DEPEND and RDEPEND	56	# Common to both DEPEND and RDEPEND
57	CDEPEND="	57	CDEPEND="
Lines 99-105 RDEPEND="${CDEPEND} Link Here
99	dev-perl/TermReadKey	99	dev-perl/TermReadKey
100	)	100	)
101	)	101	)
102	python? ( ${PYTHON_DEPS} )	102	perforce? ( ${PYTHON_DEPS} )
103	"	103	"
104		104
105	# This is how info docs are created with Git:	105	# This is how info docs are created with Git:
Lines 152-158 pkg_setup() { Link Here
152	ewarn "with USE=dso, there may be weird crashes in git-svn. You"	152	ewarn "with USE=dso, there may be weird crashes in git-svn. You"
153	ewarn "have been warned."	153	ewarn "have been warned."
154	fi	154	fi
155	if use python ; then	155	if use perforce ; then
156	python-single-r1_pkg_setup	156	python-single-r1_pkg_setup
157	fi	157	fi
158	}	158	}
Lines 167-173 exportmakeopts() { Link Here
167	$(usex iconv '' NO_ICONV=YesPlease)	167	$(usex iconv '' NO_ICONV=YesPlease)
168	$(usex nls '' NO_GETTEXT=YesPlease)	168	$(usex nls '' NO_GETTEXT=YesPlease)
169	$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)	169	$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
170	$(usex python '' NO_PYTHON=YesPlease)	170	$(usex perforce '' NO_PYTHON=YesPlease)
171	$(usex subversion '' NO_SVN_TESTS=YesPlease)	171	$(usex subversion '' NO_SVN_TESTS=YesPlease)
172	$(usex threads '' NO_PTHREAD=YesPlease)	172	$(usex threads '' NO_PTHREAD=YesPlease)
173	$(usex tk '' NO_TCLTK=YesPlease)	173	$(usex tk '' NO_TCLTK=YesPlease)
Lines 302-308 src_prepare() { Link Here
302	git_emake() {	302	git_emake() {
303	# bug #320647: PYTHON_PATH	303	# bug #320647: PYTHON_PATH
304	local PYTHON_PATH=""	304	local PYTHON_PATH=""
305	use python && PYTHON_PATH="${PYTHON}"	305	use perforce && PYTHON_PATH="${PYTHON}"
306	emake ${MY_MAKEOPTS} \	306	emake ${MY_MAKEOPTS} \
307	prefix="${EPREFIX}"/usr \	307	prefix="${EPREFIX}"/usr \
308	htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \	308	htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \