diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-12-02 07:32:57 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-12-02 07:32:57 +0000 |
| commit | b94c420d00d7ae82540ef4bf1d254352b392722d (patch) | |
| tree | 206ac1e4acaac7eddd92f93e8f364a7fe3ee96a9 | |
| parent | Cleanup otherwise unused slot that is only marked for ruby19. (diff) | |
| download | gentoo-2-b94c420d00d7ae82540ef4bf1d254352b392722d.tar.gz gentoo-2-b94c420d00d7ae82540ef4bf1d254352b392722d.tar.bz2 gentoo-2-b94c420d00d7ae82540ef4bf1d254352b392722d.zip | |
Version bump. Removed old
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
| -rw-r--r-- | dev-vcs/git/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-vcs/git/files/git-2.2.0-svn-fe-linking.patch | 11 | ||||
| -rw-r--r-- | dev-vcs/git/git-2.2.0.ebuild (renamed from dev-vcs/git/git-2.1.2.ebuild) | 6 | ||||
| -rw-r--r-- | dev-vcs/git/git-9999-r2.ebuild | 4 | ||||
| -rw-r--r-- | dev-vcs/git/git-9999.ebuild | 4 |
5 files changed, 29 insertions, 5 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog index 01ac62232ed1..790a79d64d04 100644 --- a/dev-vcs/git/ChangeLog +++ b/dev-vcs/git/ChangeLog @@ -1,6 +1,13 @@ # 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.296 2014/11/16 22:54:52 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.297 2014/12/02 07:32:57 polynomial-c Exp $ + +*git-2.2.0 (02 Dec 2014) + + 02 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> -git-2.1.2.ebuild, + +git-2.2.0.ebuild, git-9999.ebuild, git-9999-r2.ebuild, + +files/git-2.2.0-svn-fe-linking.patch: + Version bump. Removed old. 16 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org> git-1.8.3.2-r1.ebuild, git-1.8.5.5.ebuild, git-1.9.3.ebuild, git-2.0.4.ebuild, git-2.1.2.ebuild, diff --git a/dev-vcs/git/files/git-2.2.0-svn-fe-linking.patch b/dev-vcs/git/files/git-2.2.0-svn-fe-linking.patch new file mode 100644 index 000000000000..b20b889110eb --- /dev/null +++ b/dev-vcs/git/files/git-2.2.0-svn-fe-linking.patch @@ -0,0 +1,11 @@ +--- git-2.2.0/contrib/svn-fe/Makefile ++++ git-2.2.0/contrib/svn-fe/Makefile +@@ -74,7 +74,7 @@ + endif + + svn-fe$X: svn-fe.o $(VCSSVN_LIB) $(XDIFF_LIB) $(GIT_LIB) +- $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(EXTLIBS) -o $@ svn-fe.o $(LIBS) ++ $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ svn-fe.o $(LIBS) $(EXTLIBS) + + svn-fe.o: svn-fe.c ../../vcs-svn/svndump.h + $(QUIET_CC)$(CC) $(CFLAGS) -I../../vcs-svn -o $*.o -c $< diff --git a/dev-vcs/git/git-2.1.2.ebuild b/dev-vcs/git/git-2.2.0.ebuild index e82bf0141bc4..1172b6c2ddee 100644 --- a/dev-vcs/git/git-2.1.2.ebuild +++ b/dev-vcs/git/git-2.2.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.1.2.ebuild,v 1.3 2014/11/16 22:54:52 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.2.0.ebuild,v 1.1 2014/12/02 07:32:57 polynomial-c Exp $ EAPI=5 @@ -231,6 +231,8 @@ src_prepare() { # hack, needs better upstream solution epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch + epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch + epatch_user sed -i \ @@ -515,7 +517,7 @@ src_install() { } src_test() { - local disabled="t7004-tag.sh" #520270 + local disabled="" #t7004-tag.sh" #520270 local tests_cvs="t9200-git-cvsexportcommit.sh \ t9400-git-cvsserver-server.sh \ t9401-git-cvsserver-crlf.sh \ diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 31963948126a..38e41f436741 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.8 2014/11/16 22:54:52 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.9 2014/12/02 07:32:57 polynomial-c Exp $ EAPI=5 @@ -231,6 +231,8 @@ src_prepare() { # hack, needs better upstream solution epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch + epatch "${FILESDIR}"/${PN}-2.2.0-svn-fe-linking.patch + epatch_user sed -i \ diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 5425ec640227..f5b19bd15f71 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.63 2014/11/16 22:54:52 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.64 2014/12/02 07:32:57 polynomial-c Exp $ EAPI=5 @@ -231,6 +231,8 @@ src_prepare() { # hack, needs better upstream solution epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch + epatch "${FILESDIR}"/${PN}-2.2.0-svn-fe-linking.patch + epatch_user sed -i \ |