4 files changed, 22 insertions, 107 deletions
diff --git a/sys-kernel/tuxonice-sources/ChangeLog b/sys-kernel/tuxonice-sources/ChangeLog
index a2dd3a9145a0..84c8c90daae0 100644
--- a/sys-kernel/tuxonice-sources/ChangeLog
+++ b/sys-kernel/tuxonice-sources/ChangeLog
@@ -1,6 +1,13 @@
 # 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.130 2012/01/03 23:08:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/ChangeLog,v 1.131 2012/01/21 12:24:14 pacho Exp $
+
+*tuxonice-sources-3.0.17 (21 Jan 2012)
+
+  21 Jan 2012; Pacho Ramos <pacho@gentoo.org> +tuxonice-sources-3.0.17.ebuild,
+  -tuxonice-sources-2.6.37-r3.ebuild, -tuxonice-sources-2.6.37.ebuild,
+  -tuxonice-sources-2.6.38-r2.ebuild:
+  Version bump, remove old.
 
 *tuxonice-sources-3.0.15 (03 Jan 2012)
 
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.37.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.37.ebuild
deleted file mode 100644
index c17226d61d2d..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.37.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.37.ebuild,v 1.3 2011/06/06 20:09:10 tomka Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net"
-IUSE=""
-
-TUXONICE_SNAPSHOT="0"
-TUXONICE_VERSION="3.2-rc2"
-TUXONICE_TARGET="2.6.37"
-
-if [[ -n "${TUXONICE_SNAPSHOT}" ]]; then
-	TUXONICE_SRC="current-tuxonice-for-${TUXONICE_TARGET}.patch_${TUXONICE_SNAPSHOT}"
-else
-	TUXONICE_SRC="tuxonice-${TUXONICE_VERSION}-for-${TUXONICE_TARGET}.patch"
-fi
-
-TUXONICE_URI="http://www.tuxonice.net/files/${TUXONICE_SRC}.bz2"
-
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_SRC}.bz2"
-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"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.38-r2.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.38-r2.ebuild
deleted file mode 100644
index 4fc6c450319e..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.38-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.38-r2.ebuild,v 1.1 2011/06/29 18:15:08 nelchael Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="8"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net"
-IUSE=""
-
-TUXONICE_SNAPSHOT=""
-TUXONICE_VERSION="3.2"
-TUXONICE_TARGET="2.6.38"
-
-if [[ -n "${TUXONICE_SNAPSHOT}" ]]; then
-	TUXONICE_SRC="current-tuxonice-for-${TUXONICE_TARGET}.patch_${TUXONICE_SNAPSHOT}"
-else
-	TUXONICE_SRC="tuxonice-${TUXONICE_VERSION}-for-${TUXONICE_TARGET}.patch"
-fi
-
-TUXONICE_URI="http://www.tuxonice.net/files/${TUXONICE_SRC}.bz2"
-
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_SRC}.bz2"
-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"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.37-r3.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.17.ebuild
index cc1682ae5f5d..ec264ffed1f4 100644
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.37-r3.ebuild
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.17.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-2.6.37-r3.ebuild,v 1.1 2011/06/29 18:15:08 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.17.ebuild,v 1.1 2012/01/21 12:24:14 pacho Exp $
+
+EAPI="4"
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="8"
+K_GENPATCHES_VER="16"
 
 inherit kernel-2
 detect_version
@@ -14,19 +16,21 @@ DESCRIPTION="TuxOnIce + Gentoo patchset sources"
 HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net"
 IUSE=""
 
-TUXONICE_SNAPSHOT=""
-TUXONICE_VERSION="3.2"
-TUXONICE_TARGET="2.6.37"
+TUXONICE_SNAPSHOT="20111012"
+TUXONICE_VERSION=""
+TUXONICE_TARGET="3.0"
 
+# Because "current" patches can change without notifying, we need to supply them
 if [[ -n "${TUXONICE_SNAPSHOT}" ]]; then
-	TUXONICE_SRC="current-tuxonice-for-${TUXONICE_TARGET}.patch_${TUXONICE_SNAPSHOT}"
+	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"
 else
-	TUXONICE_SRC="tuxonice-${TUXONICE_VERSION}-for-${TUXONICE_TARGET}.patch"
+	TUXONICE_SRC="http://www.tuxonice.net/files/tuxonice-${TUXONICE_VERSION}-for-${TUXONICE_TARGET}.patch"
+	UNIPATCH_LIST="${DISTDIR}/tuxonice-${TUXONICE_VERSION}-for-${TUXONICE_TARGET}.patch.bz2"
 fi
 
-TUXONICE_URI="http://www.tuxonice.net/files/${TUXONICE_SRC}.bz2"
+TUXONICE_URI="${TUXONICE_SRC}.bz2"
 
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_SRC}.bz2"
 UNIPATCH_STRICTORDER="yes"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"