diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-08-27 12:48:09 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-08-27 12:48:09 +0000 |
commit | 7c6471ec5838bf1e073b1e5d651b71f57f402f4d (patch) | |
tree | 29ced69ecf690a608934a82afdb0d9166c03b873 /kde-misc/kcm-grub2 | |
parent | Version bump. (diff) | |
download | gentoo-2-7c6471ec5838bf1e073b1e5d651b71f57f402f4d.tar.gz gentoo-2-7c6471ec5838bf1e073b1e5d651b71f57f402f4d.tar.bz2 gentoo-2-7c6471ec5838bf1e073b1e5d651b71f57f402f4d.zip |
Add grub2 kcm module for in-kde configuration.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'kde-misc/kcm-grub2')
-rw-r--r-- | kde-misc/kcm-grub2/ChangeLog | 11 | ||||
-rw-r--r-- | kde-misc/kcm-grub2/files/kcm-grub2-use-gentoo-grub-commands.patch | 39 | ||||
-rw-r--r-- | kde-misc/kcm-grub2/kcm-grub2-0.5.0.ebuild | 46 | ||||
-rw-r--r-- | kde-misc/kcm-grub2/metadata.xml | 15 |
4 files changed, 111 insertions, 0 deletions
diff --git a/kde-misc/kcm-grub2/ChangeLog b/kde-misc/kcm-grub2/ChangeLog new file mode 100644 index 000000000000..7b24c5363540 --- /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/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 index 000000000000..f0c86cfed28a --- /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 index 000000000000..9ed1a536ecaa --- /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 index 000000000000..eb14e020eeaa --- /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> + |