Version bump.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xBEE84C64

3 files changed, 182 insertions, 15 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index acca036fbee6..f8060562d263 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.355 2013/06/03 23:59:33 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.356 2013/06/04 02:59:40 ryao Exp $
+
+*genkernel-3.4.46.1 (04 Jun 2013)
+
+  04 Jun 2013; Richard Yao <ryao@gentoo.org> +genkernel-3.4.46.1.ebuild:
+  Version bump.
 
 *genkernel-3.4.46 (03 Jun 2013)
 
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index b2cb0db59d28..e64b80d24dc7 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -44,6 +44,7 @@ DIST genkernel-3.4.43.tar.bz2 215293 SHA256 b2b81ef3ba2579715146b9ece257095d2178
 DIST genkernel-3.4.44.1.tar.bz2 200484 SHA256 c4e83536de1a21f8b44b151f26bc08d519a6ae4b317ffb902e3768338eb00923 SHA512 e72ea24b5875055774121a625f505ec9355721a480c22f28708c5cfd18d78907104a9cdd81a00dc61f51ea796d37d288675ebb546ea361af5443e7cb0801c745 WHIRLPOOL b40df7de6a51a8fd9832d3729044a324e9ad62dab1d55d4fe25e350d90619e21e59d8a84e30279e57d91ade713d5e8cd0978b5d314956b484daa5fabf31f3669
 DIST genkernel-3.4.44.2.tar.bz2 200589 SHA256 daa9924d421c09cdc54cb7dde5a39e616a8de438a2fc79cec78d9ee85608d1ec SHA512 4b2f6997b4497b243e0673177a56fbe6cf5cf16769accaed4fb2f2e75cc689c5fd4c243226f8f205418ea82042ee068fc73e37370ffb6b032daf7198b0d4bdf0 WHIRLPOOL 6f452924e48181567b6ead6f255bcc869dfc256de8e838272fe3ebf97fa46e2ff5694d686e2881719d8a88580d94d863664e9c193be53d8f24b876a822874bc9
 DIST genkernel-3.4.45.tar.bz2 264995 SHA256 0a69897f6339cf479b10f4c87a2a53c58c239065a5977a91d1c13c648762baa6 SHA512 3fcea10df5e35ddaa923b9a51a97a9e79340456e6c68a9f834b74d84894f603cc4aec9a571216505363e1b347261de9d3fd44e031159bfb5670d75cf3cf2fb14 WHIRLPOOL 07fc44cf7bfe4b0dcd8d6d9a3c94bdddb8df1d3f3d9a4ba15540b3310c51980441692cb5d96647b369d75cf49d173f75af209b4b4e4f3f971b40eb6516c8c6ff
+DIST genkernel-3.4.46.1.tar.bz2 270606 SHA256 e818cc5ab2ecaf6ee95db9489062de790821b587d68a5c322b5d842cc36611dd SHA512 e2186d27f05cb5d9042c97ceff68795e9ffc49d49daf201cc7baa7cd80177afd617ab652b9a55ae5d806937c718cb6b54aa299d3c18d42720ba59e99fc2cc21b WHIRLPOOL 0b761d5024aaba870ef3801730131bcabcc218969b0a254ea0f9ced57af94f5e4b26b66093aa213eeaa172fa5ecb449fc74ba79b21aeaf0eb833a1aa6ce17b7c
 DIST genkernel-3.4.46.tar.bz2 294156 SHA256 4f9410810f412d7306a3eb6054f43f9b3f8b279354ff9da7b1c0264ccd69960a SHA512 24af00c70cb2b89e9be6a170c2a3d5068e2b0709da44a293ceacf4ca9786839badccdbc411e7783cc0a497f15e357153c86b3b12468824e316123b3095a339ff WHIRLPOOL 8e79f6100c5dfd9d11628b3397920f3b8e31a6eaf2c00b37a333c7f4c3950c7d4acf008c56e6e0a4c890ea72db08c14262f5200ce294a4d2d1331f651fcfad90
 DIST gnupg-1.4.11.tar.bz2 3407075 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6 SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae WHIRLPOOL 6f914627e2f527f6616e1f99d2ae06942b734f839d03a45ffa45bf67516a81d58f89e6a85612cf8e5fd83be04ab0b6bc2da8f81114143dad7523e5fcea62366b
 DIST mdadm-3.1.4.tar.bz2 288578 SHA256 849ad0ad4ad3c1d2d8806a16b30e1f59ab2daf313cb103807207f7cba889ea63 SHA512 b668773d4f43bc90fba0ac27f01fc869aa2068d958ccc84de2bf8a64ac7e9a40cc8e461ff04a3619b17459d05478843b9fff0894868d9cbc97fc2cfa80faac73 WHIRLPOOL 28a3b43d4edfa4a097d2c410a9d67b75707dfa20d30c72870cc0584132bd2f896c02be26f97ca0d588be8cabdcf90e89d33c3f23ca727e966597ffea9af9a3a9
