Correctly set paths for Gentoo's Grub2, thanks to Fitzcarraldo in #508462

Package-Manager: portage-2.2.10/cvs/Linux x86_64

4 files changed, 60 insertions, 14 deletions

diff --git a/kde-misc/kcm-grub2/ChangeLog b/kde-misc/kcm-grub2/ChangeLog
index fc624f865e71..0c29844b9985 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcm-grub2/ChangeLog,v 1.13 2014/01/18 18:49:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcm-grub2/ChangeLog,v 1.14 2014/05/03 10:36:53 thev00d00 Exp $
+
+*kcm-grub2-0.6.4-r1 (03 May 2014)
+
+  03 May 2014; Ian Whyman <thev00d00@gentoo.org> +kcm-grub2-0.6.4-r1.ebuild,
+  metadata.xml:
+  Correctly set paths for Gentoo's Grub2, thanks to Fitzcarraldo in #508462
 
   18 Jan 2014; Pacho Ramos <pacho@gentoo.org> kcm-grub2-0.6.4.ebuild:
   amd64 stable, bug #491040
diff --git a/kde-misc/kcm-grub2/Manifest b/kde-misc/kcm-grub2/Manifest
index 0ccf293f2ea7..5866029b30a8 100644
--- a/kde-misc/kcm-grub2/Manifest
+++ b/kde-misc/kcm-grub2/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST kcm-grub2-0.6.4.tar.gz 216966 SHA256 3521da59f9494aeca641becb9bb0607ba89caa6c1795d42eb2d8a4c23db7c216 SHA512 d996520762290b344737cba06a7b1db58ff016d6d91ab59514d6c675a3ad449ec81da0589a5f3b8ea50a9082fe5d32529a6112b5478f079f9ac08904d10eb0fe WHIRLPOOL 72fc06a7b81340f3e2b52727563b026270add268d21f6583f4f16b983c3b8a39ec21a65d34f34f98491816ddc162f296223e16ea0d73d19c9547e71c2db1b32d
+EBUILD kcm-grub2-0.6.4-r1.ebuild 1440 SHA256 9d6eb4a3c21ccebcf441b0a166dab21413ceeaba6b22ffcd9927043d8117fa03 SHA512 c4e1d5e11a5753144f0947d5e52d1c86fea989df9e09d609d41e351262c6345b7a6d70f4c5474a0074f5c8d620e79a51278be700ba959fd089c97569b1ef21c6 WHIRLPOOL 8f39999ee7a93fc54089119ea609ef5e862e302a0a1f1b2b5262447803e0a12171ae2c95939cc9bbbe71675da1e6d2a822f1a32ef2393292738586724a2e1946
 EBUILD kcm-grub2-0.6.4.ebuild 1086 SHA256 ba1f4d7513cdebb9484fd267e42a94c68df3b90c7bd9d9f4120f074167d1d403 SHA512 cdc47e7038f9cd54dd65e75be9857e7163f2825faa709249791437e31aa099364ed80b98b1cb460384d5384a490f4b39fa9242d96697b8c9988d9c04744a3157 WHIRLPOOL d73ab78662929fcc63844237c6bf3d6e9627457c85939d59b157dd3a700c09fdbb9e7b4c356b649140f56e78fd9a86d7e14e2f09a3e5de191f59ea9d2cb08659
