I've modified the ebuilds to use dobin for installing the main genkernel script and to install AUTHORS via dodoc. Removing the 3.4.10_pre1 ebuild, since I don't really want anyone using that version.

Package-Manager: portage-2.1.4.4

5 files changed, 24 insertions, 143 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 89566060568b..65c8b5defacb 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.190 2008/02/14 06:57:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.191 2008/02/15 00:16:37 wolf31o2 Exp $
+
+  15 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  -genkernel-3.4.10_pre1.ebuild, genkernel-3.4.10_pre2.ebuild,
+  genkernel-9999.ebuild:
+  I've modified the ebuilds to use dobin for installing the main genkernel
+  script and to install AUTHORS via dodoc. Removing the 3.4.10_pre1 ebuild,
+  since I don't really want anyone using that version.
 
 *genkernel-3.4.10_pre2 (14 Feb 2008)
 
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 06135d3d978f..dacc468fd74b 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -6,7 +6,6 @@ DIST LVM2.2.02.28.tgz 531905 RMD160 bf6f25db6e34bf362353ae9557691a7f01962502 SHA
 DIST device-mapper.1.02.22.tgz 189726 RMD160 8bf9986536c49f53c398d6a2180e21e1235bea18 SHA1 a4533872c32951a1b549bb9207a13b7e4dae0701 SHA256 ff833a6cd6246686f5b3f5692fd6597f1ffbc60f08929e5fe68304cdafb61595
 DIST dmraid-1.0.0.rc14.tar.bz2 164234 RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c SHA1 2b3284db46a995967d88993ae5ae36b57c513bc4 SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec
 DIST e2fsprogs-1.39.tar.gz 3695111 RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b SHA1 c2dad0c9bd76701eafe3804e2a7d072aa198f046 SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3
-DIST genkernel-3.4.10_pre1.tar.bz2 180016 RMD160 7bb8f273708ae5e11572a3bff8006f4ec164185b SHA1 5a6ea7bf1994ab4269b75e99e7e6c5b12a46ad08 SHA256 616774c0aeeb8d7a0bf6d5160ffc9afa1801dc68a90df03cb145f3cb72845315
 DIST genkernel-3.4.10_pre2.tar.bz2 154103 RMD160 05cd68f48d127adff4ce29496edde118af7b3610 SHA1 2b4851188190c62fb6e6c3180cbbde079bbf8f4e SHA256 83aadd50d600ff060c85aee4b623ee4edeb4ab50096eb6b630ac125718297b4c
 DIST genkernel-3.4.9.tar.bz2 181731 RMD160 f26551a6013028fee23d7a1e6e2429fc7fa76d58 SHA1 ca6c482bb44133a04430fd0b5777294d5dd7cb8f SHA256 b3a09bb0135f052c13c0b3dac56d825b1f9c4068fbb9f81b2283f83301f559c7
 DIST genkernel-3.4.9_pre6.tar.bz2 178106 RMD160 adf02b676eb80d7167b2eb47d0c5711aeee2e37c SHA1 fd4f6ef0c494538edbdc9947c41f0cd68b256588 SHA256 af7e8c431c41e79c6bc5ab92ee6812ab2659c1a2db8e6a22d1316c82fa17b7d1
@@ -14,17 +13,16 @@ DIST genkernel-pkg-3.4-r2.tar.bz2 1909178 RMD160 49e0fc62c07cfd2f91868087a670300
 DIST genkernel-pkg-3.4-r3.tar.bz2 1915282 RMD160 8424628e94c51d500f7b28532901ad0c5e53ee38 SHA1 a4fec14ca086098fbe3d62810bf7892f7c0da326 SHA256 0681579b34705de7fc7ec7a08154cea9dc21142b612f4b7d904a4b588e3de684
 DIST genkernel-pkg-3.4-r4.tar.bz2 1915990 RMD160 5b07a74677f6c2be6b2bbd41bfe4ff87f05fa4f8 SHA1 96dc2703128ad05251be6fd26c0830bd9e628b9c SHA256 1a5150ee6106c49b641ade2743ce03232f8e3663b6d0597bf28f5b468e534aff
 DIST unionfs-1.5pre-cvs200701042308.tar.gz 163418 RMD160 6d54be6db26a562dd943df2de9cf0e0138c45c6f SHA1 9559a0ae8e0552a9c3644c85a99c1be601c837fc SHA256 d1925eee22517df72828a7c75890c20a54335e135f6ed04ea43f8771c9b1c271