@@ -79,24 +80,25 @@ EBUILD genkernel-3.4.43.ebuild 5114 SHA256 eabd0e8d7be709a7a335893ced10de3167e45
 EBUILD genkernel-3.4.44.1.ebuild 5116 SHA256 efe466e0061ff21b2b83f575444eb70d70de40600a88fd87af9d4f6ceba35122 SHA512 004b40698b6f5986e871973f28249c816c5bcb88295b585f93af619d0915d180491f8975cf20ba6ed0fcd4f7472e9876f4da9a75f28466e8971347f9e0ab58ef WHIRLPOOL 1036408608807f4e795af727c663a1fefdf7ba572972c882ceffb2ed4ffeacf99f22223c1f5b12e9c24621fc8da9cc6cc8f09a411c19edcaff9be8e1f6d6d558
 EBUILD genkernel-3.4.44.2.ebuild 5116 SHA256 12282a6fbd80a4b2fc104d5ed05959a4c243704f1597871048f7770fc316e603 SHA512 8794cd1b326968a2fd967c7202c3798587e39eee3f83af99f1cfd1adc79d3c36850b3470caf485dbcc0c8a5b2654e6bf7fd391b27a7c2b82a177bf036085ac02 WHIRLPOOL ee3c797fc1d06963e2c84ea2648f7e49f4fb78353dd46bebd4d72df72c9f6a97d76d95a8eaa29b7d544af2993c61097d2e5d2c532a265036c12ffd56ff25fa7c
 EBUILD genkernel-3.4.45.ebuild 5107 SHA256 ba7b763ea5b7ef570035dc16a545db413d08555b84bf2c89b8e75e910c99410d SHA512 ddfc74dcc90c47ede078d4178adbc6645a7297bb7f20e3aecf425edd91ae130685fa39343c3411c983050129abee6bf6f06052bf61a1ce2c841bb21bf022edc6 WHIRLPOOL c703a1c95de4b8b1503673caece244eb8f08b3d9f4e09600f42a1ba4053c13294131fdbfc76612b0eadad735c34895da1ab09ef2e6ee6321441009622184d23e
+EBUILD genkernel-3.4.46.1.ebuild 5115 SHA256 c658445ab003274b471a3fc2b8861a667a47d40506314aa8f5b241bd557dd84f SHA512 5f3755e8c7fa69003f7ecd45d1c8e2c308dcff849d041727cdac206e613a0ba68cee4694a207c30de2ff95045ca6f2109d6008d68600696d01c4be1fb06e3a19 WHIRLPOOL 0d7d45bf2b0c13f8dfdda0dc68cb459529380011a8470819c2df2620b5b15a6296c715464818b348fd7365cc9ce865f835bdfa66b19790b6bb6638fc97d31531
 EBUILD genkernel-3.4.46.ebuild 5113 SHA256 8f9f21f50ae33939f2f2b04e358babeabf4e7eea5539cc67523910413d3571ea SHA512 3e86f37642463982e41b54adad570d9f998203792547c8c1c32fbb3f3587be8aa5badbeb4e2ae3461f80e533436a6c2891479104f5567584a129c8c474c96261 WHIRLPOOL ebbfdd52690dae6fedbb2200feea89aa9f7ce582888cc8762d247dd2c2b93763c692f28e3534e5392a1a04cadc65a00b0920535fe6c4e451ff6b51b1f32ad91a
 EBUILD genkernel-9999.ebuild 5298 SHA256 b91e9450d8f6915fe99ea6e8f346be5131fb7a1aded1e55cb999de21e58390fa SHA512 e41ce0d487df87350a38dac9cefa51bc6914f520d8664c2b32d36690b0a17a51c137efcecadacede9f6a40deabe9944e8b1c929efd78c3acd179108a34ade41c WHIRLPOOL 14f0d87e55b152da3b316a4e9daa3034afa13a385e6fca7bd755419168c440133ff8f6c533686fb7386422a213c2eb69873c662ebb1e3800b1e7481f8bf00c12
-MISC ChangeLog 65414 SHA256 9b6b56b100736101f7fb10e2f2fc2412fd42ae2badc39d33a59aec82694e181d SHA512 1b540868f95efdd1ae7ddc0dae24fff9e8b70714aedc027713b5d8ec4ee1bae2ed7fe9bd8e78b3485b1e19dc5b43b1c16568f56e39c18d4fa7a16b0ff3baf470 WHIRLPOOL 1dfdc0236ba06a7b2e490c0700597d2476d4f49c376dad2755c822712958506e0024748c7644d87a0c5814f2cbf32ecdba3335e4aadc4302660647c275aa7ee6
+MISC ChangeLog 65539 SHA256 96208025ec0cd6c0fe017cfa69162169e18dd8b42e80d0e7487c157a3a28554d SHA512 8f76652c5feb982a31054a4668e34a33f7bcc6bb9fcadf0508c1029d1a4bcd6b1961413977af2350da1d8d49496fc9b66f6823b6d2cdbb090396bce193552d9c WHIRLPOOL ca3b7ddefe369fe334dc0f2b2ccc2dcfcde02abdd8ee2977710ce570533b0fd7319a71ef5a6ce09a20bb38aa32a2822cb0249af9cce5f3fb45437d516f1707d6
 MISC metadata.xml 324 SHA256 c126eb3c7144839781275d68804421eec596e3b82515780c76697ac9e106bcf0 SHA512 e0b2f618305fdcd856745964f0f1e03c77ed98f468129deaa69201d06f44248516343628c1827d0763361c1f2d67801c322f2e18b0d62ba1b2e4386c32a05da9 WHIRLPOOL a0c54a2e7cbfecc76351ee45e0cbbd500fe865626c9c66ea0a5eb80c59de262634b8c0490979c815b31a413cd8ab8527f535cf23486660ba91f248e0853a2fe8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRrS3KAAoJECDuEZm+6ExkytcQAJtQXTAJd8tDaIIYyqYOGYjP
