summaryrefslogtreecommitdiff
path: root/dev-vcs/git
diff options
context:
space:
mode:
Diffstat (limited to 'dev-vcs/git')
-rw-r--r--dev-vcs/git/Manifest20
-rw-r--r--dev-vcs/git/git-2.26.2.ebuild10
-rw-r--r--dev-vcs/git/git-2.26.3.ebuild12
-rw-r--r--dev-vcs/git/git-2.28.1.ebuild10
-rw-r--r--dev-vcs/git/git-2.29.3.ebuild10
-rw-r--r--dev-vcs/git/git-2.30.2.ebuild10
-rw-r--r--dev-vcs/git/git-2.31.0-r1.ebuild10
-rw-r--r--dev-vcs/git/git-9999-r1.ebuild10
-rw-r--r--dev-vcs/git/git-9999-r2.ebuild10
-rw-r--r--dev-vcs/git/git-9999-r3.ebuild10
-rw-r--r--dev-vcs/git/git-9999.ebuild10
11 files changed, 81 insertions, 41 deletions
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 7055dcf33cec..20ea942d56a3 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -30,14 +30,14 @@ DIST git-manpages-2.28.1.tar.xz 472404 BLAKE2B d6b411dee47439b91e61f93fdca24fc5a
DIST git-manpages-2.29.3.tar.xz 478456 BLAKE2B e568b92badda851be5d5c0524455d1eb728e4633dd88144edc8e22d84c64ad195538d906ae3443789ea14607be536d1de0f30b448ab0860d605b65a6476455fb SHA512 5d1a26c1342c31ca3501f2e40ec55c6e5dddd1ee2de909ec65425dea92455f00ca23a10e7475dcfe5b9a60dc4c2012778e86797cc8922de20638fcc07c60d941
DIST git-manpages-2.30.2.tar.xz 482180 BLAKE2B 97180d13ba73f229d205b662ca16d497baff57a23b9b621fab69bc1bb4f2ac4f52b861443917ae01ebab7130640e1b7352aa193d7c0cd945cb552749ee1367c9 SHA512 fcb2ab9dd4c29593d08b80f6731ccc3b9a54514d6cc002434f8e36277fd814d4be7e69f0563291cea4f16c35e4822def57ade50d7d10a897619b13c6a6893aa7
DIST git-manpages-2.31.0.tar.xz 487764 BLAKE2B e5acc25fe28c666afd017d29a9cce7b0e37d2b1dee93f911683c5e54972fe4def59964409bd232666963b4509d4ca30fb9b95757e2fdfe308559e455bf8160d3 SHA512 9bf426d5aadd4ac011f9b3694547da795bf5e8bc77a79ef69de56d6f39c3a0fdc039db25d4671810a5320a6c057f2364ec096413eebbbeabc26a7d3b65c9c787
-EBUILD git-2.26.2.ebuild 19084 BLAKE2B 4348be0cbf86af5f34de7b2ee0dcf3b02df62d195f65c5ce7eb09076702300e0d333217c4864b14ac6df705380d2a7b619834f0b13e60494bdd2246ece72a22a SHA512 f27c49be5bc8a168f6adc14694d638fe4c1fbf52308f25d28a11879d9c6e5c68e4a06636587fa3956d905a72cbeb24d4f179249c0266d89cfc6a0eac025a926a
-EBUILD git-2.26.3.ebuild 19091 BLAKE2B 67e8d52c690cc75858ad7196dd221827f6e7749d37e9b711335c5db3ec1c35fcaeeb6ecddd47dbd01b5fb6a36a4ff7caaccead3dfcb2318731c411810443342f SHA512 10fc52f037962124c665f169df5ec7ffa9169abee0ac937c4e027438764b54092f33daab2a9024f9979cdab12de0a5c17eccaca054e4363ca1b922db36b286bb
-EBUILD git-2.28.1.ebuild 19093 BLAKE2B ef265e1ff00542f4a2aa454b6151dfc5d01f1632b4456026734543a545b0f7917f5c59a659092dce86e23a6e3726a7b23c2691c60faf67dbacc22c85e7dc7e19 SHA512 08fb8198ba4e1971ae039bd8a692ff6a44f6f5e1bcc3389532bca9abf39db43165bd91a28fd11c1e2b74cfefa4a670dd534525d2dd74c755a31720d9b91e045a
-EBUILD git-2.29.3.ebuild 18150 BLAKE2B 1c9f0d4c815f9bcc7c1f1c166de9863873198d4da153105c299643ea2e6df5c37b489262f6ca9b8d4edd3d636f4169cd4448d85e0ac513962611a7b4be936976 SHA512 a1972288de7428427235d9dbc4b24fb833f45277804eec16ca6acd0831ef6f8e54a2e1e9ed3acc44d20aada6c3e95745fae0562278542dc478c5e1711ddef7d4
-EBUILD git-2.30.2.ebuild 18151 BLAKE2B 6ba45e94301a2afcca08655687cc6c4cb11952123ecde80fb4ae33d8531789252427644487cc0e7d5a131661681bb939ceb3a9534ffbd4519809f1fcc48d09a7 SHA512 4185e7e4daa69b3c92a6760b27eec108589276a9aa73b376212f4b5d194999c07927acb5312b2eac20d8e6fb9b25006d02c3bb2e43909b5d9ca8fc7942b14f45
-EBUILD git-2.31.0-r1.ebuild 18041 BLAKE2B 1fbaf00be28d7487b9ae0cf842b485db87435c0b1ba7002911a292f9f8ff78fa66add40e4d485e5baf44ba974834047dee8e491f64edbd300a1746a5bef37331 SHA512 08ad3f2e7e778757847cff4db3be86f9095b1d7b008768a643d79c9d5ace9252112fcb765d0eae1ef0a9017f8a5e9f263c8edc23ccb669040959dba6c76437ad
-EBUILD git-9999-r1.ebuild 18013 BLAKE2B 8e5ad64667e2051d02d65a93d61ca60cadae69c692172bd9f63749282f3f3ab87d586bd259b9a4fa1f337b7deda1b45c613b54d32d8778ed98ef9e9e6cb3933d SHA512 9f42152357ac8bbdee6667887e891cc911e598f4686d8f2fdf3577ba6567bcd118c3d197297dde5965e7338d75fbbf3c23cd126f3dccec798b00f8e4d8334a4e
-EBUILD git-9999-r2.ebuild 18013 BLAKE2B 8e5ad64667e2051d02d65a93d61ca60cadae69c692172bd9f63749282f3f3ab87d586bd259b9a4fa1f337b7deda1b45c613b54d32d8778ed98ef9e9e6cb3933d SHA512 9f42152357ac8bbdee6667887e891cc911e598f4686d8f2fdf3577ba6567bcd118c3d197297dde5965e7338d75fbbf3c23cd126f3dccec798b00f8e4d8334a4e
-EBUILD git-9999-r3.ebuild 18043 BLAKE2B 535ca9bdeca810b85d662ac42542ea9aa6ef0b4fb0d86a09ae17945e29455d4e5d0d80c4576e884419a70122b27172dc5f4dac7af85c35b451127f8f1898fd2d SHA512 74ae37c1b42d70922e320a94847e43f2e78a0cd5c2aab0bbce3b29024cbbbd5153ac2fc6a566ac51ce72c5f15d2c01773d15a6d86fa8a9a27c5163e450a96e74
-EBUILD git-9999.ebuild 18013 BLAKE2B f83705958b6840a071dcbeba4fae1b80b90f0abbf031c2919e31908bbbe4eb06a607a924ad84fe5f41d525f6c99000b8ebb3a68ab189efe0721826b071da0e9d SHA512 8b8b019f6d187ded2cc178627ef5415e88aa48dc2bbcf2869cda9a4b643fdedffde3a8fe58a7986db2d462a6f2ace3f991b3d82393dddfa8c0694e0d9403237b
+EBUILD git-2.26.2.ebuild 19165 BLAKE2B 5036fdcef058b3f39d40701ed891cc8b0426ee9754f34f7a1551918eac2c23908b4befabfb2fd58b93611c7cbb992d07994aa51c173896ccf0b9fce85617207f SHA512 7bdf502796bf3e2e6396e67311b0d295ef504b2a5e8d178e4c42775dababd128ff417605bf90c3cb8e46bb90225d985fe0468ddb556ef69327a2cffab7fd886a
+EBUILD git-2.26.3.ebuild 19166 BLAKE2B 4ade3950ba8fe50ccfae58b548e98a90add31f63850c7e5ca8f402f95fd30be0cd503c68049603975ffe127dc80bb74a9585ad7ae33cd7bf7781b1cb4c618ab8 SHA512 bc740a4f36c613f23a6f9235f570e3bc564e42fbdac69b7229b4aac1a81481eb285fc1b543fb90c34ad8c8c05d722e574d38ae2a2dafa002c603781f41001002
+EBUILD git-2.28.1.ebuild 19174 BLAKE2B 496043522e7f97321d6575312a1aea465433f83ec12c15ca5fa6e4f6de08f2a084e70f55f8f7751c45a7c0550c02cfab7eb8948909316a7f40480518ba42f14d SHA512 3a4eb51d9bcdb9c6d1438037f67ebd0d00036b6598c2f6a464fe3b7be7ffd5153f5ac911899445aa42af513eda222f9a838c4025c7a6c38ca50509f2096f00a3
+EBUILD git-2.29.3.ebuild 18231 BLAKE2B a2484155007d417a549241ba0b8d3bdbacd93ddd2b01eb6d7ccb629c1b508ba7ced870a571fce243516156928d6a7fa6152326a1d4b53d5c53380354ecc741a9 SHA512 490f6bdd56d5d5006f137e8d50443904de1ca8fda1e21ddebc558255f97d75f5ba2e041328fdeedbe582b2210578131ca1e447fd2dfef357913132be1f5d8b9c
+EBUILD git-2.30.2.ebuild 18232 BLAKE2B 503faf295b6c00bbfa57d6643b54e2047a55ed416130d889f9cc21983b2035522670a86b383e1d33f112dc0a45005933c87f1c42d26d173825916a4dd4281931 SHA512 5e9331f668d9ba96305b5891b1ce82dfee9357f49065334d7a8d2f419d63b34792c3818d4d8d8f322a662a0f73d2f11aedad767889b99cde83d42920ed597ddf
+EBUILD git-2.31.0-r1.ebuild 18122 BLAKE2B 1c0329cde02c50c6f116f0f81b13a3e3e43c32feff50863a4a8f761e345e8fefa92e149cc5fbba7b23cb8d5fb03b1884ac2a90c4c961fba084b06c0b3da6840d SHA512 93f84aff30ad5a5d4d8c9ffb8781c86c123e0b36bef1adfd9914f27adb74787a9ec327b3d5b774f78999487f84a85fbeaefc27189dd5cf75fe99715a611645e9
+EBUILD git-9999-r1.ebuild 18094 BLAKE2B 32f685e661168ae9e2087599960011ff91910677d86c9d5359fd2875df0ae700124d562f67f65fd1402a35e4771d6196f476c975c021fcdc739393b028adb5a4 SHA512 73e8b4dd152d662ed1a1374bd3789d257d55f9a68038252392efc86c141f09332b7afc4ca9430e72e0d341f4fc9c2d4756f5a9d7d3ec83a4a71fe4688f598e1a
+EBUILD git-9999-r2.ebuild 18094 BLAKE2B 32f685e661168ae9e2087599960011ff91910677d86c9d5359fd2875df0ae700124d562f67f65fd1402a35e4771d6196f476c975c021fcdc739393b028adb5a4 SHA512 73e8b4dd152d662ed1a1374bd3789d257d55f9a68038252392efc86c141f09332b7afc4ca9430e72e0d341f4fc9c2d4756f5a9d7d3ec83a4a71fe4688f598e1a
+EBUILD git-9999-r3.ebuild 18124 BLAKE2B fc824a2a9952153c7ad452db3fb26002c963427677a199ace6e028539c29620f682df374c55d334b3306f38e7799cdacf13ae7267f64aa0e525b64756afc92ea SHA512 a4642f497bfc5b646b4a80a3a4a360a817c6b67bbd817e6ac27f59c2aa2be64c9116376cc268770fcaf12001a8059cdf69e90e1bb853f7083972dec7b13f0854
+EBUILD git-9999.ebuild 18094 BLAKE2B 75bdda77c536f932775cb174012b8c6feca02ff536cd560ff8a0952e82014db9ca60c040c43240a8dabcdaa98bf925bfa61c7c2f2e68fe39f4bf36ed74fe1013 SHA512 800df03161b63a3b83501f23965000074aacf23deda08692aa61b5942470caa5e9416bb6a08f9be82dce1aa9018c5e41250b4034b46610d27cbff52fb1fd6af4
MISC metadata.xml 2277 BLAKE2B 49819fd1ea6ca2a1cf2043fde6d4cd9197db5ef44543fae528475524a35ee52d31a04f20c638b892a6d8c4dd757d302bfd43efb41242e98351d01db7654c2a05 SHA512 65b8ef639ddbec202cc7bcbed31c109d8f6fc64e52d47522eb38955401bea86a846390cfddbebd946f5f5941be83c401a1028d6721e12c6317f92a63568b56cb
diff --git a/dev-vcs/git/git-2.26.2.ebuild b/dev-vcs/git/git-2.26.2.ebuild
index c4ac2f48da97..5c1c3d2155b9 100644
--- a/dev-vcs/git/git-2.26.2.ebuild
+++ b/dev-vcs/git/git-2.26.2.ebuild
@@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl
# Common to both DEPEND and RDEPEND
DEPEND="
- gnome-keyring? ( app-crypt/libsecret )
+ gnome-keyring? (
+ app-crypt/libsecret
+ dev-libs/glib:2
+ )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
sys-libs/zlib
@@ -69,7 +72,6 @@ DEPEND="
net-misc/curl
webdav? ( dev-libs/expat )
)
- emacs? ( >=app-editors/emacs-23.1:* )
iconv? ( virtual/libiconv )
"
@@ -113,6 +115,8 @@ BDEPEND="
app-text/xmlto
sys-apps/texinfo
)
+ emacs? ( >=app-editors/emacs-23.1:* )
+ gnome-keyring? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
test? ( app-crypt/gnupg )
"
@@ -372,7 +376,7 @@ src_compile() {
if use gnome-keyring ; then
pushd contrib/credential/libsecret &>/dev/null || die
- git_emake || die "emake git-credential-libsecret failed"
+ git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
popd &>/dev/null || die
fi
diff --git a/dev-vcs/git/git-2.26.3.ebuild b/dev-vcs/git/git-2.26.3.ebuild
index 90969c232b98..dc965acafe2c 100644
--- a/dev-vcs/git/git-2.26.3.ebuild
+++ b/dev-vcs/git/git-2.26.3.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
@@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl
# Common to both DEPEND and RDEPEND
DEPEND="
- gnome-keyring? ( app-crypt/libsecret )
+ gnome-keyring? (
+ app-crypt/libsecret
+ dev-libs/glib:2
+ )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
sys-libs/zlib
@@ -69,7 +72,6 @@ DEPEND="
net-misc/curl
webdav? ( dev-libs/expat )
)
- emacs? ( >=app-editors/emacs-23.1:* )
iconv? ( virtual/libiconv )
"
@@ -113,6 +115,8 @@ BDEPEND="
app-text/xmlto
sys-apps/texinfo
)
+ emacs? ( >=app-editors/emacs-23.1:* )
+ gnome-keyring? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
test? ( app-crypt/gnupg )
"
@@ -372,7 +376,7 @@ src_compile() {
if use gnome-keyring ; then
pushd contrib/credential/libsecret &>/dev/null || die
- git_emake || die "emake git-credential-libsecret failed"
+ git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
popd &>/dev/null || die
fi
diff --git a/dev-vcs/git/git-2.28.1.ebuild b/dev-vcs/git/git-2.28.1.ebuild
index d725b8e79c39..72f0e2d91b13 100644
--- a/dev-vcs/git/git-2.28.1.ebuild
+++ b/dev-vcs/git/git-2.28.1.ebuild
@@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl
# Common to both DEPEND and RDEPEND
DEPEND="
- gnome-keyring? ( app-crypt/libsecret )
+ gnome-keyring? (
+ app-crypt/libsecret
+ dev-libs/glib:2
+ )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
sys-libs/zlib
@@ -69,7 +72,6 @@ DEPEND="
net-misc/curl
webdav? ( dev-libs/expat )
)
- emacs? ( >=app-editors/emacs-23.1:* )
iconv? ( virtual/libiconv )
"
@@ -113,6 +115,8 @@ BDEPEND="
app-text/xmlto
sys-apps/texinfo
)
+ emacs? ( >=app-editors/emacs-23.1:* )
+ gnome-keyring? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
test? ( app-crypt/gnupg )
"
@@ -372,7 +376,7 @@ src_compile() {
if use gnome-keyring ; then
pushd contrib/credential/libsecret &>/dev/null || die
- git_emake || die "emake git-credential-libsecret failed"
+ git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
popd &>/dev/null || die
fi
diff --git a/dev-vcs/git/git-2.29.3.ebuild b/dev-vcs/git/git-2.29.3.ebuild
index d73a1120a380..a0cd70ca495b 100644
--- a/dev-vcs/git/git-2.29.3.ebuild
+++ b/dev-vcs/git/git-2.29.3.ebuild
@@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl
# Common to both DEPEND and RDEPEND
DEPEND="
- gnome-keyring? ( app-crypt/libsecret )
+ gnome-keyring? (
+ app-crypt/libsecret
+ dev-libs/glib:2
+ )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
sys-libs/zlib
@@ -69,7 +72,6 @@ DEPEND="
net-misc/curl
webdav? ( dev-libs/expat )
)
- emacs? ( >=app-editors/emacs-23.1:* )
iconv? ( virtual/libiconv )
"
@@ -114,6 +116,8 @@ BDEPEND="
app-text/xmlto
sys-apps/texinfo
)
+ emacs? ( >=app-editors/emacs-23.1:* )
+ gnome-keyring? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
test? ( app-crypt/gnupg )
"
@@ -350,7 +354,7 @@ src_compile() {
if use gnome-keyring ; then
pushd contrib/credential/libsecret &>/dev/null || die
- git_emake || die "emake git-credential-libsecret failed"
+ git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
popd &>/dev/null || die
fi
diff --git a/dev-vcs/git/git-2.30.2.ebuild b/dev-vcs/git/git-2.30.2.ebuild
index f6a6fb30a9e9..2c446b27556a 100644
--- a/dev-vcs/git/git-2.30.2.ebuild
+++ b/dev-vcs/git/git-2.30.2.ebuild
@@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl
# Common to both DEPEND and RDEPEND
DEPEND="
- gnome-keyring? ( app-crypt/libsecret )
+ gnome-keyring? (
+ app-crypt/libsecret
+ dev-libs/glib:2
+ )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
sys-libs/zlib
@@ -69,7 +72,6 @@ DEPEND="
net-misc/curl
webdav? ( dev-libs/expat )
)
- emacs? ( >=app-editors/emacs-23.1:* )
iconv? ( virtual/libiconv )
"
@@ -114,6 +116,8 @@ BDEPEND="
app-text/xmlto
sys-apps/texinfo
)
+ emacs? ( >=app-editors/emacs-23.1:* )
+ gnome-keyring? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
test? ( app-crypt/gnupg )
"
@@ -350,7 +354,7 @@ src_compile() {
if use gnome-keyring ; then
pushd contrib/credential/libsecret &>/dev/null || die
- git_emake || die "emake git-credential-libsecret failed"
+ git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
popd &>/dev/null || die
fi
diff --git a/dev-vcs/git/git-2.31.0-r1.ebuild b/dev-vcs/git/git-2.31.0-r1.ebuild
index bfb176d4710e..471bbf2322be 100644
--- a/dev-vcs/git/git-2.31.0-r1.ebuild
+++ b/dev-vcs/git/git-2.31.0-r1.ebuild
@@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl
# Common to both DEPEND and RDEPEND
DEPEND="
- gnome-keyring? ( app-crypt/libsecret )
+ gnome-keyring? (
+ app-crypt/libsecret
+ dev-libs/glib:2
+ )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
sys-libs/zlib
@@ -66,7 +69,6 @@ DEPEND="
net-misc/curl
webdav? ( dev-libs/expat )
)
- emacs? ( >=app-editors/emacs-23.1:* )
iconv? ( virtual/libiconv )
"
@@ -111,6 +113,8 @@ BDEPEND="
app-text/xmlto
sys-apps/texinfo
)
+ emacs? ( >=app-editors/emacs-23.1:* )
+ gnome-keyring? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
test? ( app-crypt/gnupg )
"
@@ -338,7 +342,7 @@ src_compile() {
if use gnome-keyring ; then
pushd contrib/credential/libsecret &>/dev/null || die
- git_emake || die "emake git-credential-libsecret failed"
+ git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
popd &>/dev/null || die
fi
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index ff37be69674c..fdd0f6f7d758 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl
# Common to both DEPEND and RDEPEND
DEPEND="
- gnome-keyring? ( app-crypt/libsecret )
+ gnome-keyring? (
+ app-crypt/libsecret
+ dev-libs/glib:2
+ )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
sys-libs/zlib
@@ -66,7 +69,6 @@ DEPEND="
net-misc/curl
webdav? ( dev-libs/expat )
)
- emacs? ( >=app-editors/emacs-23.1:* )
iconv? ( virtual/libiconv )
"
@@ -111,6 +113,8 @@ BDEPEND="
app-text/xmlto
sys-apps/texinfo
)
+ emacs? ( >=app-editors/emacs-23.1:* )
+ gnome-keyring? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
test? ( app-crypt/gnupg )
"
@@ -338,7 +342,7 @@ src_compile() {
if use gnome-keyring ; then
pushd contrib/credential/libsecret &>/dev/null || die
- git_emake || die "emake git-credential-libsecret failed"
+ git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
popd &>/dev/null || die
fi
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index ff37be69674c..fdd0f6f7d758 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl
# Common to both DEPEND and RDEPEND
DEPEND="
- gnome-keyring? ( app-crypt/libsecret )
+ gnome-keyring? (
+ app-crypt/libsecret
+ dev-libs/glib:2
+ )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
sys-libs/zlib
@@ -66,7 +69,6 @@ DEPEND="
net-misc/curl
webdav? ( dev-libs/expat )
)
- emacs? ( >=app-editors/emacs-23.1:* )
iconv? ( virtual/libiconv )
"
@@ -111,6 +113,8 @@ BDEPEND="
app-text/xmlto
sys-apps/texinfo
)
+ emacs? ( >=app-editors/emacs-23.1:* )
+ gnome-keyring? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
test? ( app-crypt/gnupg )
"
@@ -338,7 +342,7 @@ src_compile() {
if use gnome-keyring ; then
pushd contrib/credential/libsecret &>/dev/null || die
- git_emake || die "emake git-credential-libsecret failed"
+ git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
popd &>/dev/null || die
fi
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index c60eee31d41d..3eac33af95be 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl
# Common to both DEPEND and RDEPEND
DEPEND="
- gnome-keyring? ( app-crypt/libsecret )
+ gnome-keyring? (
+ app-crypt/libsecret
+ dev-libs/glib:2
+ )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
sys-libs/zlib
@@ -66,7 +69,6 @@ DEPEND="
net-misc/curl
webdav? ( dev-libs/expat )
)
- emacs? ( >=app-editors/emacs-23.1:* )
iconv? ( virtual/libiconv )
"
@@ -111,6 +113,8 @@ BDEPEND="
app-text/xmlto
sys-apps/texinfo
)
+ emacs? ( >=app-editors/emacs-23.1:* )
+ gnome-keyring? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
test? ( app-crypt/gnupg )
"
@@ -338,7 +342,7 @@ src_compile() {
if use gnome-keyring ; then
pushd contrib/credential/libsecret &>/dev/null || die
- git_emake || die "emake git-credential-libsecret failed"
+ git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
popd &>/dev/null || die
fi
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index ef8a11391cf3..fb34aa101ae5 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -55,7 +55,10 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl
# Common to both DEPEND and RDEPEND
DEPEND="
- gnome-keyring? ( app-crypt/libsecret )
+ gnome-keyring? (
+ app-crypt/libsecret
+ dev-libs/glib:2
+ )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
sys-libs/zlib
@@ -66,7 +69,6 @@ DEPEND="
net-misc/curl
webdav? ( dev-libs/expat )
)
- emacs? ( >=app-editors/emacs-23.1:* )
iconv? ( virtual/libiconv )
"
@@ -111,6 +113,8 @@ BDEPEND="
app-text/xmlto
sys-apps/texinfo
)
+ emacs? ( >=app-editors/emacs-23.1:* )
+ gnome-keyring? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
test? ( app-crypt/gnupg )
"
@@ -338,7 +342,7 @@ src_compile() {
if use gnome-keyring ; then
pushd contrib/credential/libsecret &>/dev/null || die
- git_emake || die "emake git-credential-libsecret failed"
+ git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
popd &>/dev/null || die
fi