-EBUILD genkernel-3.4.10_pre1.ebuild 4026 RMD160 7c89cf352bd9efe68ddfd742ac12a762452f0307 SHA1 49bb912b8a677b29c61c8f748aa69252cb2ccc35 SHA256 8d4542b12aeafdc426f7f3252cf336523ad03b5f2088a48b6dd409dd16e9664b
-EBUILD genkernel-3.4.10_pre2.ebuild 4026 RMD160 daa71a43e722eb7c576a6a6ffc45e245472cfe4b SHA1 6b246fe7fe0ba04132707f5d51c1e037ec0a8e3b SHA256 957685f394b051e3dbbd8dea569d388b64cb7d86207f89ed1ce7b90ab0cdb8e7
+EBUILD genkernel-3.4.10_pre2.ebuild 4021 RMD160 bec00279d8ff7792fc2d7b78b57a6c1ab94f5ecb SHA1 c3d47d507614349099af2d0012a0a8c881f73b3b SHA256 298d7b08f405e42ee6ce22d49fbfb34bbfced2aadaab1e714a5b318c59856c97
 EBUILD genkernel-3.4.9.ebuild 3727 RMD160 db052ce94581209bf666290c3bcfc415f5028ae2 SHA1 10fd64150a842c0f98fb6eacf6e577051b9999c8 SHA256 1843149fd24176e38e5de48527a5f4211a4aee6aeffc67cb8a8dd2e26bd81534
 EBUILD genkernel-3.4.9_pre6.ebuild 3724 RMD160 729ced4663a140a1581c530a6f1ffe9751a9aee1 SHA1 e8b88e1cc2fdb2cdd742afb28f0bda0e5c04c315 SHA256 75d1495a68fec2e4b1a1f907a315eac68e025116e6341b7a16fce06a099b0ebb
-EBUILD genkernel-9999.ebuild 4019 RMD160 28abdac6a20b002115e88c6fee7ee34793ec1f24 SHA1 a2d948a0864495cd0e52d96d07c743e47255573c SHA256 cd028a36fe449e209692ec74dd3d4eea11ddc2d03259cc1e434e98d94dbc3cea
-MISC ChangeLog 36681 RMD160 0cf04841ef3fbe9c52db238fda6a854e902ed737 SHA1 d299ee447b4428a4321d6aa32ef31aad84c00a69 SHA256 27fbf2632419f198bfd9222284c63c88853b57098040e29f4aebdfcb932bdcd7
+EBUILD genkernel-9999.ebuild 4014 RMD160 e80832ddd0c4d604a829f158330497867dc28883 SHA1 f4d9bdd093729710ce850f17adb18fdc85296a93 SHA256 fdada94cac0797aeb0df091c7c7616c2bf94e517a7f0611aaa2cd2a813f51a9f
+MISC ChangeLog 37030 RMD160 0b79f978ef93a2c5f2c3e4b20b5ac692c5ec1a11 SHA1 b1948b3c6ed51148e1156fcbdf5b8ef95132efd4 SHA256 c6efa1acc196d1b0dc5dac7020085f4fc5b8119ef26cb868a9b8bc3e76331d13
 MISC metadata.xml 226 RMD160 8c8b08effbb307ff307346f319d8e7ec6baddd6e SHA1 33172dd797d80d11d35a2b1855e54cd2a737548d SHA256 b7b060498e250d9de733cf433899caf8e8607fac9fa648f84f5c0512a89d794b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHs+ZLkT4lNIS36YERApaYAJ41RiCbPkRj+V8sGUwHITgopVtQqACdFeb6