-MISC ChangeLog 1894 SHA256 8c663f30fa7d590b16a8520e8276f404508a3bfc9609f2683ffd7d24e899aadc SHA512 817ecb53acf48c17a8f30fb3172af39b3d3b5b04196039441b835247e522bb14e3ddeb2789f8db796bc15b12fec04bd2898c93fe3bc5c1a1cb6615708f23edc2 WHIRLPOOL d1cd754049053ccccb619edebfa2079d6d5be368ee259a34c64d2c76b477d541b50d6b071a515dc4ccf34284b4fbfc4b196aa08e52f7d7ea22e73c73e3ba37d1
-MISC metadata.xml 485 SHA256 7fa68e3ac1f104d1f65f1334090d2983681eabb0b0e77664dd30b147157d917e SHA512 52866d81e42bfe6f7edec5e65f0860add878fc3921514cc61e7e946f05ef8bcb0a23208ae3a75c159f8c6b5a72aecf5350ad50208d9907d3b96feec683b68202 WHIRLPOOL ac3d7ec931ae9c362dc81817c85d82979be922a9c1980fb6ef9b775c0bcd78aef0f1e43d291547fb69bf7df8cf4ed3f1d18ba3cacbc280e579ab48c686445de0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlLazKUACgkQCaWpQKGI+9TLLwCghqIOsUpBQ3uwv2JNmSCImaDK
-1/gAn0R0bVVsDLXR5z2wrjptMmo2T5mC
-=flIi
------END PGP SIGNATURE-----
+MISC ChangeLog 2103 SHA256 3903bf9bf5537b3f11afb272422e6ad7b4227a0ca56539152bfefb54c182a818 SHA512 25370504aaf58fdbe98ef3ff4ed84af6a591f902a319f12f90dda91c25c1561bc20bb80e8d40292db2df1814b20d423c90309685edc6ebad65eb1afe3560e2d7 WHIRLPOOL 9849fbd904380925fe93022721a2b802107c61e530544795d28d0f179d74aa021492593075a90d296b6eb356f5884e0f5fbb2537f5ebd9cc02856447154fe41e
+MISC metadata.xml 485 SHA256 aae5ec873700e665092aa9714085318c3f935b93c97459f9581e30bdbf476e03 SHA512 feac488989d8b59e11550f2cb59c7c33b4eac2deaa7ab9db012b7431d0b5ecc8f2b66749b8e924bdfc3efdb12db3b053a4a265c2ac08bcf4a9f14d2a51929857 WHIRLPOOL 566f7cc130314bdaa826ebdf6eaa92c865daa2dbe9647f3d93be3d7f35fbbf6d7568513c349ab23f49a5101337fbe33262cd5a4b2fbf424eb54443d0de0e8c02
diff --git a/kde-misc/kcm-grub2/kcm-grub2-0.6.4-r1.ebuild b/kde-misc/kcm-grub2/kcm-grub2-0.6.4-r1.ebuild
new file mode 100644
index 000000000000..d5c96bfa2e92
--- /dev/null
+++ b/kde-misc/kcm-grub2/kcm-grub2-0.6.4-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 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.6.4-r1.ebuild,v 1.1 2014/05/03 10:36:52 thev00d00 Exp $
+
+EAPI=5
+
+KDE_LINGUAS="ca ca@valencia cs da de el es et fi fr ga gl hu it lt nl pa pl pt
+pt_BR ro ru sk sl sv uk tr zh_TW"
+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="4"
+IUSE="+hwinfo imagemagick packagekit"
+
+COMMON_DEPEND="
+	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)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DWITHQApt=OFF"
+		"-DGRUB_INSTALL_EXE=/usr/sbin/grub2-install"
+		"-DGRUB_MKCONFIG_EXE=/usr/sbin/grub2-mkconfig"
+		"-DGRUB_PROBE_EXE=/usr/sbin/grub2-probe"
+		"-DGRUB_SET_DEFAULT_EXE=/usr/sbin/grub2-set-default"
+		"-DGRUB_MENU=/boot/grub/grub.cfg"
+		"-DGRUB_CONFIG=/etc/default/grub"
+		"-DGRUB_ENV=/boot/grub/grubenv"
+		"-DGRUB_MEMTEST=/etc/grub.d/39_memtest86+"
+		$(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
index 864a50d0539d..ef2481bb7a1e 100644
--- a/kde-misc/kcm-grub2/metadata.xml
+++ b/kde-misc/kcm-grub2/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>kde</herd>
 <maintainer>
-	<email>thev00d00@gentoo.org</email>
+	<email>thevoodoo@gentoo.org</email>
 	<name>Ian Whyman</name>
 </maintainer>
 <use>