Version bump, remove old

(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

7 files changed, 181 insertions, 29 deletions

diff --git a/sys-kernel/tuxonice-sources/ChangeLog b/sys-kernel/tuxonice-sources/ChangeLog
index 77323e31b6c9..87c4c02ff1a7 100644
--- a/sys-kernel/tuxonice-sources/ChangeLog
+++ b/sys-kernel/tuxonice-sources/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for sys-kernel/tuxonice-sources
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/ChangeLog,v 1.151 2012/12/16 14:19:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/ChangeLog,v 1.152 2012/12/30 21:08:16 pacho Exp $
+
+*tuxonice-sources-3.4.24 (30 Dec 2012)
+*tuxonice-sources-3.0.57 (30 Dec 2012)
+*tuxonice-sources-3.3.8-r2 (30 Dec 2012)
+*tuxonice-sources-3.5.7 (30 Dec 2012)
+*tuxonice-sources-3.6.11 (30 Dec 2012)
+*tuxonice-sources-3.7.1 (30 Dec 2012)
+
+  30 Dec 2012; Pacho Ramos <pacho@gentoo.org> +tuxonice-sources-3.0.57.ebuild,
+  +tuxonice-sources-3.3.8-r2.ebuild, +tuxonice-sources-3.4.24.ebuild,
+  +tuxonice-sources-3.5.7.ebuild, +tuxonice-sources-3.6.11.ebuild,
+  +tuxonice-sources-3.7.1.ebuild, -tuxonice-sources-3.0.46.ebuild,
+  -tuxonice-sources-3.4.10.ebuild:
+  Version bump, remove old
 
   16 Dec 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due retirement, #95685
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.46.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.57.ebuild
index fdcc2de96a7b..5c7bacccf51a 100644
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.46.ebuild
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.57.ebuild
@@ -1,29 +1,25 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.46.ebuild,v 1.1 2012/10/21 09:58:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.57.ebuild,v 1.1 2012/12/30 21:08:16 pacho Exp $
 
-EAPI="4"
+EAPI=5
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="32"
+K_GENPATCHES_VER="35"
 
-inherit kernel-2
+inherit kernel-2 versionator
 detect_version
 detect_arch
 
 DESCRIPTION="TuxOnIce + Gentoo patchset sources"
 HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net"
-IUSE=""
 
-TUXONICE_SNAPSHOT="20111012"
-TUXONICE_VERSION=""
-TUXONICE_TARGET="3.0"
-
-# Because "current" patches can change without notifying, we need to supply them
-TUXONICE_SRC="http://dev.gentoo.org/~pacho/tuxonice/current-tuxonice-for-${TUXONICE_TARGET}_${TUXONICE_SNAPSHOT}.patch"
-UNIPATCH_LIST="${DISTDIR}/current-tuxonice-for-${TUXONICE_TARGET}_${TUXONICE_SNAPSHOT}.patch.bz2"
-TUXONICE_URI="${TUXONICE_SRC}.bz2"
+TUXONICE_SNAPSHOT="2012-12-23"
+TUXONICE_PV="$(replace_version_separator 2 '-')"
 
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_SNAPSHOT}.patch.bz2"
+TUXONICE_URI="http://tuxonice.net/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
 UNIPATCH_STRICTORDER="yes"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
 
@@ -34,6 +30,6 @@ RDEPEND="${RDEPEND}
 	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
 
 K_EXTRAELOG="If there are issues with this kernel, please direct any
-queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+		queries to the tuxonice-users mailing list:
+		http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
 K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.3.8-r2.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.3.8-r2.ebuild
