Add grub2 kcm module for in-kde configuration.

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

diff --git a/kde-misc/kcm-grub2/ChangeLog b/kde-misc/kcm-grub2/ChangeLog
new file mode 100644 (file)
index 0000000..7b24c53
--- /dev/null
+++ b/kde-misc/kcm-grub2/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for kde-misc/kcm-grub2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcm-grub2/ChangeLog,v 1.1 2011/08/27 12:48:09 scarabeus Exp $
+
+*kcm-grub2-0.5.0 (28 Aug 2011)
+
+  28 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/kcm-grub2-use-gentoo-grub-commands.patch, +kcm-grub2-0.5.0.ebuild,
+  +metadata.xml:
+  Add grub2 kcm module for in-kde configuration.
+

diff --git a/kde-misc/kcm-grub2/Manifest b/kde-misc/kcm-grub2/Manifest
new file mode 100644 (file)
index 0000000..174fb5d
--- /dev/null
+++ b/kde-misc/kcm-grub2/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kcm-grub2-use-gentoo-grub-commands.patch 2156 RMD160 e6fc4a71edea7b766863cc354885ab3b818a9e98 SHA1 a523947b3d2502ff29f3732556a934b63783d9d0 SHA256 df25f220a96b1eda28ae68620506054c31f7d5dbc220d74a1e54cc9a0eb02fa7
+DIST kcm-grub2-0.5.0.tar.gz 102743 RMD160 1b891af06788e484d42f2e1ad60ddf391b489465 SHA1 0a67c1c030a327e94a8a7fadedb92a3b55dce68b SHA256 c748e272b86f54e043e4cebb3238a19d697218cb56753b75d638907bac0c4236
+EBUILD kcm-grub2-0.5.0.ebuild 1134 RMD160 8f40420026af57689fe854703f9872797425e387 SHA1 ca0b3dded5e2f8d50a5001d23ebda87751d4a623 SHA256 732a323fed3a1b63a99cf9b811b66b16c441b3080412b1461585795cda47e712
+MISC ChangeLog 442 RMD160 0929d4b84883356089d364369c44630c62728720 SHA1 4397839679f015c8c901df55331d618d91565fe9 SHA256 9e334e167cbf5d4973bd51e2c07520ad02f58d087bced3064868a06b0eaa284a
+MISC metadata.xml 491 RMD160 c25893b1c1e41960ad7d009c97dfd143f143f001 SHA1 b06acab0c95af4039589fda3bf3fe87bd356afdb SHA256 609967189bd0ac12e3df58fce9b6d0e56c409e7afdcedf4e218313ef8750a617
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk5aOMwACgkQHB6c3gNBRYfnzQCgkhJxgST+XzBJT/1X9w2mu7hL
+Cc4AoKyLYU4csGRZGUYzXQiLUbS/DJ92
+=SVVz
+-----END PGP SIGNATURE-----

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
new file mode 100644 (file)
index 0000000..f0c86cf
--- /dev/null
+++ b/kde-misc/kcm-grub2/files/kcm-grub2-use-gentoo-grub-commands.patch
@@ -0,0 +1,39 @@
+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.0.ebuild b/kde-misc/kcm-grub2/kcm-grub2-0.5.0.ebuild
new file mode 100644 (file)
index 0000000..9ed1a53
--- /dev/null
+++ b/kde-misc/kcm-grub2/kcm-grub2-0.5.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Sabayon Promotion
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcm-grub2/kcm-grub2-0.5.0.ebuild,v 1.1 2011/08/27 12:48:09 scarabeus Exp $
+
+EAPI=4
+
+KDE_MINIMAL="4.6"
+KDE_LINGUAS="da de et hu nl pt pt_BR sv uk"
+inherit kde4-base
+
+DESCRIPTION="KCModule for configuring the GRUB2 bootloader."
+HOMEPAGE="http://kde-apps.org/content/show.php?content=139643"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="+hwinfo imagemagick packagekit"
+
+COMMON_DEPEND="
+       $(add_kdebase_dep kdelibs)
+       hwinfo? ( sys-apps/hwinfo )
+       imagemagick? ( media-gfx/imagemagick )
+       packagekit? ( app-admin/packagekit-qt4 )
+"
+DEPEND="${COMMON_DEPEND}
+       dev-util/automoc
+"
+RDEPEND="${COMMON_DEPEND}
+       $(add_kdebase_dep kcmshell)
+"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-use-gentoo-grub-commands.patch
+)
+
+src_configure() {
+       local mycmakeargs=(
+               "-DWITHQApt=OFF"
+               $(cmake-utils_use_with packagekit QPackageKit)
+               $(cmake-utils_use_with imagemagick ImageMagick)
+               $(cmake-utils_use_with hwinfo HD)
+       )
+       cmake-utils_src_configure
+}

diff --git a/kde-misc/kcm-grub2/metadata.xml b/kde-misc/kcm-grub2/metadata.xml
new file mode 100644 (file)
index 0000000..eb14e02
--- /dev/null
+++ b/kde-misc/kcm-grub2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+       <email>ian.whyman@sabayon.org</email>
+       <name>Ian Whyman</name>
+</maintainer>
+<use>
+       <flag name="imagemagick">Create splash images compatible with GRUB2</flag>
+       <flag name="hwinfo">Used to work out supported framebuffer resolutions</flag>
+       <flag name="packagekit">Add support for packagekit integration</flag>
+</use>
+</pkgmetadata>
+