Re: Updated gentoo git ebuilds

[Teika Kazura <teika lavabit com>]

Hi. There's git-2.eclass now, and I've attached a patch to replace
git.eclass with git-2.eclass.

It's not necessary now, but Gentoo recommens the new one, and
git-2 is better if you set EGIT_COMMIT or EGIT_BRANCH, by emitting
a better error message if you specify them wrongly.

Regards,
Teika (Teika kazura)

diff -u -b --recursive orig/dev-libs/librep-git/librep-git-9999-r1.ebuild gentoo-sawfish-git-ebuilds/dev-libs/librep-git/librep-git-9999-r1.ebuild
--- orig/dev-libs/librep-git/librep-git-9999-r1.ebuild	2011-05-06 13:06:12.149279028 +0900
+++ gentoo-sawfish-git-ebuilds/dev-libs/librep-git/librep-git-9999-r1.ebuild	2011-05-06 13:09:20.858906629 +0900
@@ -6,7 +6,7 @@
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
 
-inherit git autotools eutils libtool toolchain-funcs multilib elisp-common
+inherit git-2 autotools eutils libtool toolchain-funcs multilib elisp-common
 
 DESCRIPTION="Shared library implementing a Lisp dialect"
 HOMEPAGE="http://git.tuxfamily.org/librep/main.git";
@@ -31,7 +31,7 @@
 
 src_unpack() {
 
-	git_src_unpack
+	git-2_src_unpack
 
 	cd "${S}"
 
diff -u -b --recursive orig/x11-libs/rep-gtk-git/rep-gtk-git-9999-r1.ebuild gentoo-sawfish-git-ebuilds/x11-libs/rep-gtk-git/rep-gtk-git-9999-r1.ebuild
--- orig/x11-libs/rep-gtk-git/rep-gtk-git-9999-r1.ebuild	2011-05-06 13:06:12.149279028 +0900
+++ gentoo-sawfish-git-ebuilds/x11-libs/rep-gtk-git/rep-gtk-git-9999-r1.ebuild	2011-05-06 13:09:49.098551608 +0900
@@ -6,11 +6,10 @@
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
 
-inherit git autotools eutils toolchain-funcs multilib
+inherit git-2 autotools eutils toolchain-funcs multilib
 
 DESCRIPTION="A GTK+ language binding for the librep Lisp environment"
 HOMEPAGE="http://git.tuxfamily.org/?p=gitroot/librep/gtk.git;a=summary";
-EGIT_COMMIT="${EGIT_BRANCH}"
 EGIT_REPO_URI="git://git.tuxfamily.org/gitroot/librep/gtk.git"
 
 LICENSE="GPL-2"
@@ -29,7 +28,7 @@
 
 src_unpack() {
 
-	git_src_unpack
+	git-2_src_unpack
 
 	cd "${S}"
 
diff -u -b --recursive orig/x11-misc/sawfish-pager-git/sawfish-pager-git-9999.ebuild gentoo-sawfish-git-ebuilds/x11-misc/sawfish-pager-git/sawfish-pager-git-9999.ebuild
--- orig/x11-misc/sawfish-pager-git/sawfish-pager-git-9999.ebuild	2011-05-06 13:06:12.149279028 +0900
+++ gentoo-sawfish-git-ebuilds/x11-misc/sawfish-pager-git/sawfish-pager-git-9999.ebuild	2011-05-06 13:10:05.382346892 +0900
@@ -6,7 +6,7 @@
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
 
-inherit git autotools
+inherit git-2 autotools
 
 DESCRIPTION="The native pager of the Sawfish windowmanager"
 HOMEPAGE="http://sawfish.wikia.com";
@@ -24,7 +24,7 @@
 
 src_unpack() {
 
-	git_src_unpack
+	git-2_src_unpack
 
 	cd "${S}"
 
diff -u -b --recursive orig/x11-wm/sawfish-git/sawfish-git-9999-r1.ebuild gentoo-sawfish-git-ebuilds/x11-wm/sawfish-git/sawfish-git-9999-r1.ebuild
--- orig/x11-wm/sawfish-git/sawfish-git-9999-r1.ebuild	2011-05-06 13:06:12.149279028 +0900
+++ gentoo-sawfish-git-ebuilds/x11-wm/sawfish-git/sawfish-git-9999-r1.ebuild	2011-05-06 13:12:07.792807985 +0900
@@ -8,15 +8,18 @@
 
 SITEFILE=50sawfish-gentoo.el
 
-inherit autotools elisp-common eutils git libtool
+inherit autotools elisp-common eutils git-2 libtool
 
 IUSE="debug emacs gnome kde nls pango"
 
 DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
 HOMEPAGE="http://sawfish.wikia.com";
 
-EGIT_COMMIT="${EGIT_BRANCH}"
 EGIT_REPO_URI="git://git.tuxfamily.org/gitroot/sawfish/main.git"
+# If you compile from a branch other than master, set this:
+# EGIT_BRANCH="my-branch-foo"
+# If you compile from a past commit of the branch, set this:
+# EGIT_COMMIT="1234abcde"
 
 SLOT="0"
 LICENSE="GPL-2 Artistic-2"
@@ -40,7 +43,7 @@
 
 src_unpack() {
 
-	git_src_unpack
+	git-2_src_unpack
 
 	cd "${S}"