version bump, drop old

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xADC916E5

4 files changed, 75 insertions, 112 deletions

diff --git a/sys-kernel/genkernel-next/ChangeLog b/sys-kernel/genkernel-next/ChangeLog
index 32be4f13590c..930819bed939 100644
--- a/sys-kernel/genkernel-next/ChangeLog
+++ b/sys-kernel/genkernel-next/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/genkernel-next
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel-next/ChangeLog,v 1.11 2013/09/09 09:56:27 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel-next/ChangeLog,v 1.12 2013/09/20 07:42:45 lxnay Exp $
+
+*genkernel-next-26 (20 Sep 2013)
+
+  20 Sep 2013; Fabio Erculiani <lxnay@gentoo.org> -genkernel-next-18.ebuild,
+  +genkernel-next-26.ebuild:
+  version bump, drop old
 
 *genkernel-next-24-r1 (09 Sep 2013)
 
diff --git a/sys-kernel/genkernel-next/Manifest b/sys-kernel/genkernel-next/Manifest
index bfd11e330b34..8e764867ec5d 100644
--- a/sys-kernel/genkernel-next/Manifest
+++ b/sys-kernel/genkernel-next/Manifest
@@ -4,16 +4,16 @@ Hash: SHA256
 AUX genkernel.bash 2443 SHA256 e01220581f0219f58939d03df62067cfed6c81a383c93190e3615d6417105b19 SHA512 b2196b83755cb14192a1696f7b824273d966d47970b49be98347b71da0bba680679c5bd0e351197e5e2fe69585440f0d7143196817ee76936d5d5066330c039a WHIRLPOOL c4113b9e1475663f8aadaca4483b8e926b932c9a777f07bd8d1b1832c2e177269830f53f76d5b02a4373eb15435c8dd5666a8c74ba4b16c1b4f9976bd9a8da64
 AUX initramfs.mounts 816 SHA256 57ba8450e3f09edc9a4e5a1be15d49c77e4e014e27c626e9e3771167cbb54e49 SHA512 97e5f92d135cff3911a68c7f1afd0f781ec1c1b794cdc824d74f8c119104ecb40bd7180be8414dc72f3a5a811143d6b4bf443ac1d3ff7a71b1e88cbf7c179665 WHIRLPOOL f39d27de6e69b3555f81138a59f25b104f9dd6aa6254a5391d3375b15acaac48f0e698f3e6f96ed88845b84fbf8fa2cd64b98281df977c12a99ec7d9ddaf2a10
 DIST busybox-1.20.2.tar.bz2 2186738 SHA256 eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882 SHA512 089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd WHIRLPOOL aa8fec92d0ac8bb246dea7353537d425a5fecfa0bb807d0e291c7351e8289b84aab83303c45b75f9b7a98cd10177e210511064f0709425c2f84b069fe6a06420
-DIST genkernel-next-18.tar.xz 130328 SHA256 ba3cdc0e2fe5d85b1201d7cf926d0eac071bf6f681e6554af9562f6a18ae6027 SHA512 3b59ecad7c87ec25c46c003c26a58136ecf43a8e35321bdb99de86bb3479932e7ddc7511364c08bb11611d4b14d9f4eab84b041b408cbb4b494ad8b5d0b6eaa5 WHIRLPOOL 67bd27d56e3325dde0a35842c842f20bfe647bd7bbb6631a5743955b30150c34dbba091931f6942935456370fbf84e46f81113c8fbf301aeb9aeda216e4c8e8e
 DIST genkernel-next-24.tar.xz 130772 SHA256 718923b1b85eb3f960ff7f6a6f15b7da67f4b4e46d768441af6aad1c01ee1fd8 SHA512 b08bae07c0d1e1310e29bde548b6de1bb8474b50e4b2af87dba198d3476766ee17e82611ff7e64fe3dcfe4bac227c522e73a163237604559ac64a322f32ac5bd WHIRLPOOL 9e937dd546d0c4e5fc741654815bdd6c69b58a2c56d1fb0b224d0c7fedffe1b4832a3e7e1da381fa211add9c13318a4e598b52ec068e842eacc23c279acadce9
