Remove non-git from genkernel ebuild

pendor · Feb 2, 2012 · 91ab512 · 91ab512
1 parent 47b7311
commit 91ab512
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 38 deletions.
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
@@ -9,6 +9,6 @@ DIST gnupg-1.4.11.tar.bz2 3407075 RMD160 9daf2dedfd4c6211fc13b8cdee8f08b8f592537
 DIST mdadm-3.1.4.tar.bz2 288578 RMD160 f41a2be4158efac08dbe2e95f1c6812609475fad SHA1 4ee43922d38b15a930daaaa026ef1b4efacdbc8a SHA256 849ad0ad4ad3c1d2d8806a16b30e1f59ab2daf313cb103807207f7cba889ea63
 DIST open-iscsi-2.0-872.tar.gz 900081 RMD160 4eacb8a94cf7712f936b52a961fa7f11774dde67 SHA1 96880185791177ba7b8970742572b46ebfe901cd SHA256 37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f
 DIST unionfs-fuse-0.22.tar.bz2 27355 RMD160 f29cbf41af0ba8f2181ac565a6663871676f6488 SHA1 e95799923ee3938e1fb44c6fd9aa7154d720063e SHA256 fa0c494a8ce63f235601fcc35e3a96527831169d6d5921ee49faccf3b25feb78
-EBUILD genkernel-9999.ebuild 5362 RMD160 fdb246c6ae83f607a47a3245b3cf77b205a78f7e SHA1 608b475d1ad9a3be8683b0acf66e90fe16ea9191 SHA256 f58b84a0b5c4b424b07812a469300ef357d230e8a367ae3881f8356bcd7a18f7
+EBUILD genkernel-9999.ebuild 4667 RMD160 ddb39e2597d58f8d441378d1d9ab04ef48184417 SHA1 dcaaedd1e26fcc349e780ec5ceb243f0e4285b8b SHA256 e92659df4f270b7362cd0728103463c85e43893eb3fec8772ea0c4ee4222c3df
 MISC ChangeLog 48039 RMD160 747f05cd3d9c618f0f847645f910b1ff5027d78b SHA1 7f9e3aaa22761f37f494d43d244dfbc58791dad2 SHA256 0b2db8a0d8444728a842fa05a062ec247fa58f2607a77a7a3b1b6e6539dfb721
 MISC metadata.xml 226 RMD160 8c8b08effbb307ff307346f319d8e7ec6baddd6e SHA1 33172dd797d80d11d35a2b1855e54cd2a737548d SHA256 b7b060498e250d9de733cf433899caf8e8607fac9fa648f84f5c0512a89d794b
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -2,9 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.15.ebuild,v 1.2 2011/04/25 21:10:28 sping Exp $
 
-# genkernel-9999				-> latest Git branch "master"
-# genkernel-VERSION		 -> normal genkernel release
-
 VERSION_BUSYBOX='1.18.1'
 VERSION_DMAP='1.02.22'
 VERSION_DMRAID='1.0.0.rc14'
@@ -37,23 +34,12 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
 		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
 
-if [[ ${PV} == 9999* ]]
-then
-	EGIT_REPO_URI="git://github.com/pendor/genkernel-zfs.git"
-	EGIT_BRANCH=dracut
-	inherit git bash-completion eutils
-	S="${WORKDIR}/${PN}"
-	SRC_URI="${COMMON_URI}"
-	KEYWORDS=""
-else
-	inherit bash-completion eutils
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		${MY_HOME}/sources/genkernel/${P}.tar.bz2
-		${COMMON_URI}"
-	# Please don't touch individual KEYWORDS.  Since this is maintained/tested by
-	# Release Engineering, it's easier for us to deal with all arches at once.
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
+EGIT_REPO_URI="git://github.com/pendor/genkernel-zfs.git"
+EGIT_BRANCH=dracut
+inherit git bash-completion eutils
+S="${WORKDIR}/${PN}"
+SRC_URI="${COMMON_URI}"
+KEYWORDS=""
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
 HOMEPAGE="http://www.gentoo.org"
@@ -63,30 +49,16 @@ SLOT="0"
 RESTRICT=""
 IUSE="ibm selinux zfs"
 
-DEPEND="sys-fs/e2fsprogs
+DEPEND="sys-fs/e2fsprogs app-text/asciidoc
 	selinux? ( sys-libs/libselinux )
-	zfs? ( >=sys-devel/spl-0.6.0_rc5 >=sys-fs/zfs-0.6.0_rc5 )"
+	zfs? ( >=sys-kernel/spl-0.6.0_rc5 >=sys-fs/zfs-0.6.0_rc5 )"
 RDEPEND="${DEPEND} app-arch/cpio sys-kernel/dracut"
 
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
 src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		git_src_unpack
-	else
-		unpack ${P}.tar.bz2
-	fi
+	git_src_unpack
 	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
-src_compile() {
-if [[ ${PV} == 9999* ]]; then
-		emake || die
-fi
-}
-
 src_install() {
 	# This block updates genkernel.conf
 	sed \