-icMV36pnWahFWDvhYnWOvcgi4r4TvZU73lQtfltVpcG3OYMw5NNHPllA0UZPgZyr
-yytKV4oVhTJ0IUSVNKCwv8lD46M6iUqVMI4/JCKZoOW4z1wikC12sk9AUInbd945
-Rlqs6bMoirRI8Mju8bIOiZP+MnQ8rqLbRjc4RNkI551s/DSn+kxWvPPVMJw4m/oJ
-a/uXpHs31ymtzhrtXRZlC9n/XLVPz2B7kxukPPrIJQpeLPSDvXWCxoLG/MlcNmFz
-AwoDYWWEvux7ywp2b8r3pGrRq3v/T6T+VxcioDest5eUbrIBZXHFlOVNwhzqbnSs
-CIiCHCJFI+EZQjv+GJhWIl/JqdYcSpsCx5k1acsEo/72iPvG+MmXYMgzUlUDZn6q
-3mv0383b4dmIKrku+sx3lPFczaHO9d6KMdtil89cXi0YiqPmca36UemuEolrmRmM
-gPUNqyhMrUOaBDqFqNnVVJ2+nMTH3GCRjIUhELAoWWMIc/shdL9Oocigk3mGAbyl
-n8cIiVfcsZ/jyug0WbYHEeXLWU3gsdnQkBmxhtBaCIY4npZBxuwKCUTHqeSjQ0ZE
-NqLiq27FqXh8rD97LuZ8KtIN9Oc9yI66fPGq/NJikrEOX9GmxgYBtsK+yGY33j5V
-IswwlbntBQNMs1+EBzvw
-=pL8j
+iQIcBAEBCAAGBQJRrVgAAAoJECDuEZm+6ExkkL0P/3sN8YXuyQB7IP/CgHUGb+tN
+CchoQoFDVpwgMOTpBfYhGOgRxK08PaKZcYkTKei/Rst3CktdpK0Z+4PS7OBabZRS
+FxOWSZZ7452ZRP+Sk6k5KxyN5I6S0S+if1tmZtAp69Nh5rhPucKEEiIg8gh9WOfo
+iUeme31ZAWpYUszlkGuhCvlXYOEDio3oSiYWvojdEj3BZmO9FaEX9T/OEOxksoBR
+zqoI7e0KdzU8ji1a/QaT5oGtZKL+VqJHO+6FoLIhAigbcVgboGkg8UU8ohXhgeyi
+w0/QtKvbHhndvMTwIpwt+P7QMYT3RSV9BnxlXgrSLfksNYaCbM3Nb31RXY8DqWov
+1cAUtIaeDVbzHxOzppJveew3+dbyFS7fSnEL15EJvs9ZU8so9POazpKf/qT+NuvY
+8JgSXrmy16p1cKqxrcI9mHUQT/EnB/RuHcO2gqNBdgYCHhK6IAvK7r0Ex7nGSPMN
+CnPOgk4PwKofe14j2M6PQZqxggWWWTxXZdypAaPdEHPhSPoX5Y8xUKqH1h8E2RoY
+po7N1Ppo0QXAucY8Mn7oKGBGrAXhlvwAlwI1s4+o6FeyaT4Bcx1T4Ycg+hdxoLgu
+hkOBJEufP1LRJlDRlGh3mNzoFGUWbRTtdf6Iv/6tFez860qAaejbG/9JNEhyt5EO
+mqsoyKMzleH53DHUhqYa
+=JodB
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/genkernel/genkernel-3.4.46.1.ebuild b/sys-kernel/genkernel/genkernel-3.4.46.1.ebuild
new file mode 100644
index 000000000000..70e10f9b96af
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.46.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.46.1.ebuild,v 1.1 2013/06/04 02:59:40 ryao Exp $
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI="3"
+
+VERSION_BUSYBOX='1.20.2'
+VERSION_DMRAID='1.0.0.rc16-3'
+VERSION_MDADM='3.1.5'
+VERSION_FUSE='2.8.6'
+VERSION_ISCSI='2.0-872'
+VERSION_LVM='2.02.88'
+VERSION_UNIONFS_FUSE='0.24'
+VERSION_GPG='1.4.11'
+
+RH_HOME="ftp://sources.redhat.com/pub"
+DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="http://www.busybox.net/downloads"
+
+COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
+		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
+		mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
+		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
+		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
+		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://git.overlays.gentoo.org/proj/${PN}.git
+		http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
+	inherit git-2 bash-completion-r1 eutils
+	S="${WORKDIR}/${PN}"
+	SRC_URI="${COMMON_URI}"
+	KEYWORDS=""
+else
+	inherit bash-completion-r1 eutils
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		${COMMON_URI}"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="crypt cryptsetup ibm selinux"  # Keep 'crypt' in to keep 'use crypt' below working!
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+		cryptsetup? ( sys-fs/cryptsetup )
+		app-arch/cpio
+		>=app-misc/pax-utils-0.2.1
+		<app-misc/pax-utils-0.5
+		!<sys-apps/openrc-0.9.9"
+# pax-utils is used for lddtree
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${P}.tar.bz2
+	fi
+}
+
+src_prepare() {
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
+		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
+		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
+		-e "s:VERSION_LVM:$VERSION_LVM:" \
+		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
+		-e "s:VERSION_GPG:$VERSION_GPG:" \
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf || die "doins genkernel.conf"
+
+	doman genkernel.8 || die "doman"
+	dodoc AUTHORS ChangeLog README TODO || die "dodoc"
+
+	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}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6
+
+	# Copy files to /var/cache/genkernel/src
+	elog "Copying files to /var/cache/genkernel/src..."
+	mkdir -p "${D}"/var/cache/genkernel/src
+	cp -f \
+		"${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2 \
+		"${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
+		"${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
+		"${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
+		"${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz \
+		"${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 \
+		"${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2 \
+		"${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
+		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."
+
+	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+}
+
+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
+	if use crypt && ! use cryptsetup ; then
+		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
+		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
+		ewarn "to have genkernel create an initramfs with LUKS support."
+		ewarn "Sorry for the inconvenience."
+		echo
+	fi
+}