Remove the requirement on <app-misc/pax-utils-0.5 since it's no longer necessary (see bug 450688).

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

3 files changed, 172 insertions, 16 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 2a83d7cb90c7..515e515030fc 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,12 @@
 # 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.357 2013/06/06 07:41:39 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.358 2013/06/06 20:10:46 ikelos Exp $
+
+*genkernel-3.4.46.1-r1 (06 Jun 2013)
+
+  06 Jun 2013; Mike Auty <ikelos@gentoo.org> +genkernel-3.4.46.1-r1.ebuild:
+  Remove the requirement on <app-misc/pax-utils-0.5 since it's no longer
+  necessary (see bug 450688).
 
   06 Jun 2013; Richard Yao <ryao@gentoo.org> metadata.xml:
   Change USE=crypt description to indicate that it is obsolete. Also, fix typo
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 8d78440f94c1..74b30aab689f 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -80,25 +80,16 @@ 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-r1.ebuild 5094 SHA256 9b5d404c2df97939e84a7d376fac5502bd05169ebc779080d8205a788d23a376 SHA512 d945cbd3613b752c4d0d77854c06bd839c96503ef23cce959a4d3a40d2971b00887eff1e5f9a9c6c6d0c5c11af95051b7d1238b752a551ab316f062e84f441bd WHIRLPOOL eeec1979717c8a033d4b0d2a7e530226a57c12e63d24b4933e4ca6861612e7c2a559ae48e61faab8ac31b3248c2aaa04b85ed35fdad20fd316e35ec9b5d26bec
 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 65707 SHA256 9fe34a87e244a617e6017974283ef4cdc3982bce4377201df3b3b2a8ae7544f1 SHA512 6408b3ad1cf15fb17f5837740644f269924ce1bb818dbaa8244e0b57d098c6c33f1176ebca99ab657c46d3735f3f91017433663bbc8307fe0415fc0546cc765e WHIRLPOOL ea7816d57a3f45ce36a2ef2a048e473f5040abb7a46a504dbe6dcc343a928e38b250f2c6346150cf513dbec859d48e5a4612258871d135b1a8df8105c7250ba5
+MISC ChangeLog 65927 SHA256 11abbf0d90c55fe4ab3e32ac73f7c9fcbafb969254002481737ec25344947b8e SHA512 129e522864374be681f10eda0eadcdfb293a939ed9300e87ebf386560e9190a9f5fed749864a79fcc16bbfc7a2b293dbca1f4813fe9de46593feaf1bf55f4d6b WHIRLPOOL 6af3640a482fcad2bd5d14d5607bfc9bccd953a2fb70366a7df9ba642b72635072c58c2afa421fe8c367ee3df9cfb6e3448fa5f3f717312610b6f1fc32146d2a
 MISC metadata.xml 418 SHA256 f91e9ba1b91a9fdde45041ae7557aace44c916ab51caecb6b1f49e115510f2cf SHA512 ae3e50da1b8e3f40e88e0a9a735bd736910ffb926f2a16ab34414b44d90d3399a6aa18e7c472194d4d1f9aadad934532a40a2287f41f442b25ac37835c99dda1 WHIRLPOOL 4a540b3702ac7abfdc275dfe371de24de378fb29c9ea3ec878b33edfcce9f1204b255c93373867e74c6d204e44c5ff1070dce0e96f527ef099914519800a51a4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRsD0WAAoJECDuEZm+6Exk7REP/iY8f+bEauA3hrqeWlUk9LmU
-nFRJuZ0cQ3du6q0zz72EaLqyiIdGf42aur2MnkHReZudesdSzY9Q1QzXA2K3wXTm
-XLUuO/uRKaf3S9bpaINqlvHjwy3K1eLjDYdzt9mHlJpZzFVBBbgk/WpEaVxqYz8z
-5xpjQ5yNxpWHDn5VM81ahqQtepEwf9gv373B4Zx8ZMjz2aAwpVR/SCJtMk6LJJrf
-9+ZBb9HOxlE5/i0BC3GUHkFwwPvwiM512sNrt5UzcvzYy/ta+HoMHJ8GFgj/LnFl
-7cKERqnvQVm3Eyz6/62qsQxQchAv/XukTGrEJp6d6muGZz+P5S/RB0ev7dzp0XDR
-FOhyP4EM3OSA0KnJTGUljM3ssKFuzOjKcTN1aGjPWinmYsaWKVZ252UMFp0uNQdP
-/xX+O7/OFFOJ/Hlx6shi7R7i0plJjF3xiVYREgO+hFPCauE4jDhAZYCXzJNdb8qh
-UlWHQu03PKWGR4Fb33m0l9i7tI5woH++WJzilo1STK1BsP3LERoGFYO9VtRrO/QA
-ywvdBsOuBKhM9XoYx3JWhvJkhxASP/m25ljP1pePvgVLP4DRRhOSqJsZfWaXCHXp
-zjzNst5W0ZhBv0AMHq0EdMoM3Rh03FkiyM+GS28Bbq5pw/kSP1LKJoVD/0pRTetm
-u5lXnz71MawoBDq3D2Ds
-=Z3rV
+iEYEAREIAAYFAlGw7McACgkQu7rWomwgFXoeHwCfa9lVg+9Zuv6OCihUAAtr8z5A
+UEoAn1OYF4/h2pEm0dXM2B7NNY6/ssPI
+=mmPu
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/genkernel/genkernel-3.4.46.1-r1.ebuild b/sys-kernel/genkernel/genkernel-3.4.46.1-r1.ebuild
new file mode 100644
index 000000000000..60243e9fef6a
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.46.1-r1.ebuild
@@ -0,0 +1,159 @@
+# 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-r1.ebuild,v 1.1 2013/06/06 20:10:46 ikelos 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
+		!<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
+}