summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <tchvatal@suse.cz>2011-08-28 14:41:06 +0200
committerTomas Chvatal <tchvatal@suse.cz>2011-08-28 14:41:06 +0200
commit550ee8a20a1ad4928b145e24a1a86daebd503164 (patch)
treef084daf9f0d402a3c521413a1fcf665fcfb2fec1
parentPunt the grub2 that is now in main tree. (diff)
downloadscarabeus-550ee8a20a1ad4928b145e24a1a86daebd503164.tar.gz
scarabeus-550ee8a20a1ad4928b145e24a1a86daebd503164.tar.bz2
scarabeus-550ee8a20a1ad4928b145e24a1a86daebd503164.zip
punt pkg moved to main tree.
-rw-r--r--kde-misc/kcm-grub2/Manifest4
-rw-r--r--kde-misc/kcm-grub2/files/kcm-grub2-use-gentoo-grub-commands.patch39
-rw-r--r--kde-misc/kcm-grub2/kcm-grub2-0.5.0.ebuild46
-rw-r--r--kde-misc/kcm-grub2/metadata.xml14
4 files changed, 0 insertions, 103 deletions
diff --git a/kde-misc/kcm-grub2/Manifest b/kde-misc/kcm-grub2/Manifest
deleted file mode 100644
index b561510..0000000
--- a/kde-misc/kcm-grub2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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 1028 RMD160 e07bdd075faa7b91d80aff2c08deceed64900435 SHA1 de94da2a4010984fe0da81e40fdc2b9b35e9935e SHA256 641d494e0c9a96f2bf8a4e93533e904ba7ad17fd3f5dd78a26e91e2d8a4adae9
-MISC metadata.xml 420 RMD160 0a74ea5c8b83ebd0f7217377858649e751b2fcf2 SHA1 3cec90a80930893485d3d85bb0b1940050c592cc SHA256 f7e2ddaacce8c5a37fad32f76ee7e2cf83f0c195d8f2dd6f8ebccad0243a6978
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 f0c86cf..0000000
--- 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.0.ebuild b/kde-misc/kcm-grub2/kcm-grub2-0.5.0.ebuild
deleted file mode 100644
index 76f59a6..0000000
--- a/kde-misc/kcm-grub2/kcm-grub2-0.5.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Sabayon Promotion
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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
deleted file mode 100644
index d3eaba7..0000000
--- a/kde-misc/kcm-grub2/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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>
-</use>
-</pkgmetadata>
-