-ySUUfxHyEzBBaPw2v04viqU=
-=sXWN
+iD8DBQFHtNnokT4lNIS36YERAu/wAKDDee9aSmZpNp0KhOVH5k5TuJhqKgCfZVaU
+9vLSlDpNdPZ+xx3GSRXUQj4=
+=2qha
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/genkernel/genkernel-3.4.10_pre1.ebuild b/sys-kernel/genkernel/genkernel-3.4.10_pre1.ebuild
deleted file mode 100644
index 74ea89649339..000000000000
--- a/sys-kernel/genkernel/genkernel-3.4.10_pre1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.10_pre1.ebuild,v 1.1 2008/02/14 04:33:25 wolf31o2 Exp $
-
-# genkernel-9999		-> latest SVN
-# genkernel-9999.REV	-> use SVN REV
-# genkernel-VERSION		-> normal genkernel release
-
-VERSION_DMAP='1.02.22'
-VERSION_DMRAID='1.0.0.rc14'
-VERSION_E2FSPROGS='1.39'
-VERSION_LVM='2.02.28'
-VERSION_PKG='3.4-r3'
-
-MY_HOME="http://dev.gentoo.org/~wolf31o2"
-RH_HOME="ftp://sources.redhat.com/pub"
-DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src"
-
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/dm/device-mapper.${VERSION_DMAP}.tgz
-		${RH_HOME}/dm/old/device-mapper.${VERSION_DMAP}.tgz
-		mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz"
-
-if [[ ${PV} == 9999* ]]
-then
-	[[ ${PV} == 9999.* ]] && ESVN_UPDATE_CMD="svn up -r ${PV/9999./}"
-	ESVN_REPO_URI="svn://anonsvn.gentoo.org/genkernel/trunk"
-	inherit subversion bash-completion eutils
-	S=${WORKDIR}/trunk
-	SRC_URI="${COMMON_URI}"
-else
-	inherit bash-completion eutils
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		mirror://gentoo/${PN}-pkg-${VERSION_PKG}.tar.bz2
-		${MY_HOME}/${P}.tar.bz2
-		${MY_HOME}/sources/${PN}/${PN}-pkg-${VERSION_PKG}.tar.bz2
-		${COMMON_URI}"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="http://www.gentoo.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-# 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"
-#KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-#KEYWORDS=""
-IUSE="ibm selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND} app-arch/cpio"
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		subversion_src_unpack
-	else
-		unpack ${P}.tar.bz2
-		cd "${S}"
-		unpack ${PN}-pkg-${VERSION_PKG}.tar.bz2
-	fi
-	use selinux && sed -i 's/###//g' gen_compile.sh
-}
-
-src_install() {
-	# This block updates genkernel.conf
-	sed -e "s:VERSION_DMAP:$VERSION_DMAP:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
-		|| die "Could not adjust versions"
-	insinto /etc
-	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
-
-	doman genkernel.8 || die "doman"
-	dodoc ChangeLog README TODO || die "dodoc"
-
-	rm -f genkernel.8 ChangeLog README TODO genkernel.conf
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/* || die "doins"
-	use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
-		cp "${S}"/ppc64/kernel-2.6.g5 "${S}"/ppc64/kernel-2.6
-
-	dodir /usr/bin
-	dosym /usr/share/genkernel/genkernel /usr/bin/genkernel
-
-	cp -f "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
-	"${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
-	"${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \
-	"${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
-	"${D}"/usr/share/genkernel/pkg || die "copying pkg"
-
-	dobashcompletion "${FILESDIR}"/genkernel.bash
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'http://www.gentoo.org/doc/en/genkernel.xml'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext3 or"
-	ewarn "even reiser3."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-
-	bash-completion_pkg_postinst
-}
diff --git a/sys-kernel/genkernel/genkernel-3.4.10_pre2.ebuild b/sys-kernel/genkernel/genkernel-3.4.10_pre2.ebuild
index acd02a0cbaa7..ffa10a7b3e65 100644
--- a/sys-kernel/genkernel/genkernel-3.4.10_pre2.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.10_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.10_pre2.ebuild,v 1.1 2008/02/14 06:57:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.10_pre2.ebuild,v 1.2 2008/02/15 00:16:37 wolf31o2 Exp $
 
 # genkernel-9999		-> latest SVN
 # genkernel-9999.REV	-> use SVN REV
@@ -80,18 +80,17 @@ src_install() {
 	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
 
 	doman genkernel.8 || die "doman"
-	dodoc ChangeLog README TODO || die "dodoc"
+	dodoc AUTHORS ChangeLog README TODO || die "dodoc"
 
-	rm -f genkernel.8 ChangeLog README TODO genkernel.conf
+	dobin genkernel || die "dobin genkernel"
+
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
 
 	insinto /usr/share/genkernel
 	doins -r "${S}"/* || die "doins"
 	use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
 		cp "${S}"/ppc64/kernel-2.6.g5 "${S}"/ppc64/kernel-2.6
 
-	dodir /usr/bin
-	dosym /usr/share/genkernel/genkernel /usr/bin/genkernel
-
 	cp -f "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
 	"${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
 	"${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index c314cc6531b6..5824202d83bb 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.2 2008/02/14 06:57:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.3 2008/02/15 00:16:37 wolf31o2 Exp $
 
 # genkernel-9999		-> latest SVN
 # genkernel-9999.REV	-> use SVN REV
@@ -80,18 +80,17 @@ src_install() {
 	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
 
 	doman genkernel.8 || die "doman"
-	dodoc ChangeLog README TODO || die "dodoc"
+	dodoc AUTHORS ChangeLog README TODO || die "dodoc"
 
-	rm -f genkernel.8 ChangeLog README TODO genkernel.conf
+	dobin genkernel || die "dobin genkernel"
+
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
 
 	insinto /usr/share/genkernel
 	doins -r "${S}"/* || die "doins"
 	use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
 		cp "${S}"/ppc64/kernel-2.6.g5 "${S}"/ppc64/kernel-2.6
 
-	dodir /usr/bin
-	dosym /usr/share/genkernel/genkernel /usr/bin/genkernel
-
 	cp -f "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
 	"${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
 	"${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \