Version bump to latest.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 8 insertions, 41 deletions

diff --git a/kde-misc/kcm-grub2/ChangeLog b/kde-misc/kcm-grub2/ChangeLog
index 9557070e563b..00a43823b995 100644
--- a/kde-misc/kcm-grub2/ChangeLog
+++ b/kde-misc/kcm-grub2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/kcm-grub2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcm-grub2/ChangeLog,v 1.6 2012/06/15 16:30:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcm-grub2/ChangeLog,v 1.7 2012/06/18 16:19:08 scarabeus Exp $
+
+*kcm-grub2-0.5.8 (18 Jun 2012)
+
+  18 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> +kcm-grub2-0.5.8.ebuild,
+  -files/kcm-grub2-use-gentoo-grub-commands.patch, -kcm-grub2-0.5.5.ebuild:
+  Version bump to latest.
 
   15 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> -kcm-grub2-0.5.0.ebuild:
   Remove old.
diff --git a/kde-misc/kcm-grub2/files/kcm-grub2-use-gentoo-grub-commands.patch b/kde-misc/kcm-grub2/files/kcm-grub2-use-gentoo-grub-commands.patch
deleted file mode 100644
index f0c86cfed28a..000000000000
--- a/kde-misc/kcm-grub2/files/kcm-grub2-use-gentoo-grub-commands.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urN kcm-grub2-0.5.0/src/helper/helper.cpp kcm-grub2-0.5.0.new/src/helper/helper.cpp
---- kcm-grub2-0.5.0/src/helper/helper.cpp	2011-05-09 16:17:59.000000000 +0200
-+++ kcm-grub2-0.5.0.new/src/helper/helper.cpp	2011-06-29 11:23:14.321387301 +0200
-@@ -67,7 +67,7 @@
-     }
- 
-     KProcess grub_install;
--    grub_install.setShellCommand(QString("grub-install --root-directory=%1 %2").arg(KShell::quoteArg(mountPoint), KShell::quoteArg(partition.remove(QRegExp("\\d+")))));
-+    grub_install.setShellCommand(QString("grub2-install --root-directory=%1 %2").arg(KShell::quoteArg(mountPoint), KShell::quoteArg(partition.remove(QRegExp("\\d+")))));
-     grub_install.setOutputChannelMode(KProcess::MergedChannels);
-     if (grub_install.execute() != 0) {
-         reply = ActionReply::HelperErrorReply;
-@@ -103,7 +103,7 @@
-     QStringList grubPartitions;
-     HelperSupport::progressStep(0);
-     for (int i = 0; i < mountPoints.size(); i++) {
--        grub_probe.setShellCommand(QString("grub-probe -t drive %1").arg(KShell::quoteArg(mountPoints.at(i))));
-+        grub_probe.setShellCommand(QString("grub2-probe -t drive %1").arg(KShell::quoteArg(mountPoints.at(i))));
-         grub_probe.setOutputChannelMode(KProcess::MergedChannels);
-         if (grub_probe.execute() != 0) {
-             reply = ActionReply::HelperErrorReply;
-@@ -175,7 +175,7 @@
-     }
- 
-     KProcess grub_mkconfig;
--    grub_mkconfig.setShellCommand(QString("grub-mkconfig -o %1").arg(KShell::quoteArg(menuFileName)));
-+    grub_mkconfig.setShellCommand(QString("grub2-mkconfig -o %1").arg(KShell::quoteArg(menuFileName)));
-     grub_mkconfig.setOutputChannelMode(KProcess::MergedChannels);
-     if (grub_mkconfig.execute() != 0) {
-         reply = ActionReply::HelperErrorReply;
-@@ -184,7 +184,7 @@
-     }
- 
-     KProcess grub_set_default;
--    grub_set_default.setShellCommand(QString("grub-set-default %1").arg(defaultEntry));
-+    grub_set_default.setShellCommand(QString("grub2-set-default %1").arg(defaultEntry));
-     grub_set_default.setOutputChannelMode(KProcess::MergedChannels);
-     if (grub_set_default.execute() != 0) {
-         reply = ActionReply::HelperErrorReply;
diff --git a/kde-misc/kcm-grub2/kcm-grub2-0.5.5.ebuild b/kde-misc/kcm-grub2/kcm-grub2-0.5.8.ebuild
index 5aaa71b8fbf3..64ebc08391d9 100644
--- a/kde-misc/kcm-grub2/kcm-grub2-0.5.5.ebuild
+++ b/kde-misc/kcm-grub2/kcm-grub2-0.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcm-grub2/kcm-grub2-0.5.5.ebuild,v 1.4 2012/02/14 21:48:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcm-grub2/kcm-grub2-0.5.8.ebuild,v 1.1 2012/06/18 16:19:07 scarabeus Exp $
 
 EAPI=4