summaryrefslogtreecommitdiff
path: root/dev-vcs/git
diff options
context:
space:
mode:
Diffstat (limited to 'dev-vcs/git')
-rw-r--r--dev-vcs/git/Manifest10
-rw-r--r--dev-vcs/git/git-2.49.0-r1.ebuild (renamed from dev-vcs/git/git-2.49.0.ebuild)30
-rw-r--r--dev-vcs/git/git-9999-r1.ebuild30
-rw-r--r--dev-vcs/git/git-9999-r2.ebuild30
-rw-r--r--dev-vcs/git/git-9999-r3.ebuild30
-rw-r--r--dev-vcs/git/git-9999.ebuild30
6 files changed, 115 insertions, 45 deletions
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index a05ef5abf0ef..07159a938d1e 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -26,9 +26,9 @@ DIST git-manpages-2.49.0.tar.xz 594760 BLAKE2B c5a1810e1369cc94c93716db5baf9d217
EBUILD git-2.45.2.ebuild 16448 BLAKE2B eecc66b8793b6a99e40c28fea1ef68bbb25902981bf18a09d7e8f2e6c00a27133b3fc2318f9460acba64d341cf6ad8970d2e855e6c4baffc982ec8830db8d2f8 SHA512 47dd7ec8dbd7256bfcdcb810abd6d47aababde17e68343cf5941dd529232ca0ecd321c2d1aa23f17ce8bd501203d39ddfa1bf3e4bb63c84f9c06e5c76fff5179
EBUILD git-2.45.3.ebuild 16448 BLAKE2B 849adc38c76ee0dba0523cad77db4a06b74b891815555578dff3a40db29b91a17f2cdd6e0727cbf842781bb3f5c215cf880f7949f157fc2f9dfbd13afc2768b9 SHA512 f1ebde7f07478fd40aedc5eca9826e1fc4684f1f808dbd29e2cbdd620df130646a5acf5f54cf160b92bb4aa1fe31afddde3101814ebb9c4a5505021806f1d23b
EBUILD git-2.48.1.ebuild 12070 BLAKE2B a3229350b02f44ff2be649d73bb56fe2741c2981e04c48cc49425ee00d78da4ebde7329d492f4ec725234e77cfeb3d060b2cf46cb9fb8a6a1c9e7978575da3f3 SHA512 6fb503653a7d1ef93cb889db38db6a31c2ae49454e5f939e41e0580ba45d317bb0ef322d7c365426632348c41a2a256b7e39645cdf09e772128328a504559aeb
-EBUILD git-2.49.0.ebuild 11563 BLAKE2B a5bdc01980b0760162a8c4a4e818d1b4c09d7c74aade6627db51b8fb27a0e453204ee20ed3d74718073b6ab9ce297579e786da3e984b04a3dba7c6697abf9d06 SHA512 1575f93b306a0ecc94a2b69ec3adcfc21ac266e5adb14033bedacfc09ed60936f3c39fad519edb558f16ebb26acbd2bc6926fe23c221a64d2e74e84cd7fecabc
-EBUILD git-9999-r1.ebuild 11563 BLAKE2B a5bdc01980b0760162a8c4a4e818d1b4c09d7c74aade6627db51b8fb27a0e453204ee20ed3d74718073b6ab9ce297579e786da3e984b04a3dba7c6697abf9d06 SHA512 1575f93b306a0ecc94a2b69ec3adcfc21ac266e5adb14033bedacfc09ed60936f3c39fad519edb558f16ebb26acbd2bc6926fe23c221a64d2e74e84cd7fecabc
-EBUILD git-9999-r2.ebuild 11563 BLAKE2B a5bdc01980b0760162a8c4a4e818d1b4c09d7c74aade6627db51b8fb27a0e453204ee20ed3d74718073b6ab9ce297579e786da3e984b04a3dba7c6697abf9d06 SHA512 1575f93b306a0ecc94a2b69ec3adcfc21ac266e5adb14033bedacfc09ed60936f3c39fad519edb558f16ebb26acbd2bc6926fe23c221a64d2e74e84cd7fecabc
-EBUILD git-9999-r3.ebuild 11563 BLAKE2B a5bdc01980b0760162a8c4a4e818d1b4c09d7c74aade6627db51b8fb27a0e453204ee20ed3d74718073b6ab9ce297579e786da3e984b04a3dba7c6697abf9d06 SHA512 1575f93b306a0ecc94a2b69ec3adcfc21ac266e5adb14033bedacfc09ed60936f3c39fad519edb558f16ebb26acbd2bc6926fe23c221a64d2e74e84cd7fecabc
-EBUILD git-9999.ebuild 11563 BLAKE2B a5bdc01980b0760162a8c4a4e818d1b4c09d7c74aade6627db51b8fb27a0e453204ee20ed3d74718073b6ab9ce297579e786da3e984b04a3dba7c6697abf9d06 SHA512 1575f93b306a0ecc94a2b69ec3adcfc21ac266e5adb14033bedacfc09ed60936f3c39fad519edb558f16ebb26acbd2bc6926fe23c221a64d2e74e84cd7fecabc
+EBUILD git-2.49.0-r1.ebuild 11704 BLAKE2B 6ce434e0a7598c34425565eb6b9563f6d1091e8228f953b557c04980d46fcf9e06eea48da50ba6a93096fb064da8a3c37633b4f5da1f6c6bfbf1737eabe036bd SHA512 cba36dc613a471ba4a49497d84cf918925d398c30b2e8e3d08cdc6a332ada62dbced82223dfbaaf74c248f64e07d2bbad2c40c57328531eb3d59e74ac98507be
+EBUILD git-9999-r1.ebuild 11704 BLAKE2B 6ce434e0a7598c34425565eb6b9563f6d1091e8228f953b557c04980d46fcf9e06eea48da50ba6a93096fb064da8a3c37633b4f5da1f6c6bfbf1737eabe036bd SHA512 cba36dc613a471ba4a49497d84cf918925d398c30b2e8e3d08cdc6a332ada62dbced82223dfbaaf74c248f64e07d2bbad2c40c57328531eb3d59e74ac98507be
+EBUILD git-9999-r2.ebuild 11704 BLAKE2B 6ce434e0a7598c34425565eb6b9563f6d1091e8228f953b557c04980d46fcf9e06eea48da50ba6a93096fb064da8a3c37633b4f5da1f6c6bfbf1737eabe036bd SHA512 cba36dc613a471ba4a49497d84cf918925d398c30b2e8e3d08cdc6a332ada62dbced82223dfbaaf74c248f64e07d2bbad2c40c57328531eb3d59e74ac98507be
+EBUILD git-9999-r3.ebuild 11704 BLAKE2B 6ce434e0a7598c34425565eb6b9563f6d1091e8228f953b557c04980d46fcf9e06eea48da50ba6a93096fb064da8a3c37633b4f5da1f6c6bfbf1737eabe036bd SHA512 cba36dc613a471ba4a49497d84cf918925d398c30b2e8e3d08cdc6a332ada62dbced82223dfbaaf74c248f64e07d2bbad2c40c57328531eb3d59e74ac98507be
+EBUILD git-9999.ebuild 11704 BLAKE2B 6ce434e0a7598c34425565eb6b9563f6d1091e8228f953b557c04980d46fcf9e06eea48da50ba6a93096fb064da8a3c37633b4f5da1f6c6bfbf1737eabe036bd SHA512 cba36dc613a471ba4a49497d84cf918925d398c30b2e8e3d08cdc6a332ada62dbced82223dfbaaf74c248f64e07d2bbad2c40c57328531eb3d59e74ac98507be
MISC metadata.xml 2041 BLAKE2B 309964a6982f6f14cecc40b4021d96d2e28c49789480bc4037879375cb5277c2eb500ff36800657e783c36f541265db20b464fc39ce2ac39ff4cda881854662f SHA512 a8dd2f76985690cded8555a0b82e5004b4d93ccc45988fdc04ef8ed3e17ef73d2b83dc9fb6b913e5f9d2b78ebe715e9eb32bfce607318d0e8c0834987eabe5b6
diff --git a/dev-vcs/git/git-2.49.0.ebuild b/dev-vcs/git/git-2.49.0-r1.ebuild
index 133f0889e801..e5f4bb671f79 100644
--- a/dev-vcs/git/git-2.49.0.ebuild
+++ b/dev-vcs/git/git-2.49.0-r1.ebuild
@@ -211,15 +211,12 @@ src_configure() {
credential_helpers+=( osxkeychain )
fi
-
local native_file="${T}"/meson.ini.local
cat >> ${native_file} <<-EOF || die
[binaries]
# We don't want to bake /usr/bin/sh from usrmerged systems into
# binaries. /bin/sh is required by POSIX.
sh='/bin/sh'
- # Avoid automagic installation of gitk-gui.
- $(usev !tk "wish='wish-falseified'")
EOF
local emesonargs=(
@@ -254,6 +251,15 @@ src_configure() {
fi
meson_src_configure
+
+ if use tk ; then
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ emesonargs=()
+ meson_src_configure
+ )
+ fi
}
git_emake() {
@@ -292,6 +298,13 @@ src_compile() {
if use tk ; then
git_emake -C git-gui
+
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ meson_src_compile
+ )
+
fi
if use doc ; then
@@ -308,11 +321,6 @@ src_test() {
local -x A=
meson_src_test
-
- # TODO: Needs help finding built git with meson
- #if use perl ; then
- # git_emake -C contrib/credential/netrc testverbose
- #fi
}
src_install() {
@@ -436,6 +444,12 @@ src_install() {
fi
if use tk ; then
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ meson_src_install
+ )
+
git_emake -C git-gui DESTDIR="${D}" install
fi
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 133f0889e801..e5f4bb671f79 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -211,15 +211,12 @@ src_configure() {
credential_helpers+=( osxkeychain )
fi
-
local native_file="${T}"/meson.ini.local
cat >> ${native_file} <<-EOF || die
[binaries]
# We don't want to bake /usr/bin/sh from usrmerged systems into
# binaries. /bin/sh is required by POSIX.
sh='/bin/sh'
- # Avoid automagic installation of gitk-gui.
- $(usev !tk "wish='wish-falseified'")
EOF
local emesonargs=(
@@ -254,6 +251,15 @@ src_configure() {
fi
meson_src_configure
+
+ if use tk ; then
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ emesonargs=()
+ meson_src_configure
+ )
+ fi
}
git_emake() {
@@ -292,6 +298,13 @@ src_compile() {
if use tk ; then
git_emake -C git-gui
+
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ meson_src_compile
+ )
+
fi
if use doc ; then
@@ -308,11 +321,6 @@ src_test() {
local -x A=
meson_src_test
-
- # TODO: Needs help finding built git with meson
- #if use perl ; then
- # git_emake -C contrib/credential/netrc testverbose
- #fi
}
src_install() {
@@ -436,6 +444,12 @@ src_install() {
fi
if use tk ; then
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ meson_src_install
+ )
+
git_emake -C git-gui DESTDIR="${D}" install
fi
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 133f0889e801..e5f4bb671f79 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -211,15 +211,12 @@ src_configure() {
credential_helpers+=( osxkeychain )
fi
-
local native_file="${T}"/meson.ini.local
cat >> ${native_file} <<-EOF || die
[binaries]
# We don't want to bake /usr/bin/sh from usrmerged systems into
# binaries. /bin/sh is required by POSIX.
sh='/bin/sh'
- # Avoid automagic installation of gitk-gui.
- $(usev !tk "wish='wish-falseified'")
EOF
local emesonargs=(
@@ -254,6 +251,15 @@ src_configure() {
fi
meson_src_configure
+
+ if use tk ; then
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ emesonargs=()
+ meson_src_configure
+ )
+ fi
}
git_emake() {
@@ -292,6 +298,13 @@ src_compile() {
if use tk ; then
git_emake -C git-gui
+
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ meson_src_compile
+ )
+
fi
if use doc ; then
@@ -308,11 +321,6 @@ src_test() {
local -x A=
meson_src_test
-
- # TODO: Needs help finding built git with meson
- #if use perl ; then
- # git_emake -C contrib/credential/netrc testverbose
- #fi
}
src_install() {
@@ -436,6 +444,12 @@ src_install() {
fi
if use tk ; then
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ meson_src_install
+ )
+
git_emake -C git-gui DESTDIR="${D}" install
fi
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 133f0889e801..e5f4bb671f79 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -211,15 +211,12 @@ src_configure() {
credential_helpers+=( osxkeychain )
fi
-
local native_file="${T}"/meson.ini.local
cat >> ${native_file} <<-EOF || die
[binaries]
# We don't want to bake /usr/bin/sh from usrmerged systems into
# binaries. /bin/sh is required by POSIX.
sh='/bin/sh'
- # Avoid automagic installation of gitk-gui.
- $(usev !tk "wish='wish-falseified'")
EOF
local emesonargs=(
@@ -254,6 +251,15 @@ src_configure() {
fi
meson_src_configure
+
+ if use tk ; then
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ emesonargs=()
+ meson_src_configure
+ )
+ fi
}
git_emake() {
@@ -292,6 +298,13 @@ src_compile() {
if use tk ; then
git_emake -C git-gui
+
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ meson_src_compile
+ )
+
fi
if use doc ; then
@@ -308,11 +321,6 @@ src_test() {
local -x A=
meson_src_test
-
- # TODO: Needs help finding built git with meson
- #if use perl ; then
- # git_emake -C contrib/credential/netrc testverbose
- #fi
}
src_install() {
@@ -436,6 +444,12 @@ src_install() {
fi
if use tk ; then
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ meson_src_install
+ )
+
git_emake -C git-gui DESTDIR="${D}" install
fi
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 133f0889e801..e5f4bb671f79 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -211,15 +211,12 @@ src_configure() {
credential_helpers+=( osxkeychain )
fi
-
local native_file="${T}"/meson.ini.local
cat >> ${native_file} <<-EOF || die
[binaries]
# We don't want to bake /usr/bin/sh from usrmerged systems into
# binaries. /bin/sh is required by POSIX.
sh='/bin/sh'
- # Avoid automagic installation of gitk-gui.
- $(usev !tk "wish='wish-falseified'")
EOF
local emesonargs=(
@@ -254,6 +251,15 @@ src_configure() {
fi
meson_src_configure
+
+ if use tk ; then
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ emesonargs=()
+ meson_src_configure
+ )
+ fi
}
git_emake() {
@@ -292,6 +298,13 @@ src_compile() {
if use tk ; then
git_emake -C git-gui
+
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ meson_src_compile
+ )
+
fi
if use doc ; then
@@ -308,11 +321,6 @@ src_test() {
local -x A=
meson_src_test
-
- # TODO: Needs help finding built git with meson
- #if use perl ; then
- # git_emake -C contrib/credential/netrc testverbose
- #fi
}
src_install() {
@@ -436,6 +444,12 @@ src_install() {
fi
if use tk ; then
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ meson_src_install
+ )
+
git_emake -C git-gui DESTDIR="${D}" install
fi