Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-vcs/git
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2014-06-24 01:44:07 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2014-06-24 01:44:07 +0000
commit91fa01cc4e942679885f68a9a00a625361010e0c (patch)
tree2c5544b0849f2c19437dd7770143c2e54e3cc005 /dev-vcs/git
parentTypo? (diff)
downloadgentoo-2-91fa01cc4e942679885f68a9a00a625361010e0c.tar.gz
gentoo-2-91fa01cc4e942679885f68a9a00a625361010e0c.tar.bz2
gentoo-2-91fa01cc4e942679885f68a9a00a625361010e0c.zip
Non-maintainer commit: depend on libgnome-keyring, not gnome-keyring (bug #514640, thanks to Michał Górny).
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'dev-vcs/git')
-rw-r--r--dev-vcs/git/ChangeLog10
-rw-r--r--dev-vcs/git/git-1.8.1.5-r1.ebuild4
-rw-r--r--dev-vcs/git/git-1.8.1.5.ebuild4
-rw-r--r--dev-vcs/git/git-1.8.2.1.ebuild4
-rw-r--r--dev-vcs/git/git-1.8.3.2-r1.ebuild4
-rw-r--r--dev-vcs/git/git-1.8.4.5.ebuild4
-rw-r--r--dev-vcs/git/git-1.8.5.5.ebuild4
-rw-r--r--dev-vcs/git/git-1.9.2.ebuild4
-rw-r--r--dev-vcs/git/git-1.9.3.ebuild4
-rw-r--r--dev-vcs/git/git-2.0.0-r1.ebuild4
-rw-r--r--dev-vcs/git/git-2.0.0.ebuild4
-rw-r--r--dev-vcs/git/git-9999-r1.ebuild4
-rw-r--r--dev-vcs/git/git-9999-r2.ebuild4
-rw-r--r--dev-vcs/git/git-9999-r3.ebuild4
-rw-r--r--dev-vcs/git/git-9999.ebuild4
15 files changed, 37 insertions, 29 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index a73d9975e060..8e423edf56fa 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-vcs/git
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.265 2014/06/01 06:20:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.266 2014/06/24 01:44:07 tetromino Exp $
+
+ 24 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org> git-1.8.1.5.ebuild,
+ git-1.8.1.5-r1.ebuild, git-1.8.2.1.ebuild, git-1.8.3.2-r1.ebuild,
+ git-1.8.4.5.ebuild, git-1.8.5.5.ebuild, git-1.9.2.ebuild, git-1.9.3.ebuild,
+ git-2.0.0.ebuild, git-2.0.0-r1.ebuild, git-9999.ebuild, git-9999-r1.ebuild,
+ git-9999-r2.ebuild, git-9999-r3.ebuild:
+ Non-maintainer commit: depend on libgnome-keyring, not gnome-keyring (bug
+ #514640, thanks to Michał Górny).
*git-2.0.0-r1 (01 Jun 2014)
diff --git a/dev-vcs/git/git-1.8.1.5-r1.ebuild b/dev-vcs/git/git-1.8.1.5-r1.ebuild
index b2303a00d7c5..97205627461b 100644
--- a/dev-vcs/git/git-1.8.1.5-r1.ebuild
+++ b/dev-vcs/git/git-1.8.1.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5-r1.ebuild,v 1.10 2014/02/07 07:59:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5-r1.ebuild,v 1.11 2014/06/24 01:44:07 tetromino Exp $
EAPI=4
@@ -54,7 +54,7 @@ CDEPEND="
webdav? ( dev-libs/expat )
)
emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
RDEPEND="${CDEPEND}
gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-1.8.1.5.ebuild b/dev-vcs/git/git-1.8.1.5.ebuild
index 0718ff3bf6f1..86ade6b867d7 100644
--- a/dev-vcs/git/git-1.8.1.5.ebuild
+++ b/dev-vcs/git/git-1.8.1.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5.ebuild,v 1.16 2014/02/07 07:59:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5.ebuild,v 1.17 2014/06/24 01:44:07 tetromino Exp $
EAPI=4
@@ -54,7 +54,7 @@ CDEPEND="
webdav? ( dev-libs/expat )
)
emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
RDEPEND="${CDEPEND}
gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-1.8.2.1.ebuild b/dev-vcs/git/git-1.8.2.1.ebuild
index f1ca174874f9..7b7da3bd11ec 100644
--- a/dev-vcs/git/git-1.8.2.1.ebuild
+++ b/dev-vcs/git/git-1.8.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.2.1.ebuild,v 1.8 2014/02/07 07:59:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.2.1.ebuild,v 1.9 2014/06/24 01:44:07 tetromino Exp $
EAPI=4
@@ -54,7 +54,7 @@ CDEPEND="
webdav? ( dev-libs/expat )
)
emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
RDEPEND="${CDEPEND}
gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-1.8.3.2-r1.ebuild b/dev-vcs/git/git-1.8.3.2-r1.ebuild
index 7ebc8df63767..b97690eb3bd1 100644
--- a/dev-vcs/git/git-1.8.3.2-r1.ebuild
+++ b/dev-vcs/git/git-1.8.3.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.3.2-r1.ebuild,v 1.12 2014/02/07 07:59:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.3.2-r1.ebuild,v 1.13 2014/06/24 01:44:07 tetromino Exp $
EAPI=5
@@ -54,7 +54,7 @@ CDEPEND="
webdav? ( dev-libs/expat )
)
emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
RDEPEND="${CDEPEND}
gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-1.8.4.5.ebuild b/dev-vcs/git/git-1.8.4.5.ebuild
index d656981fcf56..a39073aad87b 100644
--- a/dev-vcs/git/git-1.8.4.5.ebuild
+++ b/dev-vcs/git/git-1.8.4.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.4.5.ebuild,v 1.4 2014/02/07 07:59:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.4.5.ebuild,v 1.5 2014/06/24 01:44:07 tetromino Exp $
EAPI=5
@@ -54,7 +54,7 @@ CDEPEND="
webdav? ( dev-libs/expat )
)
emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
RDEPEND="${CDEPEND}
gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-1.8.5.5.ebuild b/dev-vcs/git/git-1.8.5.5.ebuild
index 2002a3020321..f951c3eb220d 100644
--- a/dev-vcs/git/git-1.8.5.5.ebuild
+++ b/dev-vcs/git/git-1.8.5.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.5.ebuild,v 1.5 2014/05/04 15:15:16 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.5.ebuild,v 1.6 2014/06/24 01:44:07 tetromino Exp $
EAPI=5
@@ -54,7 +54,7 @@ CDEPEND="
webdav? ( dev-libs/expat )
)
emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
RDEPEND="${CDEPEND}
gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-1.9.2.ebuild b/dev-vcs/git/git-1.9.2.ebuild
index a4f5bc4852be..531a3e6a0e8f 100644
--- a/dev-vcs/git/git-1.9.2.ebuild
+++ b/dev-vcs/git/git-1.9.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.9.2.ebuild,v 1.1 2014/04/09 23:59:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.9.2.ebuild,v 1.2 2014/06/24 01:44:07 tetromino Exp $
EAPI=5
@@ -54,7 +54,7 @@ CDEPEND="
webdav? ( dev-libs/expat )
)
emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
RDEPEND="${CDEPEND}
gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-1.9.3.ebuild b/dev-vcs/git/git-1.9.3.ebuild
index 897a2d0d5a41..0fafde35f280 100644
--- a/dev-vcs/git/git-1.9.3.ebuild
+++ b/dev-vcs/git/git-1.9.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.9.3.ebuild,v 1.2 2014/05/30 11:37:28 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.9.3.ebuild,v 1.3 2014/06/24 01:44:07 tetromino Exp $
EAPI=5
@@ -54,7 +54,7 @@ CDEPEND="
webdav? ( dev-libs/expat )
)
emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
RDEPEND="${CDEPEND}
gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-2.0.0-r1.ebuild b/dev-vcs/git/git-2.0.0-r1.ebuild
index b195803fb80d..4428469a2e1e 100644
--- a/dev-vcs/git/git-2.0.0-r1.ebuild
+++ b/dev-vcs/git/git-2.0.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.0-r1.ebuild,v 1.1 2014/06/01 06:20:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.0-r1.ebuild,v 1.2 2014/06/24 01:44:07 tetromino Exp $
EAPI=5
@@ -55,7 +55,7 @@ CDEPEND="
webdav? ( dev-libs/expat )
)
emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
RDEPEND="${CDEPEND}
gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-2.0.0.ebuild b/dev-vcs/git/git-2.0.0.ebuild
index b5abb0ca46de..489550d01d99 100644
--- a/dev-vcs/git/git-2.0.0.ebuild
+++ b/dev-vcs/git/git-2.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.0.ebuild,v 1.2 2014/05/30 11:37:28 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.0.ebuild,v 1.3 2014/06/24 01:44:07 tetromino Exp $
EAPI=5
@@ -55,7 +55,7 @@ CDEPEND="
webdav? ( dev-libs/expat )
)
emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
RDEPEND="${CDEPEND}
gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 2759a540fbea..e9b68030975a 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v 1.2 2014/05/28 23:44:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v 1.3 2014/06/24 01:44:07 tetromino Exp $
EAPI=5
@@ -55,7 +55,7 @@ CDEPEND="
webdav? ( dev-libs/expat )
)
emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
RDEPEND="${CDEPEND}
gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 78591f034e14..49f3bcee7143 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.2 2014/05/28 23:44:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.3 2014/06/24 01:44:07 tetromino Exp $
EAPI=5
@@ -55,7 +55,7 @@ CDEPEND="
webdav? ( dev-libs/expat )
)
emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
RDEPEND="${CDEPEND}
gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 95d0f87862b3..de502e90cec2 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.3 2014/05/28 23:44:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.4 2014/06/24 01:44:07 tetromino Exp $
EAPI=5
@@ -55,7 +55,7 @@ CDEPEND="
webdav? ( dev-libs/expat )
)
emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
RDEPEND="${CDEPEND}
gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index a15dbf56b7c0..092cc354b435 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.57 2014/05/28 23:44:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.58 2014/06/24 01:44:07 tetromino Exp $
EAPI=5
@@ -55,7 +55,7 @@ CDEPEND="
webdav? ( dev-libs/expat )
)
emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
+ gnome-keyring? ( gnome-base/libgnome-keyring )"
RDEPEND="${CDEPEND}
gpg? ( app-crypt/gnupg )