new file mode 100644
index 000000000000..19f5c09c07dd
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.3.8-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.3.8-r2.ebuild,v 1.1 2012/12/30 21:08:16 pacho Exp $
+
+EAPI=5
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="10"
+
+inherit kernel-2 versionator
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net"
+
+TUXONICE_SNAPSHOT="2012-10-23"
+TUXONICE_PV="$(get_version_component_range 1-2)"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_SNAPSHOT}.patch.bz2"
+TUXONICE_URI="http://tuxonice.net/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any
+		queries to the tuxonice-users mailing list:
+		http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
+
+src_prepare() {
+	epatch -R "${FILESDIR}/${PN}-3.3-undo-cleanup.patch" # bug #427626
+}
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.24.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.24.ebuild
new file mode 100644
index 000000000000..d2e3796b2003
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.24.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.24.ebuild,v 1.1 2012/12/30 21:08:16 pacho Exp $
+
+EAPI=5
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="13"
+
+inherit kernel-2 versionator
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net"
+
+TUXONICE_SNAPSHOT="2012-12-23"
+TUXONICE_PV="$(replace_version_separator 2 '-')"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_SNAPSHOT}.patch.bz2"
+TUXONICE_URI="http://tuxonice.net/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any
+		queries to the tuxonice-users mailing list:
+		http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.5.7.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.5.7.ebuild
new file mode 100644
index 000000000000..ec2f059e0200
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.5.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.5.7.ebuild,v 1.1 2012/12/30 21:08:16 pacho Exp $
+
+EAPI=5
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="7"
+
+inherit kernel-2 versionator
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net"
+
+TUXONICE_SNAPSHOT="2012-10-23"
+TUXONICE_PV="$(get_version_component_range 1-2)"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_SNAPSHOT}.patch.bz2"
+TUXONICE_URI="http://tuxonice.net/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any
+		queries to the tuxonice-users mailing list:
+		http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.10.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.6.11.ebuild
index 5ee27fa94f57..d0170c40459a 100644
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.10.ebuild
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.6.11.ebuild
@@ -1,29 +1,26 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.10.ebuild,v 1.1 2012/09/15 10:13:17 pacho Exp $
-
-EAPI="4"
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.6.11.ebuild,v 1.1 2012/12/30 21:08:16 pacho Exp $
 
+EAPI=5
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
 K_GENPATCHES_VER="11"
 
-inherit kernel-2
+inherit kernel-2 versionator
 detect_version
 detect_arch
 
 DESCRIPTION="TuxOnIce + Gentoo patchset sources"
 HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net"
-IUSE=""
 
-TUXONICE_SNAPSHOT="20120721"
-TUXONICE_VERSION=""
-TUXONICE_TARGET="3.4"
-TUXONICE_URI="http://dev.gentoo.org/~pacho/tuxonice/${TUXONICE_SNAPSHOT}-TuxOnIce-for-Linux-${TUXONICE_TARGET}.patch.bz2"
+TUXONICE_SNAPSHOT="2012-12-23"
+TUXONICE_PV="$(replace_version_separator 2 '-')"
 
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_SNAPSHOT}-TuxOnIce-for-Linux-${TUXONICE_TARGET}.patch.bz2"
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_SNAPSHOT}.patch.bz2"
+TUXONICE_URI="http://tuxonice.net/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
 UNIPATCH_STRICTORDER="yes"
-
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
 
 KEYWORDS="~amd64 ~x86"
@@ -33,6 +30,6 @@ RDEPEND="${RDEPEND}
 	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
 
 K_EXTRAELOG="If there are issues with this kernel, please direct any
-queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+		queries to the tuxonice-users mailing list:
+		http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
 K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.7.1.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.7.1.ebuild
new file mode 100644
index 000000000000..398e5acc041b
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.7.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.7.1.ebuild,v 1.1 2012/12/30 21:08:16 pacho Exp $
+
+EAPI=5
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+# Looks like 3.7.x don't have 'extras', recheck on every bump
+K_GENPATCHES_VER="2"
+
+inherit kernel-2 versionator
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net"
+
+TUXONICE_SNAPSHOT="2012-12-23"
+TUXONICE_PV="$(replace_version_separator 2 '-')"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_SNAPSHOT}.patch.bz2"
+TUXONICE_URI="http://tuxonice.net/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any
+		queries to the tuxonice-users mailing list:
+		http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"