-EBUILD genkernel-next-18.ebuild 3157 SHA256 4a5c961394f8cbd8fe3c65f832ecf2b6ffbd6e6e38070aecc1db78a0dc82f255 SHA512 5b1608f243a85ca9fb67ad3d0304f98b9d1bab141cce692edf40cf606442c7c04f758181903cc4429d1c06f924c55a2f21069d548a669c7c813db7e0f331d50f WHIRLPOOL 0711c73bce425bafb19519639142d18b3c281fcc5eb8d6a749febe6257ab6e89e568672a32ad5e82d5a05548613ae57021c4e2072f028c7a6f8a2799c5b55a64
+DIST genkernel-next-26.tar.xz 2285172 SHA256 ea8b17cc520d137bb5e8d6ba1739cbbbfbf30220041fdf881c9227ccc1e58c30 SHA512 bd75c23c1ded1eda1e45d0d5b884189831f0f65a7ec2f822ad5dfa615656e658bfff4ec177e8aa949c60d19052c8b7b05d38c47ef38ff014a7263789b5885430 WHIRLPOOL c5f02b974bdf9320a2a9492ac315f5f54803af8a2c26751bf6b7ce444de56361ddf0df72382447d1fa80d43f7c048f4dc6bf820c38d009b39cd9746a999e42d4
 EBUILD genkernel-next-24-r1.ebuild 3171 SHA256 3bab78b646ef38f70838688228fd335477810cd9325c66b57d3dc620117aa81d SHA512 faa3bf14549f27a6781cd4f7c197b4f374f5ecdf778d78bb7388400041523fab48fde0660db87591c0b963837cfa0cedb64c96def13c6449757eea2865b4d269 WHIRLPOOL 3459c647b2dbf61f9ad24f89bf357f227bb7e48efa84a364ab06fc57711b8af40da32d909d9e1b82c6bfd2d85b3907534600daf8139590259c10808139b75876
-MISC ChangeLog 1981 SHA256 97075cab7c281df3dbfe0d05bc2c335fe344356022f22ec890ce78b2719d74d9 SHA512 27740e0bd1eb15e56c192b88cc56ab4a73248f0b7b582028f187adbc9f1e8efde30422b0630f33a577af997cf455ab04d8ad513d8b545fbe4e7723f6293cd93c WHIRLPOOL 54e0b90ee2d737ebc59b596cd9d859f700f5736a6a8942347374881aab823ba7b0e3d25a88403b406e0a33bcb7b8c52756734f54a639529ad651449ea231aacb
+EBUILD genkernel-next-26.ebuild 1528 SHA256 f027a1b31adb63de830838e4feb8e279662c359840d9aa0e90e0a6fc359cd3f6 SHA512 07f9b9c8d3b0daeb98bacdffc79526deec21ee325acf8ebf93d1d1bd5f43ef881ccc40c021a0443d1b2eb2a1191b31f1f6f450c95a8986576fffc792a47d8755 WHIRLPOOL 611e21e151a6cae1c3e6f12ef6e48ff51e239f4027bfa0fbbb13739826e8fa46f8411587983c414001ed04fd6afaab1dbde8e17dcd7cb2a4a543e3858f0fa19b
+MISC ChangeLog 2147 SHA256 aecf56e2288335d647ebfd382b6aa7c86e5f033b7e993fa47f012e67e0941de5 SHA512 2b6c68b3970ab0eefdae9944d4ab671619aca9714eec51b1e543cc772b48125620a4478f2a5203eb1369842c9801e11970c25b7b38d3dab951fa9579b242c442 WHIRLPOOL 3b13776465204ef438a21fd77926979c2f1929a8e9e634bee33d128cd5cac4bd3403f818b481de20717243b35d85be81cf0f21a01f08d2af876e553faad5b6d6
 MISC metadata.xml 654 SHA256 9d4b66747ee265b68edfcd8b8ce81dd3608d37218b45bca4bd7e6d8c0e21fef6 SHA512 b36aac5f7d7e296c261f70cefbb6158cbaf733da79766db4d453397fe683dee0377a8ffb043c10c13fd90c40b4ef06986eb2165eec5410dcad918c0d59076753 WHIRLPOOL 7eb45a1f0b75634a8778277e1a5499e04a03162978fbc0010523ad71b4b4aa0dfb089b24dbabc05c20c67e46239d7807c84fbd8f34168adcd043d03fb8edf0e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlItm2gACgkQfaj9zK3JFuWPeACfWEeuBxNKbDbL3Ii32Vnw6ONQ
