Migrate to git-2, simplify a little.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 227076d2f61cd7894dc8d252aef6315a900b6c14..ff1ca1b2ad20e1cb0d3f0b09a17f081b56adc397 100644 (file)
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.313 2011/06/06 06:24:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.314 2011/09/21 08:15:45 mgorny Exp $
+
+  21 Sep 2011; Michał Górny <mgorny@gentoo.org> alsa-driver-9999.ebuild:
+  Migrate to git-2, simplify a little.
 
   06 Jun 2011; Robin H. Johnson <robbat2@gentoo.org> alsa-driver-1.0.23.ebuild,
   alsa-driver-9999.ebuild:

diff --git a/media-sound/alsa-driver/alsa-driver-9999.ebuild b/media-sound/alsa-driver/alsa-driver-9999.ebuild
index e937f365a11856e0f4b2d8ea5d8dbb8e1fd63e6f..0629857e4c0a93fb790411497a57c20e1fe382b7 100644 (file)
--- a/media-sound/alsa-driver/alsa-driver-9999.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-9999.ebuild,v 1.20 2011/06/06 06:24:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-9999.ebuild,v 1.21 2011/09/21 08:15:45 mgorny Exp $
 
-inherit linux-mod flag-o-matic eutils multilib autotools git
+inherit linux-mod flag-o-matic eutils multilib autotools git-2
 
 DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -101,14 +101,19 @@ pkg_setup() {
 }
 
 src_unpack() {
-       EGIT_REPO_URI="git://git.alsa-project.org/alsa-driver.git" S="${WORKDIR}/alsa-driver" git_src_unpack
-       EGIT_REPO_URI="git://git.alsa-project.org/alsa-kmirror.git" EGIT_PROJECT="alsa-kmirror" S="${WORKDIR}/alsa-driver/alsa-kernel" git_src_unpack
-       S="${WORKDIR}/alsa-driver"
+       EGIT_REPO_URI="git://git.alsa-project.org/alsa-driver.git
+               http://git.alsa-project.org/http/alsa-driver.git" \
+               git-2_src_unpack
 
-       convert_to_m "${S}/Makefile"
-       sed -i -e 's:\(.*depmod\):#\1:' "${S}/Makefile"
+       EGIT_REPO_URI="git://git.alsa-project.org/alsa-kmirror.git
+               http://git.alsa-project.org/http/alsa-kmirror.git" \
+               EGIT_SOURCEDIR="${WORKDIR}/alsa-driver/alsa-kernel" \
+               git-2_src_unpack
 
        cd "${S}"
+       convert_to_m Makefile
+       sed -i -e 's:\(.*depmod\):#\1:' Makefile
+
        emake ALSAKERNELDIR="${S}/alsa-kernel" all-deps
        eaclocal
        eautoconf