-HFQAoNWbGoMzgss4+9MB9tlikN7KRMud
-=qPhM
+iEYEAREIAAYFAlI7/I0ACgkQfaj9zK3JFuU6IQCglJcbGQ/6AJ7iOhIg7yrjO0wV
+8ncAniaJQTm+P+oiWGS0sTOINHCxdvaO
+=SVnm
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/genkernel-next/genkernel-next-18.ebuild b/sys-kernel/genkernel-next/genkernel-next-18.ebuild
deleted file mode 100644
index caa2d16b5c88..000000000000
--- a/sys-kernel/genkernel-next/genkernel-next-18.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel-next/genkernel-next-18.ebuild,v 1.1 2013/07/10 08:55:15 lxnay Exp $
-
-EAPI=5
-
-if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="http://dev.gentoo.org/~lxnay/genkernel-next/${P}.tar.xz"
-else
-	EGIT_COMMIT="v${PV}"
-	EGIT_REPO_URI="git://github.com/Sabayon/genkernel-next.git"
-	inherit git-2
-fi
-inherit bash-completion-r1 eutils
-
-VERSION_BUSYBOX="1.20.2"
-
-SRC_URI="${SRC_URI} http://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2"
-if [[ "${PV}" == "9999" ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts ('next' branch)"
-HOMEPAGE="http://www.gentoo.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="crypt cryptsetup dmraid gpg ibm iscsi plymouth selinux"  # Keep 'crypt' in to keep 'use crypt' below working!
-
-DEPEND="app-text/asciidoc
-	sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}
-	!sys-kernel/genkernel
-	cryptsetup? ( sys-fs/cryptsetup )
-	dmraid? ( sys-fs/dmraid )
-	gpg? ( app-crypt/gnupg )
-	iscsi? ( sys-block/open-iscsi )
-	plymouth? ( sys-boot/plymouth )
-	app-portage/portage-utils
-	app-arch/cpio
-	>=app-misc/pax-utils-0.2.1
-	!<sys-apps/openrc-0.9.9
-	sys-block/thin-provisioning-tools
-	sys-fs/dmraid
-	sys-fs/lvm2"
-
-src_prepare() {
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-
-	sed -i "/^GK_V=/ s:GK_V=.*:GK_V=${PV}:g" "${S}/genkernel" || \
-		die "Could not setup release"
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf || die "doins genkernel.conf"
-
-	doman genkernel.8 || die "doman"
-	dodoc AUTHORS 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}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
-		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."
-
-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-}
-
-pkg_postinst() {
-	elog 'You are using an EXPERIMENTAL version of genkernel called genkernel-next'
-	elog 'Actually, it is supposed to be more polished and reliable'
-	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."
-		echo
-	fi
-}
diff --git a/sys-kernel/genkernel-next/genkernel-next-26.ebuild b/sys-kernel/genkernel-next/genkernel-next-26.ebuild
new file mode 100644
index 000000000000..e81089c2ae32
--- /dev/null
+++ b/sys-kernel/genkernel-next/genkernel-next-26.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel-next/genkernel-next-26.ebuild,v 1.1 2013/09/20 07:42:45 lxnay Exp $
+
+EAPI=5
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="http://dev.gentoo.org/~lxnay/genkernel-next/${P}.tar.xz"
+else
+	EGIT_REPO_URI="git://github.com/Sabayon/genkernel-next.git"
+	inherit git-2
+fi
+inherit bash-completion-r1 eutils
+
+if [[ "${PV}" == "9999" ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts, reloaded"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="cryptsetup dmraid gpg iscsi plymouth selinux"
+
+DEPEND="app-text/asciidoc
+	sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+	!sys-kernel/genkernel
+	cryptsetup? ( sys-fs/cryptsetup )
+	dmraid? ( >=sys-fs/dmraid-1.0.0_rc16 )
+	gpg? ( app-crypt/gnupg )
+	iscsi? ( sys-block/open-iscsi )
+	plymouth? ( sys-boot/plymouth )
+	app-portage/portage-utils
+	app-arch/cpio
+	>=app-misc/pax-utils-0.6
+	!<sys-apps/openrc-0.9.9
+	sys-apps/util-linux
+	sys-block/thin-provisioning-tools
+	sys-fs/dmraid
+	sys-fs/lvm2"
+
+src_prepare() {
+	sed -i "/^GK_V=/ s:GK_V=.*:GK_V=${PV}:g" "${S}/genkernel" || \
+		die "Could not setup release"
+
+	epatch_user
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	doman "${S}"/genkernel.8 || die "doman"
+	dodoc "${S}"/AUTHORS || die "dodoc"
+
+	newbashcomp "${S}"/genkernel.bash "${PN}"
+}